crypticorn 2.5.2__py3-none-any.whl → 2.6.0__py3-none-any.whl

crypticorn/hive/client/models/data_info.py

@@ -17,15 +17,15 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt
-from typing import Any, ClassVar, Dict, List, Union
+from pydantic import BaseModel, ConfigDict
+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_version import DataVersion
+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_type import TargetType
+from crypticorn.hive.client.models.target_info import TargetInfo
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -38,16 +38,16 @@ class DataInfo(BaseModel):
     data: Dict[str, Dict[str, Dict[str, List[DataValueValueValueInner]]]]
     coins: List[Coins]
     feature_sizes: List[FeatureSize]
-    targets: Dict[str, TargetType]
-    versions: Dict[str, Union[StrictFloat, StrictInt]]
-    latest_version: DataVersion
+    targets: List[TargetInfo]
+    all_versions: List[DataVersionInfo]
+    available_versions: List[DataVersionInfo]
     __properties: ClassVar[List[str]] = [
         "data",
         "coins",
         "feature_sizes",
         "targets",
-        "versions",
-        "latest_version",
+        "all_versions",
+        "available_versions",
     ]
 
     model_config = ConfigDict(
@@ -87,6 +87,27 @@ class DataInfo(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of each item in targets (list)
+        _items = []
+        if self.targets:
+            for _item_targets in self.targets:
+                if _item_targets:
+                    _items.append(_item_targets.to_dict())
+            _dict["targets"] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in all_versions (list)
+        _items = []
+        if self.all_versions:
+            for _item_all_versions in self.all_versions:
+                if _item_all_versions:
+                    _items.append(_item_all_versions.to_dict())
+            _dict["all_versions"] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in available_versions (list)
+        _items = []
+        if self.available_versions:
+            for _item_available_versions in self.available_versions:
+                if _item_available_versions:
+                    _items.append(_item_available_versions.to_dict())
+            _dict["available_versions"] = _items
         return _dict
 
     @classmethod
@@ -104,12 +125,23 @@ class DataInfo(BaseModel):
                 "coins": obj.get("coins"),
                 "feature_sizes": obj.get("feature_sizes"),
                 "targets": (
-                    dict((_k, _v) for _k, _v in obj.get("targets").items())
+                    [TargetInfo.from_dict(_item) for _item in obj["targets"]]
                     if obj.get("targets") is not None
                     else None
                 ),
-                "versions": obj.get("versions"),
-                "latest_version": obj.get("latest_version"),
+                "all_versions": (
+                    [DataVersionInfo.from_dict(_item) for _item in obj["all_versions"]]
+                    if obj.get("all_versions") is not None
+                    else None
+                ),
+                "available_versions": (
+                    [
+                        DataVersionInfo.from_dict(_item)
+                        for _item in obj["available_versions"]
+                    ]
+                    if obj.get("available_versions") is not None
+                    else None
+                ),
             }
         )
         return _obj

crypticorn/hive/client/models/data_version.py

@@ -27,7 +27,6 @@ class DataVersion(str, Enum):
     allowed enum values
     """
     ENUM_1_DOT_0 = "1.0"
-    ENUM_1_DOT_1 = "1.1"
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:

crypticorn/{pay/client/models/now_api_status_res.py → hive/client/models/data_version_info.py}

@@ -1,11 +1,11 @@
 # coding: utf-8
 
 """
-Payment API
+Hive AI API
 
-No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+API for Hive AI model training and evaluation
 
