Enhance HTTP request exception message format.

Author: felixarntz

src/Providers/Http/Exception/ClientException.php

@@ -69,20 +69,21 @@ public static function fromClientErrorResponse(Response $response): self
             429 => 'Too Many Requests',
         ];
 
-        $statusText = $statusTexts[$statusCode] ?? 'Client Error';
-
-        $errorMessage = sprintf(
-            'Client error (%d %s): Request was rejected due to client-side issue',
-            $statusCode,
-            $statusText
-        );
+        if (isset($statusTexts[$statusCode])) {
+            $errorMessage = sprintf('%s (%d)', $statusTexts[$statusCode], $statusCode);
+        } else {
+            $errorMessage = sprintf(
+                'Client error (%d): Request was rejected due to client-side issue',
+                $statusCode
+            );
+        }
 
         // Extract error message from response data using centralized utility
         $extractedError = ErrorMessageExtractor::extractFromResponseData($response->getData());
         if ($extractedError !== null) {
             $errorMessage .= ' - ' . $extractedError;
         }
 
-        return new self($errorMessage, $response->getStatusCode());
+        return new self($errorMessage, $statusCode);
     }
 }

src/Providers/Http/Exception/RedirectException.php

@@ -42,13 +42,14 @@ public static function fromRedirectResponse(Response $response): self
             308 => 'Permanent Redirect',
         ];
 
-        $statusText = $statusTexts[$statusCode] ?? 'Redirect';
-
-        $errorMessage = sprintf(
-            'Redirect response (%d %s): Request needs to be retried at a different location',
-            $statusCode,
-            $statusText
-        );
+        if (isset($statusTexts[$statusCode])) {
+            $errorMessage = sprintf('%s (%d)', $statusTexts[$statusCode], $statusCode);
+        } else {
+            $errorMessage = sprintf(
+                'Redirect error (%d): Request needs to be retried at a different location',
+                $statusCode
+            );
+        }
 
         // Try to extract the redirect location from headers
         $locationValues = $response->getHeader('Location');

src/Providers/Http/Exception/ServerException.php

@@ -40,13 +40,14 @@ public static function fromServerErrorResponse(Response $response): self
             507 => 'Insufficient Storage',
         ];
 
-        $statusText = $statusTexts[$statusCode] ?? 'Server Error';
-
-        $errorMessage = sprintf(
-            'Server error (%d %s): Request failed due to server-side issue',
-            $statusCode,
-            $statusText
-        );
+        if (isset($statusTexts[$statusCode])) {
+            $errorMessage = sprintf('%s (%d)', $statusTexts[$statusCode], $statusCode);
+        } else {
+            $errorMessage = sprintf(
+                'Server error (%d): Request was rejected due to server-side issue',
+                $statusCode
+            );
+        }
 
         // Extract error message from response data using centralized utility
         $extractedError = ErrorMessageExtractor::extractFromResponseData($response->getData());

tests/unit/Providers/Http/Util/ResponseUtilTest.php

@@ -61,7 +61,7 @@ public function testThrowIfNotSuccessfulThrowsClientExceptionFor400BadRequest():
 
         $this->expectException(ClientException::class);
         $this->expectExceptionCode(400);
-        $this->expectExceptionMessage('Client error (400 Bad Request): Request was rejected due to client-side issue');
+        $this->expectExceptionMessage('Bad Request (400)');
 
         ResponseUtil::throwIfNotSuccessful($response);
     }
@@ -88,8 +88,7 @@ public function testThrowIfNotSuccessfulThrowsClientExceptionFor4xxErrors(
         $this->expectException(ClientException::class);
         $this->expectExceptionCode($statusCode);
         $this->expectExceptionMessageMatches(
-            "/^Client error \\({$statusCode} [^)]+\\): Request was rejected due to " .
-            "client-side issue( - {$expectedMessagePart})?$/"
+            "/^[A-Za-z ]+ \\({$statusCode}\\)( - {$expectedMessagePart})?$/"
         );
 
         ResponseUtil::throwIfNotSuccessful($response);
@@ -117,8 +116,7 @@ public function testThrowIfNotSuccessfulThrowsServerExceptionFor5xxErrors(
         $this->expectException(ServerException::class);
         $this->expectExceptionCode($statusCode);
         $this->expectExceptionMessageMatches(
-            "/^Server error \\({$statusCode} [^)]+\\): Request failed due to " .
-            "server-side issue( - {$expectedMessagePart})?$/"
+            "/^[A-Za-z ]+ \\({$statusCode}\\)( - {$expectedMessagePart})?$/"
         );
 
         ResponseUtil::throwIfNotSuccessful($response);

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleImageGenerationModelTest.php

@@ -206,7 +206,7 @@ public function testGenerateImageResultSuccessWithBase64JsonOutput(): void
     public function testGenerateImageResultApiFailure(): void
     {
         $prompt = [new Message(MessageRoleEnum::user(), [new MessagePart('A tree')])];
-        $response = new Response(400, [], '{"error": "Bad Request"}');
+        $response = new Response(400, [], '{"error": "Invalid parameter."}');
 
         $this->mockRequestAuthentication
             ->expects($this->once())
@@ -221,9 +221,7 @@ public function testGenerateImageResultApiFailure(): void
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage(
-            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
-        );
+        $this->expectExceptionMessage('Bad Request (400) - Invalid parameter.');
 
         $model->generateImageResult($prompt);
     }
@@ -612,13 +610,11 @@ public function testThrowIfNotSuccessfulSuccess(): void
      */
     public function testThrowIfNotSuccessfulFailure(): void
     {
-        $response = new Response(404, [], '{"error":"Not Found"}');
+        $response = new Response(404, [], '{"error":"The resource does not exist."}');
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage(
-            'Client error (404 Not Found): Request was rejected due to client-side issue - Not Found'
-        );
+        $this->expectExceptionMessage('Not Found (404) - The resource does not exist.');
 
         $model->exposeThrowIfNotSuccessful($response);
     }

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleModelMetadataDirectoryTest.php

@@ -88,7 +88,7 @@ public function createModelMetadataStub(string $modelId)
      */
     public function testSendListModelsRequestFailure(): void
     {
-        $response = new Response(400, [], '{"error": "Bad Request"}');
+        $response = new Response(400, [], '{"error": "Invalid parameter provided."}');
 
         $this->mockRequestAuthentication
             ->expects($this->once())
@@ -109,9 +109,7 @@ function (string $modelId) {
         );
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage(
-            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
-        );
+        $this->expectExceptionMessage('Bad Request (400) - Invalid parameter provided.');
 
         $directory->listModelMetadata();
     }

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleTextGenerationModelTest.php

@@ -146,7 +146,7 @@ public function testGenerateTextResultSuccess(): void
     public function testGenerateTextResultApiFailure(): void
     {
         $prompt = [new Message(MessageRoleEnum::user(), [new MessagePart('Hello')])];
-        $response = new Response(400, [], '{"error": "Bad Request"}');
+        $response = new Response(400, [], '{"error": "Invalid parameter."}');
 
         $this->mockRequestAuthentication
             ->expects($this->once())
@@ -161,9 +161,7 @@ public function testGenerateTextResultApiFailure(): void
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage(
-            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
-        );
+        $this->expectExceptionMessage('Bad Request (400) - Invalid parameter.');
 
         $model->generateTextResult($prompt);
     }