crypticorn 2.5.3__tar.gz → 2.6.0__tar.gz

{crypticorn-2.5.3 → crypticorn-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.5.3
+Version: 2.6.0
 Summary: Maximise Your Crypto Trading Profits with AI Predictions
 Author-email: Crypticorn <timon@crypticorn.com>
 Project-URL: Homepage, https://crypticorn.com

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/__init__.py

@@ -77,6 +77,12 @@ from crypticorn.auth.client.models.logout_default_response import LogoutDefaultR
 from crypticorn.auth.client.models.logout_default_response_issues_inner import (
     LogoutDefaultResponseIssuesInner,
 )
+from crypticorn.auth.client.models.oauth_callback200_response import (
+    OauthCallback200Response,
+)
+from crypticorn.auth.client.models.oauth_callback200_response_user import (
+    OauthCallback200ResponseUser,
+)
 from crypticorn.auth.client.models.refresh_token_info200_response import (
     RefreshTokenInfo200Response,
 )
@@ -95,6 +101,9 @@ from crypticorn.auth.client.models.rotate_tokens200_response import (
 from crypticorn.auth.client.models.token_info200_response import TokenInfo200Response
 from crypticorn.auth.client.models.unlink_wallet_request import UnlinkWalletRequest
 from crypticorn.auth.client.models.update_user_request import UpdateUserRequest
+from crypticorn.auth.client.models.user_by_username200_response import (
+    UserByUsername200Response,
+)
 from crypticorn.auth.client.models.user_reset_password_request import (
     UserResetPasswordRequest,
 )

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/api/auth_api.py

@@ -30,6 +30,9 @@ from crypticorn.auth.client.models.create_api_key_request import CreateApiKeyReq
 from crypticorn.auth.client.models.get_api_keys200_response_inner import (
     GetApiKeys200ResponseInner,
 )
+from crypticorn.auth.client.models.oauth_callback200_response import (
+    OauthCallback200Response,
+)
 from crypticorn.auth.client.models.refresh_token_info200_response import (
     RefreshTokenInfo200Response,
 )
@@ -1294,7 +1297,7 @@ class AuthApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> AuthorizeUser200Response:
+    ) -> OauthCallback200Response:
         """OAuth Callback
 
         Handles the OAuth callback from Google.
@@ -1344,7 +1347,7 @@ class AuthApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "AuthorizeUser200Response",
+            "200": "OauthCallback200Response",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -1374,7 +1377,7 @@ class AuthApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[AuthorizeUser200Response]:
+    ) -> ApiResponse[OauthCallback200Response]:
         """OAuth Callback
 
         Handles the OAuth callback from Google.
@@ -1424,7 +1427,7 @@ class AuthApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "AuthorizeUser200Response",
+            "200": "OauthCallback200Response",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout
@@ -1504,7 +1507,7 @@ class AuthApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            "200": "AuthorizeUser200Response",
+            "200": "OauthCallback200Response",
         }
         response_data = await self.api_client.call_api(
             *_param, _request_timeout=_request_timeout

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/api/user_api.py

@@ -24,6 +24,9 @@ from crypticorn.auth.client.models.resend_verification_email_request import (
     ResendVerificationEmailRequest,
 )
 from crypticorn.auth.client.models.update_user_request import UpdateUserRequest
+from crypticorn.auth.client.models.user_by_username200_response import (
+    UserByUsername200Response,
+)
 from crypticorn.auth.client.models.user_reset_password_request import (
     UserResetPasswordRequest,
 )
@@ -1532,6 +1535,250 @@ class UserApi:
             _request_auth=_request_auth,
         )
 
