crypticorn 2.4.4__tar.gz → 2.4.6__tar.gz

{crypticorn-2.4.4 → crypticorn-2.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.4.4
+Version: 2.4.6
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 Project-URL: Homepage, https://crypticorn.com
@@ -95,7 +95,12 @@ client = ApiClient(base_url=BaseUrl.Prod, api_key="your-api-key")
 asyncio.run(client.pay.models.get_products())
 asyncio.run(client.close())
 ```
+...or wrapped in a function
+async def main():
+    await client.pay.products.get_products()
 
+asyncio.run(main())
+asyncio.run(client.close())
 ## Response Types
 
 There are three different available output formats you can choose from:

{crypticorn-2.4.4 → crypticorn-2.4.6}/README.md

@@ -58,7 +58,12 @@ client = ApiClient(base_url=BaseUrl.Prod, api_key="your-api-key")
 asyncio.run(client.pay.models.get_products())
 asyncio.run(client.close())
 ```
+...or wrapped in a function
+async def main():
+    await client.pay.products.get_products()
 
+asyncio.run(main())
+asyncio.run(client.close())
 ## Response Types
 
 There are three different available output formats you can choose from:

{crypticorn-2.4.4 → crypticorn-2.4.6}/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-2.4.4 → crypticorn-2.4.6}/crypticorn/common/errors.py

@@ -1,4 +1,4 @@
-from enum import Enum, EnumMeta
+from enum import Enum, EnumMeta, StrEnum
 import logging
 from fastapi import status
 
@@ -6,15 +6,19 @@ logger = logging.getLogger(__name__)
 
 
 class Fallback(EnumMeta):
+    """Fallback to UNKNOWN_ERROR for error codes not yet published to PyPI."""
+
     def __getattr__(cls, name):
-        """Fallback to UNKNOWN_ERROR for error codes not yet published to PyPI."""
+        # Let Pydantic/internal stuff pass silently ! fragile
+        if name.startswith("__"):
+            raise AttributeError(name)
         logger.warning(
             f"Unknown error code '{name}' - update crypticorn package or check for typos"
         )
         return cls.UNKNOWN_ERROR
 
 
-class ApiErrorType(str, Enum):
+class ApiErrorType(StrEnum):
     """Type of API error"""
 
     USER_ERROR = "user error"
@@ -27,7 +31,7 @@ class ApiErrorType(str, Enum):
     """error that does not need to be handled or does not affect the program or is a placeholder."""
 
 
-class ApiErrorIdentifier(str, Enum):
+class ApiErrorIdentifier(StrEnum):
     """API error identifiers"""
 
     ALLOCATION_BELOW_EXPOSURE = "allocation_below_current_exposure"
@@ -97,7 +101,7 @@ class ApiErrorIdentifier(str, Enum):
     URL_NOT_FOUND = "requested_resource_not_found"
 
 
-class ApiErrorLevel(str, Enum):
+class ApiErrorLevel(StrEnum):
     """API error levels"""
 
     ERROR = "error"

{crypticorn-2.4.4 → crypticorn-2.4.6}/crypticorn/common/scopes.py

@@ -7,14 +7,20 @@ 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.
+
     def __getattr__(cls, name):
+        # Let Pydantic/internal stuff pass silently ! fragile
+        if name.startswith("__"):
+            raise AttributeError(name)
         logger.warning(
             f"Unknown scope '{name}' - falling back to no scope - update crypticorn package or check for typos"
         )
         return None
 
 
-class Scope(StrEnum, metaclass=Fallback):
+class Scope(StrEnum):
     """
     The permission scopes for the API.
     """

{crypticorn-2.4.4 → crypticorn-2.4.6}/crypticorn/common/sorter.py

@@ -4,7 +4,7 @@ import pyperclip
 
 def sort_api_errors(file_content, class_name="ApiErrorIdentifier"):
     # Find the start of the ApiError class definition
-    class_start = file_content.find(f"class {class_name}(str, Enum):")
+    class_start = file_content.find(f"class {class_name}(StrEnum):")
     if class_start == -1:
         return f"Could not find {class_name} class"
 
