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

crypticorn/common/scopes.py

@@ -1,23 +1,4 @@
-from enum import StrEnum, EnumMeta
-import logging
-
-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
+from enum import StrEnum
 
 
 class Scope(StrEnum):
@@ -27,10 +8,6 @@ class Scope(StrEnum):
 
     # If you update anything here, also update the scopes in the auth-service repository
 
-    @classmethod
-    def from_str(cls, value: str) -> "Scope":
-        return cls(value)
-
     # Scopes that can be purchased - these actually exist in the jwt token
     READ_PREDICTIONS = "read:predictions"
 
@@ -68,3 +45,29 @@ class Scope(StrEnum):
     READ_METRICS_EXCHANGES = "read:metrics:exchanges"
     READ_METRICS_TOKENS = "read:metrics:tokens"
     READ_METRICS_MARKETS = "read:metrics:markets"
+
+    # Sentiment scopes
+    READ_SENTIMENT = "read:sentiment"
+
+    @classmethod
+    def admin_scopes(cls) -> list["Scope"]:
+        """Scopes that are only available to admins"""
+        return [
+            cls.WRITE_TRADE_STRATEGIES,
+            cls.WRITE_PAY_PRODUCTS,
+            cls.WRITE_PAY_NOW,
+        ]
+
+    @classmethod
+    def internal_scopes(cls) -> list["Scope"]:
+        """Scopes that are only available to internal services"""
+        return [
+            cls.WRITE_TRADE_ACTIONS,
+        ]
+
+    @classmethod
+    def purchaseable_scopes(cls) -> list["Scope"]:
+        """Scopes that can be purchased"""
+        return [
+            cls.READ_PREDICTIONS,
+        ]

crypticorn/common/status_router.py

@@ -4,6 +4,7 @@ from fastapi import APIRouter
 
 router = APIRouter(tags=["Status"], prefix="")
 
+
 @router.get("/", operation_id="ping")
 async def ping() -> str:
     """
@@ -11,10 +12,9 @@ async def ping() -> str:
     """
     return "OK"
 
+
 @router.get("/time", operation_id="getTime")
-async def time(
-    type: Literal["iso", "unix"] = "iso"
-) -> str:
+async def time(type: Literal["iso", "unix"] = "iso") -> str:
     """
     Returns the current time in the specified format.
     """
