crypticorn 2.17.0rc2__tar.gz → 2.17.0rc4__tar.gz

{crypticorn-2.17.0rc2 → crypticorn-2.17.0rc4}/CHANGELOG.md

@@ -1,6 +1,32 @@
 # CHANGELOG
 
 
+## v2.17.0-rc.4 (2025-06-06)
+
+### Features
+
+- Add `last` attribute and helper functions to paginated responses
+  ([`fe29d0c`](https://github.com/crypticorn-ai/api-client/commit/fe29d0cb1da60c0fa2dc86f9f0ec54e8d035293d))
+
+### Refactoring
+
+- Add message to invalid_bearer exception
+  ([`5578140`](https://github.com/crypticorn-ai/api-client/commit/557814099f6c37ce015c0ad8e5989266f332e834))
+
+### Testing
+
+- Update websocket authentication test
+  ([`4f727d5`](https://github.com/crypticorn-ai/api-client/commit/4f727d545ab7275e7f3dc8e45b1ed2f0270e4038))
+
+
+## v2.17.0-rc.3 (2025-06-05)
+
+### Bug Fixes
+
+- Fixes bearer auth in websocket
+  ([`cb2f5f0`](https://github.com/crypticorn-ai/api-client/commit/cb2f5f07be25b8009f734de0d4bfdd4dd8b5c357))
+
+
 ## v2.17.0-rc.2 (2025-06-05)
 
 ### Documentation

{crypticorn-2.17.0rc2/crypticorn.egg-info → crypticorn-2.17.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.17.0rc2
+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.0rc2 → crypticorn-2.17.0rc4}/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,10 +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:
-            return await self.bearer_auth(bearer=bearer, 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,
@@ -270,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-2.17.0rc2 → crypticorn-2.17.0rc4}/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.0rc2 → crypticorn-2.17.0rc4/crypticorn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crypticorn
-Version: 2.17.0rc2
+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.0rc2 → crypticorn-2.17.0rc4}/pyproject.toml

@@ -5,7 +5,7 @@ readme = "README.md"
 license = "MIT"
 requires-python = ">=3.9"
 authors = [{name = "Crypticorn", email = "timon@crypticorn.com"}]
-version = "2.17.0-rc.2"
+version = "2.17.0-rc.4"
 keywords = ["machine learning", "data science", "crypto", "modelling"]
 dynamic = ["dependencies", "optional-dependencies"]
 

{crypticorn-2.17.0rc2 → crypticorn-2.17.0rc4}/tests/test_auth_client.py

@@ -153,7 +153,7 @@ async def test_combined_auth_with_expired_api_key(auth_handler: AuthHandler):
 @pytest.mark.asyncio
 async def test_ws_combined_auth_websocket_exception(auth_handler: AuthHandler):
     """Without credentials"""
-    with pytest.raises(WebSocketException) as e:
+    with pytest.raises(HTTPException) as e:
         return await auth_handler.ws_combined_auth(bearer=None, api_key=None)
-    assert e.value.status_code == 1008
+    assert e.value.status_code == 401
     assert e.value.detail.get("code") == ApiError.NO_CREDENTIALS.identifier