@@ -23,7 +23,7 @@ def sort_api_errors(file_content, class_name="ApiErrorIdentifier"):
     sorted_entries = sorted(enum_entries, key=lambda x: x[0])
 
     # Reconstruct the class content
-    class_header = f"class {class_name}(str, Enum):\n\n"
+    class_header = f"class {class_name}(StrEnum):\n\n"
     sorted_content = class_header + "\n    ".join(entry[1] for entry in sorted_entries)
 
     return sorted_content

{crypticorn-2.4.4 → crypticorn-2.4.6}/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-2.4.4 → crypticorn-2.4.6}/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-2.4.4 → crypticorn-2.4.6}/crypticorn/pay/client/__init__.py

@@ -41,15 +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.partial_product_update_model import (
-    PartialProductUpdateModel,
-)
+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_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-2.4.4 → crypticorn-2.4.6}/crypticorn/pay/client/api/payments_api.py

@@ -16,11 +16,11 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictStr
+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(
@@ -298,6 +298,18 @@ class PaymentsApi:
     @validate_call
     async def get_payment_history(
         self,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of payments returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of payments returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -309,11 +321,15 @@ 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.
 
+        :param limit: Limit the number of payments returned. 0 means no limit.
+        :type limit: int
+        :param offset: Offset the number of payments returned. 0 means no offset.
+        :type offset: int
         :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
@@ -337,6 +353,8 @@ class PaymentsApi:
         """  # noqa: E501
 
         _param = self._get_payment_history_serialize(
+            limit=limit,
+            offset=offset,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -344,7 +362,8 @@ 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(
             *_param, _request_timeout=_request_timeout
@@ -358,6 +377,18 @@ class PaymentsApi:
     @validate_call
     async def get_payment_history_with_http_info(
         self,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of payments returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of payments returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -369,11 +400,15 @@ 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.
 
+        :param limit: Limit the number of payments returned. 0 means no limit.
+        :type limit: int
+        :param offset: Offset the number of payments returned. 0 means no offset.
+        :type offset: int
         :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
@@ -397,6 +432,8 @@ class PaymentsApi:
         """  # noqa: E501
 
         _param = self._get_payment_history_serialize(
+            limit=limit,
+            offset=offset,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -404,7 +441,8 @@ 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(
             *_param, _request_timeout=_request_timeout
@@ -418,6 +456,18 @@ class PaymentsApi:
     @validate_call
     async def get_payment_history_without_preload_content(
         self,
+        limit: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Limit the number of payments returned. 0 means no limit."
+            ),
+        ] = None,
+        offset: Annotated[
+            Optional[StrictInt],
+            Field(
+                description="Offset the number of payments returned. 0 means no offset."
+            ),
+        ] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -434,6 +484,10 @@ class PaymentsApi:
 
         Get the combined payment history for a user across all payment services.
 
+        :param limit: Limit the number of payments returned. 0 means no limit.
+        :type limit: int
+        :param offset: Offset the number of payments returned. 0 means no offset.
+        :type offset: int
         :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
@@ -457,6 +511,8 @@ class PaymentsApi:
         """  # noqa: E501
 
         _param = self._get_payment_history_serialize(
+            limit=limit,
+            offset=offset,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -464,7 +520,8 @@ 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(
             *_param, _request_timeout=_request_timeout
@@ -473,6 +530,8 @@ class PaymentsApi:
 
     def _get_payment_history_serialize(
         self,
+        limit,
+        offset,
         _request_auth,
         _content_type,
         _headers,
@@ -494,6 +553,14 @@ class PaymentsApi:
 
         # process the path parameters
         # process the query parameters
+        if limit is not None:
+
+            _query_params.append(("limit", limit))
+
+        if offset is not None:
+
+            _query_params.append(("offset", offset))
+
         # process the header parameters
         # process the form parameters
         # process the body parameter
@@ -542,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.
@@ -580,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(
@@ -612,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.
@@ -650,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(
@@ -720,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(