crypticorn 2.4.5__py3-none-any.whl → 2.4.6__py3-none-any.whl

crypticorn/client.py

@@ -106,7 +106,7 @@ class ApiClient:
         new_config = sub_client.config
         for attr in vars(config):
             new_value = getattr(config, attr)
-            if new_value is not None:
+            if new_value:
                 setattr(new_config, attr, new_value)
 
         if sub_client == self.hive:

crypticorn/common/errors.py

@@ -7,7 +7,7 @@ logger = logging.getLogger(__name__)
 
 class Fallback(EnumMeta):
     """Fallback to UNKNOWN_ERROR for error codes not yet published to PyPI."""
-    
+
     def __getattr__(cls, name):
         # Let Pydantic/internal stuff pass silently ! fragile
         if name.startswith("__"):

crypticorn/common/scopes.py

@@ -6,6 +6,7 @@ logger = logging.getLogger("uvicorn")
 
 class Fallback(EnumMeta):
     """Fallback to no scope for unknown scopes."""
+
     # Note: This is a workaround to avoid the AttributeError when an unknown scope is accessed.
     # As soon as we have stable scopes, we can remove this.
 
@@ -19,7 +20,7 @@ class Fallback(EnumMeta):
         return None
 
 
-class Scope(StrEnum, metaclass=Fallback):
+class Scope(StrEnum):
     """
     The permission scopes for the API.
     """

crypticorn/metrics/client/models/exchange_mapping.py

@@ -20,6 +20,8 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
+from crypticorn.metrics.client.models.market_type import MarketType
+from crypticorn.metrics.client.models.trading_status import TradingStatus
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -35,8 +37,8 @@ class ExchangeMapping(BaseModel):
     pair: StrictStr
     first_trade_timestamp: Optional[datetime]
     last_trade_timestamp: Optional[datetime]
-    status: StrictStr
-    market_type: Optional[StrictStr]
+    status: TradingStatus
+    market_type: Optional[MarketType]
     __properties: ClassVar[List[str]] = [
         "exchange_name",
         "symbol",

crypticorn/metrics/client/models/trading_status.py

@@ -28,6 +28,7 @@ class TradingStatus(str, Enum):
     """
     ACTIVE = "ACTIVE"
     RETIRED = "RETIRED"
+    EXPIRED = "EXPIRED"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

crypticorn/pay/client/__init__.py

@@ -41,13 +41,14 @@ from crypticorn.pay.client.models.now_create_invoice_res import NowCreateInvoice
 from crypticorn.pay.client.models.now_fee_structure import NowFeeStructure
 from crypticorn.pay.client.models.now_payment_status import NowPaymentStatus
 from crypticorn.pay.client.models.now_webhook_payload import NowWebhookPayload
+from crypticorn.pay.client.models.payment import Payment
 from crypticorn.pay.client.models.payment_status import PaymentStatus
-from crypticorn.pay.client.models.product_model import ProductModel
-from crypticorn.pay.client.models.product_subs_model import ProductSubsModel
-from crypticorn.pay.client.models.product_update_model import ProductUpdateModel
+from crypticorn.pay.client.models.product_create import ProductCreate
+from crypticorn.pay.client.models.product_read import ProductRead
+from crypticorn.pay.client.models.product_sub_read import ProductSubRead
+from crypticorn.pay.client.models.product_update import ProductUpdate
 from crypticorn.pay.client.models.scope import Scope
 from crypticorn.pay.client.models.services import Services
-from crypticorn.pay.client.models.unified_payment_model import UnifiedPaymentModel
 from crypticorn.pay.client.models.validation_error import ValidationError
 from crypticorn.pay.client.models.validation_error_loc_inner import (
     ValidationErrorLocInner,

crypticorn/pay/client/api/payments_api.py

@@ -19,8 +19,8 @@ from typing_extensions import Annotated
 from pydantic import Field, StrictInt, StrictStr
 from typing import List, Optional
 from typing_extensions import Annotated
-from crypticorn.pay.client.models.product_subs_model import ProductSubsModel
-from crypticorn.pay.client.models.unified_payment_model import UnifiedPaymentModel
+from crypticorn.pay.client.models.payment import Payment
+from crypticorn.pay.client.models.product_sub_read import ProductSubRead
 
 from crypticorn.pay.client.api_client import ApiClient, RequestSerialized
 from crypticorn.pay.client.api_response import ApiResponse
@@ -57,7 +57,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> UnifiedPaymentModel:
+    ) -> Payment:
         """Get Latest Payment From Invoice
 
         Get the latest payment by a user from an invoice
@@ -95,7 +95,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "UnifiedPaymentModel",
+            "200": "Payment",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -125,7 +125,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[UnifiedPaymentModel]:
+    ) -> ApiResponse[Payment]:
         """Get Latest Payment From Invoice
 
         Get the latest payment by a user from an invoice
@@ -163,7 +163,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "UnifiedPaymentModel",
+            "200": "Payment",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -231,7 +231,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "UnifiedPaymentModel",
+            "200": "Payment",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -321,7 +321,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[UnifiedPaymentModel]:
+    ) -> List[Payment]:
         """Get Payments
 
         Get the combined payment history for a user across all payment services.
