Merge branch '3.x'

Author: ilvalerione

src/RAG/Embeddings/OpenAIEmbeddingsProvider.php

@@ -4,51 +4,48 @@
 
 namespace NeuronAI\RAG\Embeddings;
 
-use GuzzleHttp\Client;
 use NeuronAI\RAG\Document;
+use NeuronAI\HttpClient\GuzzleHttpClient;
+use NeuronAI\HttpClient\HasHttpClient;
+use NeuronAI\HttpClient\HttpClientInterface;
+use NeuronAI\HttpClient\HttpRequest;
 
-use function json_decode;
 use function array_chunk;
 use function array_map;
 use function array_merge;
 
 class OpenAIEmbeddingsProvider extends AbstractEmbeddingsProvider
 {
-    protected Client $client;
+    use HasHttpClient;
 
     protected string $baseUri = 'https://api.openai.com/v1/embeddings';
 
     public function __construct(
         protected string $key,
         protected string $model,
-        protected ?int $dimensions = 1024
+        protected ?int $dimensions = 1024,
+        ?HttpClientInterface $httpClient = null,
     ) {
-        $this->client = new Client([
-            'base_uri' => $this->baseUri,
-            'headers' => [
+        $this->httpClient = ($httpClient ?? new GuzzleHttpClient())
+            ->withBaseUri($this->baseUri)
+            ->withHeaders([
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/json',
                 'Authorization' => 'Bearer ' . $this->key,
-            ]
-        ]);
+            ]);
     }
 
     public function embedDocuments(array $documents): array
     {
         $chunks = array_chunk($documents, 100);
 
         foreach ($chunks as $chunk) {
-            $response = $this->client->post('', [
-                'json' => [
-                    'model' => $this->model,
-                    'input' => array_map(fn (Document $document): string => $document->getContent(), $chunk),
-                    'encoding_format' => 'float',
-                    ...($this->dimensions ? ['dimensions' => $this->dimensions] : []),
-
-                ]
-            ])->getBody()->getContents();
-
-            $response = json_decode($response, true);
+            $response = $this->httpClient->request(HttpRequest::post('', [
+                'model' => $this->model,
+                'input' => array_map(fn (Document $document): string => $document->getContent(), $chunk),
+                'encoding_format' => 'float',
+                ...($this->dimensions ? ['dimensions' => $this->dimensions] : []),
+            ]))->json();
 
             foreach ($response['data'] as $index => $item) {
                 $chunk[$index]->embedding = $item['embedding'];
@@ -60,17 +57,12 @@ public function embedDocuments(array $documents): array
 
     public function embedText(string $text): array
     {
-        $response = $this->client->post('', [
-            'json' => [
-                'model' => $this->model,
-                'input' => $text,
-                'encoding_format' => 'float',
-                ...($this->dimensions ? ['dimensions' => $this->dimensions] : []),
-
-            ]
-        ])->getBody()->getContents();
-
-        $response = json_decode($response, true);
+        $response = $this->httpClient->request(HttpRequest::post('', [
+            'model' => $this->model,
+            'input' => $text,
+            'encoding_format' => 'float',
+            ...($this->dimensions ? ['dimensions' => $this->dimensions] : []),
+        ]))->json();
 
         return $response['data'][0]['embedding'];
     }

src/RAG/VectorStore/QdrantVectorStore.php

@@ -54,17 +54,7 @@ protected function initialize(): void
             return;
         }
 
-        $this->httpClient->request(
-            HttpRequest::put(
-                uri: '',
-                body: [
-                    'vectors' => [
-                        'size' => $this->dimension,
-                        'distance' => 'Cosine',
-                    ],
-                ],
-            )
-        );
+        $this->createCollection();
     }
 
     /**
@@ -182,4 +172,19 @@ public function similaritySearch(array $embedding): iterable
             return $document;
         }, $response['result']['points']);
     }
+
+    protected function createCollection(): void
+    {
+        $this->httpClient->request(
+            HttpRequest::put(
+                uri: '',
+                body: [
+                    'vectors' => [
+                        'size' => $this->dimension,
+                        'distance' => 'Cosine',
+                    ],
+                ],
+            )
+        );
+    }
 }