crypticorn 1.0.2rc1__tar.gz → 1.0.2rc3__tar.gz

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: crypticorn
-Version: 1.0.2rc1
+Version: 1.0.2rc3
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 License: MIT License
@@ -16,6 +16,21 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Provides-Extra: trade
+Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "trade"
+Requires-Dist: python_dateutil>=2.8.2; extra == "trade"
+Requires-Dist: pydantic>=2; extra == "trade"
+Requires-Dist: typing-extensions>=4.7.1; extra == "trade"
+Provides-Extra: klines
+Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "klines"
+Requires-Dist: python_dateutil>=2.8.2; extra == "klines"
+Requires-Dist: pydantic>=2; extra == "klines"
+Requires-Dist: typing-extensions>=4.7.1; extra == "klines"
+Provides-Extra: hive
+Requires-Dist: pandas<3.0.0,>=2.2.0; extra == "hive"
+Requires-Dist: requests<3.0.0,>=2.32.0; extra == "hive"
+Requires-Dist: tqdm<5.0.0,>=4.67.0; extra == "hive"
+Requires-Dist: pydantic<3.0.0,>=2.0.0; extra == "hive"
 Provides-Extra: dev
 Requires-Dist: streamlit; extra == "dev"
 Requires-Dist: httpx; extra == "dev"
@@ -30,18 +45,3 @@ Requires-Dist: tox>=3.9.0; extra == "test"
 Requires-Dist: flake8>=4.0.0; extra == "test"
 Requires-Dist: types-python-dateutil>=2.8.19.14; extra == "test"
 Requires-Dist: mypy>=1.5; extra == "test"
-Provides-Extra: klines
-Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "klines"
-Requires-Dist: python_dateutil>=2.8.2; extra == "klines"
-Requires-Dist: pydantic>=2; extra == "klines"
-Requires-Dist: typing-extensions>=4.7.1; extra == "klines"
-Provides-Extra: hive
-Requires-Dist: pandas<3.0.0,>=2.2.0; extra == "hive"
-Requires-Dist: requests<3.0.0,>=2.32.0; extra == "hive"
-Requires-Dist: tqdm<5.0.0,>=4.67.0; extra == "hive"
-Requires-Dist: pydantic<3.0.0,>=2.0.0; extra == "hive"
-Provides-Extra: trade
-Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "trade"
-Requires-Dist: python_dateutil>=2.8.2; extra == "trade"
-Requires-Dist: pydantic>=2; extra == "trade"
-Requires-Dist: typing-extensions>=4.7.1; extra == "trade"

crypticorn-1.0.2rc3/crypticorn/client.py

@@ -0,0 +1,16 @@
+from crypticorn.hive import HiveClient
+from crypticorn.trade import TradeClient
+from crypticorn.klines import KlinesClient
+
+class CrypticornClient:
+    def __init__(
+        self, base_url: str = "https://api.crypticorn.com", api_key: str = None, jwt: str = None
+    ):
+        self.base_url = base_url
+        self.api_key = api_key
+        self.jwt = jwt
+        
+        # Initialize service clients
+        self.hive = HiveClient(base_url, api_key, jwt)
+        self.trade = TradeClient(base_url, api_key, jwt)
+        self.klines = KlinesClient(base_url, api_key, jwt)

crypticorn-1.0.2rc3/crypticorn/hive/__init__.py

@@ -0,0 +1 @@
+from crypticorn.hive.main import HiveClient

crypticorn-1.0.2rc3/crypticorn/klines/__init__.py

@@ -0,0 +1,2 @@
+from crypticorn.klines.client import *
+from crypticorn.klines.main import KlinesClient

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/klines/main.py

@@ -1,4 +1,4 @@
-from crypticorn.klines.client import FundingRatesApi, OHLCVDataApi, SymbolsApi, UDFApi, HealthCheckApi, Configuration, ApiClient
+from crypticorn.klines import FundingRatesApi, OHLCVDataApi, SymbolsApi, UDFApi, HealthCheckApi, Configuration, ApiClient
 import pandas as pd
 
 class FundingRatesApiWrapper(FundingRatesApi):

