crypticorn 2.17.0rc3__py3-none-any.whl → 2.17.0rc4__py3-none-any.whl

crypticorn/common/auth.py

@@ -112,6 +112,7 @@ class AuthHandler:
             elif message == "jwt expired":
                 error = ApiError.EXPIRED_BEARER
             else:
+                message = "Invalid bearer token"
                 error = (
                     ApiError.INVALID_BEARER
                 )  # jwt malformed, jwt not active (https://www.npmjs.com/package/jsonwebtoken#errors--codes)
@@ -234,10 +235,7 @@ class AuthHandler:
         Use this function if you only want to allow access via the API key.
         This function is used for WebSocket connections.
         """
-        try:
-            return await self.api_key_auth(api_key=api_key, sec=sec)
-        except HTTPException as e:
-            raise WebSocketException.from_http_exception(e)
+        return await self.api_key_auth(api_key=api_key, sec=sec)
 
     async def ws_bearer_auth(
         self,
@@ -249,11 +247,8 @@ class AuthHandler:
         Use this function if you only want to allow access via the bearer token.
         This function is used for WebSocket connections.
         """
-        try:
-            credentials = HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
-            return await self.bearer_auth(bearer=credentials, sec=sec)
-        except HTTPException as e:
-            raise WebSocketException.from_http_exception(e)
+        credentials = HTTPAuthorizationCredentials(scheme="Bearer", credentials=bearer)
+        return await self.bearer_auth(bearer=credentials, sec=sec)
 
     async def ws_combined_auth(
         self,
@@ -271,9 +266,6 @@ class AuthHandler:
             if bearer
             else None
         )
-        try:
-            return await self.combined_auth(
-                bearer=credentials, api_key=api_key, sec=sec
-            )
-        except HTTPException as e:
-            raise WebSocketException.from_http_exception(e)
+        return await self.combined_auth(
+            bearer=credentials, api_key=api_key, sec=sec
+        )

crypticorn/common/pagination.py

@@ -2,6 +2,7 @@
 
 from typing import Annotated, Any, Generic, Type, TypeVar, Optional, Literal
 from pydantic import BaseModel, Field, model_validator
+import math
 
 T = TypeVar("T")
 
@@ -17,6 +18,26 @@ class PaginatedResponse(BaseModel, Generic[T]):
     page_size: int = Field(description="The number of items per page")
     prev: Optional[int] = Field(None, description="The previous page number")
     next: Optional[int] = Field(None, description="The next page number")
+    last: Optional[int] = Field(None, description="The last page number")
+
+    @staticmethod
+    def get_next_page(total: int, page_size: int, page: int) -> Optional[int]:
+        """Get the next page number"""
+        if page < math.ceil(total / page_size):
+            return page + 1
+        return None
+    
+    @staticmethod
+    def get_prev_page(page: int) -> Optional[int]:
+        """Get the previous page number"""
+        if page > 1:
+            return page - 1
+        return None
+    
+    @staticmethod
+    def get_last_page(total: int, page_size: int) -> int:
+        """Get the last page number"""
+        return max(1, math.ceil(total / page_size))
 
 
 class PaginationParams(BaseModel, Generic[T]):

