Fixes in driver setup code

cognesy · Oct 7, 2024 · d769a42 · d769a42
1 parent a3fcba4
commit d769a42
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 38 deletions.
diff --git a/config/embed.php b/config/embed.php
@@ -71,8 +71,7 @@
             'defaultModel' => 'nomic-embed-text',
             'defaultDimensions' => 1024,
             'maxInputs' => 512,
-            'connectionTimeout' => 5,
-            'requestTimeout' => 30,
+            'httpClient' => 'guzzle-ollama',
         ],
         'openai' => [
             'providerType' => LLMProviderType::OpenAI->value,

diff --git a/config/http.php b/config/http.php
@@ -19,7 +19,12 @@
         ],
         'symfony' => [
             'httpClientType' => HttpClientType::Symfony->value,
-            'connectTimeout' => 90, // Symfony HttpClient does not allow to set connect timeout, set it to request timeout
+            'requestTimeout' => 30,
+            'idleTimeout' => -1,
+        ],
+        'guzzle-ollama' => [
+            'httpClientType' => HttpClientType::Guzzle->value,
+            'connectTimeout' => 5,
             'requestTimeout' => 90,
         ],
     ]

diff --git a/config/llm.php b/config/llm.php
@@ -95,8 +95,7 @@
             'endpoint' => '/chat/completions',
             'defaultModel' => 'llama3.2:3b', //'gemma2:2b',
             'defaultMaxTokens' => 1024,
-            'connectTimeout' => 30,
-            'requestTimeout' => 60,
+            'httpClient' => 'guzzle-ollama',
         ],
         'openai' => [
             'providerType' => LLMProviderType::OpenAI->value,

diff --git a/src/Extras/Embeddings/Data/EmbeddingsConfig.php b/src/Extras/Embeddings/Data/EmbeddingsConfig.php
@@ -9,13 +9,14 @@
 class EmbeddingsConfig
 {
     public function __construct(
-        public string           $apiUrl = '',
-        public string           $apiKey = '',
-        public string           $endpoint = '',
-        public string           $model = '',
-        public int              $dimensions = 0,
-        public int              $maxInputs = 0,
-        public array            $metadata = [],
+        public string $apiUrl = '',
+        public string $apiKey = '',
+        public string $endpoint = '',
+        public string $model = '',
+        public int $dimensions = 0,
+        public int $maxInputs = 0,
+        public array $metadata = [],
+        public string $httpClient = '',
         public ?LLMProviderType $providerType = null,
     ) {}
 
@@ -31,9 +32,8 @@ public static function load(string $connection) : EmbeddingsConfig {
             dimensions: Settings::get('embed', "connections.$connection.defaultDimensions", 0),
             maxInputs: Settings::get('embed', "connections.$connection.maxInputs", 1),
             metadata: Settings::get('embed', "connections.$connection.metadata", []),
-            providerType: LLMProviderType::from(
-                Settings::get('embed', "connections.$connection.providerType")
-            ),
+            httpClient: Settings::get('embed', "connections.$connection.httpClient", ''),
+            providerType: LLMProviderType::from(Settings::get('embed', "connections.$connection.providerType")),
         );
     }
 }
diff --git a/src/Extras/Embeddings/Embeddings.php b/src/Extras/Embeddings/Embeddings.php
@@ -2,6 +2,7 @@
 
 namespace Cognesy\Instructor\Extras\Embeddings;
 
+use Cognesy\Instructor\Events\EventDispatcher;
 use Cognesy\Instructor\Extras\Embeddings\Contracts\CanVectorize;
 use Cognesy\Instructor\Extras\Embeddings\Data\EmbeddingsConfig;
 use Cognesy\Instructor\Extras\Embeddings\Drivers\AzureOpenAIDriver;