crypticorn-1.0.2rc3/crypticorn/trade/__init__.py

@@ -0,0 +1,2 @@
+from crypticorn.trade.client import *
+from crypticorn.trade.main import TradeClient

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/action_model.py

@@ -31,8 +31,8 @@ class ActionModel(BaseModel):
     """
     ActionModel
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     execution_id: Optional[StrictStr] = None
     open_order_execution_id: Optional[StrictStr] = None
@@ -177,8 +177,8 @@ class ActionModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "execution_id": obj.get("execution_id"),
             "open_order_execution_id": obj.get("open_order_execution_id"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/api_key_model.py

@@ -26,8 +26,8 @@ class APIKeyModel(BaseModel):
     """
     APIKeyModel
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     exchange: StrictStr = Field(description="Exchange name")
     api_key: Optional[StrictStr] = None
@@ -119,8 +119,8 @@ class APIKeyModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "exchange": obj.get("exchange"),
             "api_key": obj.get("api_key"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/bot_model.py

@@ -26,8 +26,8 @@ class BotModel(BaseModel):
     """
     BotModel
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     name: StrictStr = Field(description="Name of the bot")
     strategy_id: StrictStr = Field(description="UID for the trading strategy used by the bot")
@@ -105,8 +105,8 @@ class BotModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "name": obj.get("name"),
             "strategy_id": obj.get("strategy_id"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/notification_model.py

@@ -28,8 +28,8 @@ class NotificationModel(BaseModel):
     """
     NotificationModel
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     identifier: ApiErrorIdentifier = Field(description="Identifier string. Must match the mapping key in the frontend.")
     user_id: Optional[StrictStr] = None
@@ -99,8 +99,8 @@ class NotificationModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "identifier": obj.get("identifier"),
             "user_id": obj.get("user_id"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/order_model.py

@@ -32,8 +32,8 @@ class OrderModel(BaseModel):
     """
     Response model for orders. All optional as the model is built step by step.
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     trading_action_id: Optional[StrictStr] = None
     execution_id: Optional[StrictStr] = None
@@ -231,8 +231,8 @@ class OrderModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "trading_action_id": obj.get("trading_action_id"),
             "execution_id": obj.get("execution_id"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/client/models/strategy_model.py

@@ -28,8 +28,8 @@ class StrategyModel(BaseModel):
     """
     StrategyModel
     """ # noqa: E501
-    created_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of creation")
-    updated_at: Optional[StrictInt] = Field(default=1742340838, description="Timestamp of last update")
+    created_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of creation")
+    updated_at: Optional[StrictInt] = Field(default=1742386800, description="Timestamp of last update")
     id: Optional[StrictStr] = None
     identifier: StrictStr = Field(description="Unique human readable identifier for the strategy e.g. 'daily_trend_momentum'")
     name: StrictStr = Field(description="Name of the strategy")
@@ -103,8 +103,8 @@ class StrategyModel(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742340838,
-            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742340838,
+            "created_at": obj.get("created_at") if obj.get("created_at") is not None else 1742386800,
+            "updated_at": obj.get("updated_at") if obj.get("updated_at") is not None else 1742386800,
             "id": obj.get("id"),
             "identifier": obj.get("identifier"),
             "name": obj.get("name"),

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn/trade/main.py

@@ -1,4 +1,4 @@
-from crypticorn.trade.client import (
+from crypticorn.trade import (
     BotsApi,
     ExchangesApi,
     NotificationsApi,
@@ -23,7 +23,8 @@ class TradeClient:
         self.host = f"{base_url}/v1/trade"
         config = Configuration(
             host=self.host,
-            access_token=jwt,  # at the moment we only support JWT auth
+            access_token=jwt,
+            # authorization=api_key, # TODO: add api key verification
         )
         base_client = ApiClient(configuration=config)
         # Instantiate all the endpoint clients
@@ -33,6 +34,6 @@ class TradeClient:
         self.orders = OrdersApi(base_client)
         self.status = StatusApi(base_client)
         self.strategies = StrategiesApi(base_client)
-        self.trading_actions = TradingActionsApi(base_client)
+        self.actions = TradingActionsApi(base_client)
         self.futures = FuturesTradingPanelApi(base_client)
         self.api_keys = APIKeysApi(base_client)

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: crypticorn
-Version: 1.0.2rc1
+Version: 1.0.2rc3
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 License: MIT License
@@ -16,6 +16,21 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Provides-Extra: trade
+Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "trade"
+Requires-Dist: python_dateutil>=2.8.2; extra == "trade"
+Requires-Dist: pydantic>=2; extra == "trade"
+Requires-Dist: typing-extensions>=4.7.1; extra == "trade"
+Provides-Extra: klines
+Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "klines"
+Requires-Dist: python_dateutil>=2.8.2; extra == "klines"
+Requires-Dist: pydantic>=2; extra == "klines"
+Requires-Dist: typing-extensions>=4.7.1; extra == "klines"
+Provides-Extra: hive
+Requires-Dist: pandas<3.0.0,>=2.2.0; extra == "hive"
+Requires-Dist: requests<3.0.0,>=2.32.0; extra == "hive"
+Requires-Dist: tqdm<5.0.0,>=4.67.0; extra == "hive"
+Requires-Dist: pydantic<3.0.0,>=2.0.0; extra == "hive"
 Provides-Extra: dev
 Requires-Dist: streamlit; extra == "dev"
 Requires-Dist: httpx; extra == "dev"
@@ -30,18 +45,3 @@ Requires-Dist: tox>=3.9.0; extra == "test"
 Requires-Dist: flake8>=4.0.0; extra == "test"
 Requires-Dist: types-python-dateutil>=2.8.19.14; extra == "test"
 Requires-Dist: mypy>=1.5; extra == "test"
-Provides-Extra: klines
-Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "klines"
-Requires-Dist: python_dateutil>=2.8.2; extra == "klines"
-Requires-Dist: pydantic>=2; extra == "klines"
-Requires-Dist: typing-extensions>=4.7.1; extra == "klines"
-Provides-Extra: hive
-Requires-Dist: pandas<3.0.0,>=2.2.0; extra == "hive"
-Requires-Dist: requests<3.0.0,>=2.32.0; extra == "hive"
-Requires-Dist: tqdm<5.0.0,>=4.67.0; extra == "hive"
-Requires-Dist: pydantic<3.0.0,>=2.0.0; extra == "hive"
-Provides-Extra: trade
-Requires-Dist: urllib3<3.0.0,>=1.25.3; extra == "trade"
-Requires-Dist: python_dateutil>=2.8.2; extra == "trade"
-Requires-Dist: pydantic>=2; extra == "trade"
-Requires-Dist: typing-extensions>=4.7.1; extra == "trade"

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/crypticorn.egg-info/SOURCES.txt

@@ -9,9 +9,11 @@ crypticorn.egg-info/SOURCES.txt
 crypticorn.egg-info/dependency_links.txt
 crypticorn.egg-info/requires.txt
 crypticorn.egg-info/top_level.txt
+crypticorn/hive/__init__.py
 crypticorn/hive/main.py
 crypticorn/hive/requirements.txt
 crypticorn/hive/utils.py
+crypticorn/klines/__init__.py
 crypticorn/klines/main.py
 crypticorn/klines/requirements.txt
 crypticorn/klines/client/__init__.py
@@ -84,6 +86,7 @@ crypticorn/klines/test/test_udf_api.py
 crypticorn/klines/test/test_udf_config_response.py
 crypticorn/klines/test/test_validation_error.py
 crypticorn/klines/test/test_validation_error_loc_inner.py
+crypticorn/trade/__init__.py
 crypticorn/trade/main.py
 crypticorn/trade/requirements.txt
 crypticorn/trade/client/__init__.py
@@ -126,40 +129,4 @@ crypticorn/trade/client/models/tpsl.py
 crypticorn/trade/client/models/trading_action_type.py
 crypticorn/trade/client/models/update_notification.py
 crypticorn/trade/client/models/validation_error.py
-crypticorn/trade/client/models/validation_error_loc_inner.py
-crypticorn/trade/test/__init__.py
-crypticorn/trade/test/test_action_model.py
-crypticorn/trade/test/test_api_error_identifier.py
-crypticorn/trade/test/test_api_key_model.py
-crypticorn/trade/test/test_api_keys_api.py
-crypticorn/trade/test/test_bot_model.py
-crypticorn/trade/test/test_bots_api.py
-crypticorn/trade/test/test_exchange.py
-crypticorn/trade/test/test_exchanges_api.py
-crypticorn/trade/test/test_execution_ids.py
-crypticorn/trade/test/test_futures_balance.py
-crypticorn/trade/test/test_futures_trading_action.py
-crypticorn/trade/test/test_futures_trading_panel_api.py
-crypticorn/trade/test/test_http_validation_error.py
-crypticorn/trade/test/test_margin_mode.py
-crypticorn/trade/test/test_market_type.py
-crypticorn/trade/test/test_notification_model.py
-crypticorn/trade/test/test_notification_type.py
-crypticorn/trade/test/test_notifications_api.py
-crypticorn/trade/test/test_order_model.py
-crypticorn/trade/test/test_order_status.py
-crypticorn/trade/test/test_orders_api.py
-crypticorn/trade/test/test_post_futures_action.py
-crypticorn/trade/test/test_status_api.py
-crypticorn/trade/test/test_strategies_api.py
-crypticorn/trade/test/test_strategy_exchange_info.py
-crypticorn/trade/test/test_strategy_model.py
-crypticorn/trade/test/test_tpsl.py
-crypticorn/trade/test/test_trading_action_type.py
-crypticorn/trade/test/test_trading_actions_api.py
-crypticorn/trade/test/test_update_notification.py
-crypticorn/trade/test/test_validation_error.py
-crypticorn/trade/test/test_validation_error_loc_inner.py
-tests/test_api_client.py
-tests/test_crypticorn_client.py
-tests/test_hive_client.py
+crypticorn/trade/client/models/validation_error_loc_inner.py

{crypticorn-1.0.2rc1 → crypticorn-1.0.2rc3}/pyproject.toml

@@ -5,9 +5,10 @@ readme = "README.md"
 requires-python = ">=3.10"
 license = {text = "MIT License"}
 authors = [{name = "Crypticorn", email = "timon@crypticorn.com"}]
-version = "1.0.2rc1"
+version = "1.0.2rc3"
 keywords = ["machine learning", "data science", "crypto", "modelling"]
-dynamic = ["dependencies", "optional-dependencies"]
+dynamic = ["optional-dependencies"]
+dependencies = []
 
 classifiers = [
     "Topic :: Scientific/Engineering",
@@ -20,16 +21,15 @@ classifiers = [
 ]
 
 [tool.setuptools.dynamic]
-
-optional-dependencies.dev = { file = ["requirements-dev.txt"] }
-optional-dependencies.test = { file = ["requirements-test.txt"] }
+optional-dependencies.trade = { file = ["crypticorn/trade/requirements.txt"] }
 optional-dependencies.klines = { file = ["crypticorn/klines/requirements.txt"] }
 optional-dependencies.hive = { file = ["crypticorn/hive/requirements.txt"] }
-optional-dependencies.trade = { file = ["crypticorn/trade/requirements.txt"] }
+optional-dependencies.dev = { file = ["requirements-dev.txt"] }
+optional-dependencies.test = { file = ["requirements-test.txt"] }
 
 [project.urls]
 Homepage = "https://crypticorn.com"
 
 [build-system]
 requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"