{crypticorn-2.17.0rc3.dist-info → crypticorn-2.17.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.17.0rc3
+Version: 2.17.0rc4
 Summary: Maximise Your Crypto Trading Profits with Machine Learning
 Author-email: Crypticorn <timon@crypticorn.com>
 License-Expression: MIT

{crypticorn-2.17.0rc3.dist-info → crypticorn-2.17.0rc4.dist-info}/RECORD

@@ -67,7 +67,7 @@ crypticorn/cli/templates/merge-env.sh,sha256=BNPrDTihII0yG2gehBkWwWj0GqHmb6xwmrA
 crypticorn/cli/templates/ruff.yml,sha256=gWicFFTzC4nToSmRkIIGipos8CZ447YG0kebBCJhtJE,319
 crypticorn/common/__init__.py,sha256=3nv8Kfuqh15s9oTIqMQtDAqKGGNVC4BVHlHQFDmfg8I,792
 crypticorn/common/ansi_colors.py,sha256=-tMlUTE8NI7TPv7uj0kGRe-SI2hGaUNPKBFI_dfiZy0,1392
-crypticorn/common/auth.py,sha256=0YC6920_iyVq9OrZT0buJXoYzmjp5O4aTWXB-AVVthI,10022
+crypticorn/common/auth.py,sha256=yYfCmSfiO5ataDCFqbbBbMGimxJBDTJdYL6c-pS1X5E,9723
 crypticorn/common/decorators.py,sha256=t5Y3vSJ-gt0n2vOYYjYN0dtzNXvZxrJs2SEItpzG8oo,1127
 crypticorn/common/enums.py,sha256=x-2xe0NUI8kB6DNg9GLjqAjYOsFAGwP-jdM1YgIt9AI,1381
 crypticorn/common/errors.py,sha256=qPCYpmxw0uZNmQw9RYj9vUsg-_R5aRn7fYE8qxTAnyA,30129
@@ -77,7 +77,7 @@ crypticorn/common/metrics.py,sha256=Hhl05p7UzcHWdv2l8UUfPlbCtQG0CDJ1DGEoKOiko7I,
 crypticorn/common/middleware.py,sha256=9J-Da1GNo14Xp7kPYkCPJFs9ozi4s1fHZ8ROuaQndHk,2599
 crypticorn/common/mixins.py,sha256=l7XQrBISaee6fDZXy96k0HnQ18XYocjTUXlNpVxhaOY,2206
 crypticorn/common/openapi.py,sha256=D8bCpCVVzYQptHrJ7SYOgCxI3R_d0cjW9KMOBq-x0xk,279
-crypticorn/common/pagination.py,sha256=L4n6cf5itPB7qt0qzMgMcRuvDOhkTl_NSWFjyxnmyyE,7862
+crypticorn/common/pagination.py,sha256=Qzwq6Qc7N3cgr8GNhPcM85F0FE9e8wIG_VPEQbg2KEg,8539
 crypticorn/common/scopes.py,sha256=ZreqkW_XshlyLJjciAfaIFmcy4HO6RnCsbbkjCw-fxc,2900
 crypticorn/common/urls.py,sha256=v23H2gevTNZ6HMRXDPiuc8znBbNdNqj0JTAdm5Hhms8,1223
 crypticorn/common/utils.py,sha256=5aWZmQEP6yKTeb7JbhfmXljUoNi2iR6F5GgG9aymTnM,3110
@@ -281,9 +281,9 @@ crypticorn/trade/client/models/strategy_update.py,sha256=g427iKdk-gIsQ_BfD3E0W8b
 crypticorn/trade/client/models/tpsl.py,sha256=iuHwBxHaUdtJn7NhcTE6Skzv4nmoSF8jEnf7_bTglwk,3730
 crypticorn/trade/client/models/tpsl_create.py,sha256=nX4i2BGWv5rmu3SLgRngfvEMFOWa3CIy0G3fyoxI-e4,3351
 crypticorn/trade/client/models/trading_action_type.py,sha256=BysUEOl85zs79EA2zOcDN1EExcpQdABaJ4Jz08_z8VU,857
-crypticorn-2.17.0rc3.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
-crypticorn-2.17.0rc3.dist-info/METADATA,sha256=vcTZ2ugWSHmHWo-M6aFm38Ne6SMhCKMsdK1hakRRXgw,11712
-crypticorn-2.17.0rc3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crypticorn-2.17.0rc3.dist-info/entry_points.txt,sha256=d_xHsGvUTebPveVUK0SrpDFQ5ZRSjlI7lNCc11sn2PM,59
-crypticorn-2.17.0rc3.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
-crypticorn-2.17.0rc3.dist-info/RECORD,,
+crypticorn-2.17.0rc4.dist-info/licenses/LICENSE,sha256=HonAVvzFXkP2C1d7D3ByIKPwjGH8NcHTAQvKH7uvOHQ,1856
+crypticorn-2.17.0rc4.dist-info/METADATA,sha256=90j4teSD13rNbajS-sYCjviH9bKgJsr-YQM2EvCI9wA,11712
+crypticorn-2.17.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crypticorn-2.17.0rc4.dist-info/entry_points.txt,sha256=d_xHsGvUTebPveVUK0SrpDFQ5ZRSjlI7lNCc11sn2PM,59
+crypticorn-2.17.0rc4.dist-info/top_level.txt,sha256=EP3NY216qIBYfmvGl0L2Zc9ItP0DjGSkiYqd9xJwGcM,11
+crypticorn-2.17.0rc4.dist-info/RECORD,,