Skip to content

Fix array_merge() fatal error with string payloads in ModelClient imp… #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −44
Open

Fix array_merge() fatal error with string payloads in ModelClient imp… #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/platform/src/Bridge/Albert/EmbeddingsModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawResultInterface
public function request(Model $model, array $payload, array $options = []): RawResultInterface
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/embeddings', $this->baseUrl), [
'auth_bearer' => $this->apiKey,
'json' => \is_array($payload) ? array_merge($payload, $options) : $payload,
'json' => array_merge($payload, $options),
]));
}
}
4 changes: 2 additions & 2 deletions src/platform/src/Bridge/Albert/GptModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public function supports(Model $model): bool
return $model instanceof Gpt;
}

public function request(Model $model, array|string $payload, array $options = []): RawResultInterface
public function request(Model $model, array $payload, array $options = []): RawResultInterface
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/chat/completions', $this->baseUrl), [
'auth_bearer' => $this->apiKey,
'json' => \is_array($payload) ? array_merge($payload, $options) : $payload,
'json' => array_merge($payload, $options),
]));
}
}
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Anthropic/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function supports(Model $model): bool
return $model instanceof Claude;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$headers = [
'x-api-key' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Azure/Meta/LlamaModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function supports(Model $model): bool
return $model instanceof Llama;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$url = \sprintf('https://%s/chat/completions', $this->baseUrl);

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Azure/OpenAi/EmbeddingsModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$url = \sprintf('https://%s/openai/deployments/%s/embeddings', $this->baseUrl, $this->deployment);

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Azure/OpenAi/GptModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function supports(Model $model): bool
return $model instanceof Gpt;
}

public function request(Model $model, object|array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, object|array $payload, array $options = []): RawHttpResult
{
$url = \sprintf('https://%s/openai/deployments/%s/chat/completions', $this->baseUrl, $this->deployment);

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Azure/OpenAi/WhisperModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function supports(Model $model): bool
return $model instanceof Whisper;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$task = $options['task'] ?? Task::TRANSCRIPTION;
$endpoint = Task::TRANSCRIPTION === $task ? 'transcriptions' : 'translations';
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Bedrock/Anthropic/ClaudeModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function supports(Model $model): bool
return $model instanceof Claude;
}

public function request(Model $model, array|string $payload, array $options = []): RawBedrockResult
public function request(Model $model, array $payload, array $options = []): RawBedrockResult
{
unset($payload['model']);

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Bedrock/Meta/LlamaModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function supports(Model $model): bool
return $model instanceof Llama;
}

