refactor(providers): rename ValidateResponse to HandleResponseError

Make handleResponseError abstract

Author: MrCrayon

src/Providers/Anthropic/Handlers/Text.php

@@ -154,4 +154,6 @@ protected function extractToolCalls(array $data): array
 
         return $toolCalls;
     }
+
+    protected function handleResponseError(): void {}
 }

…DeepSeek/Concerns/ValidatesResponses.php …eepSeek/Concerns/HandleResponseError.phpsrc/Providers/DeepSeek/Concerns/ValidatesResponses.php renamed to src/Providers/DeepSeek/Concerns/HandleResponseError.php src/Providers/DeepSeek/Concerns/ValidatesResponses.php renamed to src/Providers/DeepSeek/Concerns/HandleResponseError.php

@@ -4,11 +4,14 @@
 
 namespace Prism\Prism\Providers\DeepSeek\Concerns;
 
+use Illuminate\Http\Client\Response;
 use Prism\Prism\Exceptions\PrismException;
 
-trait ValidatesResponses
+trait HandleResponseError
 {
-    protected function validateResponse(): void
+    protected Response $httpResponse;
+
+    protected function handleResponseError(): void
     {
         if ($this->httpResponse->json() === []) {
             throw PrismException::providerResponseError('DeepSeek Error: Empty response');

src/Providers/DeepSeek/Handlers/Structured.php

@@ -4,9 +4,8 @@
 
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Arr;
-use Prism\Prism\Exceptions\PrismException;
+use Prism\Prism\Providers\DeepSeek\Concerns\HandleResponseError;
 use Prism\Prism\Providers\DeepSeek\Concerns\MapsFinishReason;
-use Prism\Prism\Providers\DeepSeek\Concerns\ValidatesResponses;
 use Prism\Prism\Providers\DeepSeek\Maps\FinishReasonMap;
 use Prism\Prism\Providers\DeepSeek\Maps\MessageMap;
 use Prism\Prism\Structured\Request;
@@ -20,8 +19,8 @@
 
 class Structured
 {
+    use HandleResponseError;
     use MapsFinishReason;
-    use ValidatesResponses;
 
     protected ResponseBuilder $responseBuilder;
 
@@ -36,7 +35,7 @@ public function handle(Request $request): StructuredResponse
 
         $data = $this->sendRequest($request);
 
-        $this->validateResponse($data);
+        $this->handleResponseError();
 
         return $this->createResponse($request, $data);
     }
@@ -46,7 +45,7 @@ public function handle(Request $request): StructuredResponse
      */
     protected function sendRequest(Request $request): array
     {
-        $response = $this->client->post(
+        $this->httpResponse = $this->client->post(
             'chat/completions',
             array_merge([
                 'model' => $request->model(),
@@ -59,17 +58,7 @@ protected function sendRequest(Request $request): array
             ]))
         );
 
-        return $response->json();
-    }
-
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    protected function validateResponse(array $data): void
-    {
-        if ($data === []) {
-            throw PrismException::providerResponseError('DeepSeek Error: Empty response');
-        }
+        return $this->httpResponse->json();
     }
 
     /**

src/Providers/DeepSeek/Handlers/Text.php

@@ -8,8 +8,8 @@
 use Illuminate\Support\Collection;
 use Prism\Prism\Concerns\CallsTools;
 use Prism\Prism\Contracts\PrismRequest;
+use Prism\Prism\Providers\DeepSeek\Concerns\HandleResponseError;
 use Prism\Prism\Providers\DeepSeek\Concerns\MapsFinishReason;
-use Prism\Prism\Providers\DeepSeek\Concerns\ValidatesResponses;
 use Prism\Prism\Providers\DeepSeek\Maps\MessageMap;
 use Prism\Prism\Providers\DeepSeek\Maps\ToolCallMap;
 use Prism\Prism\Providers\DeepSeek\Maps\ToolChoiceMap;
@@ -24,8 +24,8 @@
 class Text extends TextHandler
 {
     use CallsTools;
+    use HandleResponseError;
     use MapsFinishReason;
-    use ValidatesResponses;
 
     /**
      * @param  TextRequest  $request

…rs/Gemini/Concerns/ValidatesResponse.php …/Gemini/Concerns/HandleResponseError.phpsrc/Providers/Gemini/Concerns/ValidatesResponse.php renamed to src/Providers/Gemini/Concerns/HandleResponseError.php src/Providers/Gemini/Concerns/ValidatesResponse.php renamed to src/Providers/Gemini/Concerns/HandleResponseError.php

@@ -4,11 +4,14 @@
 
 namespace Prism\Prism\Providers\Gemini\Concerns;
 
+use Illuminate\Http\Client\Response;
 use Prism\Prism\Exceptions\PrismException;
 
-trait ValidatesResponse
+trait HandleResponseError
 {
-    protected function validateResponse(): void
+    protected Response $httpResponse;
+
+    protected function handleResponseError(): void
     {
         $data = $this->httpResponse->json();
 

src/Providers/Gemini/Handlers/Structured.php

@@ -4,8 +4,7 @@
 
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Arr;
-use Prism\Prism\Exceptions\PrismException;
-use Prism\Prism\Providers\Gemini\Concerns\ValidatesResponse;
+use Prism\Prism\Providers\Gemini\Concerns\HandleResponseError;
 use Prism\Prism\Providers\Gemini\Maps\FinishReasonMap;
 use Prism\Prism\Providers\Gemini\Maps\MessageMap;
 use Prism\Prism\Providers\Gemini\Maps\SchemaMap;
@@ -19,7 +18,7 @@
 
 class Structured
 {
-    use ValidatesResponse;
+    use HandleResponseError;
 
     protected ResponseBuilder $responseBuilder;
 
@@ -32,7 +31,7 @@ public function handle(Request $request): StructuredResponse
     {
         $data = $this->sendRequest($request);
 
-        $this->validateResponse($data);
+        $this->handleResponseError();
 
         $responseMessage = new AssistantMessage(data_get($data, 'candidates.0.content.parts.0.text') ?? '');
 
@@ -52,7 +51,7 @@ public function sendRequest(Request $request): array
     {
         $providerOptions = $request->providerOptions();
 
-        $response = $this->client->post(
+        $this->httpResponse = $this->client->post(
             "{$request->model()}:generateContent",
             Arr::whereNotNull([
                 ...(new MessageMap($request->messages(), $request->systemPrompts()))(),
@@ -71,23 +70,7 @@ public function sendRequest(Request $request): array
             ])
         );
 
-        return $response->json();
-    }
-
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    protected function validateResponse(array $data): void
-    {
-        if (! $data || data_get($data, 'error')) {
-            throw PrismException::providerResponseError(vsprintf(
-                'Gemini Error: [%s] %s',
-                [
-                    data_get($data, 'error.code', 'unknown'),
-                    data_get($data, 'error.message', 'unknown'),
-                ]
-            ));
-        }
+        return $this->httpResponse->json();
     }
 
     /**

src/Providers/Gemini/Handlers/Text.php

@@ -10,7 +10,7 @@
 use Prism\Prism\Contracts\PrismRequest;
 use Prism\Prism\Exceptions\PrismException;
 use Prism\Prism\Providers\Gemini\Concerns\ExtractSearchGroundings;
-use Prism\Prism\Providers\Gemini\Concerns\ValidatesResponse;
+use Prism\Prism\Providers\Gemini\Concerns\HandleResponseError;
 use Prism\Prism\Providers\Gemini\Maps\FinishReasonMap;
 use Prism\Prism\Providers\Gemini\Maps\MessageMap;
 use Prism\Prism\Providers\Gemini\Maps\ToolCallMap;
@@ -27,7 +27,7 @@
 
 class Text extends TextHandler
 {
-    use CallsTools, ExtractSearchGroundings, ValidatesResponse;
+    use CallsTools, ExtractSearchGroundings, HandleResponseError;
 
     /**
      * @param  TextRequest  $request

…iders/Groq/Concerns/ValidateResponse.php …rs/Groq/Concerns/HandleResponseError.phpsrc/Providers/Groq/Concerns/ValidateResponse.php renamed to src/Providers/Groq/Concerns/HandleResponseError.php src/Providers/Groq/Concerns/ValidateResponse.php renamed to src/Providers/Groq/Concerns/HandleResponseError.php

@@ -8,9 +8,11 @@
 use Prism\Prism\Exceptions\PrismException;
 use Prism\Prism\ValueObjects\ProviderRateLimit;
 
-trait ValidateResponse
+trait HandleResponseError
 {
-    protected function validateResponse(): void
+    protected Response $httpResponse;
+
+    protected function handleResponseError(): void
     {
         $data = $this->httpResponse->json();
 

src/Providers/Groq/Handlers/Stream.php

@@ -14,8 +14,8 @@
 use Prism\Prism\Exceptions\PrismChunkDecodeException;
 use Prism\Prism\Exceptions\PrismException;
 use Prism\Prism\Exceptions\PrismRateLimitedException;
+use Prism\Prism\Providers\Groq\Concerns\HandleResponseError;
 use Prism\Prism\Providers\Groq\Concerns\ProcessRateLimits;
-use Prism\Prism\Providers\Groq\Concerns\ValidateResponse;
 use Prism\Prism\Providers\Groq\Maps\FinishReasonMap;
 use Prism\Prism\Providers\Groq\Maps\MessageMap;
 use Prism\Prism\Providers\Groq\Maps\ToolChoiceMap;
@@ -30,7 +30,7 @@
 
 class Stream
 {
-    use CallsTools, ProcessRateLimits, ValidateResponse;
+    use CallsTools, HandleResponseError, ProcessRateLimits;
 
     public function __construct(protected PendingRequest $client) {}
 

src/Providers/Groq/Handlers/Structured.php

@@ -5,8 +5,8 @@
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Response as ClientResponse;
 use Illuminate\Support\Arr;
+use Prism\Prism\Providers\Groq\Concerns\HandleResponseError;
 use Prism\Prism\Providers\Groq\Concerns\ProcessRateLimits;
-use Prism\Prism\Providers\Groq\Concerns\ValidateResponse;
 use Prism\Prism\Providers\Groq\Maps\FinishReasonMap;
 use Prism\Prism\Providers\Groq\Maps\MessageMap;
 use Prism\Prism\Structured\Request;
@@ -20,7 +20,7 @@
 
 class Structured
 {
-    use ProcessRateLimits, ValidateResponse;
+    use HandleResponseError, ProcessRateLimits;
 
     protected ClientResponse $httpResponse;
 
@@ -37,7 +37,7 @@ public function handle(Request $request): StructuredResponse
 
         $response = $this->sendRequest($request);
 
-        $this->validateResponse();
+        $this->handleResponseError();
 
         $data = $response->json();