HotFix: Google Max Token Correction

Author: Ariansdf

_docker_production/model_providers.php

@@ -9,7 +9,8 @@
     |   This Model is used by default before the user choses their
     |   desired model.
     */
-    'defaultModel' => 'gpt-4o',
+    'defaultModel' => 'gpt-4.1',
+    'defaultSearchModel' => 'gemini-2.0-flash',
 
     /*
     |--------------------------------------------------------------------------
@@ -23,9 +24,9 @@
     |
     */
     'system_models' => [
-        'title_generator' => 'gpt-4o-mini',
-        'prompt_improver' => 'gpt-4o-mini',
-        'summarizer' => 'gpt-4o-mini',
+        'title_generator' => 'gpt-4.1-nano',
+        'prompt_improver' => 'gpt-4.1-nano',
+        'summarizer' => 'gpt-4.1-nano',
     ],
 
     /*
@@ -48,13 +49,13 @@
             'ping_url' => 'https://api.openai.com/v1/models',
             'models' => [
                 [
-                    'id' => 'gpt-4o',
-                    'label' => 'OpenAI GPT 4o',
+                    'id' => 'gpt-4.1',
+                    'label' => 'OpenAI GPT 4.1',
                     'streamable' => true,
                 ],
                 [
-                    'id' => 'gpt-4o-mini',
-                    'label' => 'OpenAI GPT 4o mini',
+                    'id' => 'gpt-4.1-nano',
+                    'label' => 'OpenAI GPT 4.1 Nano',
                     'streamable' => true,
                 ],
                 [
@@ -71,7 +72,7 @@
             'api_key' => '',
             'api_url' => 'https://chat-ai.academiccloud.de/v1/chat/completions',
             'ping_url' => 'https://chat-ai.academiccloud.de/v1/models',
-            'status_check' => true,
+            'status_check' => false,
 
             'models' => [
                 [
@@ -115,22 +116,25 @@
             'api_url' => 'https://generativelanguage.googleapis.com/v1beta/models/',
             'streaming_url' => 'https://generativelanguage.googleapis.com/v1beta/models/',
             'ping_url' => '',
+            'allow_search' => true,
             'models' => [
                 [
-                    'id' => 'gemini-1.5-flash',
-                    'label' => 'Google Gemini 1.5 Flash',
-                    'streamable' => false,
+                    'id' => 'gemini-2.0-flash',
+                    'label' => 'Google Gemini 2.0 Flash',
+                    'streamable' => true,
+                    'search_tool'=> true,
                 ],
                 [
                     'id' => 'gemini-2.0-flash-lite',
                     'label' => 'Google Gemini 2.0 Flash Lite',
                     'streamable' => true,
-                    'search_tool' => false,
+                    'search_tool'=> false,
                 ],
                 [
-                    'id' => 'gemini-2.0-flash-exp',
-                    'label' => 'Google Gemini 2.0 Flash Exp',
-                    'streamable' => false,
+                    'id' => 'gemini-2.5-pro',
+                    'label' => 'Google Gemini 2.5 Pro',
+                    'streamable' => true,
+                    'search_tool'=> true,
                 ]
             ]
         ],

app/Services/AI/Providers/GoogleProvider.php

@@ -47,23 +47,23 @@ public function formatPayload(array $rawPayload): array
             'contents' => $formattedMessages,
             'stream' => $rawPayload['stream'] && $this->supportsStreaming($modelId),
         ];
-        
+
         // Set complete optional fields with content (default values if not present in $rawPayload)
         $payload['safetySettings'] = $rawPayload['safetySettings'] ?? [
             [
                 'category' => 'HARM_CATEGORY_DANGEROUS_CONTENT',
                 'threshold' => 'BLOCK_ONLY_HIGH'
             ]
         ];
-        
+
         $payload['generationConfig'] = $rawPayload['generationConfig'] ?? [
             // 'stopSequences' => ["Title"],
             'temperature' => 1.0,
-            'maxOutputTokens' => 800,
+            'maxOutputTokens' => 3000,
             'topP' => 0.8,
             'topK' => 10
         ];
-        
+
         // Google Search only works with gemini >= 2.0
         // Search tool is context sensitive, this means the llm decides if a search is necessary for an answer
         if ($this->config['allow_search'] && $this->getModelDetails($modelId)['search_tool']){
@@ -75,7 +75,7 @@ public function formatPayload(array $rawPayload): array
         }
         return $payload;
     }
-    
+
     /**
      * Format the complete response from Google
      *
@@ -85,7 +85,7 @@ public function formatPayload(array $rawPayload): array
     public function formatResponse($response): array
     {
         $responseContent = $response->getContent();
-        $jsonContent = json_decode($responseContent, true);        
+        $jsonContent = json_decode($responseContent, true);
 
         $content = $jsonContent['candidates'][0]['content']['parts'][0]['text'] ?? '';
         $groundingMetadata = $jsonContent['candidates'][0]['groundingMetadata'] ?? '';
@@ -98,7 +98,7 @@ public function formatResponse($response): array
             'usage' => $this->extractUsage($jsonContent)
         ];
     }
-    
+
     /**
      * Format a single chunk from a streaming response from Google
      *
@@ -109,12 +109,12 @@ public function formatStreamChunk(string $chunk): array
     {
 
         $jsonChunk = json_decode($chunk, true);
-     
+
         $content = '';
         $groundingMetadata = '';
         $isDone = false;
         $usage = null;
-        
+
         // Extract content if available
         if (isset($jsonChunk['candidates'][0]['content']['parts'][0]['text'])) {
             $content = $jsonChunk['candidates'][0]['content']['parts'][0]['text'];
@@ -124,18 +124,18 @@ public function formatStreamChunk(string $chunk): array
         if (isset($jsonChunk['candidates'][0]['groundingMetadata'])) {
             $groundingMetadata = $jsonChunk['candidates'][0]['groundingMetadata'];
         }
-        
+
         // Check for completion
-        if (isset($jsonChunk['candidates'][0]['finishReason']) && 
+        if (isset($jsonChunk['candidates'][0]['finishReason']) &&
             $jsonChunk['candidates'][0]['finishReason'] !== 'FINISH_REASON_UNSPECIFIED') {
             $isDone = true;
         }
-        
+
         // Extract usage if available
         if (isset($jsonChunk['usageMetadata'])) {
             $usage = $this->extractUsage($jsonChunk);
         }
-        
+
         return [
             'content' => [
                 'text' => $content,
@@ -145,7 +145,7 @@ public function formatStreamChunk(string $chunk): array
             'usage' => $usage
         ];
     }
-    
+
     /**
      * Extract usage information from Google response
      *
@@ -166,7 +166,7 @@ protected function extractUsage(array $data): ?array
         }
         return null;
     }
-    
+
     /**
      * Override common HTTP headers for Google API requests without Authorization header
      *
@@ -192,7 +192,7 @@ public function makeNonStreamingRequest(array $payload)
     {
         // Ensure stream is set to false
         $payload['stream'] = false;
-        
+
         // Construct the URL with API key
         $url = $this->config['api_url'] . $payload['model'] . ':generateContent?key=' . $this->config['api_key'];
         // Extract just the necessary parts for Google's API
@@ -211,29 +211,29 @@ public function makeNonStreamingRequest(array $payload)
         if (isset($payload['tools'])) {
             $requestPayload['tools'] = $payload['tools'];
         }
-        
+
         // Initialize cURL
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
-        
+
         // Set common cURL options
         $this->setCommonCurlOptions($ch, $requestPayload, $this->getHttpHeaders());
-        
+
         // Execute the request
         $response = curl_exec($ch);
-        
+
         // Handle errors
         if (curl_errno($ch)) {
             $error = 'Error: ' . curl_error($ch);
             curl_close($ch);
             return response()->json(['error' => $error], 500);
         }
-        
+
         curl_close($ch);
-        
+
         return response($response)->header('Content-Type', 'application/json');
     }
-    
+
 /**
      * Make a streaming request to the OpenAI API
      *
@@ -251,7 +251,7 @@ public function makeStreamingRequest(array $payload, callable $streamCallback)
             'system_instruction' => $payload['system_instruction'],
             'contents' => $payload['contents']
         ];
-        
+
         // Add aditional config parameters if present
         if (isset($payload['safetySettings'])) {
             $requestPayload['safetySettings'] = $payload['safetySettings'];
@@ -264,30 +264,30 @@ public function makeStreamingRequest(array $payload, callable $streamCallback)
         }
 
         set_time_limit(120);
-        
+
         // Set headers for SSE
         header('Content-Type: text/event-stream');
         header('Cache-Control: no-cache');
         header('Connection: keep-alive');
         header('Access-Control-Allow-Origin: *');
-        
+
         // Initialize cURL
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
-        
+
         // Set common cURL options
         $this->setCommonCurlOptions($ch, $requestPayload, $this->getHttpHeaders(true));
-        
+
         // Set streaming-specific options
         $this->setStreamingCurlOptions($ch, $streamCallback);
-        
+
             // Log the full curl command (simulated)
             $httpHeaders = $this->getHttpHeaders(true);
             $headerString = '';
             foreach ($httpHeaders as $header) {
                 $headerString .= "-H '" . $header . "' ";
             }
-            $command = "curl -X POST '" . $url . "' " . $headerString . "-d '" . json_encode($requestPayload) . "'";    
+            $command = "curl -X POST '" . $url . "' " . $headerString . "-d '" . json_encode($requestPayload) . "'";
 
         // Execute the cURL session
         curl_exec($ch);
@@ -300,13 +300,13 @@ public function makeStreamingRequest(array $payload, callable $streamCallback)
             }
             flush();
         }
-        
+
         curl_close($ch);
-        
+
         // Flush any remaining data
         if (ob_get_length()) {
             ob_flush();
         }
         flush();
     }
-}
+}