public function request(Model $model, array|string $payload, array $options = []): RawBedrockResult
public function request(Model $model, array $payload, array $options = []): RawBedrockResult
{
return new RawBedrockResult($this->bedrockRuntimeClient->invokeModel(new InvokeModelRequest([
'modelId' => $this->getModelId($model),
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Bedrock/Nova/NovaModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function supports(Model $model): bool
return $model instanceof Nova;
}

public function request(Model $model, array|string $payload, array $options = []): RawBedrockResult
public function request(Model $model, array $payload, array $options = []): RawBedrockResult
{
$modelOptions = [];
if (isset($options['tools'])) {
Expand Down
4 changes: 2 additions & 2 deletions src/platform/src/Bridge/Cerebras/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function supports(BaseModel $model): bool
return $model instanceof Model;
}

public function request(BaseModel $model, array|string $payload, array $options = []): RawHttpResult
public function request(BaseModel $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult(
$this->httpClient->request(
Expand All @@ -55,7 +55,7 @@ public function request(BaseModel $model, array|string $payload, array $options
'Content-Type' => 'application/json',
'Authorization' => \sprintf('Bearer %s', $this->apiKey),
],
'json' => \is_array($payload) ? array_merge($payload, $options) : $payload,
'json' => array_merge($payload, $options),
]
)
);
Expand Down
10 changes: 3 additions & 7 deletions src/platform/src/Bridge/ElevenLabs/ElevenLabsClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ public function supports(Model $model): bool
return $model instanceof ElevenLabs;
}

public function request(Model $model, array|string $payload, array $options = []): RawResultInterface
public function request(Model $model, array $payload, array $options = []): RawResultInterface
{
if (!\is_array($payload)) {
throw new InvalidArgumentException(\sprintf('The payload must be an array, received "%s".', get_debug_type($payload)));
}

if (\in_array($model->getName(), [ElevenLabs::SCRIBE_V1, ElevenLabs::SCRIBE_V1_EXPERIMENTAL], true)) {
return $this->doSpeechToTextRequest($model, $payload, $options);
}
Expand All @@ -58,7 +54,7 @@ public function request(Model $model, array|string $payload, array $options = []
* @param array<string|int, mixed> $payload
* @param array<string, mixed> $options
*/
private function doSpeechToTextRequest(Model $model, array|string $payload, array $options): RawHttpResult
private function doSpeechToTextRequest(Model $model, array $payload, array $options): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/speech-to-text', $this->hostUrl), [
'headers' => [
Expand All @@ -75,7 +71,7 @@ private function doSpeechToTextRequest(Model $model, array|string $payload, arra
* @param array<string|int, mixed> $payload
* @param array<string, mixed> $options
*/
private function doTextToSpeechRequest(Model $model, array|string $payload, array $options): RawHttpResult
private function doTextToSpeechRequest(Model $model, array $payload, array $options): RawHttpResult
{
if (!\array_key_exists('voice', $model->getOptions())) {
throw new InvalidArgumentException('The voice option is required.');
Expand Down
4 changes: 2 additions & 2 deletions src/platform/src/Bridge/Gemini/Embeddings/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$url = \sprintf('https://generativelanguage.googleapis.com/v1beta/models/%s:%s', $model->getName(), 'batchEmbedContents');
$modelOptions = $model->getOptions();
Expand All @@ -52,7 +52,7 @@ public function request(Model $model, array|string $payload, array $options = []
'taskType' => $modelOptions['task_type'] ?? null,
'title' => $options['title'] ?? null,
]),
\is_array($payload) ? $payload : [$payload],
$payload,
),
],
]));
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Gemini/Gemini/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function supports(Model $model): bool
/**
* @throws TransportExceptionInterface When the HTTP request fails due to network issues
*/
public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$url = \sprintf(
'https://generativelanguage.googleapis.com/v1beta/models/%s:%s',
Expand Down
4 changes: 2 additions & 2 deletions src/platform/src/Bridge/HuggingFace/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function supports(Model $model): bool
/**
* The difference in HuggingFace here is that we treat the payload as the options for the request not only the body.
*/
public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
// Extract task from options if provided
$task = $options['task'] ?? null;
Expand Down Expand Up @@ -71,7 +71,7 @@ private function getUrl(Model $model, ?string $task): string
*
* @return array<string, mixed>
*/
private function getPayload(array|string $payload, array $options): array
private function getPayload(array $payload, array $options): array
{
// Expect JSON input if string or not
if (\is_string($payload) || !(isset($payload['body']) || isset($payload['json']))) {
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/LmStudio/Completions/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function supports(Model $model): bool
return $model instanceof Completions;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/v1/chat/completions', $this->hostUrl), [
'json' => array_merge($options, $payload),
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/LmStudio/Embeddings/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/v1/embeddings', $this->hostUrl), [
'json' => array_merge($options, [
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Mistral/Embeddings/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.mistral.ai/v1/embeddings', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Mistral/Llm/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function supports(Model $model): bool
return $model instanceof Mistral;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.mistral.ai/v1/chat/completions', [
'auth_bearer' => $this->apiKey,
Expand Down
6 changes: 3 additions & 3 deletions src/platform/src/Bridge/Ollama/OllamaClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function supports(Model $model): bool
return $model instanceof Ollama;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$response = $this->httpClient->request('POST', \sprintf('%s/api/show', $this->hostUrl), [
'json' => [
Expand All @@ -58,7 +58,7 @@ public function request(Model $model, array|string $payload, array $options = []
* @param array<string|int, mixed> $payload
* @param array<string, mixed> $options
*/
private function doCompletionRequest(array|string $payload, array $options = []): RawHttpResult
private function doCompletionRequest(array $payload, array $options = []): RawHttpResult
{
// Revert Ollama's default streaming behavior
$options['stream'] ??= false;
Expand All @@ -78,7 +78,7 @@ private function doCompletionRequest(array|string $payload, array $options = [])
* @param array<string|int, mixed> $payload
* @param array<string, mixed> $options
*/
private function doEmbeddingsRequest(Model $model, array|string $payload, array $options = []): RawHttpResult
private function doEmbeddingsRequest(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', \sprintf('%s/api/embed', $this->hostUrl), [
'json' => array_merge($options, [
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/OpenAi/DallE/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function supports(Model $model): bool
return $model instanceof DallE;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.openai.com/v1/images/generations', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/OpenAi/Embeddings/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function supports(Model $model): bool
return $model instanceof Embeddings;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.openai.com/v1/embeddings', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/OpenAi/Gpt/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function supports(Model $model): bool
return $model instanceof Gpt;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.openai.com/v1/chat/completions', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/OpenAi/Whisper/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function supports(Model $model): bool
return $model instanceof Whisper;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$task = $options['task'] ?? Task::TRANSCRIPTION;
$endpoint = Task::TRANSCRIPTION === $task ? 'transcriptions' : 'translations';
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/OpenRouter/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function supports(Model $model): bool
return true;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://openrouter.ai/api/v1/chat/completions', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Replicate/LlamaModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function supports(Model $model): bool
return $model instanceof Llama;
}

public function request(Model $model, array|string $payload, array $options = []): RawHttpResult
public function request(Model $model, array $payload, array $options = []): RawHttpResult
{
$model instanceof Llama || throw new InvalidArgumentException(\sprintf('The model must be an instance of "%s".', Llama::class));

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/TransformersPhp/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function supports(Model $model): bool
return true;
}

public function request(Model $model, array|string $payload, array $options = []): RawPipelineResult
public function request(Model $model, array $payload, array $options = []): RawPipelineResult
{
if (null === $task = $options['task'] ?? null) {
throw new InvalidArgumentException('The task option is required.');
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/TransformersPhp/PipelineExecution.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final class PipelineExecution
*/
public function __construct(
private readonly Pipeline $pipeline,
private readonly array|string $input,
private readonly array $input,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/Bridge/Voyage/ModelClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function supports(Model $model): bool
return $model instanceof Voyage;
}

public function request(Model $model, object|string|array $payload, array $options = []): RawHttpResult
public function request(Model $model, object|array $payload, array $options = []): RawHttpResult
{
return new RawHttpResult($this->httpClient->request('POST', 'https://api.voyageai.com/v1/embeddings', [
'auth_bearer' => $this->apiKey,
Expand Down
2 changes: 1 addition & 1 deletion src/platform/src/ModelClientInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ public function supports(Model $model): bool;
* @param array<string|int, mixed> $payload
* @param array<string, mixed> $options
*/
public function request(Model $model, array|string $payload, array $options = []): RawResultInterface;
public function request(Model $model, array $payload, array $options = []): RawResultInterface;
}
2 changes: 1 addition & 1 deletion src/store/tests/Double/PlatformTestHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function supports(Model $model): bool
return true;
}

public function request(Model $model, array|string|object $payload, array $options = []): RawHttpResult
public function request(Model $model, array|object $payload, array $options = []): RawHttpResult
{
++$this->createCalls;

Expand Down
Loading