fix: correctly propagate errors from the ai proxy

Author: theboxer

assets/components/modai/js/mgr/executor.js

@@ -224,6 +224,10 @@
 
         if (!res.ok) {
             const data = await res.json();
+            if (data.error) {
+                throw new Error(data.error.message);
+            }
+
             throw new Error(data.detail);
         }
 
@@ -241,6 +245,10 @@
 
         if (!res.ok) {
             const data = await res.json();
+            if (data.error) {
+                throw new Error(data.error.message);
+            }
+
             throw new Error(data.detail);
         }
 
@@ -251,7 +259,7 @@
 
         if (!proxy) {
             const data = await res.json();
-            return serviceExecutor(data.object, onChunkStream);
+            return serviceExecutor(data, onChunkStream);
         }
 
         if (!stream) {

core/components/modai/src/API/API.php

@@ -126,7 +126,7 @@ protected function success($data): void {
 
     protected function proxyAIResponse(AIResponse $aiResponse)
     {
-        $headerStream = (int)$aiResponse->getStream();
+        $headerStream = (int)$aiResponse->isStream();
         header("x-modai-service: {$aiResponse->getService()}");
         header("x-modai-parser: {$aiResponse->getParser()}");
         header("x-modai-stream: $headerStream");
@@ -137,7 +137,7 @@ protected function proxyAIResponse(AIResponse $aiResponse)
             $this->success([
                 'forExecutor' => [
                     'service' => $aiResponse->getService(),
-                    'stream' => $aiResponse->getStream(),
+                    'stream' => $aiResponse->isStream(),
                     'parser' => $aiResponse->getParser(),
                     'url' => $aiResponse->getUrl(),
                     'headers' => $aiResponse->getHeaders(),
@@ -155,24 +155,53 @@ protected function proxyAIResponse(AIResponse $aiResponse)
         }
 
         $ch = curl_init($aiResponse->getUrl());
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, !$aiResponse->getStream());
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, !$aiResponse->isStream());
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $aiResponse->getBody());
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_HEADER, false);
+
+        $statusCode = 200;
+        $headersSent = false;
+        $bodyBuffer = '';
+
+
+        if ($aiResponse->isStream()) {
+            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header_line) use (&$statusCode) {
+                if (strpos($header_line, 'HTTP/') === 0) {
+                    preg_match('#HTTP/\S+ (\d+)#', $header_line, $matches);
+                    if (isset($matches[1])) {
+                        $statusCode = (int)$matches[1];
+                    }
+                }
+                return strlen($header_line);
+            });
 
-        if ($aiResponse->getStream()) {
             header('Content-Type: text/event-stream');
             header('Connection: keep-alive');
             header('Cache-Control: no-cache');
             flush();
             ob_flush();
 
-            curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($curl, $chunk) {
-                echo $chunk;
-                flush();
-                ob_flush();
-
-                return strlen($chunk);
+            curl_setopt($ch, CURLOPT_WRITEFUNCTION, function ($curl, $chunk) use (&$statusCode, &$headersSent, &$bodyBuffer) {
+                if ($statusCode >= 400) {
+                    $bodyBuffer .= $chunk;
+                    return strlen($chunk);
+                } else {
+                    if (!$headersSent) {
+                        header('Content-Type: text/event-stream');
+                        header('Connection: keep-alive');
+                        header('Cache-Control: no-cache');
+                        flush();
+                        ob_flush();
+                        $headersSent = true;
+                    }
+
+                    echo $chunk;
+                    flush();
+                    ob_flush();
+                    return strlen($chunk);
+                }
             });
         }
 
@@ -183,10 +212,20 @@ protected function proxyAIResponse(AIResponse $aiResponse)
             throw new \Exception($error_msg);
         }
 
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        http_response_code($httpCode);
+        if (!$aiResponse->isStream()) {
+            $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            $bodyBuffer = $response;
+        }
+
+        http_response_code($statusCode);
+
+        if ($statusCode >= 400) {
+            header('Content-Type: application/json');
+            echo $bodyBuffer;
+            return;
+        }
 
-        if (!$aiResponse->getStream()) {
+        if (!$aiResponse->isStream()) {
             header("Content-Type: application/json");
             echo $response;
             return;

core/components/modai/src/Services/Response/AIResponse.php

@@ -72,7 +72,7 @@ public function getBody(): string
         return json_encode($this->body);
     }
 
-    public function getStream(): bool
+    public function isStream(): bool
     {
         return $this->stream;
     }