Fix Laravel context errors

Author: ogorzalka

public/logo.svg

@@ -45,9 +45,14 @@ private function __construct(
      * @param  Translator<T>|null  $translator
      * @return self<T>
      */
-    public static function make(string $apiKey = '', string $model = 'gpt-4o', ?Translator $translator = null): self
+    public static function make(?string $apiKey = null, string $model = 'gpt-4o', ?Translator $translator = null): self
     {
-        if ($apiKey === '' && $translator === null) {
+        // Ensure apiKey is a valid string, even if empty
+        $apiKey = $apiKey ?? '';
+
+        // Only throw exception if both apiKey is empty AND translator is null
+        // This allows for blank string apiKeys if they're intentionally set that way in config
+        if (($apiKey === '' || $apiKey === null) && $translator === null) {
             throw new InvalidArgumentException('Either apiKey or translator must be provided');
         }
 
@@ -56,7 +61,7 @@ public static function make(string $apiKey = '', string $model = 'gpt-4o', ?Tran
         }
 
         /** @var OpenAITranslator<T> */
-        $defaultTranslator = new OpenAITranslator($apiKey ?? '', $model);
+        $defaultTranslator = new OpenAITranslator($apiKey, $model);
 
         /** @var self<T> */
         return new self($defaultTranslator);

src/Pollingo.php

@@ -25,12 +25,26 @@ public function register(): void
         $this->app->singleton(Pollingo::class, function ($app) {
             $config = $app['config']['pollingo'];
 
+            // Debugging to see the actual config
+            \Log::debug('Pollingo config:', ['config' => $config]);
+
+            $apiKey = $config['openai_api_key'] ?? null;
+            // If apiKey is null, try to get it from nested structure
+            if ($apiKey === null && isset($config['openai']['api_key'])) {
+                $apiKey = $config['openai']['api_key'];
+            }
+
+            // Ensure apiKey is a string, not null, to avoid type error
+            $apiKey = $apiKey ?? '';
+
+            $model = $config['openai_model'] ?? $config['openai']['model'] ?? 'gpt-4o';
+
             /**
              * @var Pollingo<TKey> $pollingo
              */
             $pollingo = Pollingo::make(
-                apiKey: $config['openai_api_key'],
-                model: $config['openai_model'],
+                apiKey: $apiKey,
+                model: $model,
             );
 
             return $pollingo;
@@ -42,8 +56,8 @@ public function register(): void
 
             /** @var OpenAITranslator<TKey> */
             $translator = new OpenAITranslator(
-                apiKey: $config['openai']['api_key'],
-                model: $config['openai']['model'],
+                apiKey: $config['openai']['api_key'] ?? '',
+                model: $config['openai']['model'] ?? 'gpt-4o',
             );
 
             return $translator;