crypticorn 2.4.7__py3-none-any.whl → 2.5.0rc2__py3-none-any.whl

crypticorn/klines/client/rest.py

@@ -16,23 +16,16 @@ import io
 import json
 import re
 import ssl
+from typing import Optional, Union
 
-import urllib3
+import aiohttp
+import aiohttp_retry
 
 from crypticorn.klines.client.exceptions import ApiException, ApiValueError
 
-SUPPORTED_SOCKS_PROXIES = {"socks5", "socks5h", "socks4", "socks4a"}
-RESTResponseType = urllib3.HTTPResponse
+RESTResponseType = aiohttp.ClientResponse
 
-
-def is_socks_proxy_url(url):
-    if url is None:
-        return False
-    split_section = url.split("://")
-    if len(split_section) < 2:
-        return False
-    else:
-        return split_section[0].lower() in SUPPORTED_SOCKS_PROXIES
+ALLOW_RETRY_METHODS = frozenset({"DELETE", "GET", "HEAD", "OPTIONS", "PUT", "TRACE"})
 
 
 class RESTResponse(io.IOBase):
@@ -43,13 +36,13 @@ class RESTResponse(io.IOBase):
         self.reason = resp.reason
         self.data = None
 
-    def read(self):
+    async def read(self):
         if self.data is None:
-            self.data = self.response.data
+            self.data = await self.response.read()
         return self.data
 
     def getheaders(self):
-        """Returns a dictionary of the response headers."""
+        """Returns a CIMultiDictProxy of the response headers."""
         return self.response.headers
 
     def getheader(self, name, default=None):
@@ -60,56 +53,38 @@ class RESTResponse(io.IOBase):
 class RESTClientObject:
 
     def __init__(self, configuration) -> None:
-        # urllib3.PoolManager will pass all kw parameters to connectionpool
-        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75  # noqa: E501
-        # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/connectionpool.py#L680  # noqa: E501
-        # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
-
-        # cert_reqs
-        if configuration.verify_ssl:
-            cert_reqs = ssl.CERT_REQUIRED
-        else:
-            cert_reqs = ssl.CERT_NONE
-
-        pool_args = {
-            "cert_reqs": cert_reqs,
-            "ca_certs": configuration.ssl_ca_cert,
-            "cert_file": configuration.cert_file,
-            "key_file": configuration.key_file,
-        }
-        if configuration.assert_hostname is not None:
-            pool_args["assert_hostname"] = configuration.assert_hostname
-
-        if configuration.retries is not None:
-            pool_args["retries"] = configuration.retries
-
-        if configuration.tls_server_name:
-            pool_args["server_hostname"] = configuration.tls_server_name
-
-        if configuration.socket_options is not None:
-            pool_args["socket_options"] = configuration.socket_options
-
-        if configuration.connection_pool_maxsize is not None:
-            pool_args["maxsize"] = configuration.connection_pool_maxsize
 
-        # https pool manager
-        self.pool_manager: urllib3.PoolManager
+        # maxsize is number of requests to host that are allowed in parallel
+        self.maxsize = configuration.connection_pool_maxsize
 
-        if configuration.proxy:
-            if is_socks_proxy_url(configuration.proxy):
-                from urllib3.contrib.socks import SOCKSProxyManager
+        self.ssl_context = ssl.create_default_context(
+            cafile=configuration.ssl_ca_cert,
+            cadata=configuration.ca_cert_data,
+        )
+        if configuration.cert_file:
+            self.ssl_context.load_cert_chain(
+                configuration.cert_file, keyfile=configuration.key_file
+            )
 
-                pool_args["proxy_url"] = configuration.proxy
-                pool_args["headers"] = configuration.proxy_headers
-                self.pool_manager = SOCKSProxyManager(**pool_args)
-            else:
-                pool_args["proxy_url"] = configuration.proxy
-                pool_args["proxy_headers"] = configuration.proxy_headers
-                self.pool_manager = urllib3.ProxyManager(**pool_args)
-        else:
-            self.pool_manager = urllib3.PoolManager(**pool_args)
+        if not configuration.verify_ssl:
+            self.ssl_context.check_hostname = False
+            self.ssl_context.verify_mode = ssl.CERT_NONE
+
+        self.proxy = configuration.proxy
+        self.proxy_headers = configuration.proxy_headers
+
+        self.retries = configuration.retries
+
+        self.pool_manager: Optional[aiohttp.ClientSession] = None
+        self.retry_client: Optional[aiohttp_retry.RetryClient] = None
 
