Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion src/Providers/Ollama/Handlers/Embeddings.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public function handle(Request $request): EmbeddingsResponse

protected function sendRequest(Request $request): Response
{
$options = Arr::except($request->providerOptions(), ['dimensions', 'keep_alive']);

/** @var Response $response */
$response = $this->client->post(
'api/embed',
Expand All @@ -51,7 +53,7 @@ protected function sendRequest(Request $request): Response
'input' => $request->inputs(),
'dimensions' => $request->providerOptions('dimensions'),
'keep_alive' => $request->providerOptions('keep_alive'),
'options' => $request->providerOptions() ?: null,
'options' => $options ?: null,
])
);

Expand Down
2 changes: 1 addition & 1 deletion src/Text/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function toArray(): array
'tool_results' => array_map(fn (ToolResult $toolResult): array => $toolResult->toArray(), $this->toolResults),
'usage' => $this->usage->toArray(),
'meta' => $this->meta->toArray(),
'messages' => $this->messages->map(fn (Message $message): array => $this->messageToArray($message))->toArray(),
'messages' => $this->messages->map($this->messageToArray(...))->toArray(),
'additional_content' => $this->additionalContent,
'raw' => $this->raw,
];
Expand Down
3 changes: 1 addition & 2 deletions tests/Embeddings/ImageEmbeddingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Prism\Prism\Embeddings\Content;
use Prism\Prism\Embeddings\PendingRequest;
use Prism\Prism\Embeddings\Request;
use Prism\Prism\Embeddings\Response;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\ValueObjects\Media\Image;

Expand Down Expand Up @@ -103,7 +102,7 @@
it('throws exception when no embeddings content is provided', function (): void {
$pendingRequest = new PendingRequest;

expect(fn (): Response => $pendingRequest->asEmbeddings())
expect($pendingRequest->asEmbeddings(...))
->toThrow(PrismException::class, 'Embeddings input is required (text, images, audio, video, documents, or content parts)');
});
Comment thread
sv-LayZ marked this conversation as resolved.

Expand Down
3 changes: 1 addition & 2 deletions tests/Embeddings/MultimodalEmbeddingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Prism\Prism\Embeddings\Content;
use Prism\Prism\Embeddings\PendingRequest;
use Prism\Prism\Embeddings\Request;
use Prism\Prism\Embeddings\Response;
use Prism\Prism\Exceptions\PrismException;
use Prism\Prism\ValueObjects\Media\Audio;
use Prism\Prism\ValueObjects\Media\Document;
Expand Down Expand Up @@ -70,6 +69,6 @@
it('throws exception when no embeddings content is provided', function (): void {
$pendingRequest = new PendingRequest;

expect(fn (): Response => $pendingRequest->asEmbeddings())
expect($pendingRequest->asEmbeddings(...))
->toThrow(PrismException::class, 'Embeddings input is required (text, images, audio, video, documents, or content parts)');
});
Comment thread
sv-LayZ marked this conversation as resolved.
7 changes: 7 additions & 0 deletions tests/Providers/Ollama/EmbeddingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@
->fromInput('The food was delicious and the waiter...')
->asEmbeddings();

Http::assertSent(function (Request $request): true {
expect($request->data()['dimensions'])->toBe(256);
expect($request->data())->not->toHaveKeys(['options']);

return true;
});

$embeddings = json_decode(
file_get_contents('tests/Fixtures/ollama/embeddings-with-dimensions-1.json'),
true
Expand Down
Loading