compass_api_sdk 0.9.36__py3-none-any.whl → 0.9.37__py3-none-any.whl

compass_api_sdk/erc_4626_vaults.py

@@ -89,31 +89,20 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.VaultGetVaultResponse)
+            return utils.unmarshal_json_response(models.VaultGetVaultResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
     async def vault_async(
         self,
@@ -196,31 +185,20 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.VaultGetVaultResponse)
+            return utils.unmarshal_json_response(models.VaultGetVaultResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
     def deposit(
         self,
@@ -313,31 +291,20 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return utils.unmarshal_json_response(models.TxResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
     async def deposit_async(
         self,
@@ -430,31 +397,20 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return utils.unmarshal_json_response(models.TxResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
     def withdraw(
         self,
@@ -547,31 +503,20 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return utils.unmarshal_json_response(models.TxResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
     async def withdraw_async(
         self,
@@ -664,28 +609,17 @@ class ERC4626Vaults(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return utils.unmarshal_json_response(models.TxResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = utils.unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)

compass_api_sdk/errors/__init__.py

@@ -5,14 +5,27 @@ from importlib import import_module
 
 if TYPE_CHECKING:
     from .apierror import APIError
+    from .compassapierror import CompassAPIError
     from .httpvalidationerror import HTTPValidationError, HTTPValidationErrorData
-
-__all__ = ["APIError", "HTTPValidationError", "HTTPValidationErrorData"]
+    from .no_response_error import NoResponseError
+    from .responsevalidationerror import ResponseValidationError
+
+__all__ = [
+    "APIError",
+    "CompassAPIError",
+    "HTTPValidationError",
+    "HTTPValidationErrorData",
+    "NoResponseError",
+    "ResponseValidationError",
+]
 
 _dynamic_imports: dict[str, str] = {
     "APIError": ".apierror",
+    "CompassAPIError": ".compassapierror",
     "HTTPValidationError": ".httpvalidationerror",
     "HTTPValidationErrorData": ".httpvalidationerror",
+    "NoResponseError": ".no_response_error",
+    "ResponseValidationError": ".responsevalidationerror",
 }
 
 

compass_api_sdk/errors/apierror.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 compass_api_sdk.errors import CompassAPIError
+
+MAX_MESSAGE_LEN = 10_000
+
+
+class APIError(CompassAPIError):
+    """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 APIError(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)

compass_api_sdk/errors/compassapierror.py

@@ -0,0 +1,26 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+import httpx
+from typing import Optional
+
+
+class CompassAPIError(Exception):
+    """The base class for all HTTP error responses."""
+
+    message: str
+    status_code: int
+    body: str
+    headers: httpx.Headers
+    raw_response: httpx.Response
+
+    def __init__(
+        self, message: str, raw_response: httpx.Response, body: Optional[str] = None
+    ):
+        self.message = message
+        self.status_code = raw_response.status_code
+        self.body = body if body is not None else raw_response.text
+        self.headers = raw_response.headers
+        self.raw_response = raw_response
+
+    def __str__(self):
+        return self.message

compass_api_sdk/errors/httpvalidationerror.py

@@ -1,9 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from compass_api_sdk import utils
+from compass_api_sdk.errors import CompassAPIError
 from compass_api_sdk.models import validationerror as models_validationerror
 from compass_api_sdk.types import BaseModel
+import httpx
 from typing import List, Optional
 
 
@@ -11,11 +12,15 @@ class HTTPValidationErrorData(BaseModel):
     detail: Optional[List[models_validationerror.ValidationError]] = None
 
 
-class HTTPValidationError(Exception):
+class HTTPValidationError(CompassAPIError):
     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)

compass_api_sdk/errors/no_response_error.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

compass_api_sdk/errors/responsevalidationerror.py

@@ -0,0 +1,25 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+import httpx
+from typing import Optional
+
+from compass_api_sdk.errors import CompassAPIError
+
+
+class ResponseValidationError(CompassAPIError):
+    """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__

compass_api_sdk/models/apy.py

@@ -6,12 +6,15 @@ from typing_extensions import TypedDict
 
 
 class ApyTypedDict(TypedDict):
+    current: str
     apy_1_day: str
     apy_7_day: str
     apy_30_day: str
 
 
 class Apy(BaseModel):
+    current: str
+
     apy_1_day: str
 
     apy_7_day: str

compass_api_sdk/models/morpho_vaultop.py

@@ -1,30 +1,88 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from compass_api_sdk.types import BaseModel
+from compass_api_sdk.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
 from compass_api_sdk.utils import FieldMetadata, QueryParamMetadata
 from enum import Enum
-from typing_extensions import Annotated, TypedDict
+from pydantic import model_serializer
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class MorphoVaultChain(str, Enum):
-    ETHEREUM_MAINNET = "ethereum:mainnet"
+    r"""The chain to use."""
+
     BASE_MAINNET = "base:mainnet"
+    ETHEREUM_MAINNET = "ethereum:mainnet"
+    ARBITRUM_MAINNET = "arbitrum:mainnet"
 
 
 class MorphoVaultRequestTypedDict(TypedDict):
     chain: MorphoVaultChain
+    r"""The chain to use."""
+    block: NotRequired[Nullable[int]]
+    r"""Optional block number (defaults to latest)."""
     vault_address: str
-    r"""The vault address of the desired vault data & metrics."""
+    r"""The vault address of the desired vault position."""
+    user_address: NotRequired[Nullable[str]]
+    r"""The user address of the desired vault position. Only include if you would like the user position included in the response. Defaults to `None`."""
 
 
 class MorphoVaultRequest(BaseModel):
     chain: Annotated[
         MorphoVaultChain,
         FieldMetadata(query=QueryParamMetadata(style="form", explode=True)),
-    ] = MorphoVaultChain.BASE_MAINNET
+    ] = MorphoVaultChain.ETHEREUM_MAINNET
+    r"""The chain to use."""
+
+    block: Annotated[
+        OptionalNullable[int],
+        FieldMetadata(query=QueryParamMetadata(style="form", explode=True)),
+    ] = UNSET
+    r"""Optional block number (defaults to latest)."""
 
     vault_address: Annotated[
         str, FieldMetadata(query=QueryParamMetadata(style="form", explode=True))
-    ] = "0xc1256Ae5FF1cf2719D4937adb3bbCCab2E00A2Ca"
-    r"""The vault address of the desired vault data & metrics."""
+    ] = "0x182863131F9a4630fF9E27830d945B1413e347E8"
+    r"""The vault address of the desired vault position."""
+
+    user_address: Annotated[
+        OptionalNullable[str],
+        FieldMetadata(query=QueryParamMetadata(style="form", explode=True)),
+    ] = UNSET
+    r"""The user address of the desired vault position. Only include if you would like the user position included in the response. Defaults to `None`."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["block", "user_address"]
+        nullable_fields = ["block", "user_address"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m