Skip to content

Commit 07de0f3

Browse files
AlvinCodedAlvinCoded
committed
fix: test errors and others
1 parent 23f477e commit 07de0f3

23 files changed

+321
-106
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ jobs:
4848
- name: Run tests
4949
env:
5050
GROK_API_KEY: sk-test-key
51-
GROK_BASE_URL: https://api.x.ai/v1
51+
GROK_BASE_URL: https://api.x.ai/
5252
run: |
5353
composer test --testsuite Unit

‎composer.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
"psr/http-client": "^1.0"
1212
},
1313
"require-dev": {
14-
"phpunit/phpunit": "^10.5",
14+
"phpunit/phpunit": "^11.0",
1515
"phpstan/phpstan": "^1.11",
1616
"squizlabs/php_codesniffer": "^3.8",
1717
"mockery/mockery": "^1.6",
1818
"symfony/var-dumper": "^7.0",
19-
"vlucas/phpdotenv": "^5.6"
19+
"vlucas/phpdotenv": "^5.6",
20+
"laravel/framework": "^11.0 || ^12.0",
21+
"laravel/pint": "^1.20"
2022
},
2123
"suggest": {
2224
"laravel/framework": "Required for Laravel integration (11.x or higher)"
@@ -52,6 +54,7 @@
5254
},
5355
"config": {
5456
"sort-packages": true,
57+
"preferred-install": "dist",
5558
"optimize-autoloader": true,
5659
"allow-plugins": {
5760
"php-http/discovery": true

‎phpunit.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
4-
bootstrap="vendor/autoload.php"
4+
bootstrap="tests/bootstrap.php"
55
colors="true"
66
cacheDirectory=".phpunit.cache">
77

@@ -23,6 +23,6 @@
2323
<php>
2424
<env name="APP_ENV" value="testing"/>
2525
<env name="GROK_API_KEY" value="sk-test-key"/>
26-
<env name="GROK_BASE_URL" value="https://api.x.ai/v1"/>
26+
<env name="GROK_BASE_URL" value="https://api.x.ai"/>
2727
</php>
28-
</phpunit>
28+
</phpunit>

‎src/Client/GrokClient.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public function __construct(private ?string $apiKey = null, array $options = [])
5252
}
5353

5454
$this->config = new Config(array_merge($options, ['api_key' => $this->apiKey]));
55+
$this->baseUrl = $this->config->getBaseUrl();
5556
}
5657

5758
/**
@@ -125,7 +126,7 @@ public function embeddings(): Embeddings
125126
*/
126127
public function setBaseUrl(string $url): void
127128
{
128-
$this->baseUrl = $url;
129+
$this->config->setBaseUrl($url);
129130
}
130131

131132
/**

‎src/Config.php‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Config
1919
/**
2020
* @var string Current API version
2121
*/
22-
private string $apiVersion = 'v1';
22+
private string $apiVersion = '';
2323

2424
/**
2525
* @var array Default configuration options
@@ -29,7 +29,6 @@ class Config
2929
'connect_timeout' => 10,
3030
'max_retries' => 3,
3131
'retry_delay' => 1000,
32-
'base_url' => 'https://api.x.ai',
3332
'debug' => false,
3433
'stream_buffer_size' => 1024,
3534
];
@@ -39,21 +38,26 @@ class Config
3938
*/
4039
private array $config;
4140

41+
private function loadConfig(): array
42+
{
43+
return include __DIR__ . '/config/grok.php';
44+
}
45+
4246
/**
4347
* Config constructor.
4448
*
45-
* @param array $options Custom configuration options
49+
* @param array $options
4650
*/
4751
public function __construct(array $options = [])
4852
{
49-
$this->config = array_merge($this->defaults, $options);
53+
$this->config = array_merge($this->defaults, $this->loadConfig(), $options);
5054
}
5155

5256
/**
5357
* Get a configuration value.
5458
*
55-
* @param string $key Configuration key
56-
* @param mixed|null $default Default value if key doesn't exist
59+
* @param string $key
60+
* @param mixed|null $default
5761
* @return mixed
5862
*/
5963
public function get(string $key, mixed $default = null): mixed
@@ -64,8 +68,8 @@ public function get(string $key, mixed $default = null): mixed
6468
/**
6569
* Set a configuration value.
6670
*
67-
* @param string $key Configuration key
68-
* @param mixed $value Configuration value
71+
* @param string $key
72+
* @param mixed $value
6973
* @return void
7074
*/
7175
public function set(string $key, mixed $value): void
@@ -150,6 +154,17 @@ public function getModelMaxTokens(Model $model): int
150154
return $model->contextWindow();
151155
}
152156

