feat(client): improve error handling

Author: stainless-app[bot]

README.md

@@ -53,8 +53,8 @@ $client = new Client(
 $params = SmartscraperCreateParams::with(
   userPrompt: "Extract the product name, price, and description"
 );
-$completedSmartscraper = $client->smartscraper->create($params);
 
+$completedSmartscraper = $client->smartscraper->create($params);
 var_dump($completedSmartscraper->request_id);
 ```
 
@@ -80,7 +80,7 @@ try {
     echo "A 429 status code was received; we should back off a bit.", PHP_EOL;
 } catch (APIStatusError $e) {
     echo "Another non-200-range status code was received", PHP_EOL;
-    var_dump($e->status);
+    echo $e->getMessage();
 }
 ```
 

src/Core/BaseClient.php

@@ -26,7 +26,7 @@ class BaseClient
 
     protected RequestFactoryInterface $requestFactory;
 
-    protected ClientInterface $requester;
+    protected ClientInterface $transporter;
 
     /**
      * @param array<string, null|int|list<int|string>|string> $headers
@@ -41,7 +41,7 @@ public function __construct(
         $this->requestFactory = Psr17FactoryDiscovery::findRequestFactory();
 
         $this->baseUrl = $this->uriFactory->createUri($baseUrl);
-        $this->requester = Psr18ClientDiscovery::find();
+        $this->transporter = Psr18ClientDiscovery::find();
     }
 
     /**
@@ -158,7 +158,7 @@ protected function sendRequest(
         int $redirectCount,
     ): ResponseInterface {
         $req = Util::withSetBody($this->streamFactory, req: $req, body: $data);
-        $rsp = $this->requester->sendRequest($req);
+        $rsp = $this->transporter->sendRequest($req);
         $code = $rsp->getStatusCode();
 
         if ($code >= 300 && $code < 400) {
@@ -172,7 +172,7 @@ protected function sendRequest(
         }
 
         if ($code >= 400 && $code < 500) {
-            throw APIStatusError::from(null, request: $req, response: $rsp);
+            throw APIStatusError::from(request: $req, response: $rsp);
         }
 
         if ($code >= 500 && $retryCount < $opts->maxRetries) {

src/Errors/APIError.php

@@ -18,6 +18,6 @@ public function __construct(
         ?\Throwable $previous = null,
         string $message = '',
     ) {
-        parent::__construct(message: 'response: '.$message.PHP_EOL.'request: '.$request->getBody()->__toString(), previous: $previous);
+        parent::__construct(message: $message, previous: $previous);
     }
 }

src/Errors/APIStatusError.php

@@ -4,7 +4,7 @@
 
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Scrapegraphai\Core\Util;
+use Psr\Http\Message\StreamInterface;
 
 class APIStatusError extends APIError
 {
@@ -14,23 +14,26 @@ class APIStatusError extends APIError
     public ?int $status;
 
     public function __construct(
-        public mixed $body,
         public RequestInterface $request,
         ResponseInterface $response,
         ?\Throwable $previous = null,
         string $message = '',
     ) {
         $this->response = $response;
         $this->status = $response->getStatusCode();
-        $message |= json_encode(
-            ['status' => $this->status, 'body' => $body],
-            flags: Util::JSON_ENCODE_FLAGS,
-        );
-        parent::__construct(request: $request, message: $message, previous: $previous);
+
+        $summary = 'Status: '.$this->status.PHP_EOL
+            .'Response Body: '.self::fmtBody($response->getBody()).PHP_EOL
+            .'Request Body: '.self::fmtBody($request->getBody()).PHP_EOL;
+
+        if ('' != $message) {
+            $summary .= $message.PHP_EOL.$summary;
+        }
+
+        parent::__construct(request: $request, message: $summary, previous: $previous);
     }
 
     public static function from(
-        mixed $body,
         RequestInterface $request,
         ResponseInterface $response
     ): self {
@@ -48,6 +51,11 @@ public static function from(
             default => APIStatusError::class
         };
 
-        return new $cls(body: $body, request: $request, response: $response);
+        return new $cls(request: $request, response: $response);
+    }
+
+    private static function fmtBody(StreamInterface $body): string
+    {
+        return json_encode(json_decode($body->__toString() ?: ''), JSON_PRETTY_PRINT) ?: '';
     }
 }

src/Errors/Error.php

@@ -9,6 +9,6 @@ class Error extends \Exception
 
     public function __construct(string $message, int $code = 0, ?\Throwable $previous = null)
     {
-        parent::__construct($this::DESC.' '.$message, $code, $previous);
+        parent::__construct($this::DESC.PHP_EOL.$message, $code, $previous);
     }
 }