fix(OpenAI): don't bail out early on text/plain - only if JSON parsing errors occurred. (#736)

* test(OpenAI): add assertion for invalid_request_error

* fix(OpenAI): no early bail out on content-type text/plain

Author: iBotPeaches

src/Transporters/HttpTransporter.php

@@ -86,13 +86,13 @@ public function requestStringOrObject(Payload $payload): AdaptableResponse
 
         $contents = (string) $response->getBody();
 
+        $this->throwIfRateLimit($response);
+        $this->throwIfJsonError($response, $contents);
+
         if (str_contains($response->getHeaderLine('Content-Type'), ContentType::TEXT_PLAIN->value)) {
             return AdaptableResponse::from($contents, $response->getHeaders());
         }
 
-        $this->throwIfRateLimit($response);
-        $this->throwIfJsonError($response, $contents);
-
         try {
             /** @var array{error?: array{message: string, type: string, code: string}} $data */
             $data = json_decode($contents, true, flags: JSON_THROW_ON_ERROR);
@@ -163,10 +163,6 @@ private function throwIfJsonError(ResponseInterface $response, string|ResponseIn
             return;
         }
 
-        if (! str_contains($response->getHeaderLine('Content-Type'), ContentType::JSON->value)) {
-            return;
-        }
-
         if ($contents instanceof ResponseInterface) {
             $contents = (string) $contents->getBody();
         }
@@ -179,6 +175,11 @@ private function throwIfJsonError(ResponseInterface $response, string|ResponseIn
                 throw new ErrorException($data['error'], $response);
             }
         } catch (JsonException $jsonException) {
+            // Due to some JSON coming back from OpenAI as text/plain, we need to avoid an early return from purely content-type checks.
+            if (! str_contains($response->getHeaderLine('Content-Type'), ContentType::JSON->value)) {
+                return;
+            }
+
             throw new UnserializableResponse($jsonException, $response);
         }
     }

tests/Transporters/HttpTransporter.php

@@ -112,6 +112,34 @@
         });
 })->with('request methods');
 
+test('request object mismatched project error', function (string $requestMethod) {
+    $payload = Payload::list('models');
+
+    $response = new Response(401, ['Content-Type' => 'text/plain; charset=utf-8'], json_encode([
+        'error' => [
+            'message' => 'OpenAI-Project header should match project for API key',
+            'type' => 'invalid_request_error',
+            'code' => 'mismatched_project',
+            'param' => null,
+        ],
+        'status' => 401,
+    ]));
+
+    $this->client
+        ->shouldReceive('sendRequest')
+        ->once()
+        ->andReturn($response);
+
+    expect(fn () => $this->http->$requestMethod($payload))
+        ->toThrow(function (ErrorException $e) {
+            expect($e->getMessage())->toBe('OpenAI-Project header should match project for API key')
+                ->and($e->getErrorMessage())->toBe('OpenAI-Project header should match project for API key')
+                ->and($e->getErrorCode())->toBe('mismatched_project')
+                ->and($e->getErrorType())->toBe('invalid_request_error')
+                ->and($e->getStatusCode())->toBe(401);
+        });
+})->with('request methods');
+
 test('request object server errors', function () {
     $payload = Payload::create('completions', ['model' => 'gpt-4']);