Skip to content
Merged
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
8 changes: 8 additions & 0 deletions src/Providers/OpenAI/Handlers/Images.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Illuminate\Http\Client\PendingRequest;
use Illuminate\Http\Client\Response as ClientResponse;
use Illuminate\Support\Arr;
use InvalidArgumentException;
use Prism\Prism\Images\Request;
use Prism\Prism\Images\Response;
Expand Down Expand Up @@ -46,6 +47,13 @@ public function handle(Request $request): Response
rateLimits: $this->processRateLimits($response),
),
images: $images,
additionalContent: Arr::whereNotNull([
'input_tokens_details' => data_get($data, 'usage.input_tokens_details'),
'quality' => data_get($data, 'quality'),
'size' => data_get($data, 'size'),
'output_format' => data_get($data, 'output_format'),
'background' => data_get($data, 'background'),
]),
raw: $data,
);

Expand Down
23 changes: 23 additions & 0 deletions tests/Providers/OpenAI/ImagesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
expect($response->firstImage()->revisedPrompt)->toBe('A cute baby sea otter floating on its back in calm blue water');
expect($response->usage->promptTokens)->toBe(15);
expect($response->imageCount())->toBe(1);
expect($response->additionalContent)->toBe([]);

Http::assertSent(function (Request $request): bool {
$data = $request->data();
Expand Down Expand Up @@ -229,6 +230,10 @@
Http::fake([
'api.openai.com/v1/images/generations' => Http::response([
'created' => 1713833628,
'background' => 'opaque',
'quality' => 'high',
'size' => '1024x1024',
'output_format' => 'png',
'data' => [
[
'b64_json' => 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
Expand Down Expand Up @@ -258,6 +263,16 @@
expect($response->firstImage()->url)->toBeNull();
expect($response->usage->promptTokens)->toBe(50);
expect($response->imageCount())->toBe(1);
expect($response->additionalContent)->toBe([
'input_tokens_details' => [
'text_tokens' => 10,
'image_tokens' => 40,
],
'quality' => 'high',
'size' => '1024x1024',
'output_format' => 'png',
'background' => 'opaque',
]);

Http::assertSent(function (Request $request): bool {
$data = $request->data();
Expand Down Expand Up @@ -369,6 +384,14 @@
->generate();

expect($response->firstImage()->base64)->not->toBeEmpty();
expect($response->additionalContent)->toHaveKeys([
'input_tokens_details',
'quality',
'size',
'output_format',
'background',
]);
expect($response->additionalContent['input_tokens_details'])->toHaveKeys(['text_tokens', 'image_tokens']);
});

it('can edit with multiple images', function (): void {
Expand Down