+    @validate_call
+    async def user_by_username(
+        self,
+        username: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> UserByUsername200Response:
+        """User By Username
+
+        Returns the user by username.
+
+        :param username: (required)
+        :type username: 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
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._user_by_username_serialize(
+            username=username,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "UserByUsername200Response",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+    @validate_call
+    async def user_by_username_with_http_info(
+        self,
+        username: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[UserByUsername200Response]:
+        """User By Username
+
+        Returns the user by username.
+
+        :param username: (required)
+        :type username: 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
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._user_by_username_serialize(
+            username=username,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "UserByUsername200Response",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+    @validate_call
+    async def user_by_username_without_preload_content(
+        self,
+        username: StrictStr,
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]
+            ],
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """User By Username
+
+        Returns the user by username.
+
+        :param username: (required)
+        :type username: 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
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """  # noqa: E501
+
+        _param = self._user_by_username_serialize(
+            username=username,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index,
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            "200": "UserByUsername200Response",
+        }
+        response_data = await self.api_client.call_api(
+            *_param, _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+    def _user_by_username_serialize(
+        self,
+        username,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {}
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        # process the query parameters
+        if username is not None:
+
+            _query_params.append(("username", username))
+
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+        # set the HTTP header `Accept`
+        if "Accept" not in _header_params:
+            _header_params["Accept"] = self.api_client.select_header_accept(
+                ["application/json"]
+            )
+
+        # authentication setting
+        _auth_settings: List[str] = []
+
+        return self.api_client.param_serialize(
+            method="GET",
+            resource_path="/user-by-username",
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth,
+        )
+
     @validate_call
     async def user_reset_password(
         self,

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/__init__.py

@@ -56,6 +56,12 @@ from crypticorn.auth.client.models.logout_default_response import LogoutDefaultR
 from crypticorn.auth.client.models.logout_default_response_issues_inner import (
     LogoutDefaultResponseIssuesInner,
 )
+from crypticorn.auth.client.models.oauth_callback200_response import (
+    OauthCallback200Response,
+)
+from crypticorn.auth.client.models.oauth_callback200_response_user import (
+    OauthCallback200ResponseUser,
+)
 from crypticorn.auth.client.models.refresh_token_info200_response import (
     RefreshTokenInfo200Response,
 )
@@ -74,6 +80,9 @@ from crypticorn.auth.client.models.rotate_tokens200_response import (
 from crypticorn.auth.client.models.token_info200_response import TokenInfo200Response
 from crypticorn.auth.client.models.unlink_wallet_request import UnlinkWalletRequest
 from crypticorn.auth.client.models.update_user_request import UpdateUserRequest
+from crypticorn.auth.client.models.user_by_username200_response import (
+    UserByUsername200Response,
+)
 from crypticorn.auth.client.models.user_reset_password_request import (
     UserResetPasswordRequest,
 )

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/create_api_key_request.py

@@ -77,10 +77,11 @@ class CreateApiKeyRequest(BaseModel):
                     "read:metrics:exchanges",
                     "read:metrics:tokens",
                     "read:metrics:markets",
+                    "read:sentiment",
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:predictions', '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')"
+                    "each list item must be one of ('read:predictions', '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')"
                 )
         return value
 

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/get_api_keys200_response_inner.py

@@ -85,10 +85,11 @@ class GetApiKeys200ResponseInner(BaseModel):
                     "read:metrics:exchanges",
                     "read:metrics:tokens",
                     "read:metrics:markets",
+                    "read:sentiment",
                 ]
             ):
                 raise ValueError(
-                    "each list item must be one of ('read:predictions', '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')"
+                    "each list item must be one of ('read:predictions', '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')"
                 )
         return value
 

crypticorn-2.6.0/crypticorn/auth/client/models/user_by_username200_response.py

@@ -0,0 +1,91 @@
+# coding: utf-8
+
+"""
+Crypticorn Auth API
+
+OpenAPI compliant REST API built using tRPC with Express
+
+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, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+
+class UserByUsername200Response(BaseModel):
+    """
+    UserByUsername200Response
+    """  # noqa: E501
+
+    user_id: StrictStr = Field(alias="userId")
+    username: Optional[StrictStr] = None
+    name: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["userId", "username", "name"]
+
+    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 UserByUsername200Response 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 UserByUsername200Response from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate(
+            {
+                "userId": obj.get("userId"),
+                "username": obj.get("username"),
+                "name": obj.get("name"),
+            }
+        )
+        return _obj

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/verify200_response.py

@@ -17,7 +17,15 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    StrictBool,
+    StrictFloat,
+    StrictInt,
+    StrictStr,
+)
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -41,6 +49,9 @@ class Verify200Response(BaseModel):
         default=None, description="Issued at time"
     )
     jti: Optional[StrictStr] = Field(default=None, description="JWT ID")
+    admin: Optional[StrictBool] = Field(
+        default=None, description="Whether the user is an admin"
+    )
     scopes: Optional[List[StrictStr]] = Field(default=None, description="Scopes")
     __properties: ClassVar[List[str]] = [
         "iss",
@@ -50,6 +61,7 @@ class Verify200Response(BaseModel):
         "nbf",
         "iat",
         "jti",
+        "admin",
         "scopes",
     ]
 
@@ -110,6 +122,7 @@ class Verify200Response(BaseModel):
                 "nbf": obj.get("nbf"),
                 "iat": obj.get("iat"),
                 "jti": obj.get("jti"),
+                "admin": obj.get("admin"),
                 "scopes": obj.get("scopes"),
             }
         )

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/verify_email200_response_auth_auth.py

@@ -17,7 +17,15 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    StrictBool,
+    StrictFloat,
+    StrictInt,
+    StrictStr,
+)
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -41,6 +49,9 @@ class VerifyEmail200ResponseAuthAuth(BaseModel):
         default=None, description="Issued at time"
     )
     jti: Optional[StrictStr] = Field(default=None, description="JWT ID")
+    admin: Optional[StrictBool] = Field(
+        default=None, description="Whether the user is an admin"
+    )
     scopes: Optional[List[StrictStr]] = Field(default=None, description="Scopes")
     __properties: ClassVar[List[str]] = [
         "iss",
@@ -50,6 +61,7 @@ class VerifyEmail200ResponseAuthAuth(BaseModel):
         "nbf",
         "iat",
         "jti",
+        "admin",
         "scopes",
     ]
 
@@ -110,6 +122,7 @@ class VerifyEmail200ResponseAuthAuth(BaseModel):
                 "nbf": obj.get("nbf"),
                 "iat": obj.get("iat"),
                 "jti": obj.get("jti"),
+                "admin": obj.get("admin"),
                 "scopes": obj.get("scopes"),
             }
         )

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/auth/client/models/whoami200_response.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
@@ -34,6 +34,7 @@ class Whoami200Response(BaseModel):
     picture: Optional[StrictStr] = None
     username: Optional[StrictStr] = None
     phone: Optional[StrictStr] = None
+    is_admin: Optional[StrictBool] = Field(default=False, alias="isAdmin")
     __properties: ClassVar[List[str]] = [
         "email",
         "id",
@@ -41,6 +42,7 @@ class Whoami200Response(BaseModel):
         "picture",
         "username",
         "phone",
+        "isAdmin",
     ]
 
     model_config = ConfigDict(
@@ -99,6 +101,9 @@ class Whoami200Response(BaseModel):
                 "picture": obj.get("picture"),
                 "username": obj.get("username"),
                 "phone": obj.get("phone"),
+                "isAdmin": (
+                    obj.get("isAdmin") if obj.get("isAdmin") is not None else False
+                ),
             }
         )
         return _obj

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/common/__init__.py

@@ -7,4 +7,5 @@ from crypticorn.common.auth import *
 from crypticorn.common.enums import *
 from crypticorn.common.utils import *
 from crypticorn.common.exceptions import *
+from crypticorn.common.pagination import *
 from crypticorn.common.status_router import router as status_router

{crypticorn-2.5.3 → crypticorn-2.6.0}/crypticorn/common/auth.py

@@ -3,9 +3,14 @@ import json
 from crypticorn.auth import Verify200Response, AuthClient, Configuration
 from crypticorn.auth.client.exceptions import ApiException
 from crypticorn.common.scopes import Scope
-from crypticorn.common.exceptions import ApiError, HTTPException, ExceptionContent
+from crypticorn.common.exceptions import (
+    ApiError,
+    HTTPException,
+    ExceptionContent,
+    WebSocketException,
+)
 from crypticorn.common.urls import BaseUrl, Service, ApiVersion
-from fastapi import Depends, Query, status, WebSocketException
+from fastapi import Depends, Query
 from fastapi.security import (
     HTTPAuthorizationCredentials,
     SecurityScopes,
@@ -48,6 +53,7 @@ class AuthHandler:
         """
         Verifies the API key.
         """
+        # self.client.config.api_key = {apikey_header.scheme_name: api_key}
         return await self.client.login.verify_api_key(api_key)
 
     async def _verify_bearer(
@@ -229,11 +235,9 @@ class AuthHandler:
             if bearer
             else None
         )
-        response = await self.combined_auth(
-            bearer=credentials, api_key=api_key, sec=sec
-        )
-        if isinstance(response, HTTPException):
-            raise WebSocketException(
-                code=status.WS_1008_POLICY_VIOLATION, reason=response.detail
+        try:
+            return await self.combined_auth(
+                bearer=credentials, api_key=api_key, sec=sec
             )
-        return response
+        except HTTPException as e:
+            raise WebSocketException.from_http_exception(e)