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
7 changes: 6 additions & 1 deletion src/platform/src/Bridge/Gemini/Gemini/ResultConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\AI\Platform\Exception\RateLimitExceededException;
use Symfony\AI\Platform\Exception\RuntimeException;
use Symfony\AI\Platform\Model;
use Symfony\AI\Platform\Result\BinaryResult;
use Symfony\AI\Platform\Result\ChoiceResult;
use Symfony\AI\Platform\Result\RawHttpResult;
use Symfony\AI\Platform\Result\RawResultInterface;
Expand Down Expand Up @@ -138,7 +139,7 @@ private function convertStream(HttpResponse $result): \Generator
* }
* } $choice
*/
private function convertChoice(array $choice): ToolCallResult|TextResult
private function convertChoice(array $choice): ToolCallResult|TextResult|BinaryResult
{
$contentParts = $choice['content']['parts'];

Expand All @@ -156,6 +157,10 @@ private function convertChoice(array $choice): ToolCallResult|TextResult
return new TextResult($contentPart['text']);
}

if (isset($contentPart['inlineData'])) {
return new BinaryResult($contentPart['inlineData']['data'], $contentPart['inlineData']['mimeType'] ?? null);
}

throw new RuntimeException(\sprintf('Unsupported finish reason "%s".', $choice['finishReason']));
}

Expand Down
16 changes: 14 additions & 2 deletions src/platform/src/Bridge/VertexAi/Gemini/ResultConverter.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

namespace Symfony\AI\Platform\Bridge\VertexAi\Gemini;

use Symfony\AI\Platform\Exception\RateLimitExceededException;
use Symfony\AI\Platform\Exception\RuntimeException;
use Symfony\AI\Platform\Model as BaseModel;
use Symfony\AI\Platform\Result\BinaryResult;
use Symfony\AI\Platform\Result\ChoiceResult;
use Symfony\AI\Platform\Result\RawHttpResult;
use Symfony\AI\Platform\Result\RawResultInterface;
Expand Down Expand Up @@ -42,8 +44,14 @@ public function supports(BaseModel $model): bool

public function convert(RawResultInterface|RawHttpResult $result, array $options = []): ResultInterface
{
$response = $result->getObject();

if (429 === $response->getStatusCode()) {
throw new RateLimitExceededException();
}

if ($options['stream'] ?? false) {
return new StreamResult($this->convertStream($result->getObject()));
return new StreamResult($this->convertStream($response));
}

$data = $result->getData();
Expand Down Expand Up @@ -125,7 +133,7 @@ private function convertStream(HttpResponse $result): \Generator
* }
* } $choice
*/
private function convertChoice(array $choice): ToolCallResult|TextResult
private function convertChoice(array $choice): ToolCallResult|TextResult|BinaryResult
{
$contentParts = $choice['content']['parts'];

Expand All @@ -143,6 +151,10 @@ private function convertChoice(array $choice): ToolCallResult|TextResult
return new TextResult($contentPart['text']);
}

if (isset($contentPart['inlineData'])) {
return new BinaryResult($contentPart['inlineData']['data'], $contentPart['inlineData']['mimeType'] ?? null);
}

throw new RuntimeException(\sprintf('Unsupported finish reason "%s".', $choice['finishReason']));
}

Expand Down
56 changes: 56 additions & 0 deletions src/platform/tests/Bridge/Gemini/Gemini/ResultConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\AI\Platform\Bridge\Gemini\Gemini\ResultConverter;
use Symfony\AI\Platform\Exception\RuntimeException;
use Symfony\AI\Platform\Result\BinaryResult;
use Symfony\AI\Platform\Result\RawHttpResult;
use Symfony\AI\Platform\Result\ToolCall;
use Symfony\AI\Platform\Result\ToolCallResult;
Expand Down Expand Up @@ -76,4 +77,59 @@ public function testReturnsToolCallEvenIfMultipleContentPartsAreGiven()
$this->assertInstanceOf(ToolCall::class, $toolCall);
$this->assertSame('1234', $toolCall->id);
}

public function testConvertsInlineDataToBinaryResult()
{
$converter = new ResultConverter();
$httpResponse = self::createMock(ResponseInterface::class);
$httpResponse->method('getStatusCode')->willReturn(200);
$httpResponse->method('toArray')->willReturn([
'candidates' => [
[
'content' => [
'parts' => [
[
'inlineData' => [
'mimeType' => 'image/png',
'data' => 'base64EncodedImageData',
],
],
],
],
],
],
]);

$result = $converter->convert(new RawHttpResult($httpResponse));
$this->assertInstanceOf(BinaryResult::class, $result);
$this->assertSame('base64EncodedImageData', $result->getContent());
$this->assertSame('image/png', $result->mimeType);
}

public function testConvertsInlineDataWithoutMimeTypeToBinaryResult()
{
$converter = new ResultConverter();
$httpResponse = self::createMock(ResponseInterface::class);
$httpResponse->method('getStatusCode')->willReturn(200);
$httpResponse->method('toArray')->willReturn([
'candidates' => [
[
'content' => [
'parts' => [
[
'inlineData' => [
'data' => 'base64EncodedData',
],
],
],
],
],
],
]);

$result = $converter->convert(new RawHttpResult($httpResponse));
$this->assertInstanceOf(BinaryResult::class, $result);
$this->assertSame('base64EncodedData', $result->getContent());
$this->assertNull($result->mimeType);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

use PHPUnit\Framework\TestCase;
use Symfony\AI\Platform\Bridge\VertexAi\Gemini\ResultConverter;
use Symfony\AI\Platform\Result\BinaryResult;
use Symfony\AI\Platform\Result\RawHttpResult;
use Symfony\AI\Platform\Result\TextResult;
use Symfony\AI\Platform\Result\ToolCall;
Expand Down Expand Up @@ -124,4 +125,65 @@ public function testItThrowsExceptionOnTimeout()
$this->expectException(\RuntimeException::class);
$converter->convert(new RawHttpResult($response));
}

public function testConvertsInlineDataToBinaryResult()
{
$response = $this->createStub(ResponseInterface::class);
$response
->method('toArray')
->willReturn([
'candidates' => [
[
'content' => [
'parts' => [
[
'inlineData' => [
'mimeType' => 'image/png',
'data' => 'base64EncodedImageData',
],
],
],
],
],
],
]);

$resultConverter = new ResultConverter();

$result = $resultConverter->convert(new RawHttpResult($response));

$this->assertInstanceOf(BinaryResult::class, $result);
$this->assertSame('base64EncodedImageData', $result->getContent());
$this->assertSame('image/png', $result->mimeType);
}

public function testConvertsInlineDataWithoutMimeTypeToBinaryResult()
{
$response = $this->createStub(ResponseInterface::class);
$response
->method('toArray')
->willReturn([
'candidates' => [
[
'content' => [
'parts' => [
[
'inlineData' => [
'data' => 'base64EncodedData',
],
],
],
],
],
],
]);

$resultConverter = new ResultConverter();

$result = $resultConverter->convert(new RawHttpResult($response));

$this->assertInstanceOf(BinaryResult::class, $result);
$this->assertSame('base64EncodedData', $result->getContent());
$this->assertNull($result->mimeType);
}
}