Handle client errors in the requestStream method using ResponseClientException

src/Exceptions/TransporterException.php

@@ -5,15 +5,26 @@
 namespace OpenAI\Exceptions;
 
 use Exception;
-use Psr\Http\Client\ClientExceptionInterface;
+use Psr\Http\Message\RequestInterface;
 
 final class TransporterException extends Exception
 {
+    private RequestInterface $request;
+
     /**
      * Creates a new Exception instance.
      */
-    public function __construct(ClientExceptionInterface $exception)
+    public function __construct(RequestInterface $request, string $message = '', int $code = 0)
+    {
+        parent::__construct($message, $code);
+        $this->request = $request;
+    }
+
+    /**
+     * Get the request that caused the exception.
+     */
+    public function getRequest(): RequestInterface
     {
-        parent::__construct($exception->getMessage(), 0, $exception);
+        return $this->request;
     }
 }

src/Transporters/HttpTransporter.php

@@ -46,7 +46,7 @@ public function requestObject(Payload $payload): array|string
         try {
             $response = $this->client->sendRequest($request);
         } catch (ClientExceptionInterface $clientException) {
-            throw new TransporterException($clientException);
+            throw new TransporterException($request, $clientException->getMessage(), $clientException->getCode());
         }
 
         $contents = (string) $response->getBody();
@@ -79,7 +79,7 @@ public function requestContent(Payload $payload): string
         try {
             $response = $this->client->sendRequest($request);
         } catch (ClientExceptionInterface $clientException) {
-            throw new TransporterException($clientException);
+            throw new TransporterException($request, $clientException->getMessage(), $clientException->getCode());
         }
 
         $contents = $response->getBody()->getContents();
@@ -108,7 +108,12 @@ public function requestStream(Payload $payload): ResponseInterface
         try {
             $response = ($this->streamHandler)($request);
         } catch (ClientExceptionInterface $clientException) {
-            throw new TransporterException($clientException);
+            throw new TransporterException($request, $clientException->getMessage(), $clientException->getCode());
+        }
+
+        $statusCode = $response->getStatusCode();
+        if ($statusCode >= 400 && $statusCode < 500) {
+            throw new TransporterException($request, 'Client error: ' . $statusCode, $statusCode);
         }
 
         return $response;

tests/Transporters/HttpTransporter.php

@@ -124,7 +124,7 @@
     expect(fn () => $this->http->requestObject($payload))->toThrow(function (TransporterException $e) {
         expect($e->getMessage())->toBe('Could not resolve host.')
             ->and($e->getCode())->toBe(0)
-            ->and($e->getPrevious())->toBeInstanceOf(ConnectException::class);
+            ->and($e->getRequest())->toBeInstanceOf(RequestInterface::class);
     });
 });
 
@@ -209,7 +209,7 @@
     expect(fn () => $this->http->requestContent($payload))->toThrow(function (TransporterException $e) {
         expect($e->getMessage())->toBe('Could not resolve host.')
             ->and($e->getCode())->toBe(0)
-            ->and($e->getPrevious())->toBeInstanceOf(ConnectException::class);
+            ->and($e->getRequest())->toBeInstanceOf(RequestInterface::class);
     });
 });
 
@@ -261,3 +261,53 @@
 
     $this->http->requestStream($payload);
 });
+
+test('request stream client error 401', function () {
+    $payload = Payload::create('completions', []);
+
+    $response = new Response(401, [], json_encode([
+        'error' => [
+            'message' => 'Unauthorized',
+            'type' => 'client_error',
+            'param' => null,
+            'code' => 'unauthorized',
+        ],
+    ]));
+
+    $this->client
+        ->shouldReceive('sendAsyncRequest')
+        ->once()
+        ->andReturn($response);
+
+    expect(fn() => $this->http->requestStream($payload))
+        ->toThrow(function (TransporterException $e) {
+            expect($e->getMessage())->toBe('Client error: 401')
+                ->and($e->getCode())->toBe(401)
+                ->and($e->getRequest())->toBeInstanceOf(RequestInterface::class);
+        });
+});
+
+test('request stream client error 404', function () {
+    $payload = Payload::create('completions', []);
+
+    $response = new Response(404, [], json_encode([
+        'error' => [
+            'message' => 'Not Found',
+            'type' => 'client_error',
+            'param' => null,
+            'code' => 'not_found',
+        ],
+    ]));
+
+    $this->client
+        ->shouldReceive('sendAsyncRequest')
+        ->once()
+        ->andReturn($response);
+
+    expect(fn() => $this->http->requestStream($payload))
+        ->toThrow(function (TransporterException $e) {
+            expect($e->getMessage())->toBe('Client error: 404')
+                ->and($e->getCode())->toBe(404)
+                ->and($e->getRequest())->toBeInstanceOf(RequestInterface::class);
+        });
+});