@@ -362,7 +362,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[UnifiedPaymentModel]",
+            "200": "List[Payment]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -400,7 +400,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[UnifiedPaymentModel]]:
+    ) -> ApiResponse[List[Payment]]:
         """Get Payments
 
         Get the combined payment history for a user across all payment services.
@@ -441,7 +441,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[UnifiedPaymentModel]",
+            "200": "List[Payment]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -520,7 +520,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[UnifiedPaymentModel]",
+            "200": "List[Payment]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -609,7 +609,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[ProductSubsModel]:
+    ) -> List[ProductSubRead]:
         """Get Subscriptions
 
         Get all subscriptions for a user. Subscriptions are the products a user has subscribed to. Returns both active and inactive subscriptions.
@@ -647,7 +647,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductSubsModel]",
+            "200": "List[ProductSubRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -679,7 +679,7 @@ class PaymentsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[ProductSubsModel]]:
+    ) -> ApiResponse[List[ProductSubRead]]:
         """Get Subscriptions
 
         Get all subscriptions for a user. Subscriptions are the products a user has subscribed to. Returns both active and inactive subscriptions.
@@ -717,7 +717,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductSubsModel]",
+            "200": "List[ProductSubRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -787,7 +787,7 @@ class PaymentsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductSubsModel]",
+            "200": "List[ProductSubRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(

crypticorn/pay/client/api/products_api.py

@@ -17,10 +17,11 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictInt, StrictStr
-from typing import Any, List, Optional
+from typing import List, Optional
 from typing_extensions import Annotated
-from crypticorn.pay.client.models.product_model import ProductModel
-from crypticorn.pay.client.models.product_update_model import ProductUpdateModel
+from crypticorn.pay.client.models.product_create import ProductCreate
+from crypticorn.pay.client.models.product_read import ProductRead
+from crypticorn.pay.client.models.product_update import ProductUpdate
 
 from crypticorn.pay.client.api_client import ApiClient, RequestSerialized
 from crypticorn.pay.client.api_response import ApiResponse
@@ -42,7 +43,7 @@ class ProductsApi:
     @validate_call
     async def create_product(
         self,
-        product_model: ProductModel,
+        product_create: ProductCreate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -54,13 +55,13 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
+    ) -> ProductRead:
         """Create Product
 
         Create a new product
 
-        :param product_model: (required)
-        :type product_model: ProductModel
+        :param product_create: (required)
+        :type product_create: ProductCreate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -84,7 +85,7 @@ class ProductsApi:
         """  # noqa: E501
 
         _param = self._create_product_serialize(
-            product_model=product_model,
+            product_create=product_create,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -92,7 +93,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "201": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -107,7 +108,7 @@ class ProductsApi:
     @validate_call
     async def create_product_with_http_info(
         self,
-        product_model: ProductModel,
+        product_create: ProductCreate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -119,13 +120,13 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[object]:
+    ) -> ApiResponse[ProductRead]:
         """Create Product
 
         Create a new product
 