157+
/**
158+
* Sets the base URL in the configuration.
159+
*
160+
* @param string $url
161+
* @return void
162+
*/
163+
public function setBaseUrl(string $url): void
164+
{
165+
$this->config['base_url'] = $url;
166+
}
167+
153168
/**
154169
* Get the base URL for API requests.
155170
*

‎src/Endpoints/Chat.php‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,12 @@ public function __construct(Config $config, ?Model $model = null)
101101
*/
102102
public function send(string $message, ?Params $params = null): ChatMessage
103103
{
104+
if (empty($message)) {
105+
throw new GrokException('Message cannot be empty');
106+
}
104107
$this->history[] = ['role' => 'user', 'content' => $message];
105108
$response = $this->generate($this->history, $params);
106-
$this->history[] = ['role' => 'assistant', 'content' => $response->text()];
109+
$this->history[] = ['role' => 'assistant', 'content' => $response->getContent()];
107110
return $response;
108111
}
109112

@@ -170,10 +173,10 @@ public function generateStructured(string|array $prompt, array|string $jsonSchem
170173
$chatMessage = $this->responseParser->parse($response, 'chat');
171174
$decoded = json_decode($chatMessage->getContent(), true);
172175

173-
if (is_string($schema) && class_exists($schema)) {
174-
return (new $schema())->fromArray($decoded);
176+
if (is_string($jsonSchema) && class_exists($jsonSchema)) {
177+
return (new $jsonSchema())->fromArray($decoded)->toArray();
175178
}
176-
179+
177180
return $decoded;
178181
}
179182

@@ -248,8 +251,15 @@ private function streamRequest(string $endpoint, array $payload, callable $callb
248251
'stream' => true,
249252
]);
250253

251-
foreach ($response->getBody() as $chunk) {
252-
$callback($chunk);
254+
$body = $response->getBody();
255+
while (!$body->eof()) {
256+
$chunk = $body->read(1024);
257+
$lines = explode("\n", $chunk);
258+
foreach ($lines as $line) {
259+
if (!empty($line)) {
260+
$callback($line);
261+
}
262+
}
253263
}
254264
}
255265

@@ -266,4 +276,17 @@ private function formatPrompt(string|array $prompt): array
266276
}
267277
return $prompt;
268278
}
279+
280+
/**
281+
* Set the HTTP client (for testing purposes).
282+
*
283+
* @param Client $client
284+
* @return self
285+
*/
286+
public function setHttpClient(Client $client): self
287+
{
288+
$this->client = $client;
289+
return $this;
290+
}
291+
269292
}

‎src/Endpoints/Completions.php‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,20 @@ public function create(string $prompt, ?Params $params = null): ChatCompletion
101101
$this->model->value
102102
);
103103

104-
$response = $this->post(self::COMPLETIONS_ENDPOINT, $payload)[0];
105-
return $this->responseParser->parse($response, 'completion');
104+
$maxTokens = $this->config->getModelMaxTokens($this->model);
105+
if (isset($payload['max_tokens']) && $payload['max_tokens'] > $maxTokens) {
106+
throw new GrokException("Requested token count exceeds the model's maximum context length of {$maxTokens} tokens");
107+
}
108+
109+
$response = $this->client->post($this->config->getBaseUrl() . self::COMPLETIONS_ENDPOINT, [
110+
'json' => $payload,
111+
'headers' => $this->requestBuilder->buildHeaders($this->config->getApiKey())
112+
]);
113+
$parsedResponse = $this->responseParser->parse($response, 'completion');
114+
if (empty($parsedResponse->getChoices())) {
115+
throw new GrokException('The response does not contain any choices.');
116+
}
117+
return $parsedResponse;
106118
}
107119

