crypticorn 2.17.0rc7__py3-none-any.whl → 2.18.0__py3-none-any.whl

crypticorn/auth/client/api/service_api.py

@@ -11,10 +11,14 @@ Generated by OpenAPI Generator (https://openapi-generator.tech)
 Do not edit the class manually.
 """  # noqa: E501
 
+import warnings
 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, StrictStr
+from typing import Optional
+from typing_extensions import Annotated
 from crypticorn.auth.client.models.list_wallets200_response_user_value import (
     ListWallets200ResponseUserValue,
 )

crypticorn/auth/client/api/user_api.py

@@ -11,10 +11,14 @@ Generated by OpenAPI Generator (https://openapi-generator.tech)
 Do not edit the class manually.
 """  # noqa: E501
 
+import warnings
 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, StrictStr
+from typing import Any, Optional
+from typing_extensions import Annotated
 from crypticorn.auth.client.models.create_user_request import CreateUserRequest
 from crypticorn.auth.client.models.resend_verification_email_request import (
     ResendVerificationEmailRequest,

crypticorn/auth/client/api/wallet_api.py

@@ -11,10 +11,14 @@ Generated by OpenAPI Generator (https://openapi-generator.tech)
 Do not edit the class manually.
 """  # noqa: E501
 
+import warnings
 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, StrictFloat, StrictInt, StrictStr
+from typing import Any, Optional, Union
+from typing_extensions import Annotated
 from crypticorn.auth.client.models.add_wallet200_response import AddWallet200Response
 from crypticorn.auth.client.models.add_wallet_request import AddWalletRequest
 from crypticorn.auth.client.models.list_wallets200_response import (

crypticorn/auth/client/api_client.py

@@ -33,6 +33,11 @@ from crypticorn.auth.client import rest
 from crypticorn.auth.client.exceptions import (
     ApiValueError,
     ApiException,
+    BadRequestException,
+    UnauthorizedException,
+    ForbiddenException,
+    NotFoundException,
+    ServiceException,
 )
 
 RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]

crypticorn/auth/client/configuration.py

@@ -195,7 +195,7 @@ class Configuration:
         debug: Optional[bool] = None,
     ) -> None:
         """Constructor"""
-        self._base_path = "https://api.crypticorn.dev/v1/auth" if host is None else host
+        self._base_path = "http://localhost/v1/auth" if host is None else host
         """Default Base url
         """
         self.server_index = 0 if server_index is None and host is None else server_index
@@ -528,7 +528,7 @@ class Configuration:
         """
         return [
             {
-                "url": "https://api.crypticorn.dev/v1/auth",
+                "url": "http://localhost/v1/auth",
                 "description": "No description provided",
             }
         ]

crypticorn/auth/client/models/add_wallet_request.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/authorize_user_request.py

@@ -20,7 +20,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictBool
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/create_api_key_request.py

@@ -21,7 +21,7 @@ from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 
@@ -50,7 +50,7 @@ class CreateApiKeyRequest(BaseModel):
             if i not in set(
                 [
                     "read:predictions",
-                    "read:dexsignals",
+                    "read:dex:signals",
                     "read:hive:model",
                     "read:hive:data",
                     "write:hive:model",
@@ -85,7 +85,7 @@ class CreateApiKeyRequest(BaseModel):
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:predictions', 'read:dexsignals', 'read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:metrics:marketcap', 'read:metrics:indicators', 'read:metrics:exchanges', 'read:metrics:tokens', 'read:metrics:markets', 'read:sentiment', 'read:klines', 'read:admin', 'write:admin')"
+                    "each list item must be one of ('read:predictions', 'read:dex:signals', 'read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:metrics:marketcap', 'read:metrics:indicators', 'read:metrics:exchanges', 'read:metrics:tokens', 'read:metrics:markets', 'read:sentiment', 'read:klines', 'read:admin', 'write:admin')"
                 )
         return value
 

crypticorn/auth/client/models/create_user_request.py

@@ -20,7 +20,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/get_api_keys200_response_inner.py

@@ -20,7 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 
@@ -58,7 +58,7 @@ class GetApiKeys200ResponseInner(BaseModel):
             if i not in set(
                 [
                     "read:predictions",
-                    "read:dexsignals",
+                    "read:dex:signals",
                     "read:hive:model",
                     "read:hive:data",
                     "write:hive:model",
@@ -93,7 +93,7 @@ class GetApiKeys200ResponseInner(BaseModel):
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:predictions', 'read:dexsignals', 'read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:metrics:marketcap', 'read:metrics:indicators', 'read:metrics:exchanges', 'read:metrics:tokens', 'read:metrics:markets', 'read:sentiment', 'read:klines', 'read:admin', 'write:admin')"
+                    "each list item must be one of ('read:predictions', 'read:dex:signals', 'read:hive:model', 'read:hive:data', 'write:hive:model', 'read:trade:bots', 'write:trade:bots', 'read:trade:exchangekeys', 'write:trade:exchangekeys', 'read:trade:orders', 'read:trade:actions', 'write:trade:actions', 'read:trade:exchanges', 'read:trade:futures', 'write:trade:futures', 'read:trade:notifications', 'write:trade:notifications', 'read:trade:strategies', 'write:trade:strategies', 'read:pay:payments', 'read:pay:products', 'write:pay:products', 'read:pay:now', 'write:pay:now', 'read:metrics:marketcap', 'read:metrics:indicators', 'read:metrics:exchanges', 'read:metrics:tokens', 'read:metrics:markets', 'read:sentiment', 'read:klines', 'read:admin', 'write:admin')"
                 )
         return value
 

crypticorn/auth/client/models/list_wallets200_response_balances_inner_sale_round.py

@@ -20,7 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/list_wallets200_response_balances_inner_wallet.py

@@ -22,7 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Union
 from crypticorn.auth.client.models.list_wallets200_response_balances_inner_wallet_vesting_wallets_inner import (
     ListWallets200ResponseBalancesInnerWalletVestingWalletsInner,
 )
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/list_wallets200_response_balances_inner_wallet_vesting_wallets_inner.py

@@ -27,7 +27,7 @@ from pydantic import (
     StrictStr,
 )
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/list_wallets200_response_data_inner.py

@@ -20,7 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/logout_default_response.py

@@ -22,7 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from crypticorn.auth.client.models.logout_default_response_issues_inner import (
     LogoutDefaultResponseIssuesInner,
 )
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/oauth_callback200_response_user.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/refresh_token_info200_response_user_session.py

@@ -20,7 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/rotate_tokens200_response.py

@@ -22,7 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Union
 from crypticorn.auth.client.models.verify_email200_response_auth_auth import (
     VerifyEmail200ResponseAuthAuth,
 )
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/token_info200_response.py

@@ -22,7 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from crypticorn.auth.client.models.verify_email200_response_auth_auth import (
     VerifyEmail200ResponseAuthAuth,
 )
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/update_user_request.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/user_by_username200_response.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/verify200_response.py

@@ -27,7 +27,7 @@ from pydantic import (
     StrictStr,
 )
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/verify_email200_response_auth.py

@@ -22,7 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from crypticorn.auth.client.models.verify_email200_response_auth_auth import (
     VerifyEmail200ResponseAuthAuth,
 )
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/verify_email200_response_auth_auth.py

@@ -27,7 +27,7 @@ from pydantic import (
     StrictStr,
 )
 from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/auth/client/models/whoami200_response.py

@@ -19,7 +19,7 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
-from typing import Set
+from typing import Optional, Set
 from typing_extensions import Self
 
 

crypticorn/common/__init__.py

@@ -1,18 +1,18 @@
-from crypticorn.common.errors import *
-from crypticorn.common.scopes import *
-from crypticorn.common.urls import *
-from crypticorn.common.decorators import *
-from crypticorn.common.mixins import *
+from crypticorn.common.ansi_colors import *
 from crypticorn.common.auth import *
+from crypticorn.common.decorators import *
 from crypticorn.common.enums import *
-from crypticorn.common.utils import *
+from crypticorn.common.errors import *
 from crypticorn.common.exceptions import *
-from crypticorn.common.pagination import *
 from crypticorn.common.logging import *
-from crypticorn.common.ansi_colors import *
+from crypticorn.common.metrics import *
 from crypticorn.common.middleware import *
-from crypticorn.common.warnings import *
+from crypticorn.common.mixins import *
 from crypticorn.common.openapi import *
-from crypticorn.common.metrics import *
-from crypticorn.common.router.status_router import router as status_router
+from crypticorn.common.pagination import *
 from crypticorn.common.router.admin_router import router as admin_router
+from crypticorn.common.router.status_router import router as status_router
+from crypticorn.common.scopes import *
+from crypticorn.common.urls import *
+from crypticorn.common.utils import *
+from crypticorn.common.warnings import *

crypticorn/common/auth.py

@@ -1,25 +1,30 @@
 import json
+from typing import Union
 
-from crypticorn.auth import Verify200Response, AuthClient, Configuration
+from crypticorn.auth import AuthClient, Configuration, Verify200Response
 from crypticorn.auth.client.exceptions import ApiException
-from crypticorn.common.scopes import Scope
 from crypticorn.common.exceptions import (
     ApiError,
-    HTTPException,
     ExceptionContent,
+    HTTPException,
 )
-from crypticorn.common.urls import BaseUrl, Service, ApiVersion
+from crypticorn.common.scopes import Scope
+from crypticorn.common.urls import ApiVersion, BaseUrl, Service
 from fastapi import Depends, Query
 from fastapi.security import (
-    HTTPAuthorizationCredentials,
-    SecurityScopes,
-    HTTPBearer,
     APIKeyHeader,
+    HTTPAuthorizationCredentials,
     HTTPBasic,
+    HTTPBasicCredentials,
+    HTTPBearer,
+    SecurityScopes,
 )
 from typing_extensions import Annotated
-from typing import Union
-from fastapi.security import HTTPBasicCredentials
+
+AUTHENTICATE_HEADER = "WWW-Authenticate"
+BEARER_AUTH_SCHEME = "Bearer"
+APIKEY_AUTH_SCHEME = "X-API-Key"
+BASIC_AUTH_SCHEME = "Basic"
 
 # Auth Schemes
 http_bearer = HTTPBearer(
@@ -29,15 +34,15 @@ http_bearer = HTTPBearer(
 )
 
 apikey_header = APIKeyHeader(
-    name="X-API-Key",
+    name=APIKEY_AUTH_SCHEME,
     auto_error=False,
     description="The API key to use for authentication.",
 )
 
-basic_auth = HTTPBasic(
-    scheme_name="Basic",
+http_basic = HTTPBasic(
+    scheme_name=BASIC_AUTH_SCHEME,
     auto_error=False,
-    description="The username and password to use for authentication. Only used in /admin/metrics",
+    description="The username and password to use for authentication.",
 )
 
 
@@ -55,7 +60,7 @@ class AuthHandler:
         base_url: BaseUrl = BaseUrl.PROD,
     ):
         self.url = f"{base_url}/{ApiVersion.V1}/{Service.AUTH}"
-        self.client = AuthClient(Configuration(host=self.url))
+        self.client = AuthClient(Configuration(host=self.url), is_sync=False)
 
     async def _verify_api_key(self, api_key: str) -> Verify200Response:
         """
@@ -73,6 +78,12 @@ class AuthHandler:
         self.client.config.access_token = bearer.credentials
         return await self.client.login.verify()
 
+    async def _verify_basic(self, basic: HTTPBasicCredentials) -> Verify200Response:
+        """
+        Verifies the basic authentication credentials.
+        """
+        return await self.client.login.verify_basic_auth(basic.username, basic.password)
+
     async def _validate_scopes(
         self, api_scopes: list[Scope], user_scopes: list[Scope]
     ) -> bool:
@@ -118,6 +129,8 @@ class AuthHandler:
                 error = ApiError.EXPIRED_API_KEY
             elif message == "jwt expired":
                 error = ApiError.EXPIRED_BEARER
+            elif message == "Invalid basic authentication credentials":
+                error = ApiError.INVALID_BASIC_AUTH
             else:
                 message = "Invalid bearer token"
                 error = (
@@ -150,17 +163,17 @@ class AuthHandler:
         This function is used for HTTP connections.
         """
         try:
-            return await self.combined_auth(bearer=None, api_key=api_key, sec=sec)
+            return await self.full_auth(
+                bearer=None, api_key=api_key, basic=None, sec=sec
+            )
         except HTTPException as e:
-            if e.detail.get("code") == ApiError.NO_CREDENTIALS.identifier:
-                raise HTTPException(
-                    content=ExceptionContent(
-                        error=ApiError.NO_API_KEY,
-                        message="No credentials provided. API key is required",
-                    ),
-                    headers={"WWW-Authenticate": "X-API-Key"},
-                )
-            raise e
+            raise HTTPException(
+                content=ExceptionContent(
+                    error=ApiError.from_json(e.detail),
+                    message=e.detail.get("message"),
+                ),
+                headers={AUTHENTICATE_HEADER: APIKEY_AUTH_SCHEME},
+            )
 
     async def bearer_auth(
         self,
@@ -176,17 +189,37 @@ class AuthHandler:
         This function is used for HTTP connections.
         """
         try:
-            return await self.combined_auth(bearer=bearer, api_key=None, sec=sec)
+            return await self.full_auth(
+                bearer=bearer, api_key=None, basic=None, sec=sec
+            )
+        except HTTPException as e:
+            raise HTTPException(
+                content=ExceptionContent(
+                    error=ApiError.from_json(e.detail),
+                    message=e.detail.get("message"),
+                ),
+                headers={AUTHENTICATE_HEADER: BEARER_AUTH_SCHEME},
+            )
+
+    async def basic_auth(
+        self,
+        credentials: Annotated[Union[HTTPBasicCredentials, None], Depends(http_basic)],
+    ) -> Verify200Response:
+        """
+        Verifies the basic authentication credentials. This authentication method should just be used for special cases like /admin/metrics, where JWT and API key authentication are not desired or not possible.
+        """
+        try:
+            return await self.full_auth(
+                basic=credentials, bearer=None, api_key=None, sec=None
+            )
         except HTTPException as e:
-            if e.detail.get("code") == ApiError.NO_CREDENTIALS.identifier:
-                raise HTTPException(
-                    content=ExceptionContent(
-                        error=ApiError.NO_BEARER,
-                        message="No credentials provided. Bearer token is required",
-                    ),
-                    headers={"WWW-Authenticate": "Bearer"},
-                )
-            raise e
+            raise HTTPException(
+                content=ExceptionContent(
+                    error=ApiError.from_json(e.detail),
+                    message=e.detail.get("message"),
+                ),
+                headers={AUTHENTICATE_HEADER: BASIC_AUTH_SCHEME},
+            )
 
     async def combined_auth(
         self,
@@ -202,8 +235,38 @@ class AuthHandler:
         Use this function if you want to allow access via either the bearer token or the API key.
         This function is used for HTTP connections.
         """
-        tokens = [bearer, api_key]
+        try:
+            return await self.full_auth(
+                basic=None, bearer=bearer, api_key=api_key, sec=sec
+            )
+        except HTTPException as e:
+            raise HTTPException(
+                content=ExceptionContent(
+                    error=ApiError.from_json(e.detail),
+                    message=e.detail.get("message"),
+                ),
+                headers={
+                    AUTHENTICATE_HEADER: f"{BEARER_AUTH_SCHEME}, {APIKEY_AUTH_SCHEME}"
+                },
+            )
 
+    async def full_auth(
+        self,
+        basic: Annotated[Union[HTTPBasicCredentials, None], Depends(http_basic)] = None,
+        bearer: Annotated[
+            Union[HTTPAuthorizationCredentials, None], Depends(http_bearer)
+        ] = None,
+        api_key: Annotated[Union[str, None], Depends(apikey_header)] = None,
+        sec: SecurityScopes = SecurityScopes(),
+    ) -> Verify200Response:
+        """
+        IMPORTANT: combined_auth is sufficient for most use cases. This function adds basic auth to the mix, which is needed for external services like prometheus, but is not recommended for internal use.
+        Verifies the bearer token, API key and basic authentication credentials and checks the 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, the API key or the basic authentication credentials.
+        This function is used for HTTP connections.
+        """
+        tokens = [bearer, api_key, basic]
         last_error = None
         for token in tokens:
             try:
@@ -214,6 +277,8 @@ class AuthHandler:
                     res = await self._verify_api_key(token)
                 elif isinstance(token, HTTPAuthorizationCredentials):
                     res = await self._verify_bearer(token)
+                elif isinstance(token, HTTPBasicCredentials):
+                    res = await self._verify_basic(token)
                 if res is None:
                     continue
                 if sec:
@@ -230,9 +295,11 @@ class AuthHandler:
             raise HTTPException(
                 content=ExceptionContent(
                     error=ApiError.NO_CREDENTIALS,
-                    message="No credentials provided. Either API key or bearer token is required.",
+                    message="No credentials provided. Check the WWW-Authenticate header for the available authentication methods.",
                 ),
-                headers={"WWW-Authenticate": "Bearer, X-API-Key"},
+                headers={
+                    AUTHENTICATE_HEADER: f"{BEARER_AUTH_SCHEME}, {APIKEY_AUTH_SCHEME}, {BASIC_AUTH_SCHEME}"
+                },
             )
 
     async def ws_api_key_auth(
@@ -257,7 +324,11 @@ class AuthHandler:
         Use this function if you only want to allow access via the bearer token.
         This function is used for WebSocket connections.
         """
-        credentials = HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
+        credentials = (
+            HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
+            if bearer
+            else None
+        )
         return await self.bearer_auth(bearer=credentials, sec=sec)
 
     async def ws_combined_auth(
@@ -277,22 +348,3 @@ class AuthHandler:
             else None
         )
         return await self.combined_auth(bearer=credentials, api_key=api_key, sec=sec)
-    
-    async def basic_auth(
-        self,
-        credentials: Annotated[HTTPBasicCredentials, Depends(basic_auth)],
-    ):
-        """
-        Verifies the basic authentication credentials. This authentication method should just be used for special cases like /admin/metrics, where JWT and API key authentication are not desired or not possible.
-        """
-        try:
-            await self.client.login.verify_basic_auth(credentials.username, credentials.password)
-        except ApiException as e:
-            raise HTTPException(
-                content=ExceptionContent(
-                    error=ApiError.INVALID_BASIC_AUTH,
-                    message="Invalid basic authentication credentials",
-                ),
-                headers={"WWW-Authenticate": "Basic"},
-            )
-        return credentials.username

crypticorn/common/decorators.py

@@ -1,5 +1,5 @@
-from typing import Optional, Type, Any, Tuple
 from copy import deepcopy
+from typing import Any, Optional, Tuple, Type
 
 from pydantic import BaseModel, create_model
 from pydantic.fields import FieldInfo

crypticorn/common/enums.py

@@ -6,6 +6,7 @@ except ImportError:
     from strenum import StrEnum
 
 import warnings
+
 from crypticorn.common.mixins import ValidateEnumMixin
 from crypticorn.common.warnings import CrypticornDeprecatedSince215