-    def request(
+    async def close(self) -> None:
+        if self.pool_manager:
+            await self.pool_manager.close()
+        if self.retry_client is not None:
+            await self.retry_client.close()
+
+    async def request(
         self,
         method,
         url,
@@ -118,7 +93,7 @@ class RESTClientObject:
         post_params=None,
         _request_timeout=None,
     ):
-        """Perform requests.
+        """Execute request
 
         :param method: http request method
         :param url: http request url
@@ -142,105 +117,82 @@ class RESTClientObject:
 
         post_params = post_params or {}
         headers = headers or {}
+        # url already contains the URL query string
+        timeout = _request_timeout or 5 * 60
+
+        if "Content-Type" not in headers:
+            headers["Content-Type"] = "application/json"
+
+        args = {"method": method, "url": url, "timeout": timeout, "headers": headers}
+
+        if self.proxy:
+            args["proxy"] = self.proxy
+        if self.proxy_headers:
+            args["proxy_headers"] = self.proxy_headers
+
+        # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
+        if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
+            if re.search("json", headers["Content-Type"], re.IGNORECASE):
+                if body is not None:
+                    body = json.dumps(body)
+                args["data"] = body
+            elif headers["Content-Type"] == "application/x-www-form-urlencoded":
+                args["data"] = aiohttp.FormData(post_params)
+            elif headers["Content-Type"] == "multipart/form-data":
+                # must del headers['Content-Type'], or the correct
+                # Content-Type which generated by aiohttp
+                del headers["Content-Type"]
+                data = aiohttp.FormData()
+                for param in post_params:
+                    k, v = param
+                    if isinstance(v, tuple) and len(v) == 3:
+                        data.add_field(k, value=v[1], filename=v[0], content_type=v[2])
+                    else:
+                        # Ensures that dict objects are serialized
+                        if isinstance(v, dict):
+                            v = json.dumps(v)
+                        elif isinstance(v, int):
+                            v = str(v)
+                        data.add_field(k, v)
+                args["data"] = data
+
+            # Pass a `bytes` or `str` parameter directly in the body to support
+            # other content types than Json when `body` argument is provided
+            # in serialized form
+            elif isinstance(body, str) or isinstance(body, bytes):
+                args["data"] = body
+            else:
+                # Cannot generate the request from given parameters
+                msg = """Cannot prepare a request message for provided
+                         arguments. Please check that your arguments match
+                         declared content type."""
+                raise ApiException(status=0, reason=msg)
 
-        timeout = None
-        if _request_timeout:
-            if isinstance(_request_timeout, (int, float)):
-                timeout = urllib3.Timeout(total=_request_timeout)
-            elif isinstance(_request_timeout, tuple) and len(_request_timeout) == 2:
-                timeout = urllib3.Timeout(
-                    connect=_request_timeout[0], read=_request_timeout[1]
-                )
+        pool_manager: Union[aiohttp.ClientSession, aiohttp_retry.RetryClient]
 
-        try:
-            # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
-            if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
-
-                # no content type provided or payload is json
-                content_type = headers.get("Content-Type")
-                if not content_type or re.search("json", content_type, re.IGNORECASE):
-                    request_body = None
-                    if body is not None:
-                        request_body = json.dumps(body)
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        body=request_body,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False,
-                    )
-                elif content_type == "application/x-www-form-urlencoded":
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        fields=post_params,
-                        encode_multipart=False,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False,
-                    )
-                elif content_type == "multipart/form-data":
-                    # must del headers['Content-Type'], or the correct
-                    # Content-Type which generated by urllib3 will be
-                    # overwritten.
-                    del headers["Content-Type"]
-                    # Ensures that dict objects are serialized
-                    post_params = [
-                        (a, json.dumps(b)) if isinstance(b, dict) else (a, b)
-                        for a, b in post_params
-                    ]
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        fields=post_params,
-                        encode_multipart=True,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False,
-                    )
-                # Pass a `string` parameter directly in the body to support
-                # other content types than JSON when `body` argument is
-                # provided in serialized form.
-                elif isinstance(body, str) or isinstance(body, bytes):
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        body=body,
-                        timeout=timeout,
-                        headers=headers,
-                        preload_content=False,
-                    )
-                elif headers["Content-Type"].startswith("text/") and isinstance(
-                    body, bool
-                ):
-                    request_body = "true" if body else "false"
-                    r = self.pool_manager.request(
-                        method,
-                        url,
-                        body=request_body,
-                        preload_content=False,
-                        timeout=timeout,
-                        headers=headers,
-                    )
-                else:
-                    # Cannot generate the request from given parameters
-                    msg = """Cannot prepare a request message for provided
-                             arguments. Please check that your arguments match
-                             declared content type."""
-                    raise ApiException(status=0, reason=msg)
-            # For `GET`, `HEAD`
-            else:
-                r = self.pool_manager.request(
-                    method,
-                    url,
-                    fields={},
-                    timeout=timeout,
-                    headers=headers,
-                    preload_content=False,
+        # https pool manager
+        if self.pool_manager is None:
+            self.pool_manager = aiohttp.ClientSession(
+                connector=aiohttp.TCPConnector(
+                    limit=self.maxsize, ssl=self.ssl_context
+                ),
+                trust_env=True,
+            )
+        pool_manager = self.pool_manager
+
+        if self.retries is not None and method in ALLOW_RETRY_METHODS:
+            if self.retry_client is None:
+                self.retry_client = aiohttp_retry.RetryClient(
+                    client_session=self.pool_manager,
+                    retry_options=aiohttp_retry.ExponentialRetry(
+                        attempts=self.retries,
+                        factor=2.0,
+                        start_timeout=0.1,
+                        max_timeout=120.0,
+                    ),
                 )
-        except urllib3.exceptions.SSLError as e:
-            msg = "\n".join([type(e).__name__, str(e)])
-            raise ApiException(status=0, reason=msg)
+            pool_manager = self.retry_client
+
+        r = await pool_manager.request(**args)
 
         return RESTResponse(r)

crypticorn/metrics/main.py

@@ -16,6 +16,7 @@ from pydantic import StrictStr, StrictInt, Field
 from typing_extensions import Annotated
 from typing import Optional
 
+
 class MetricsClient:
     """
     A client for interacting with the Crypticorn Metrics API.

crypticorn/pay/client/__init__.py

@@ -38,9 +38,6 @@ from crypticorn.pay.client.models.http_validation_error import HTTPValidationErr
 from crypticorn.pay.client.models.now_api_status_res import NowAPIStatusRes
 from crypticorn.pay.client.models.now_create_invoice_req import NowCreateInvoiceReq
 from crypticorn.pay.client.models.now_create_invoice_res import NowCreateInvoiceRes
-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_create import ProductCreate

crypticorn/pay/client/api/now_payments_api.py

@@ -16,13 +16,10 @@ 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 typing import Any
-from typing_extensions import Annotated
 from crypticorn.pay.client.models.now_api_status_res import NowAPIStatusRes
 from crypticorn.pay.client.models.now_create_invoice_req import NowCreateInvoiceReq
 from crypticorn.pay.client.models.now_create_invoice_res import NowCreateInvoiceRes
-from crypticorn.pay.client.models.now_webhook_payload import NowWebhookPayload
 
 from crypticorn.pay.client.api_client import ApiClient, RequestSerialized
 from crypticorn.pay.client.api_response import ApiResponse
@@ -526,10 +523,6 @@ class NOWPaymentsApi:
     @validate_call
     async def handle_now_webhook(
         self,
-        x_nowpayments_sig: Annotated[
-            StrictStr, Field(description="Signature for the webhook")
-        ],
-        now_webhook_payload: NowWebhookPayload,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -546,10 +539,6 @@ class NOWPaymentsApi:
 
         Handle NOWPayments webhook notifications (IPN). Validates the signature, updates the payment status and creates a product subscription if the payment is successful.
 
-        :param x_nowpayments_sig: Signature for the webhook (required)
-        :type x_nowpayments_sig: str
-        :param now_webhook_payload: (required)
-        :type now_webhook_payload: NowWebhookPayload
         :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
@@ -573,8 +562,6 @@ class NOWPaymentsApi:
         """  # noqa: E501
 
         _param = self._handle_now_webhook_serialize(
-            x_nowpayments_sig=x_nowpayments_sig,
-            now_webhook_payload=now_webhook_payload,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -583,7 +570,6 @@ class NOWPaymentsApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "object",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -597,10 +583,6 @@ class NOWPaymentsApi:
     @validate_call
     async def handle_now_webhook_with_http_info(
         self,
-        x_nowpayments_sig: Annotated[
-            StrictStr, Field(description="Signature for the webhook")
-        ],
-        now_webhook_payload: NowWebhookPayload,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -617,10 +599,6 @@ class NOWPaymentsApi:
 
         Handle NOWPayments webhook notifications (IPN). Validates the signature, updates the payment status and creates a product subscription if the payment is successful.
 
-        :param x_nowpayments_sig: Signature for the webhook (required)
-        :type x_nowpayments_sig: str
-        :param now_webhook_payload: (required)
-        :type now_webhook_payload: NowWebhookPayload
         :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
@@ -644,8 +622,6 @@ class NOWPaymentsApi:
         """  # noqa: E501
 
         _param = self._handle_now_webhook_serialize(
-            x_nowpayments_sig=x_nowpayments_sig,
-            now_webhook_payload=now_webhook_payload,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -654,7 +630,6 @@ class NOWPaymentsApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "object",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -668,10 +643,6 @@ class NOWPaymentsApi:
     @validate_call
     async def handle_now_webhook_without_preload_content(
         self,
-        x_nowpayments_sig: Annotated[
-            StrictStr, Field(description="Signature for the webhook")
-        ],
-        now_webhook_payload: NowWebhookPayload,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -688,10 +659,6 @@ class NOWPaymentsApi:
 
         Handle NOWPayments webhook notifications (IPN). Validates the signature, updates the payment status and creates a product subscription if the payment is successful.
 
-        :param x_nowpayments_sig: Signature for the webhook (required)
-        :type x_nowpayments_sig: str
-        :param now_webhook_payload: (required)
-        :type now_webhook_payload: NowWebhookPayload
         :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
@@ -715,8 +682,6 @@ class NOWPaymentsApi:
         """  # noqa: E501
 
         _param = self._handle_now_webhook_serialize(
-            x_nowpayments_sig=x_nowpayments_sig,
-            now_webhook_payload=now_webhook_payload,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -725,7 +690,6 @@ class NOWPaymentsApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "object",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -734,8 +698,6 @@ class NOWPaymentsApi:
 
     def _handle_now_webhook_serialize(
         self,
-        x_nowpayments_sig,
-        now_webhook_payload,
         _request_auth,
         _content_type,
         _headers,
@@ -758,12 +720,8 @@ class NOWPaymentsApi:
         # process the path parameters
         # process the query parameters
         # process the header parameters
-        if x_nowpayments_sig is not None:
-            _header_params["x-nowpayments-sig"] = x_nowpayments_sig
         # process the form parameters
         # process the body parameter
-        if now_webhook_payload is not None:
-            _body_params = now_webhook_payload
 
         # set the HTTP header `Accept`
         if "Accept" not in _header_params:
@@ -771,18 +729,8 @@ class NOWPaymentsApi:
                 ["application/json"]
             )
 
-        # set the HTTP header `Content-Type`
-        if _content_type:
-            _header_params["Content-Type"] = _content_type
-        else:
-            _default_content_type = self.api_client.select_header_content_type(
-                ["application/json"]
-            )
-            if _default_content_type is not None:
-                _header_params["Content-Type"] = _default_content_type
-
         # authentication setting
-        _auth_settings: List[str] = ["HTTPBearer"]
+        _auth_settings: List[str] = []
 
         return self.api_client.param_serialize(
             method="POST",

crypticorn/pay/client/models/__init__.py

@@ -18,9 +18,6 @@ from crypticorn.pay.client.models.http_validation_error import HTTPValidationErr
 from crypticorn.pay.client.models.now_api_status_res import NowAPIStatusRes
 from crypticorn.pay.client.models.now_create_invoice_req import NowCreateInvoiceReq
 from crypticorn.pay.client.models.now_create_invoice_res import NowCreateInvoiceRes
-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_create import ProductCreate

crypticorn/pay/client/models/payment.py

@@ -32,7 +32,7 @@ class Payment(BaseModel):
 
     id: StrictStr = Field(description="Payment ID")
     product_id: StrictStr = Field(description="Product ID")
-    var_date: StrictInt = Field(description="Payment date in seconds", alias="date")
+    timestamp: StrictInt = Field(description="Payment timestamp in seconds")
     amount: Union[StrictFloat, StrictInt] = Field(description="Payment amount")
     currency: StrictStr = Field(description="Payment currency")
     status: PaymentStatus
@@ -41,7 +41,7 @@ class Payment(BaseModel):
     __properties: ClassVar[List[str]] = [
         "id",
         "product_id",
-        "date",
+        "timestamp",
         "amount",
         "currency",
         "status",
@@ -101,7 +101,7 @@ class Payment(BaseModel):
             {
                 "id": obj.get("id"),
                 "product_id": obj.get("product_id"),
-                "date": obj.get("date"),
+                "timestamp": obj.get("timestamp"),
                 "amount": obj.get("amount"),
                 "currency": obj.get("currency"),
                 "status": obj.get("status"),

crypticorn/pay/client/models/scope.py

@@ -26,6 +26,7 @@ class Scope(str, Enum):
     """
     allowed enum values
     """
+    READ_COLON_PREDICTIONS = "read:predictions"
     READ_COLON_HIVE_COLON_MODEL = "read:hive:model"
     READ_COLON_HIVE_COLON_DATA = "read:hive:data"
     WRITE_COLON_HIVE_COLON_MODEL = "write:hive:model"
@@ -48,7 +49,11 @@ class Scope(str, Enum):
     WRITE_COLON_PAY_COLON_PRODUCTS = "write:pay:products"
     READ_COLON_PAY_COLON_NOW = "read:pay:now"
     WRITE_COLON_PAY_COLON_NOW = "write:pay:now"
-    READ_COLON_PREDICTIONS = "read:predictions"
+    READ_COLON_METRICS_COLON_MARKETCAP = "read:metrics:marketcap"
+    READ_COLON_METRICS_COLON_INDICATORS = "read:metrics:indicators"
+    READ_COLON_METRICS_COLON_EXCHANGES = "read:metrics:exchanges"
+    READ_COLON_METRICS_COLON_TOKENS = "read:metrics:tokens"
+    READ_COLON_METRICS_COLON_MARKETS = "read:metrics:markets"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

crypticorn/trade/client/__init__.py

@@ -3,14 +3,14 @@
 # flake8: noqa
 
 """
-    Trading API
+Trading API
 
-    No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-    The version of the OpenAPI document: 0.1.0
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 0.1.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 
@@ -63,4 +63,6 @@ from crypticorn.trade.client.models.strategy_model_output import StrategyModelOu
 from crypticorn.trade.client.models.tpsl import TPSL
 from crypticorn.trade.client.models.trading_action_type import TradingActionType
 from crypticorn.trade.client.models.validation_error import ValidationError
-from crypticorn.trade.client.models.validation_error_loc_inner import ValidationErrorLocInner
+from crypticorn.trade.client.models.validation_error_loc_inner import (
+    ValidationErrorLocInner,
+)

crypticorn/trade/client/api/__init__.py

@@ -10,4 +10,3 @@ from crypticorn.trade.client.api.orders_api import OrdersApi
 from crypticorn.trade.client.api.status_api import StatusApi
 from crypticorn.trade.client.api.strategies_api import StrategiesApi
 from crypticorn.trade.client.api.trading_actions_api import TradingActionsApi
-