crypticorn 2.8.0rc6__tar.gz → 2.8.0rc8__tar.gz

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/CHANGELOG.md

@@ -1,6 +1,22 @@
 # CHANGELOG
 
 
+## v2.8.0-rc.8 (2025-05-07)
+
+### Bug Fixes
+
+- Use root logger of the client with specific child logger as option
+  ([`2f8cde2`](https://github.com/crypticorn-ai/api-client/commit/2f8cde2659f22704c5c4310f3ec9a07cbd1d4cef))
+
+
+## v2.8.0-rc.7 (2025-05-07)
+
+### Bug Fixes
+
+- Pass args to the override function in hive data download
+  ([`7bb3e29`](https://github.com/crypticorn-ai/api-client/commit/7bb3e2997f79da8e4e55b42a1a699a75fe1f985f))
+
+
 ## v2.8.0-rc.6 (2025-05-07)
 
 ### Bug Fixes

{crypticorn-2.8.0rc6/crypticorn.egg-info → crypticorn-2.8.0rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.8.0rc6
+Version: 2.8.0rc8
 Summary: Maximise Your Crypto Trading Profits with Machine Learning
 Author-email: Crypticorn <timon@crypticorn.com>
 License: MIT
@@ -84,7 +84,7 @@ The ApiClient serves as the central interface for API operations. It instantiate
 
 <img src="../static/pip-structure.svg" alt="pip package structure" />
 
-You can either explore each API by clicking through the library or checkout the [API Documentation](https://docs.crypticorn.dev/api).
+You can either explore each API by clicking through the library or checkout the [API Documentation](https://docs.crypticorn.com/api).
 
 Request and response models for API operations should be accessed through the sub package you are using for an operation. All symbols are re-exported at the sub package level for convenience.
 
@@ -180,7 +180,7 @@ Some API operations allow to get the returned data formatted as a pandas Datafra
 
 ### Data Downloads
 This utility allows direct data streaming to your local disk, instead of only returning download links. It is being used in the following functions:
-- `client.hive.data.download_data()` (overrides the [default response](https://docs.crypticorn.dev/api/?api=hive-ai-api#tag/data/GET/data))
+- `client.hive.data.download_data()` (overrides the [default response](https://docs.crypticorn.com/api/?api=hive-ai-api#tag/data/GET/data))
 
 ## Advanced Usage
 

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/README.md

@@ -31,7 +31,7 @@ The ApiClient serves as the central interface for API operations. It instantiate
 
 <img src="../static/pip-structure.svg" alt="pip package structure" />
 
-You can either explore each API by clicking through the library or checkout the [API Documentation](https://docs.crypticorn.dev/api).
+You can either explore each API by clicking through the library or checkout the [API Documentation](https://docs.crypticorn.com/api).
 
 Request and response models for API operations should be accessed through the sub package you are using for an operation. All symbols are re-exported at the sub package level for convenience.
 
@@ -127,7 +127,7 @@ Some API operations allow to get the returned data formatted as a pandas Datafra
 
 ### Data Downloads
 This utility allows direct data streaming to your local disk, instead of only returning download links. It is being used in the following functions:
-- `client.hive.data.download_data()` (overrides the [default response](https://docs.crypticorn.dev/api/?api=hive-ai-api#tag/data/GET/data))
+- `client.hive.data.download_data()` (overrides the [default response](https://docs.crypticorn.com/api/?api=hive-ai-api#tag/data/GET/data))
 
 ## Advanced Usage
 

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/__init__.py

@@ -8,7 +8,7 @@ You can find the full Changelog [below](#changelog).
 
 from crypticorn.common.logging import configure_logging
 
-configure_logging("crypticorn")
+configure_logging()
 
 from crypticorn.client import ApiClient
 

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/client.py

@@ -63,7 +63,7 @@ class ApiClient:
     def klines(self) -> KlinesClient:
         """
         Entry point for the Klines API ([Docs](https://docs.crypticorn.com/api/?api=klines-api)).
-        """ 
+        """
         return self._services[Service.KLINES]
 
     @property

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/common/exceptions.py

@@ -6,7 +6,7 @@ from fastapi.exceptions import RequestValidationError, ResponseValidationError
 from fastapi.responses import JSONResponse
 from crypticorn.common import ApiError, ApiErrorIdentifier, ApiErrorType, ApiErrorLevel
 import logging
-
+import json
 logger = logging.getLogger(__name__)
 
 
@@ -99,7 +99,7 @@ async def general_handler(request: Request, exc: Exception) -> JSONResponse:
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 
@@ -112,7 +112,7 @@ async def request_validation_handler(
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 
@@ -125,7 +125,7 @@ async def response_validation_handler(
         status_code=body.enrich().status_code,
         content=HTTPException(content=body).detail,
     )
-    logger.error(f"Response validation error: {res}")
+    logger.error(f"Response validation error: {json.loads(res.__dict__.get('body'))}")
     return res
 
 

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/common/logging.py

@@ -12,8 +12,7 @@ from crypticorn.common.mixins import ValidateEnumMixin
 from crypticorn.common.ansi_colors import AnsiColors as C
 from datetime import datetime
 import os
-
-
+    
 class LogLevel(ValidateEnumMixin, StrEnum):
     DEBUG = "DEBUG"
     INFO = "INFO"
@@ -71,7 +70,7 @@ class CustomFormatter(logging.Formatter):
 
 
 def configure_logging(
-    name: str,
+    name: str = None,
     fmt: str = _LOGFORMAT,
     datefmt: str = _DATEFMT,
     stdout_level: int = logging.INFO,
@@ -82,8 +81,15 @@ def configure_logging(
     """Configures the logging for the application.
     Run this function as early as possible in the application (for example using the `lifespan` parameter in FastAPI).
     Then use can use the default `logging.getLogger(__name__)` method to get the logger.
+    :param name: The name of the logger. If not provided, the root logger will be used. Use a name if use multiple loggers in the same application.
+    :param fmt: The format of the log message.
+    :param datefmt: The date format of the log message.
+    :param stdout_level: The level of the log message to be printed to the console.
+    :param file_level: The level of the log message to be written to the file. Only used if `log_file` is provided.
+    :param log_file: The file to write the log messages to.
+    :param filters: A list of filters to apply to the log handlers.
     """
-    logger = logging.getLogger(name)
+    logger = logging.getLogger(name) if name else logging.getLogger()
 
     if logger.handlers:  # clear existing handlers to avoid duplicates
         logger.handlers.clear()
@@ -109,6 +115,9 @@ def configure_logging(
         for filter in filters:
             file_handler.addFilter(filter)
         logger.addHandler(file_handler)
+    
+    if name:
+        logger.propagate = False
 
 
 def disable_logging():

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/common/middleware.py

@@ -11,7 +11,7 @@ def add_cors_middleware(app: "FastAPI"):
             "http://localhost:5173",  # vite dev server
             "http://localhost:4173",  # vite preview server
         ],
-        allow_origin_regex="^https:\/\/([a-zA-Z0-9-]+\.)*crypticorn\.(dev|com)\/?$",  # matches (multiple or no) subdomains of crypticorn.dev and crypticorn.com
+        allow_origin_regex="^https://([a-zA-Z0-9-]+.)*crypticorn.(dev|com)/?$",  # matches (multiple or no) subdomains of crypticorn.dev and crypticorn.com
         allow_credentials=True,
         allow_methods=["*"],
         allow_headers=["*"],
@@ -23,6 +23,5 @@ async def default_lifespan(app: FastAPI):
     This is used to configure the logging for the application.
     To override this, pass a different lifespan to the FastAPI constructor or call this lifespan within a custom lifespan.
     """
-    configure_logging(__name__)  # for the consuming app
-    logger = logging.getLogger(__name__)
+    configure_logging()
     yield

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/common/mixins.py

@@ -32,14 +32,15 @@ class ValidateEnumMixin:
         except ValueError:
             return False
 
-#This Mixin will be removed in a future version. And has no effect from now on
+
+# This Mixin will be removed in a future version. And has no effect from now on
 class ExcludeEnumMixin:
     """Mixin to exclude enum from OpenAPI schema. We use this to avoid duplicating enums when generating client code from the openapi spec."""
 
     @classmethod
     def __get_pydantic_json_schema__(cls, core_schema, handler):
         schema = handler(core_schema)
-        #schema.pop("enum", None)
+        # schema.pop("enum", None)
         return schema
 
 

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/hive/client/__init__.py

@@ -34,12 +34,13 @@ from crypticorn.hive.client.exceptions import ApiAttributeError
 from crypticorn.hive.client.exceptions import ApiException
 
 # import models into sdk package
+from crypticorn.hive.client.models.api_error_identifier import ApiErrorIdentifier
+from crypticorn.hive.client.models.api_error_level import ApiErrorLevel
+from crypticorn.hive.client.models.api_error_type import ApiErrorType
 from crypticorn.hive.client.models.coins import Coins
 from crypticorn.hive.client.models.data_download_response import DataDownloadResponse
 from crypticorn.hive.client.models.data_info import DataInfo
-from crypticorn.hive.client.models.data_value_value_value_inner import (
-    DataValueValueValueInner,
-)
+from crypticorn.hive.client.models.data_options import DataOptions
 from crypticorn.hive.client.models.data_version import DataVersion
 from crypticorn.hive.client.models.data_version_info import DataVersionInfo
 from crypticorn.hive.client.models.download_links import DownloadLinks
@@ -52,7 +53,6 @@ from crypticorn.hive.client.models.model import Model
 from crypticorn.hive.client.models.model_create import ModelCreate
 from crypticorn.hive.client.models.model_status import ModelStatus
 from crypticorn.hive.client.models.model_update import ModelUpdate
-from crypticorn.hive.client.models.response_getuptime import ResponseGetuptime
 from crypticorn.hive.client.models.target import Target
 from crypticorn.hive.client.models.target_info import TargetInfo
 from crypticorn.hive.client.models.target_type import TargetType

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/hive/client/api/admin_api.py

@@ -20,7 +20,6 @@ from pydantic import Field, StrictInt, StrictStr, field_validator
 from typing import Any, Dict, List, Optional
 from typing_extensions import Annotated
 from crypticorn.hive.client.models.log_level import LogLevel
-from crypticorn.hive.client.models.response_getuptime import ResponseGetuptime
 
 from crypticorn.hive.client.api_client import ApiClient, RequestSerialized
 from crypticorn.hive.client.api_response import ApiResponse
@@ -1223,7 +1222,7 @@ class AdminApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ResponseGetuptime:
+    ) -> str:
         """Get Uptime
 
         Return the server uptime in seconds or human-readable form.
@@ -1261,7 +1260,7 @@ class AdminApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "ResponseGetuptime",
+            "200": "str",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -1287,7 +1286,7 @@ class AdminApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[ResponseGetuptime]:
+    ) -> ApiResponse[str]:
         """Get Uptime
 
         Return the server uptime in seconds or human-readable form.
@@ -1325,7 +1324,7 @@ class AdminApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "ResponseGetuptime",
+            "200": "str",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -1389,7 +1388,7 @@ class AdminApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "ResponseGetuptime",
+            "200": "str",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/hive/client/models/__init__.py

@@ -14,12 +14,13 @@ Do not edit the class manually.
 
 
 # import models into model package
+from crypticorn.hive.client.models.api_error_identifier import ApiErrorIdentifier
+from crypticorn.hive.client.models.api_error_level import ApiErrorLevel
+from crypticorn.hive.client.models.api_error_type import ApiErrorType
 from crypticorn.hive.client.models.coins import Coins
 from crypticorn.hive.client.models.data_download_response import DataDownloadResponse
 from crypticorn.hive.client.models.data_info import DataInfo
-from crypticorn.hive.client.models.data_value_value_value_inner import (
-    DataValueValueValueInner,
-)
+from crypticorn.hive.client.models.data_options import DataOptions
 from crypticorn.hive.client.models.data_version import DataVersion
 from crypticorn.hive.client.models.data_version_info import DataVersionInfo
 from crypticorn.hive.client.models.download_links import DownloadLinks
@@ -32,7 +33,6 @@ from crypticorn.hive.client.models.model import Model
 from crypticorn.hive.client.models.model_create import ModelCreate
 from crypticorn.hive.client.models.model_status import ModelStatus
 from crypticorn.hive.client.models.model_update import ModelUpdate
-from crypticorn.hive.client.models.response_getuptime import ResponseGetuptime
 from crypticorn.hive.client.models.target import Target
 from crypticorn.hive.client.models.target_info import TargetInfo
 from crypticorn.hive.client.models.target_type import TargetType

crypticorn-2.8.0rc8/crypticorn/hive/client/models/api_error_identifier.py

@@ -0,0 +1,115 @@
+# coding: utf-8
+
+"""
+Hive AI API
+
+API for Hive AI model training and evaluation
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class ApiErrorIdentifier(str, Enum):
+    """
+    API error identifiers
+    """
+
+    """
+    allowed enum values
+    """
+    ALLOCATION_BELOW_CURRENT_EXPOSURE = "allocation_below_current_exposure"
+    ALLOCATION_BELOW_MIN_AMOUNT = "allocation_below_min_amount"
+    BLACK_SWAN = "black_swan"
+    BOT_ALREADY_DELETED = "bot_already_deleted"
+    BOT_DISABLED = "bot_disabled"
+    BOT_STOPPING_COMPLETED = "bot_stopping_completed"
+    BOT_STOPPING_STARTED = "bot_stopping_started"
+    CLIENT_ORDER_ID_ALREADY_EXISTS = "client_order_id_already_exists"
+    INVALID_CONTENT_TYPE = "invalid_content_type"
+    DELETE_BOT_ERROR = "delete_bot_error"
+    EXCHANGE_INVALID_SIGNATURE = "exchange_invalid_signature"
+    EXCHANGE_INVALID_TIMESTAMP = "exchange_invalid_timestamp"
+    EXCHANGE_IP_ADDRESS_IS_NOT_AUTHORIZED = "exchange_ip_address_is_not_authorized"
+    EXCHANGE_KEY_ALREADY_EXISTS = "exchange_key_already_exists"
+    EXCHANGE_KEY_IN_USE = "exchange_key_in_use"
+    EXCHANGE_SYSTEM_UNDER_MAINTENANCE = "exchange_system_under_maintenance"
+    EXCHANGE_RATE_LIMIT_EXCEEDED = "exchange_rate_limit_exceeded"
+    INSUFFICIENT_PERMISSIONS_SPOT_AND_FUTURES_REQUIRED = (
+        "insufficient_permissions_spot_and_futures_required"
+    )
+    EXCHANGE_SERVICE_TEMPORARILY_UNAVAILABLE = (
+        "exchange_service_temporarily_unavailable"
+    )
+    EXCHANGE_SYSTEM_IS_BUSY = "exchange_system_is_busy"
+    EXCHANGE_SYSTEM_CONFIGURATION_ERROR = "exchange_system_configuration_error"
+    EXCHANGE_INTERNAL_SYSTEM_ERROR = "exchange_internal_system_error"
+    EXCHANGE_USER_ACCOUNT_IS_FROZEN = "exchange_user_account_is_frozen"
+    API_KEY_EXPIRED = "api_key_expired"
+    BEARER_TOKEN_EXPIRED = "bearer_token_expired"
+    FORBIDDEN = "forbidden"
+    HEDGE_MODE_NOT_ACTIVE = "hedge_mode_not_active"
+    HTTP_REQUEST_ERROR = "http_request_error"
+    INSUFFICIENT_BALANCE = "insufficient_balance"
+    INSUFFICIENT_MARGIN = "insufficient_margin"
+    INSUFFICIENT_SCOPES = "insufficient_scopes"
+    INVALID_API_KEY = "invalid_api_key"
+    INVALID_BEARER = "invalid_bearer"
+    INVALID_DATA = "invalid_data"
+    INVALID_DATA_RESPONSE = "invalid_data_response"
+    INVALID_EXCHANGE_KEY = "invalid_exchange_key"
+    INVALID_MARGIN_MODE = "invalid_margin_mode"
+    INVALID_MODEL_NAME = "invalid_model_name"
+    INVALID_PARAMETER_PROVIDED = "invalid_parameter_provided"
+    LEVERAGE_LIMIT_EXCEEDED = "leverage_limit_exceeded"
+    ORDER_VIOLATES_LIQUIDATION_PRICE_CONSTRAINTS = (
+        "order_violates_liquidation_price_constraints"
+    )
+    MODEL_NAME_NOT_UNIQUE = "model_name_not_unique"
+    NO_CREDENTIALS = "no_credentials"
+    NOW_API_DOWN = "now_api_down"
+    OBJECT_ALREADY_EXISTS = "object_already_exists"
+    OBJECT_CREATED = "object_created"
+    OBJECT_DELETED = "object_deleted"
+    OBJECT_NOT_FOUND = "object_not_found"
+    OBJECT_UPDATED = "object_updated"
+    ORDER_IS_ALREADY_FILLED = "order_is_already_filled"
+    ORDER_IS_BEING_PROCESSED = "order_is_being_processed"
+    ORDER_QUANTITY_LIMIT_EXCEEDED = "order_quantity_limit_exceeded"
+    ORDER_DOES_NOT_EXIST = "order_does_not_exist"
+    ORDER_PRICE_IS_INVALID = "order_price_is_invalid"
+    ORDER_SIZE_TOO_LARGE = "order_size_too_large"
+    ORDER_SIZE_TOO_SMALL = "order_size_too_small"
+    POSITION_LIMIT_EXCEEDED = "position_limit_exceeded"
+    POSITION_DOES_NOT_EXIST = "position_does_not_exist"
+    POSITION_OPENING_TEMPORARILY_SUSPENDED = "position_opening_temporarily_suspended"
+    POST_ONLY_ORDER_WOULD_IMMEDIATELY_MATCH = "post_only_order_would_immediately_match"
+    REQUEST_SCOPE_LIMIT_EXCEEDED = "request_scope_limit_exceeded"
+    RISK_LIMIT_EXCEEDED = "risk_limit_exceeded"
+    RPC_TIMEOUT = "rpc_timeout"
+    SYSTEM_SETTLEMENT_IN_PROCESS = "system_settlement_in_process"
+    STRATEGY_ALREADY_EXISTS = "strategy_already_exists"
+    STRATEGY_DISABLED = "strategy_disabled"
+    STRATEGY_LEVERAGE_MISMATCH = "strategy_leverage_mismatch"
+    STRATEGY_NOT_SUPPORTING_EXCHANGE = "strategy_not_supporting_exchange"
+    SUCCESS = "success"
+    SYMBOL_DOES_NOT_EXIST = "symbol_does_not_exist"
+    TRADING_ACTION_EXPIRED = "trading_action_expired"
+    TRADING_ACTION_SKIPPED = "trading_action_skipped"
+    TRADING_HAS_BEEN_LOCKED = "trading_has_been_locked"
+    TRADING_IS_SUSPENDED = "trading_is_suspended"
+    UNKNOWN_ERROR_OCCURRED = "unknown_error_occurred"
+    REQUESTED_RESOURCE_NOT_FOUND = "requested_resource_not_found"
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of ApiErrorIdentifier from a JSON string"""
+        return cls(json.loads(json_str))

crypticorn-2.8.0rc8/crypticorn/hive/client/models/api_error_level.py

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+"""
+Hive AI API
+
+API for Hive AI model training and evaluation
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class ApiErrorLevel(str, Enum):
+    """
+    API error levels
+    """
+
+    """
+    allowed enum values
+    """
+    ERROR = "error"
+    INFO = "info"
+    SUCCESS = "success"
+    WARNING = "warning"
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of ApiErrorLevel from a JSON string"""
+        return cls(json.loads(json_str))

crypticorn-2.8.0rc8/crypticorn/hive/client/models/api_error_type.py

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+"""
+Hive AI API
+
+API for Hive AI model training and evaluation
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+from enum import Enum
+from typing_extensions import Self
+
+
+class ApiErrorType(str, Enum):
+    """
+    Type of API error
+    """
+
+    """
+    allowed enum values
+    """
+    USER_ERROR = "user error"
+    EXCHANGE_ERROR = "exchange error"
+    SERVER_ERROR = "server error"
+    NO_ERROR = "no error"
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Create an instance of ApiErrorType from a JSON string"""
+        return cls(json.loads(json_str))

{crypticorn-2.8.0rc6 → crypticorn-2.8.0rc8}/crypticorn/hive/client/models/data_info.py

@@ -20,9 +20,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List
 from crypticorn.hive.client.models.coins import Coins
-from crypticorn.hive.client.models.data_value_value_value_inner import (
-    DataValueValueValueInner,
-)
+from crypticorn.hive.client.models.data_options import DataOptions
 from crypticorn.hive.client.models.data_version_info import DataVersionInfo
 from crypticorn.hive.client.models.feature_size import FeatureSize
 from crypticorn.hive.client.models.target_info import TargetInfo
@@ -35,7 +33,7 @@ class DataInfo(BaseModel):
     The complete data information for all versions, coins, feature sizes and targets
     """  # noqa: E501
 
-    data: Dict[str, Dict[str, Dict[str, List[DataValueValueValueInner]]]] = Field(
+    data: Dict[str, Dict[str, DataOptions]] = Field(
         description="The complete data information for all versions, coins, feature sizes and targets."
     )
     coins: List[Coins] = Field(
@@ -99,6 +97,13 @@ class DataInfo(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of each value in data (dict)
+        _field_dict = {}
+        if self.data:
+            for _key_data in self.data:
+                if self.data[_key_data]:
+                    _field_dict[_key_data] = self.data[_key_data].to_dict()
+            _dict["data"] = _field_dict
         # override the default output from pydantic by calling `to_dict()` of each item in targets (list)
         _items = []
         if self.targets:
@@ -133,7 +138,24 @@ class DataInfo(BaseModel):
 
         _obj = cls.model_validate(
             {
-                "data": obj.get("data"),
+                "data": (
+                    dict(
+                        (
+                            _k,
+                            (
+                                dict(
+                                    (_ik, DataOptions.from_dict(_iv))
+                                    for _ik, _iv in _v.items()
+                                )
+                                if _v is not None
+                                else None
+                            ),
+                        )
+                        for _k, _v in obj.get("data").items()
+                    )
+                    if obj.get("data") is not None
+                    else None
+                ),
                 "coins": obj.get("coins"),
                 "feature_sizes": obj.get("feature_sizes"),
                 "targets": (

crypticorn-2.8.0rc8/crypticorn/hive/client/models/data_options.py

@@ -0,0 +1,92 @@
+# coding: utf-8
+
+"""
+Hive AI API
+
+API for Hive AI model training and evaluation
+
+The version of the OpenAPI document: 1.0.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field
+from typing import Any, ClassVar, Dict, List
+from crypticorn.hive.client.models.feature_size import FeatureSize
+from crypticorn.hive.client.models.target import Target
+from typing import Optional, Set
+from typing_extensions import Self
+
+
+class DataOptions(BaseModel):
+    """
+    DataOptions
+    """  # noqa: E501
+
+    targets: List[Target] = Field(
+        description="The targets available on the latest data version."
+    )
+    feature_sizes: List[FeatureSize] = Field(
+        description="The feature sizes available on the latest data version."
+    )
+    __properties: ClassVar[List[str]] = ["targets", "feature_sizes"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of DataOptions from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of DataOptions from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate(
+            {"targets": obj.get("targets"), "feature_sizes": obj.get("feature_sizes")}
+        )
+        return _obj