108120
/**
@@ -141,8 +153,15 @@ private function streamRequest(string $endpoint, array $payload, callable $callb
141153
'stream' => true,
142154
]);
143155

144-
foreach ($response->getBody() as $chunk) {
145-
$callback($chunk);
156+
$body = $response->getBody();
157+
while (!$body->eof()) {
158+
$chunk = $body->read(1024);
159+
$lines = explode("\n", $chunk);
160+
foreach ($lines as $line) {
161+
if (!empty($line)) {
162+
$callback($line);
163+
}
164+
}
146165
}
147166
}
148167

@@ -187,4 +206,16 @@ public function getTokenCount(string $text): int
187206
$result = json_decode($response[0]->getBody()->getContents(), false);
188207
return $result['token_count'];
189208
}
209+
210+
/**
211+
* Set the HTTP client (for testing purposes).
212+
*
213+
* @param Client $client
214+
* @return self
215+
*/
216+
public function setHttpClient(Client $client): self
217+
{
218+
$this->client = $client;
219+
return $this;
220+
}
190221
}

‎src/Endpoints/Embeddings.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,16 @@ public function create(string|array $input, ?Params $params = null): EmbeddingRe
111111

112112
return $this->responseParser->parse($response, 'embedding');
113113
}
114+
115+
/**
116+
* Set the HTTP client (for testing purposes).
117+
*
118+
* @param Client $client
119+
* @return self
120+
*/
121+
public function setHttpClient(Client $client): self
122+
{
123+
$this->client = $client;
124+
return $this;
125+
}
114126
}

‎src/Endpoints/Images.php‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,14 @@ public function __construct(Config $config, ?Model $model = null)
7474
{
7575
$this->config = $config;
7676
$this->apiKey = $config->getApiKey();
77-
$this->httpClient = new Client();
77+
$this->client = new Client([
78+
'base_uri' => $config->getBaseUrl(),
79+
'timeout' => $config->get('timeout'),
80+
'headers' => [
81+
'Authorization' => 'Bearer ' . $this->apiKey,
82+
'Content-Type' => 'application/json',
83+
],
84+
]);
7885

7986
if (is_string($model)) {
8087
$this->model = Model::fromString($model);
@@ -97,8 +104,12 @@ public function __construct(Config $config, ?Model $model = null)
97104
* @return Image
98105
* @throws GrokException
99106
*/
100-
public function analyze(string $imageUrl, ?string $prompt = null, ?Params $params = null): Image
107+
public function analyze(?string $imageUrl, ?string $prompt = null, ?Params $params = null): Image
101108
{
109+
if (is_null($imageUrl)) {
110+
throw new GrokException("Image URL cannot be null");
111+
}
112+
102113
$this->validateImageUrl($imageUrl);
103114

104115
$payload = $this->requestBuilder->buildImageAnalysisRequest(
@@ -108,7 +119,10 @@ public function analyze(string $imageUrl, ?string $prompt = null, ?Params $param
108119
$this->model->value
109120
);
110121

111-
$response = $this->post(self::CHAT_ENDPOINT, $payload)[0];
122+
$response = $this->client->post($this->config->getBaseUrl() . self::CHAT_ENDPOINT, [
123+
'json' => $payload,
124+
'headers' => $this->requestBuilder->buildHeaders($this->config->getApiKey())
125+
]);
112126
return $this->responseParser->parse($response, 'image');
113127
}
114128

@@ -129,4 +143,17 @@ private function validateImageUrl(string $imageUrl): void
129143
throw new GrokException("Unsupported image format: {$extension}");
130144
}
131145
}
146+
147+
/**
148+
* Set the HTTP client (for testing purposes).
149+
*
150+
* @param Client $client
151+
* @return self
152+
*/
153+
public function setHttpClient(Client $client): self
154+
{
155+
$this->client = $client;
156+
return $this;
157+
}
158+
132159
}

‎src/Enums/Model.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ public static function fromString(string $value): self
8080
*/
8181
public function supportsVision(): bool
8282
{
83-
return $this === self::GROK_2_VISION_1212 || $this === self::GROK_VISION_BETA;
83+
return match($this) {
84+
self::GROK_2_VISION_1212, self::GROK_VISION_BETA => true,
85+
default => false,
86+
};
8487
}
8588

8689
/**
@@ -125,4 +128,8 @@ public static function default(): self
125128
return self::GROK_2_1212;
126129
}
127130

131+
// public function __toString(): string
132+
// {
133+
// return $this->value;
134+
// }
128135
}

0 commit comments

Comments
 (0)