Actually commit everything...

Author: awalker4

src/unstructured_client/basesdk.py

@@ -249,7 +249,7 @@ def do():
 
             if http_res is None:
                 logger.debug("Raising no response SDK error")
-                raise errors.SDKError("No response received")
+                raise errors.NoResponseError("No response received")
 
             logger.debug(
                 "Response:\nStatus Code: %s\nURL: %s\nHeaders: %s\nBody: %s",
@@ -270,7 +270,7 @@ def do():
                     http_res = result
                 else:
                     logger.debug("Raising unexpected SDK error")
-                    raise errors.SDKError("Unexpected error occurred")
+                    raise errors.SDKError("Unexpected error occurred", http_res)
 
             return http_res
 
@@ -321,7 +321,7 @@ async def do():
 
             if http_res is None:
                 logger.debug("Raising no response SDK error")
-                raise errors.SDKError("No response received")
+                raise errors.NoResponseError("No response received")
 
             logger.debug(
                 "Response:\nStatus Code: %s\nURL: %s\nHeaders: %s\nBody: %s",
@@ -342,7 +342,7 @@ async def do():
                     http_res = result
                 else:
                     logger.debug("Raising unexpected SDK error")
-                    raise errors.SDKError("Unexpected error occurred")
+                    raise errors.SDKError("Unexpected error occurred", http_res)
 
             return http_res
 

src/unstructured_client/destinations.py

@@ -7,6 +7,7 @@
 from unstructured_client._hooks import HookContext
 from unstructured_client.models import errors, operations, shared
 from unstructured_client.types import BaseModel, OptionalNullable, UNSET
+from unstructured_client._hooks.custom.clean_server_url_hook import clean_server_url
 from unstructured_client.utils.unmarshal_json_response import unmarshal_json_response
 
 

src/unstructured_client/general.py

@@ -9,25 +9,34 @@
         HTTPValidationError,
         HTTPValidationErrorData,
     )
+    from .no_response_error import NoResponseError
+    from .responsevalidationerror import ResponseValidationError
     from .sdkerror import SDKError
     from .servererror import ServerError, ServerErrorData
+    from .unstructuredclienterror import UnstructuredClientError
 
 __all__ = [
     "Detail",
     "HTTPValidationError",
     "HTTPValidationErrorData",
+    "NoResponseError",
+    "ResponseValidationError",
     "SDKError",
     "ServerError",
     "ServerErrorData",
+    "UnstructuredClientError",
 ]
 
 _dynamic_imports: dict[str, str] = {
     "Detail": ".httpvalidationerror",
     "HTTPValidationError": ".httpvalidationerror",
     "HTTPValidationErrorData": ".httpvalidationerror",
+    "NoResponseError": ".no_response_error",
+    "ResponseValidationError": ".responsevalidationerror",
     "SDKError": ".sdkerror",
     "ServerError": ".servererror",
     "ServerErrorData": ".servererror",
+    "UnstructuredClientError": ".unstructuredclienterror",
 }
 
 

src/unstructured_client/jobs.py

@@ -1,9 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
+import httpx
 from typing import List, Optional, Union
 from typing_extensions import TypeAliasType
-from unstructured_client import utils
+from unstructured_client.models.errors import UnstructuredClientError
 from unstructured_client.models.shared import validationerror as shared_validationerror
 from unstructured_client.types import BaseModel
 
@@ -22,11 +23,15 @@ class HTTPValidationErrorData(BaseModel):
     detail: Optional[Detail] = None
 
 
-class HTTPValidationError(Exception):
+class HTTPValidationError(UnstructuredClientError):
     data: HTTPValidationErrorData
 
-    def __init__(self, data: HTTPValidationErrorData):
+    def __init__(
+        self,
+        data: HTTPValidationErrorData,
+        raw_response: httpx.Response,
+        body: Optional[str] = None,
+    ):
+        message = body or raw_response.text
+        super().__init__(message, raw_response, body)
         self.data = data
-
-    def __str__(self) -> str:
-        return utils.marshal_json(self.data, HTTPValidationErrorData)

src/unstructured_client/models/errors/__init__.py

@@ -0,0 +1,13 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+class NoResponseError(Exception):
+    """Error raised when no HTTP response is received from the server."""
+
+    message: str
+
+    def __init__(self, message: str = "No response received"):
+        self.message = message
+        super().__init__(message)
+
+    def __str__(self):
+        return self.message

src/unstructured_client/models/errors/httpvalidationerror.py

@@ -0,0 +1,25 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+import httpx
+from typing import Optional
+
+from unstructured_client.models.errors import UnstructuredClientError
+
+
+class ResponseValidationError(UnstructuredClientError):
+    """Error raised when there is a type mismatch between the response data and the expected Pydantic model."""
+
+    def __init__(
+        self,
+        message: str,
+        raw_response: httpx.Response,
+        cause: Exception,
+        body: Optional[str] = None,
+    ):
+        message = f"{message}: {cause}"
+        super().__init__(message, raw_response, body)
+
+    @property
+    def cause(self):
+        """Normally the Pydantic ValidationError"""
+        return self.__cause__

src/unstructured_client/models/errors/no_response_error.py

@@ -1,22 +1,38 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from dataclasses import dataclass
-from typing import Optional
 import httpx
+from typing import Optional
+
+from unstructured_client.models.errors import UnstructuredClientError
+
+MAX_MESSAGE_LEN = 10_000
+
+
+class SDKError(UnstructuredClientError):
+    """The fallback error class if no more specific error class is matched."""
+
+    def __init__(
+        self, message: str, raw_response: httpx.Response, body: Optional[str] = None
+    ):
+        body_display = body or raw_response.text or '""'
 
+        if message:
+            message += ": "
+        message += f"Status {raw_response.status_code}"
 
-@dataclass
-class SDKError(Exception):
-    """Represents an error returned by the API."""
+        headers = raw_response.headers
+        content_type = headers.get("content-type", '""')
+        if content_type != "application/json":
+            if " " in content_type:
+                content_type = f'"{content_type}"'
+            message += f" Content-Type {content_type}"
 
-    message: str
-    status_code: int = -1
-    body: str = ""
-    raw_response: Optional[httpx.Response] = None
+        if len(body_display) > MAX_MESSAGE_LEN:
+            truncated = body_display[:MAX_MESSAGE_LEN]
+            remaining = len(body_display) - MAX_MESSAGE_LEN
+            body_display = f"{truncated}...and {remaining} more chars"
 
-    def __str__(self):
-        body = ""
-        if len(self.body) > 0:
-            body = f"\n{self.body}"
+        message += f". Body: {body_display}"
+        message = message.strip()
 
-        return f"{self.message}: Status {self.status_code}{body}"
+        super().__init__(message, raw_response, body)

src/unstructured_client/models/errors/responsevalidationerror.py

@@ -1,20 +1,25 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
+import httpx
 from typing import Optional
-from unstructured_client import utils
+from unstructured_client.models.errors import UnstructuredClientError
 from unstructured_client.types import BaseModel
 
 
 class ServerErrorData(BaseModel):
     detail: Optional[str] = None
 
 
-class ServerError(Exception):
+class ServerError(UnstructuredClientError):
     data: ServerErrorData
 
-    def __init__(self, data: ServerErrorData):
+    def __init__(
+        self,
+        data: ServerErrorData,
+        raw_response: httpx.Response,
+        body: Optional[str] = None,
+    ):
+        message = body or raw_response.text
+        super().__init__(message, raw_response, body)
         self.data = data
-
-    def __str__(self) -> str:
-        return utils.marshal_json(self.data, ServerErrorData)