-The version of the OpenAPI document: 0.1.0
+The version of the OpenAPI document: 1.0.0
 Generated by OpenAPI Generator (https://openapi-generator.tech)
 
 Do not edit the class manually.
@@ -17,19 +17,23 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictInt
 from typing import Any, ClassVar, Dict, List
+from crypticorn.hive.client.models.data_version import DataVersion
 from typing import Optional, Set
 from typing_extensions import Self
 
 
-class NowAPIStatusRes(BaseModel):
+class DataVersionInfo(BaseModel):
     """
-    Response for the API status.
+    DataVersionInfo
     """  # noqa: E501
 
-    message: StrictStr = Field(description="API status message")
-    __properties: ClassVar[List[str]] = ["message"]
+    version: DataVersion = Field(description="Data version")
+    release_date: StrictInt = Field(
+        description="Release date of the data version in unix timestamp"
+    )
+    __properties: ClassVar[List[str]] = ["version", "release_date"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -48,7 +52,7 @@ class NowAPIStatusRes(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of NowAPIStatusRes from a JSON string"""
+        """Create an instance of DataVersionInfo from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -72,12 +76,14 @@ class NowAPIStatusRes(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of NowAPIStatusRes from a dict"""
+        """Create an instance of DataVersionInfo from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
             return cls.model_validate(obj)
 
-        _obj = cls.model_validate({"message": obj.get("message")})
+        _obj = cls.model_validate(
+            {"version": obj.get("version"), "release_date": obj.get("release_date")}
+        )
         return _obj

crypticorn/hive/client/models/exception_detail.py

@@ -0,0 +1,114 @@
+# 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, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+
+class ExceptionDetail(BaseModel):
+    """
+    This is the detail of the exception. It is used to enrich the exception with additional information by unwrapping the ApiError into its components.
+    """  # noqa: E501
+
+    message: Optional[StrictStr] = None
+    code: StrictStr = Field(description="API error identifiers")
+    type: StrictStr = Field(description="Type of API error")
+    level: StrictStr = Field(description="API error levels")
+    status_code: StrictInt = Field(description="The HTTP status code")
+    details: Optional[Any] = None
+    __properties: ClassVar[List[str]] = [
+        "message",
+        "code",
+        "type",
+        "level",
+        "status_code",
+        "details",
+    ]
+
+    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 ExceptionDetail 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,
+        )
+        # set to None if message (nullable) is None
+        # and model_fields_set contains the field
+        if self.message is None and "message" in self.model_fields_set:
+            _dict["message"] = None
+
+        # set to None if details (nullable) is None
+        # and model_fields_set contains the field
+        if self.details is None and "details" in self.model_fields_set:
+            _dict["details"] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of ExceptionDetail from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate(
+            {
+                "message": obj.get("message"),
+                "code": obj.get("code"),
+                "type": obj.get("type"),
+                "level": obj.get("level"),
+                "status_code": obj.get("status_code"),
+                "details": obj.get("details"),
+            }
+        )
+        return _obj

crypticorn/hive/client/models/model.py

@@ -17,7 +17,6 @@ import pprint
 import re  # noqa: F401
 import json
 
-from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List
 from crypticorn.hive.client.models.coins import Coins
@@ -42,8 +41,8 @@ class Model(BaseModel):
     target_type: TargetType = Field(description="Target type")
     evaluations: List[Evaluation] = Field(description="Model evaluations")
     user_id: StrictStr = Field(description="Developer user ID")
-    created_at: datetime = Field(description="Model creation timestamp")
-    updated_at: datetime = Field(description="Model update timestamp")
+    created_at: StrictInt = Field(description="Model creation unix timestamp")
+    updated_at: StrictInt = Field(description="Model update unix timestamp")
     __properties: ClassVar[List[str]] = [
         "model_id",
         "name",

crypticorn/hive/client/models/{validation_error.py → target_info.py}

@@ -17,24 +17,24 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List
-from crypticorn.hive.client.models.validation_error_loc_inner import (
-    ValidationErrorLocInner,
-)
+from crypticorn.hive.client.models.data_version import DataVersion
+from crypticorn.hive.client.models.target import Target
+from crypticorn.hive.client.models.target_type import TargetType
 from typing import Optional, Set
 from typing_extensions import Self
 
 
-class ValidationError(BaseModel):
+class TargetInfo(BaseModel):
     """
-    ValidationError
+    TargetInfo
     """  # noqa: E501
 
-    loc: List[ValidationErrorLocInner]
-    msg: StrictStr
-    type: StrictStr
-    __properties: ClassVar[List[str]] = ["loc", "msg", "type"]
+    name: Target = Field(description="Target name")
+    type: TargetType = Field(description="Target type")
+    version: DataVersion = Field(description="Data version")
+    __properties: ClassVar[List[str]] = ["name", "type", "version"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -53,7 +53,7 @@ class ValidationError(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of ValidationError from a JSON string"""
+        """Create an instance of TargetInfo from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -73,18 +73,11 @@ class ValidationError(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in loc (list)
-        _items = []
-        if self.loc:
-            for _item_loc in self.loc:
-                if _item_loc:
-                    _items.append(_item_loc.to_dict())
-            _dict["loc"] = _items
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of ValidationError from a dict"""
+        """Create an instance of TargetInfo from a dict"""
         if obj is None:
             return None
 
@@ -93,13 +86,9 @@ class ValidationError(BaseModel):
 
         _obj = cls.model_validate(
             {
-                "loc": (
-                    [ValidationErrorLocInner.from_dict(_item) for _item in obj["loc"]]
-                    if obj.get("loc") is not None
-                    else None
-                ),
-                "msg": obj.get("msg"),
+                "name": obj.get("name"),
                 "type": obj.get("type"),
+                "version": obj.get("version"),
             }
         )
         return _obj

crypticorn/hive/client/rest.py

@@ -57,7 +57,10 @@ class RESTClientObject:
         # maxsize is number of requests to host that are allowed in parallel
         self.maxsize = configuration.connection_pool_maxsize
 
-        self.ssl_context = ssl.create_default_context(cafile=configuration.ssl_ca_cert)
+        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