Remove unnecessary ClientException static methods and add status mapping

Author: Mohamed Khaled

src/Providers/Http/Exception/ClientException.php

@@ -47,57 +47,6 @@ public function getRequest(): Request
         return $this->request;
     }
 
-    /**
-     * Creates a ClientException from a 400 Bad Request response.
-     *
-     * @since n.e.x.t
-     *
-     * @param string $errorDetail Details about what made the request bad.
-     * @return self
-     */
-    public static function fromBadRequestResponse(string $errorDetail = 'Invalid request parameters'): self
-    {
-        $message = sprintf('Bad request (400): %s', $errorDetail);
-        return new self($message, 400);
-    }
-
-    /**
-     * Creates a ClientException from a bad request.
-     *
-     * @since n.e.x.t
-     *
-     * @param RequestInterface $psrRequest The PSR-7 request that failed.
-     * @param string $errorDetail Details about what made the request bad.
-     * @return self
-     */
-    public static function fromBadRequest(
-        RequestInterface $psrRequest,
-        string $errorDetail = 'Invalid request parameters'
-    ): self {
-        $request = Request::fromPsrRequest($psrRequest);
-        $message = sprintf('Bad request to %s (400): %s', $request->getUri(), $errorDetail);
-
-        $exception = new self($message, 400);
-        $exception->request = $request;
-        return $exception;
-    }
-
-    /**
-     * Creates a ClientException from a bad request to a specific URI.
-     *
-     * @since n.e.x.t
-     *
-     * @param string $uri The URI that was requested.
-     * @param string $errorDetail Details about what made the request bad.
-     * @return self
-     *
-     * @deprecated Use fromBadRequest() with RequestInterface for better type safety
-     */
-    public static function fromBadRequestToUri(string $uri, string $errorDetail = 'Invalid request parameters'): self
-    {
-        return new self(sprintf('Bad request to %s (400): %s', $uri, $errorDetail), 400);
-    }
-
     /**
      * Creates a ClientException from a client error response (4xx).
      *
@@ -111,9 +60,22 @@ public static function fromBadRequestToUri(string $uri, string $errorDetail = 'I
      */
     public static function fromClientErrorResponse(Response $response): self
     {
+        $statusCode = $response->getStatusCode();
+        $statusTexts = [
+            400 => 'Bad Request',
+            401 => 'Unauthorized',
+            403 => 'Forbidden',
+            404 => 'Not Found',
+            422 => 'Unprocessable Entity',
+            429 => 'Too Many Requests',
+        ];
+
+        $statusText = $statusTexts[$statusCode] ?? 'Client Error';
+
         $errorMessage = sprintf(
-            'Client error (%d): Request was rejected due to client-side issue',
-            $response->getStatusCode()
+            'Client error (%d %s): Request was rejected due to client-side issue',
+            $statusCode,
+            $statusText
         );
 
         // Extract error message from response data using centralized utility

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): Request was rejected due to client-side issue');
+        $this->expectExceptionMessage('Client error (400 Bad Request): Request was rejected due to client-side issue');
 
         ResponseUtil::throwIfNotSuccessful($response);
     }
@@ -88,7 +88,7 @@ public function testThrowIfNotSuccessfulThrowsClientExceptionFor4xxErrors(
         $this->expectException(ClientException::class);
         $this->expectExceptionCode($statusCode);
         $this->expectExceptionMessageMatches(
-            "/^Client error \\({$statusCode}\\): Request was rejected due to " .
+            "/^Client error \\({$statusCode} [^)]+\\): Request was rejected due to " .
             "client-side issue( - {$expectedMessagePart})?$/"
         );
 

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleImageGenerationModelTest.php

@@ -221,7 +221,9 @@ public function testGenerateImageResultApiFailure(): void
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('Client error (400): Request was rejected due to client-side issue - Bad Request');
+        $this->expectExceptionMessage(
+            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
+        );
 
         $model->generateImageResult($prompt);
     }
@@ -614,7 +616,9 @@ public function testThrowIfNotSuccessfulFailure(): void
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('Client error (404): Request was rejected due to client-side issue - Not Found');
+        $this->expectExceptionMessage(
+            'Client error (404 Not Found): Request was rejected due to client-side issue - Not Found'
+        );
 
         $model->exposeThrowIfNotSuccessful($response);
     }

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleModelMetadataDirectoryTest.php

@@ -109,7 +109,9 @@ function (string $modelId) {
         );
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('Client error (400): Request was rejected due to client-side issue - Bad Request');
+        $this->expectExceptionMessage(
+            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
+        );
 
         $directory->listModelMetadata();
     }

tests/unit/Providers/OpenAiCompatibleImplementation/AbstractOpenAiCompatibleTextGenerationModelTest.php

@@ -161,7 +161,9 @@ public function testGenerateTextResultApiFailure(): void
         $model = $this->createModel();
 
         $this->expectException(ClientException::class);
-        $this->expectExceptionMessage('Client error (400): Request was rejected due to client-side issue - Bad Request');
+        $this->expectExceptionMessage(
+            'Client error (400 Bad Request): Request was rejected due to client-side issue - Bad Request'
+        );
 
         $model->generateTextResult($prompt);
     }