@@ -22,7 +22,8 @@ async def time(
         return datetime.now().isoformat()
     else:
         return str(int(datetime.now().timestamp()))
-    
+
+
 @router.get("/config", operation_id="getConfig")
 async def config() -> dict:
     """
@@ -31,12 +32,13 @@ async def config() -> dict:
     import importlib.metadata
     import os
     from dotenv import load_dotenv
+
     load_dotenv()
-    try: 
-        crypticorn_version = importlib.metadata.version("flask")
+    try:
+        crypticorn_version = importlib.metadata.version("crypticorn")
     except importlib.metadata.PackageNotFoundError:
         crypticorn_version = "not installed"
     return {
-        "crypticorn": crypticorn_version,
+        "crypticorn": f"v{crypticorn_version}",
         "environment": os.getenv("API_ENV", "not set"),
     }

crypticorn/common/utils.py

@@ -8,16 +8,22 @@ from typing_extensions import deprecated
 from crypticorn.common import ApiError, HTTPException, ExceptionContent
 
 
-def throw_if_none(value: Any, error: ApiError = ApiError.OBJECT_NOT_FOUND) -> None:
-    """Throws an FastAPI HTTPException if the value is None."""
+def throw_if_none(
+    value: Any,
+    exception: ExceptionContent = ExceptionContent(error=ApiError.OBJECT_NOT_FOUND),
+) -> None:
+    """Throws an FastAPI HTTPException if the value is None. https://docs.python.org/3/library/stdtypes.html#truth-value-testing"""
     if value is None:
-        raise HTTPException(content=ExceptionContent(error=error))
+        raise HTTPException(content=exception)
 
 
-def throw_if_falsy(value: Any, error: ApiError = ApiError.OBJECT_NOT_FOUND) -> None:
-    """Throws an FastAPI HTTPException if the value is False."""
+def throw_if_falsy(
+    value: Any,
+    exception: ExceptionContent = ExceptionContent(error=ApiError.OBJECT_NOT_FOUND),
+) -> None:
+    """Throws an FastAPI HTTPException if the value is False. https://docs.python.org/3/library/stdtypes.html#truth-value-testing"""
     if not value:
-        raise HTTPException(content=ExceptionContent(error=error))
+        raise HTTPException(content=exception)
 
 
 def gen_random_id(length: int = 20) -> str:

crypticorn/hive/client/__init__.py

@@ -40,18 +40,16 @@ 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.download_links import DownloadLinks
 from crypticorn.hive.client.models.evaluation import Evaluation
 from crypticorn.hive.client.models.evaluation_response import EvaluationResponse
+from crypticorn.hive.client.models.exception_detail import ExceptionDetail
 from crypticorn.hive.client.models.feature_size import FeatureSize
-from crypticorn.hive.client.models.http_validation_error import HTTPValidationError
 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.target import Target
+from crypticorn.hive.client.models.target_info import TargetInfo
 from crypticorn.hive.client.models.target_type import TargetType
-from crypticorn.hive.client.models.validation_error import ValidationError
-from crypticorn.hive.client.models.validation_error_loc_inner import (
-    ValidationErrorLocInner,
-)

crypticorn/hive/client/api/data_api.py

@@ -16,7 +16,7 @@ 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, StrictInt, StrictStr
+from pydantic import Field, StrictInt
 from typing import Optional
 from typing_extensions import Annotated
 from crypticorn.hive.client.models.data_download_response import DataDownloadResponse
@@ -52,7 +52,6 @@ class DataApi:
         feature_size: Annotated[
             Optional[FeatureSize], Field(description="Feature size")
         ] = None,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -75,8 +74,6 @@ class DataApi:
         :type version: DataVersion
         :param feature_size: Feature size
         :type feature_size: FeatureSize
-        :param access_token:
-        :type access_token: str
         :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
@@ -103,7 +100,6 @@ class DataApi:
             model_id=model_id,
             version=version,
             feature_size=feature_size,
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -112,7 +108,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataDownloadResponse",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -134,7 +129,6 @@ class DataApi:
         feature_size: Annotated[
             Optional[FeatureSize], Field(description="Feature size")
         ] = None,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -157,8 +151,6 @@ class DataApi:
         :type version: DataVersion
         :param feature_size: Feature size
         :type feature_size: FeatureSize
-        :param access_token:
-        :type access_token: str
         :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
@@ -185,7 +177,6 @@ class DataApi:
             model_id=model_id,
             version=version,
             feature_size=feature_size,
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -194,7 +185,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataDownloadResponse",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -216,7 +206,6 @@ class DataApi:
         feature_size: Annotated[
             Optional[FeatureSize], Field(description="Feature size")
         ] = None,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -239,8 +228,6 @@ class DataApi:
         :type version: DataVersion
         :param feature_size: Feature size
         :type feature_size: FeatureSize
-        :param access_token:
-        :type access_token: str
         :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
@@ -267,7 +254,6 @@ class DataApi:
             model_id=model_id,
             version=version,
             feature_size=feature_size,
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -276,7 +262,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataDownloadResponse",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -288,7 +273,6 @@ class DataApi:
         model_id,
         version,
         feature_size,
-        access_token,
         _request_auth,
         _content_type,
         _headers,
@@ -353,7 +337,6 @@ class DataApi:
     @validate_call
     async def get_data_info(
         self,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -370,8 +353,6 @@ class DataApi:
 
         Get information about available data and options for the latest data version
 
-        :param access_token:
-        :type access_token: str
         :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
@@ -395,7 +376,6 @@ class DataApi:
         """  # noqa: E501
 
         _param = self._get_data_info_serialize(
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -404,7 +384,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataInfo",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -418,7 +397,6 @@ class DataApi:
     @validate_call
     async def get_data_info_with_http_info(
         self,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -435,8 +413,6 @@ class DataApi:
 
         Get information about available data and options for the latest data version
 
-        :param access_token:
-        :type access_token: str
         :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
@@ -460,7 +436,6 @@ class DataApi:
         """  # noqa: E501
 
         _param = self._get_data_info_serialize(
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -469,7 +444,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataInfo",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -483,7 +457,6 @@ class DataApi:
     @validate_call
     async def get_data_info_without_preload_content(
         self,
-        access_token: Optional[StrictStr] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -500,8 +473,6 @@ class DataApi:
 
         Get information about available data and options for the latest data version
 
-        :param access_token:
-        :type access_token: str
         :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
@@ -525,7 +496,6 @@ class DataApi:
         """  # noqa: E501
 
         _param = self._get_data_info_serialize(
-            access_token=access_token,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -534,7 +504,6 @@ class DataApi:
 
         _response_types_map: Dict[str, Optional[str]] = {
             "200": "DataInfo",
-            "422": "HTTPValidationError",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -543,7 +512,6 @@ class DataApi:
 
     def _get_data_info_serialize(
         self,
-        access_token,
         _request_auth,
         _content_type,
         _headers,