-        :param product_model: (required)
-        :type product_model: ProductModel
+        :param product_create: (required)
+        :type product_create: ProductCreate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -149,7 +150,7 @@ class ProductsApi:
         """  # noqa: E501
 
         _param = self._create_product_serialize(
-            product_model=product_model,
+            product_create=product_create,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -157,7 +158,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "201": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -172,7 +173,7 @@ class ProductsApi:
     @validate_call
     async def create_product_without_preload_content(
         self,
-        product_model: ProductModel,
+        product_create: ProductCreate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -189,8 +190,8 @@ class ProductsApi:
 
         Create a new product
 
-        :param product_model: (required)
-        :type product_model: ProductModel
+        :param product_create: (required)
+        :type product_create: ProductCreate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -214,7 +215,7 @@ class ProductsApi:
         """  # noqa: E501
 
         _param = self._create_product_serialize(
-            product_model=product_model,
+            product_create=product_create,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -222,7 +223,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "201": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -232,7 +233,7 @@ class ProductsApi:
 
     def _create_product_serialize(
         self,
-        product_model,
+        product_create,
         _request_auth,
         _content_type,
         _headers,
@@ -257,8 +258,8 @@ class ProductsApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if product_model is not None:
-            _body_params = product_model
+        if product_create is not None:
+            _body_params = product_create
 
         # set the HTTP header `Accept`
         if "Accept" not in _header_params:
@@ -320,7 +321,7 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[ProductModel]:
+    ) -> List[ProductRead]:
         """Get Products
 
         Get all software products from Crypticorn
@@ -361,7 +362,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductModel]",
+            "200": "List[ProductRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -399,7 +400,7 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[ProductModel]]:
+    ) -> ApiResponse[List[ProductRead]]:
         """Get Products
 
         Get all software products from Crypticorn
@@ -440,7 +441,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductModel]",
+            "200": "List[ProductRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -519,7 +520,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "List[ProductModel]",
+            "200": "List[ProductRead]",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -592,7 +593,7 @@ class ProductsApi:
     async def update_product(
         self,
         id: Annotated[StrictStr, Field(description="The ID of the product to update")],
-        product_update_model: ProductUpdateModel,
+        product_update: ProductUpdate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -604,15 +605,15 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
+    ) -> ProductRead:
         """Update Product
 
         Update an existing product
 
         :param id: The ID of the product to update (required)
         :type id: str
-        :param product_update_model: (required)
-        :type product_update_model: ProductUpdateModel
+        :param product_update: (required)
+        :type product_update: ProductUpdate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -637,7 +638,7 @@ class ProductsApi:
 
         _param = self._update_product_serialize(
             id=id,
-            product_update_model=product_update_model,
+            product_update=product_update,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -645,7 +646,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "200": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -661,7 +662,7 @@ class ProductsApi:
     async def update_product_with_http_info(
         self,
         id: Annotated[StrictStr, Field(description="The ID of the product to update")],
-        product_update_model: ProductUpdateModel,
+        product_update: ProductUpdate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -673,15 +674,15 @@ class ProductsApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[object]:
+    ) -> ApiResponse[ProductRead]:
         """Update Product
 
         Update an existing product
 
         :param id: The ID of the product to update (required)
         :type id: str
-        :param product_update_model: (required)
-        :type product_update_model: ProductUpdateModel
+        :param product_update: (required)
+        :type product_update: ProductUpdate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -706,7 +707,7 @@ class ProductsApi:
 
         _param = self._update_product_serialize(
             id=id,
-            product_update_model=product_update_model,
+            product_update=product_update,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -714,7 +715,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "200": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -730,7 +731,7 @@ class ProductsApi:
     async def update_product_without_preload_content(
         self,
         id: Annotated[StrictStr, Field(description="The ID of the product to update")],
-        product_update_model: ProductUpdateModel,
+        product_update: ProductUpdate,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -749,8 +750,8 @@ class ProductsApi:
 
         :param id: The ID of the product to update (required)
         :type id: str
-        :param product_update_model: (required)
-        :type product_update_model: ProductUpdateModel
+        :param product_update: (required)
+        :type product_update: ProductUpdate
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -775,7 +776,7 @@ class ProductsApi:
 
         _param = self._update_product_serialize(
             id=id,
-            product_update_model=product_update_model,
+            product_update=product_update,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -783,7 +784,7 @@ class ProductsApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "object",
+            "200": "ProductRead",
             "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
@@ -794,7 +795,7 @@ class ProductsApi:
     def _update_product_serialize(
         self,
         id,
-        product_update_model,
+        product_update,
         _request_auth,
         _content_type,
         _headers,
@@ -821,8 +822,8 @@ class ProductsApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if product_update_model is not None:
-            _body_params = product_update_model
+        if product_update is not None:
+            _body_params = product_update
 
         # set the HTTP header `Accept`
         if "Accept" not in _header_params:

crypticorn/pay/client/models/__init__.py

@@ -21,13 +21,14 @@ from crypticorn.pay.client.models.now_create_invoice_res import NowCreateInvoice
 from crypticorn.pay.client.models.now_fee_structure import NowFeeStructure
 from crypticorn.pay.client.models.now_payment_status import NowPaymentStatus
 from crypticorn.pay.client.models.now_webhook_payload import NowWebhookPayload
+from crypticorn.pay.client.models.payment import Payment
 from crypticorn.pay.client.models.payment_status import PaymentStatus
-from crypticorn.pay.client.models.product_model import ProductModel
-from crypticorn.pay.client.models.product_subs_model import ProductSubsModel
-from crypticorn.pay.client.models.product_update_model import ProductUpdateModel
+from crypticorn.pay.client.models.product_create import ProductCreate
+from crypticorn.pay.client.models.product_read import ProductRead
+from crypticorn.pay.client.models.product_sub_read import ProductSubRead
+from crypticorn.pay.client.models.product_update import ProductUpdate
 from crypticorn.pay.client.models.scope import Scope
 from crypticorn.pay.client.models.services import Services
-from crypticorn.pay.client.models.unified_payment_model import UnifiedPaymentModel
 from crypticorn.pay.client.models.validation_error import ValidationError
 from crypticorn.pay.client.models.validation_error_loc_inner import (
     ValidationErrorLocInner,