Use JSON Path to convert responses

Author: chr-hertel

examples/composer.json

@@ -22,6 +22,7 @@
         "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/filesystem": "^6.4|^7.0",
         "symfony/finder": "^6.4|^7.0",
+        "symfony/json-path": "7.3.*",
         "symfony/process": "^6.4|^7.0",
         "symfony/var-dumper": "^6.4|^7.0"
     },

src/platform/composer.json

@@ -28,6 +28,7 @@
         "psr/log": "^3.0",
         "symfony/clock": "^6.4 || ^7.1",
         "symfony/http-client": "^6.4 || ^7.1",
+        "symfony/json-path": "7.3.*",
         "symfony/property-access": "^6.4 || ^7.1",
         "symfony/property-info": "^6.4 || ^7.1",
         "symfony/serializer": "^6.4 || ^7.1",

src/platform/src/Bridge/Albert/PlatformFactory.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\AI\Platform\Bridge\Albert;
 
-use Symfony\AI\Platform\Bridge\OpenAI\Embeddings;
 use Symfony\AI\Platform\Bridge\OpenAI\GPT;
 use Symfony\AI\Platform\Contract;
 use Symfony\AI\Platform\Exception\InvalidArgumentException;
@@ -40,7 +39,7 @@ public static function create(
                 new GPTModelClient($httpClient, $apiKey, $baseUrl),
                 new EmbeddingsModelClient($httpClient, $apiKey, $baseUrl),
             ],
-            [new GPT\ResultConverter(), new Embeddings\ResultConverter()],
+            [new GPT\ResultConverter(), Contract\ResultConverter::create()],
             Contract::create(),
         );
     }

src/platform/src/Bridge/Azure/OpenAI/PlatformFactory.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\AI\Platform\Bridge\Azure\OpenAI;
 
-use Symfony\AI\Platform\Bridge\OpenAI\Embeddings;
 use Symfony\AI\Platform\Bridge\OpenAI\GPT;
 use Symfony\AI\Platform\Bridge\OpenAI\Whisper;
 use Symfony\AI\Platform\Bridge\OpenAI\Whisper\AudioNormalizer;
@@ -41,7 +40,7 @@ public static function create(
 
         return new Platform(
             [$GPTModelClient, $embeddingsModelClient, $whisperModelClient],
-            [new GPT\ResultConverter(), new Embeddings\ResultConverter(), new Whisper\ResultConverter()],
+            [new GPT\ResultConverter(), new Whisper\ResultConverter(), Contract\ResultConverter::create()],
             $contract ?? Contract::create(new AudioNormalizer()),
         );
     }

src/platform/src/Bridge/Gemini/Embeddings/ResultConverter.php

@@ -13,10 +13,10 @@
 
 use Symfony\AI\Platform\Bridge\Gemini\Contract\GeminiContract;
 use Symfony\AI\Platform\Bridge\Gemini\Embeddings\ModelClient as EmbeddingsModelClient;
-use Symfony\AI\Platform\Bridge\Gemini\Embeddings\ResultConverter as EmbeddingsResultConverter;
 use Symfony\AI\Platform\Bridge\Gemini\Gemini\ModelClient as GeminiModelClient;
-use Symfony\AI\Platform\Bridge\Gemini\Gemini\ResultConverter as GeminiResultConverter;
 use Symfony\AI\Platform\Contract;
+use Symfony\AI\Platform\Contract\JsonPathConverter\VectorResultExtractor;
+use Symfony\AI\Platform\Contract\ResultConverter;
 use Symfony\AI\Platform\Platform;
 use Symfony\Component\HttpClient\EventSourceHttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -36,7 +36,9 @@ public static function create(
 
         return new Platform(
             [new EmbeddingsModelClient($httpClient, $apiKey), new GeminiModelClient($httpClient, $apiKey)],
-            [new EmbeddingsResultConverter(), new GeminiResultConverter()],
+            [new Gemini\ResultConverter(), ResultConverter::create([
+                new VectorResultExtractor('$.embeddings[*].values'),
+            ])],
             $contract ?? GeminiContract::create(),
         );
     }

src/platform/src/Bridge/Gemini/PlatformFactory.php

@@ -170,14 +170,14 @@ private function isToolCallsStreamFinished(array $data): bool
      *     finish_reason: 'stop'|'length'|'tool_calls'|'content_filter',
      * } $choice
      */
-    private function convertChoice(array $choice): Choice
+    private function convertChoice(array $choice): TextResult|ToolCallResult
     {
         if ('tool_calls' === $choice['finish_reason']) {
-            return new Choice(toolCalls: array_map([$this, 'convertToolCall'], $choice['message']['tool_calls']));
+            return new ToolCallResult(...array_map([$this, 'convertToolCall'], $choice['message']['tool_calls']));
         }
 
         if ('stop' === $choice['finish_reason']) {
-            return new Choice($choice['message']['content']);
+            return new TextResult($choice['message']['content']);
         }
 
         throw new RuntimeException(\sprintf('Unsupported finish reason "%s".', $choice['finish_reason']));

src/platform/src/Bridge/Mistral/Embeddings/ResultConverter.php

@@ -32,7 +32,7 @@ public static function create(
 
         return new Platform(
             [new Embeddings\ModelClient($httpClient, $apiKey), new Llm\ModelClient($httpClient, $apiKey)],
-            [new Embeddings\ResultConverter(), new Llm\ResultConverter()],
+            [new Llm\ResultConverter(), Contract\ResultConverter::create()],
             $contract ?? Contract::create(new ToolNormalizer()),
         );
     }