Decouple OpenRouter bridge from OpenAI in favor of Generic bridge

Author: chr-hertel

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

@@ -12,6 +12,9 @@
 namespace Symfony\AI\Platform\Bridge\Generic\Embeddings;
 
 use Symfony\AI\Platform\Bridge\Generic\EmbeddingsModel;
+use Symfony\AI\Platform\Exception\AuthenticationException;
+use Symfony\AI\Platform\Exception\BadRequestException;
+use Symfony\AI\Platform\Exception\RateLimitExceededException;
 use Symfony\AI\Platform\Exception\RuntimeException;
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\Result\RawResultInterface;
@@ -23,6 +26,7 @@
  * This default result converter assumes the same response format as OpenAI's embeddings endpoint.
  *
  * @author Christopher Hertel <mail@christopher-hertel.de>
+ * @author Tim Lochmüller <tim@fruit-lab.de>
  */
 class ResultConverter implements ResultConverterInterface
 {
@@ -33,16 +37,32 @@ public function supports(Model $model): bool
 
     public function convert(RawResultInterface $result, array $options = []): VectorResult
     {
+        $response = $result->getObject();
         $data = $result->getData();
 
-        if (!isset($data['data'])) {
+        if (401 === $response->getStatusCode()) {
+            $errorMessage = json_decode($response->getContent(false), true)['error']['message'];
+            throw new AuthenticationException($errorMessage);
+        }
+
+        if (400 === $response->getStatusCode() || 404 === $response->getStatusCode()) {
+            $errorMessage = json_decode($response->getContent(false), true)['error']['message'] ?? 'Bad Request';
+            throw new BadRequestException($errorMessage);
+        }
+
+        if (429 === $response->getStatusCode()) {
+            $errorMessage = json_decode($response->getContent(false), true)['error']['message'] ?? 'Bad Request';
+            throw new RateLimitExceededException($errorMessage);
+        }
+
+        if (!isset($data['data'][0]['embedding'])) {
             throw new RuntimeException('Response does not contain data.');
         }
 
         return new VectorResult(
             ...array_map(
                 static fn (array $item): Vector => new Vector($item['embedding']),
-                $data['data']
+                $data['data'],
             ),
         );
     }

src/platform/src/Bridge/OpenRouter/AbstractOpenRouterModelCatalog.php

@@ -11,8 +11,8 @@
 
 namespace Symfony\AI\Platform\Bridge\OpenRouter;
 
+use Symfony\AI\Platform\Bridge\Generic\CompletionsModel;
 use Symfony\AI\Platform\Capability;
-use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\ModelCatalog\AbstractModelCatalog;
 
 /**
@@ -35,11 +35,11 @@ public function __construct()
     {
         $this->models = [
             'openrouter/auto' => [
-                'class' => Model::class,
+                'class' => CompletionsModel::class,
                 'capabilities' => Capability::cases(),
             ],
             '@preset' => [
-                'class' => Model::class,
+                'class' => CompletionsModel::class,
                 'capabilities' => Capability::cases(),
             ],
         ];

src/platform/src/Bridge/OpenRouter/Completions/ModelClient.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\AI\Platform\Bridge\OpenRouter;
 
+use Symfony\AI\Platform\Bridge\Generic\CompletionsModel;
+use Symfony\AI\Platform\Bridge\Generic\EmbeddingsModel;
 use Symfony\AI\Platform\Capability;
 use Symfony\AI\Platform\Exception\InvalidArgumentException;
 use Symfony\AI\Platform\Model;
@@ -100,7 +102,7 @@ protected function fetchRemoteModels(): iterable
             }
 
             yield $model['id'] => [
-                'class' => Model::class,
+                'class' => CompletionsModel::class,
                 'capabilities' => $capabilities,
             ];
         }
@@ -114,7 +116,7 @@ protected function fetchRemoteEmbeddings(): iterable
         $responseEmbeddings = $this->httpClient->request('GET', 'https://openrouter.ai/api/v1/embeddings/models');
         foreach ($responseEmbeddings->toArray()['data'] as $embedding) {
             yield $embedding['id'] => [
-                'class' => Embeddings::class,
+                'class' => EmbeddingsModel::class,
                 'capabilities' => [Capability::INPUT_TEXT, Capability::EMBEDDINGS],
             ];
         }