@@ -19,14 +20,24 @@ class Embeddings
 {
     use Traits\HasFinders;
 
+    protected EventDispatcher $events;
     protected EmbeddingsConfig $config;
     protected CanHandleHttp $httpClient;
     protected CanVectorize $driver;
 
-    public function __construct() {
-        $this->httpClient = HttpClient::make();
-        $this->config = EmbeddingsConfig::load(Settings::get('embed', "defaultConnection"));
-        $this->driver = $this->getDriver($this->config, $this->httpClient);
+    public function __construct(
+        string $connection = '',
+        EmbeddingsConfig $config = null,
+        CanHandleHttp $httpClient = null,
+        CanVectorize $driver = null,
+        EventDispatcher $events = null,
+    ) {
+        $this->events = $events ?? new EventDispatcher();
+        $this->config = $config ?? EmbeddingsConfig::load($connection
+            ?: Settings::get('embed', "defaultConnection")
+        );
+        $this->httpClient = $httpClient ?? HttpClient::make($this->config->httpClient);
+        $this->driver = $driver ?? $this->getDriver($this->config, $this->httpClient);
     }
 
     // PUBLIC ///////////////////////////////////////////////////

diff --git a/src/Extras/Http/Data/HttpClientConfig.php b/src/Extras/Http/Data/HttpClientConfig.php
@@ -12,8 +12,8 @@ public function __construct(
         public HttpClientType $httpClientType = HttpClientType::Guzzle,
         public int $connectTimeout = 3,
         public int $requestTimeout = 30,
-    ) {
-    }
+        public int $idleTimeout = 0,
+    ) {}
 
     public static function load(string $client) : HttpClientConfig {
         if (!Settings::has('http', "clients.$client")) {
@@ -23,6 +23,7 @@ public static function load(string $client) : HttpClientConfig {
             httpClientType: HttpClientType::from(Settings::get('http', "clients.$client.httpClientType")),
             connectTimeout: Settings::get(group: "http", key: "clients.$client.connectTimeout", default: 30),
             requestTimeout: Settings::get("http", "clients.$client.requestTimeout", 3),
+            idleTimeout: Settings::get(group: "http", key: "clients.$client.idleTimeout", default: 0),
         );
     }
 }
diff --git a/src/Extras/Http/Drivers/SymfonyDriver.php b/src/Extras/Http/Drivers/SymfonyDriver.php
@@ -42,8 +42,8 @@ public function handle(
                 options: [
                     'headers' => $headers,
                     'body' => is_array($body) ? json_encode($body) : $body,
-                    'timeout' => $this->config->requestTimeout ?? 5,
-                    'max_duration' => $this->config->connectTimeout ?? 30,
+                    'timeout' => $this->config->idleTimeout ?? 0,
+                    'max_duration' => $this->config->requestTimeout ?? 30,
                     'buffer' => !$streaming,
                 ]
             );

diff --git a/src/Extras/Http/HttpClient.php b/src/Extras/Http/HttpClient.php
@@ -8,7 +8,6 @@
 use Cognesy\Instructor\Extras\Http\Data\HttpClientConfig;
 use Cognesy\Instructor\Extras\Http\Drivers\GuzzleDriver;
 use Cognesy\Instructor\Extras\Http\Drivers\SymfonyDriver;
-use Cognesy\Instructor\Extras\Http\Drivers\SymfonyNyholmDriver;
 use Cognesy\Instructor\Utils\Settings;
 use InvalidArgumentException;
 
@@ -19,13 +18,12 @@ class HttpClient
 
     public function __construct(string $client = '', EventDispatcher $events = null) {
         $this->events = $events ?? new EventDispatcher();
-
         $config = HttpClientConfig::load($client ?: Settings::get('http', "defaultClient"));
         $this->driver = $this->makeDriver($config);
     }
 
-    public static function make(string $client = '') : CanHandleHttp {
-        return (new self($client))->get();
+    public static function make(string $client = '', ?EventDispatcher $events = null) : CanHandleHttp {
+        return (new self($client, $events))->get();
     }
 
     public function withClient(string $name) : self {

diff --git a/src/Extras/LLM/Data/LLMConfig.php b/src/Extras/LLM/Data/LLMConfig.php
@@ -15,6 +15,7 @@ public function __construct(
         public array $metadata = [],
         public string $model = '',
         public int $maxTokens = 1024,
+        public string $httpClient = '',
         public LLMProviderType $providerType = LLMProviderType::OpenAICompatible,
     ) {}
 
@@ -29,6 +30,7 @@ public static function load(string $connection) : LLMConfig {
             metadata: Settings::get('llm', "connections.$connection.metadata", []),
             model: Settings::get('llm', "connections.$connection.defaultModel", ''),
             maxTokens: Settings::get('llm', "connections.$connection.defaultMaxTokens", 1024),
+            httpClient: Settings::get('llm', "connections.$connection.httpClient", ''),
             providerType: LLMProviderType::from(Settings::get('llm', "connections.$connection.providerType")),
         );
     }

diff --git a/src/Extras/LLM/Drivers/AnthropicDriver.php b/src/Extras/LLM/Drivers/AnthropicDriver.php
@@ -3,6 +3,7 @@
 
 use Cognesy\Instructor\Data\Messages\Messages;
 use Cognesy\Instructor\Enums\Mode;
+use Cognesy\Instructor\Events\EventDispatcher;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleHttp;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleResponse;
 use Cognesy\Instructor\Extras\Http\HttpClient;
@@ -21,7 +22,9 @@ class AnthropicDriver implements CanHandleInference
     public function __construct(
         protected LLMConfig $config,
         protected ?CanHandleHttp $httpClient = null,
+        protected ?EventDispatcher $events = null,
     ) {
+        $this->events = $events ?? new EventDispatcher();
         $this->httpClient = $httpClient ?? HttpClient::make();
     }
 

diff --git a/src/Extras/LLM/Drivers/CohereV1Driver.php b/src/Extras/LLM/Drivers/CohereV1Driver.php
@@ -3,6 +3,7 @@
 
 use Cognesy\Instructor\Data\Messages\Messages;
 use Cognesy\Instructor\Enums\Mode;
+use Cognesy\Instructor\Events\EventDispatcher;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleHttp;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleResponse;
 use Cognesy\Instructor\Extras\Http\HttpClient;
@@ -20,7 +21,9 @@ class CohereV1Driver implements CanHandleInference
     public function __construct(
         protected LLMConfig $config,
         protected ?CanHandleHttp $httpClient = null,
+        protected ?EventDispatcher $events = null,
     ) {
+        $this->events = $events ?? new EventDispatcher();
         $this->httpClient = $httpClient ?? HttpClient::make();
     }
 

diff --git a/src/Extras/LLM/Drivers/GeminiDriver.php b/src/Extras/LLM/Drivers/GeminiDriver.php
@@ -3,6 +3,7 @@
 
 use Cognesy\Instructor\Data\Messages\Messages;
 use Cognesy\Instructor\Enums\Mode;
+use Cognesy\Instructor\Events\EventDispatcher;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleHttp;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleResponse;
 use Cognesy\Instructor\Extras\Http\HttpClient;
@@ -22,7 +23,9 @@ class GeminiDriver implements CanHandleInference
     public function __construct(
         protected LLMConfig      $config,
         protected ?CanHandleHttp $httpClient = null,
+        protected ?EventDispatcher $events = null,
     ) {
+        $this->events = $events ?? new EventDispatcher();
         $this->httpClient = $httpClient ?? HttpClient::make();
     }
 

diff --git a/src/Extras/LLM/Drivers/OpenAIDriver.php b/src/Extras/LLM/Drivers/OpenAIDriver.php
@@ -3,6 +3,7 @@
 namespace Cognesy\Instructor\Extras\LLM\Drivers;
 
 use Cognesy\Instructor\Enums\Mode;
+use Cognesy\Instructor\Events\EventDispatcher;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleHttp;
 use Cognesy\Instructor\Extras\Http\Contracts\CanHandleResponse;
 use Cognesy\Instructor\Extras\Http\HttpClient;
@@ -19,7 +20,9 @@ class OpenAIDriver implements CanHandleInference
     public function __construct(
         protected LLMConfig $config,
         protected ?CanHandleHttp $httpClient = null,
+        protected ?EventDispatcher $events = null,
     ) {
+        $this->events = $events ?? new EventDispatcher();
         $this->httpClient = $httpClient ?? HttpClient::make();
     }
 

diff --git a/src/Extras/LLM/Inference.php b/src/Extras/LLM/Inference.php
@@ -26,9 +26,9 @@ class Inference
 {
     protected LLMConfig $config;
 
+    protected EventDispatcher $events;
     protected CanHandleInference $driver;
     protected CanHandleHttp $httpClient;
-    protected EventDispatcher $events;
     protected CachedContext $cachedContext;
 
     public function __construct(
@@ -39,11 +39,10 @@ public function __construct(
         EventDispatcher $events = null,
     ) {
         $this->events = $events ?? new EventDispatcher();
-
-        $this->httpClient = $httpClient ?? HttpClient::make();
         $this->config = $config ?? LLMConfig::load(connection: $connection
             ?: Settings::get('llm', "defaultConnection")
         );
+        $this->httpClient = $httpClient ?? HttpClient::make($this->config->httpClient);
         $this->driver = $driver ?? $this->makeDriver($this->config, $this->httpClient);
     }
 
@@ -135,20 +134,20 @@ public function create(
 
     protected function makeDriver(LLMConfig $config, CanHandleHttp $httpClient): CanHandleInference {
         return match ($config->providerType) {
-            LLMProviderType::Anthropic => new AnthropicDriver($config, $httpClient),
-            LLMProviderType::Azure => new AzureOpenAIDriver($config, $httpClient),
-            LLMProviderType::CohereV1 => new CohereV1Driver($config, $httpClient),
-            LLMProviderType::CohereV2 => new CohereV2Driver($config, $httpClient),
-            LLMProviderType::Gemini => new GeminiDriver($config, $httpClient),
-            LLMProviderType::Mistral => new MistralDriver($config, $httpClient),
-            LLMProviderType::OpenAI => new OpenAIDriver($config, $httpClient),
+            LLMProviderType::Anthropic => new AnthropicDriver($config, $httpClient, $this->events),
+            LLMProviderType::Azure => new AzureOpenAIDriver($config, $httpClient, $this->events),
+            LLMProviderType::CohereV1 => new CohereV1Driver($config, $httpClient, $this->events),
+            LLMProviderType::CohereV2 => new CohereV2Driver($config, $httpClient, $this->events),
+            LLMProviderType::Gemini => new GeminiDriver($config, $httpClient, $this->events),
+            LLMProviderType::Mistral => new MistralDriver($config, $httpClient, $this->events),
+            LLMProviderType::OpenAI => new OpenAIDriver($config, $httpClient, $this->events),
             LLMProviderType::Fireworks,
             LLMProviderType::Groq,
             LLMProviderType::Ollama,
             LLMProviderType::OpenAICompatible,
             LLMProviderType::OpenRouter,
             LLMProviderType::Together,
-            => new OpenAICompatibleDriver($config, $httpClient),
+            => new OpenAICompatibleDriver($config, $httpClient, $this->events),
             default => throw new InvalidArgumentException("Client not supported: {$config->providerType->value}"),
         };
     }

diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php
@@ -24,6 +24,10 @@ public static function get(string $group, string $key, mixed $default = null) :
             self::$settings[$group] = dot(self::loadGroup($group));
         }
 
+        if ($default === null && !self::has($group, $key)) {
+            throw new Exception("Settings key not found: $key in group: $group and no default value provided");
+        }
+
         return self::$settings[$group]->get($key, $default);
     }