crypticorn 2.0.1__py3-none-any.whl → 2.1.1__py3-none-any.whl

crypticorn/common/auth_client.py

@@ -1,4 +1,4 @@
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends, HTTPException, Query, status
 from fastapi.security import HTTPAuthorizationCredentials
 from typing_extensions import Annotated, Doc
 import json
@@ -51,8 +51,7 @@ class AuthHandler:
         """
         Verifies the API key.
         """
-        # TODO: Implement in auth service
-        raise NotImplementedError("API key verification not implemented")
+        return await self.auth_client.login.verify_api_key(api_key)
 
     async def _verify_bearer(
         self, bearer: HTTPAuthorizationCredentials
@@ -76,9 +75,9 @@ class AuthHandler:
             )
 
     async def _extract_message(self, e: ApiException) -> str:
-        '''
+        """
         Tries to extract the message from the body of the exception.
-        '''
+        """
         try:
             load = json.loads(e.body)
         except (json.JSONDecodeError, TypeError):
@@ -91,9 +90,9 @@ class AuthHandler:
             return load
 
     async def _handle_exception(self, e: Exception) -> HTTPException:
-        '''
+        """
         Handles exceptions and returns a HTTPException with the appropriate status code and detail.
-        '''
+        """
         if isinstance(e, ApiException):
             return HTTPException(
                 status_code=e.status,
@@ -104,8 +103,9 @@ class AuthHandler:
         else:
             return HTTPException(
                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail=str(e),
             )
-    
+
     async def api_key_auth(
         self,
         api_key: Annotated[str | None, Depends(apikey_header)] = None,
@@ -113,16 +113,9 @@ class AuthHandler:
     ) -> Verify200Response:
         """
         Verifies the API key and checks if the user scopes are a subset of the API scopes.
+        Use this function if you only want to allow access via the API key.
         """
-        try:
-            if not api_key:
-                raise self.no_credentials_exception
-            
-            res = await self._verify_api_key(api_key)
-            await self._validate_scopes(scopes, [Scope.from_str(scope) for scope in res.scopes])
-            return res
-        except Exception as e:
-            raise await self._handle_exception(e)
+        return await self.combined_auth(bearer=None, api_key=api_key, scopes=scopes)
 
     async def bearer_auth(
         self,
@@ -134,17 +127,9 @@ class AuthHandler:
     ) -> Verify200Response:
         """
         Verifies the bearer token and checks if the user scopes are a subset of the API scopes.
+        Use this function if you only want to allow access via the bearer token.
         """
-        if not bearer:
-            raise self.no_credentials_exception
-
-        try:
-            res = await self._verify_bearer(bearer)
-            await self._validate_scopes(scopes, [Scope.from_str(scope) for scope in res.scopes])
-            return res
-        except Exception as e:
-            raise await self._handle_exception(e)
-
+        return await self.combined_auth(bearer=bearer, api_key=None, scopes=scopes)
 
     async def combined_auth(
         self,
@@ -155,8 +140,9 @@ class AuthHandler:
         scopes: list[Scope] = [],
     ) -> Verify200Response:
         """
-        Verifies the bearer token and API key and checks if the user scopes are a subset of the API scopes.
+        Verifies the bearer token and/or API key and checks if the user scopes are a subset of the API scopes.
         Returns early on the first successful verification, otherwise tries all available tokens.
+        Use this function if you want to allow access via either the bearer token or the API key.
         """
         tokens = [bearer, api_key]
 
@@ -173,7 +159,9 @@ class AuthHandler:
                 if res is None:
                     continue
                 if scopes:
-                    await self._validate_scopes(scopes, [Scope.from_str(scope) for scope in res.scopes])
+                    await self._validate_scopes(
+                        scopes, [Scope.from_str(scope) for scope in res.scopes]
+                    )
                 return res
 
             except Exception as e:
@@ -181,3 +169,49 @@ class AuthHandler:
                 continue
 
         raise last_error or self.no_credentials_exception
+
+    async def ws_api_key_auth(
+        self,
+        api_key: Annotated[str | None, Query()] = None,
+        scopes: list[Scope] = [],
+    ) -> Verify200Response:
+        """
+        Verifies the API key and checks if the user scopes are a subset of the API scopes.
+        Use this function if you only want to allow access via the API key.
+        """
+        return await self.api_key_auth(api_key=api_key, scopes=scopes)
+
+    async def ws_bearer_auth(
+        self,
+        bearer: Annotated[str | None, Query()] = None,
+        scopes: list[Scope] = [],
+    ) -> Verify200Response:
+        """
+        Verifies the bearer token and checks if the user scopes are a subset of the API scopes.
+        Use this function if you only want to allow access via the bearer token.
+        """
+        credentials = (
+            HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
+            if bearer
+            else None
+        )
+        return await self.bearer_auth(bearer=credentials, scopes=scopes)
+
+    async def ws_combined_auth(
+        self,
+        bearer: Annotated[str | None, Query()] = None,
+        api_key: Annotated[str | None, Query()] = None,
+        scopes: list[Scope] = [],
+    ) -> Verify200Response:
+        """
+        Verifies the bearer token and/or API key and checks if the user scopes are a subset of the API scopes.
+        Use this function if you want to allow access via either the bearer token or the API key.
+        """
+        credentials = (
+            HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
+            if bearer
+            else None
+        )
+        return await self.combined_auth(
+            bearer=credentials, api_key=api_key, scopes=scopes
+        )

crypticorn/common/scopes.py

@@ -6,31 +6,39 @@ class Scope(str, Enum):
     The permission scopes for the API.
     """
 
+    # 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)
 
     # Hive scopes
-    HIVE_MODEL_READ = "hive:model:read"
-    HIVE_DATA_READ = "hive:data:read"
-    HIVE_MODEL_WRITE = "hive:model:write"
-    HIVE_DATA_WRITE = "hive:data:write"
+    READ_HIVE_MODEL = "read:hive:model"
+    READ_HIVE_DATA = "read:hive:data"
+    WRITE_HIVE_MODEL = "write:hive:model"
 
     # Trade scopes
-    TRADE_BOTS_READ = "trade:bots:read"
-    TRADE_BOTS_WRITE = "trade:bots:write"
-    TRADE_API_KEYS_READ = "trade:api_keys:read"
-    TRADE_API_KEYS_WRITE = "trade:api_keys:write"
-    TRADE_ORDERS_READ = "trade:orders:read"
-    TRADE_ACTIONS_READ = "trade:actions:read"
-    TRADE_ACTIONS_WRITE = "trade:actions:write"
-    TRADE_EXCHANGES_READ = "trade:exchanges:read"
-    TRADE_FUTURES_READ = "trade:futures:read"
-    TRADE_FUTURES_WRITE = "trade:futures:write"
-    TRADE_NOTIFICATIONS_READ = "trade:notifications:read"
-    TRADE_NOTIFICATIONS_WRITE = "trade:notifications:write"
-    TRADE_STRATEGIES_READ = "trade:strategies:read"
-    TRADE_STRATEGIES_WRITE = "trade:strategies:write"
+    READ_TRADE_BOTS = "read:trade:bots"
+    WRITE_TRADE_BOTS = "write:trade:bots"
+    READ_TRADE_APIKEYS = "read:trade:api_keys"
+    WRITE_TRADE_APIKEYS = "write:trade:api_keys"
+    READ_TRADE_ORDERS = "read:trade:orders"
+    READ_TRADE_ACTIONS = "read:trade:actions"
+    WRITE_TRADE_ACTIONS = "write:trade:actions"
+    READ_TRADE_EXCHANGES = "read:trade:exchanges"
+    READ_TRADE_FUTURES = "read:trade:futures"
+    WRITE_TRADE_FUTURES = "write:trade:futures"
+    READ_TRADE_NOTIFICATIONS = "read:trade:notifications"
+    WRITE_TRADE_NOTIFICATIONS = "write:trade:notifications"
+    READ_TRADE_STRATEGIES = "read:trade:strategies"
+    WRITE_TRADE_STRATEGIES = "write:trade:strategies"
+
+    # Payment scopes
+    READ_PAY_PAYMENTS = "read:pay:payments"
+    READ_PAY_PRODUCTS = "read:pay:products"
+    WRITE_PAY_PRODUCTS = "write:pay:products"
+    READ_PAY_NOW = "read:pay:now"
+    WRITE_PAY_NOW = "write:pay:now"
 
     # Read projections
     READ_PREDICTIONS = "read:predictions"

{crypticorn-2.0.1.dist-info → crypticorn-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.0.1
+Version: 2.1.1
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 Project-URL: Homepage, https://crypticorn.com
@@ -15,15 +15,14 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: fastapi
 Requires-Dist: urllib3<3.0.0,>=1.25.3
-Requires-Dist: python_dateutil>=2.8.2
-Requires-Dist: aiohttp>=3.8.4
-Requires-Dist: aiohttp-retry>=2.8.3
-Requires-Dist: pydantic>=2
-Requires-Dist: typing-extensions>=4.7.1
+Requires-Dist: python_dateutil<3.0.0,>=2.8.2
+Requires-Dist: aiohttp<4.0.0,>=3.8.4
+Requires-Dist: aiohttp-retry<3.0.0,>=2.8.3
+Requires-Dist: pydantic<3.0.0,>=2.0.0
+Requires-Dist: typing-extensions<5.0.0,>=4.7.1
 Requires-Dist: pandas<3.0.0,>=2.2.0
 Requires-Dist: requests<3.0.0,>=2.32.0
 Requires-Dist: tqdm<5.0.0,>=4.67.0
-Requires-Dist: pydantic<3.0.0,>=2.0.0
 Provides-Extra: dev
 Requires-Dist: streamlit; extra == "dev"
 Requires-Dist: httpx; extra == "dev"
@@ -32,9 +31,10 @@ Requires-Dist: black; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Requires-Dist: pyflakes; extra == "dev"
 Provides-Extra: test
-Requires-Dist: pytest>=7.2.1; extra == "test"
-Requires-Dist: pytest-cov>=2.8.1; extra == "test"
-Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Requires-Dist: pytest==8.3.5; extra == "test"
+Requires-Dist: pytest-asyncio==0.26.0; extra == "test"
+Requires-Dist: pytest-cov==6.1.1; extra == "test"
+Requires-Dist: python-dotenv==1.0.1; extra == "test"
 
 # What is Crypticorn?
 

{crypticorn-2.0.1.dist-info → crypticorn-2.1.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ crypticorn/__init__.py,sha256=TL41V09dmtbd2ee07wmOuG9KJJpyvLMPJi5DEd9bDyU,129
 crypticorn/client.py,sha256=PHtTaV8hWiR-IXcZhQlwEY38q-PhqQjf-JiqaN2MPWg,1844
 crypticorn/auth/__init__.py,sha256=JAl1tBLK9pYLr_-YKaj581c-c94PWLoqnatTIVAVvMM,81
 crypticorn/auth/main.py,sha256=ljPuO27VDiOO-jnNycBn96X8UbVHPgOUglj46ib3OjM,1336
-crypticorn/auth/client/__init__.py,sha256=PAAEv-J8dFQ9NfwMonLRNVS64t0gozOq45Z_RoWuP98,4694
+crypticorn/auth/client/__init__.py,sha256=ziGgrJ7judjAwOaSKF-7lgs1zhE-XEZkMYKD0WUkHfs,4990
 crypticorn/auth/client/api_client.py,sha256=H2jviD8CKiFnK1ZZXWKbSdBszBYcCQNcga9pwgM03D4,26908
 crypticorn/auth/client/api_response.py,sha256=WhxwYDSMm6wPixp9CegO8dJzjFxDz3JF1yCq9s0ZqKE,639
 crypticorn/auth/client/configuration.py,sha256=GNyY6hld-m9Dr7YPngRP5RQGg7o90SsSsSsq7VhyGVs,17715
@@ -11,17 +11,20 @@ crypticorn/auth/client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 crypticorn/auth/client/rest.py,sha256=RPbNRRbq7GtH9EBsQxaKT6NtSN8pIp1NmO1SKYZ9vVo,6944
 crypticorn/auth/client/api/__init__.py,sha256=c-MlPvmOXSsk_ragrcUe8WkOuCPTTpJ8maSp2sER0EU,339
 crypticorn/auth/client/api/admin_api.py,sha256=Bp52mo4XPDSzVsHolqAykAFpsaioNASY8qDfAUInxgU,21223
-crypticorn/auth/client/api/auth_api.py,sha256=72xZo02SGYbxNjOOdfrb4Dqiiqksiqkv1X1B10P41_s,85123
+crypticorn/auth/client/api/auth_api.py,sha256=3MS0t5n5_dh_OsnxlxAGocxsA_OxOixoy6CeBwyWWEE,124189
 crypticorn/auth/client/api/service_api.py,sha256=xMQKbP9p6fNdJmFa3qMq2RXvE_Brt9HmtprBxEzb0Nk,12423
 crypticorn/auth/client/api/user_api.py,sha256=nJJ_qD2RYDd6yQ9twHjtwhMJ9lEMSSE91IKltpFC3h0,103457
 crypticorn/auth/client/api/wallet_api.py,sha256=AF6PSfv5bAnHpThe0Mtz1LD9qhWcd99lMOo7TJDGIt0,68927
-crypticorn/auth/client/models/__init__.py,sha256=yrOSQbOq_ZQLDgkjJmmuPxn8vz-AeR2NOEYavs9z1e0,3786
+crypticorn/auth/client/models/__init__.py,sha256=T0I3N-rI2A-VQ2BN9o8Nejt2Z5frT4V7fBmbBMceYHM,4082
 crypticorn/auth/client/models/add_wallet200_response.py,sha256=ibNUhAku-i2Bglo6ibyQ3V-JlFFauvswYy4doZUNiN4,2559
 crypticorn/auth/client/models/add_wallet_request.py,sha256=w86tiy1vtlymB7ET0opmENQiEKAGAEjXTC-w4T3LHT4,3204
 crypticorn/auth/client/models/authorize_user200_response.py,sha256=tkhq7TaQK4li03HKXzrH0GzXa-GIkDVJTUKZ-Qp0USE,3381
 crypticorn/auth/client/models/authorize_user200_response_auth.py,sha256=h1PFbqzF96ssj7t7dMMKiNtRjRu44kPNUydevJm8vKo,3228
 crypticorn/auth/client/models/authorize_user_request.py,sha256=VZKmGc91nIhWwoKNTbYZ4oFPYuFNcLxEBvWl-HcM0r8,2981
+crypticorn/auth/client/models/create_api_key200_response.py,sha256=dj6G4vqSTDoUY3jT3_RbUxsLdg_2W-BvfYfwP9O9RJE,2479
+crypticorn/auth/client/models/create_api_key_request.py,sha256=UHRtVGudMK0h-ePJ_whlwqO0W6UVTQqNSeCBjo1A6wQ,4707
 crypticorn/auth/client/models/create_user_request.py,sha256=kqVBJatlPtoYC1-nZnP2Mx2qZP2ATXffod7hTdWtoCY,3501
+crypticorn/auth/client/models/get_api_keys200_response_inner.py,sha256=YH7vEVQBgnrMV4EgD6WdkTJhC3h3l-Z-dNN2DJOSP5c,4845
 crypticorn/auth/client/models/list_wallets200_response.py,sha256=OB8nKlBflpj8dXhjTeTewxjSRok3LnllZZ5ZKISDRvE,4752
 crypticorn/auth/client/models/list_wallets200_response_balances_inner.py,sha256=sLebeWVenEeiHpiCgxQR8iCMlAgjtC6K8CKq6v9g-Ok,4043
 crypticorn/auth/client/models/list_wallets200_response_balances_inner_sale_round.py,sha256=rqXN7WVEhmeJxDKCSK5sxwWXvmn-Gnf810MGWwIUXII,3623
@@ -31,6 +34,8 @@ crypticorn/auth/client/models/list_wallets200_response_data_inner.py,sha256=IxZr
 crypticorn/auth/client/models/list_wallets200_response_user_value.py,sha256=e0LbNMdI77IVRt9glwquB6C790o6OWfvitlfyuIoupQ,3841
 crypticorn/auth/client/models/logout_default_response.py,sha256=ioZ8FrV2DDUdCX2XIkS0X1Y2H0ZjLBCl4_5t_OzrnXE,3395
 crypticorn/auth/client/models/logout_default_response_issues_inner.py,sha256=_aOp_ngnk19-YLM07nSiqClp6-l6Qa5g6u6Habd1BEc,2487
+crypticorn/auth/client/models/oauth_callback200_response.py,sha256=E7NaQVrrlPtkkaFHG-QNJCQWQzFGXfpjotd2sVZ-gE4,3436
+crypticorn/auth/client/models/oauth_callback200_response_user.py,sha256=ABTvVFLHPR8jMOOHJDvy4_fIVLKuL753ImHLifNQzVg,3018
 crypticorn/auth/client/models/refresh_token_info200_response.py,sha256=YZITc7MeCrKIVewQxtwOv9xcr26fFhwhnl6o59Ry024,3082
 crypticorn/auth/client/models/refresh_token_info200_response_user_session.py,sha256=QUz7M-lgSDdvLg2RqFYJkTEJuZtvKlD1CB5BfXo4kFo,3101
 crypticorn/auth/client/models/resend_verification_email_request.py,sha256=Gx5OONaDxeXaXU7Q30NLMIAvX1XkzmdqbuC6EPlxumk,2546
@@ -50,10 +55,10 @@ crypticorn/auth/client/models/verify_wallet_request.py,sha256=b0DAocvhKzPXPjM62D
 crypticorn/auth/client/models/wallet_verified200_response.py,sha256=QILnTLsCKdI-WdV_fsLBy1UH4ZZU-U-wWJ9ot8v08tI,2465
 crypticorn/auth/client/models/whoami200_response.py,sha256=uehdq5epgeOphhrIR3tbrseflxcLAzGyKF-VW-o5cY8,2974
 crypticorn/common/__init__.py,sha256=lY87VMTkIEqto6kcEjC1YWsUvT03QuPmXwxCaeWE854,196
-crypticorn/common/auth.py,sha256=SncaDgteLLyypwiRGd1fEF_yvy2mxPy0YNkLgv30ARQ,1204
-crypticorn/common/auth_client.py,sha256=uqf4IL0UfnxO8TxZHEhaZb9CzI4vUOKpU2wZXBud-30,6122
+crypticorn/common/auth.py,sha256=kO03VKuFRIoWXMDLPmgnVZ49EeTqOMzgJ2yEXt_SmQM,1223
+crypticorn/common/auth_client.py,sha256=7ptCkWZwuMSIFTx3gajOH4CScPFG-Pn5gLe1m_NY5AQ,7622
 crypticorn/common/errors.py,sha256=jGAS7TONKhdaRfft7w-0wrJ3BBTzqS6u03susiqAF0w,12723
-crypticorn/common/scopes.py,sha256=PkInTfPGelXW3jXJlMiOOZsO5uPW-FDjKDediZh9xqQ,1144
+crypticorn/common/scopes.py,sha256=pRD9RauSRSxVGo8k5b2x66h3Wy2aaVEcluZvu6aMTE0,1418
 crypticorn/common/urls.py,sha256=_NMhvhZXOsZpDBbgucqu0yboRFox6JVMlOoQq_Y5SGA,432
 crypticorn/hive/__init__.py,sha256=hRfTlEzEql4msytdUC_04vfaHzVKG5CGZle1M-9QFgY,81
 crypticorn/hive/main.py,sha256=RmCYSR0jwmfYWTK89dt79DuGPjEaip9XQs_LWNWr_tc,1036
@@ -220,7 +225,7 @@ crypticorn/trade/client/models/trading_action_type.py,sha256=jW0OsNz_ZNXlITxAfh9
 crypticorn/trade/client/models/update_notification.py,sha256=B9QUuVRNpk1e5G8o0WFgIg3inm-OX7KJAJcjVnRzYx8,3046
 crypticorn/trade/client/models/validation_error.py,sha256=uTkvsKrOAt-21UC0YPqCdRl_OMsuu7uhPtWuwRSYvv0,3228
 crypticorn/trade/client/models/validation_error_loc_inner.py,sha256=22ql-H829xTBgfxNQZsqd8fS3zQt9tLW1pj0iobo0jY,5131
-crypticorn-2.0.1.dist-info/METADATA,sha256=CCwYU2zydLX-poZzGLMXdQ1QIy6s2Oom8n2GP-O1i4k,3066
-crypticorn-2.0.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-crypticorn-2.0.1.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
-crypticorn-2.0.1.dist-info/RECORD,,
+crypticorn-2.1.1.dist-info/METADATA,sha256=yQ-VVRigGhwWn9thJoC-qZtQMHth2JOF448X_kTAt2o,3120
+crypticorn-2.1.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+crypticorn-2.1.1.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
+crypticorn-2.1.1.dist-info/RECORD,,