rb-commons 0.5.10__tar.gz → 0.5.12__tar.gz

{rb_commons-0.5.10 → rb_commons-0.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.10
+Version: 0.5.12
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.10 → rb_commons-0.5.12}/rb_commons/http/base_api.py

@@ -60,7 +60,13 @@ class BaseAPI:
 
             response = request_methods[method](url, **kwargs)
 
-            data = response.json()
+            try:
+                if response.text.strip():
+                    data = response.json()
+                else:
+                    data = {}
+            except ValueError as e:
+                raise BadRequestException(f"Invalid JSON response: {response.text}")
 
             if not (200 <= response.status_code < 300):
                 error_message = data.get("message")

{rb_commons-0.5.10 → rb_commons-0.5.12}/rb_commons/schemes/jwt.py

@@ -16,13 +16,15 @@ class Claims(BaseModel):
     user_id: Optional[int] = Field(None, alias="x-user-id")
     user_role: UserRole = Field(UserRole.GUEST, alias="x-user-role")
     shop_id: Optional[uuid.UUID] = Field(None, alias="x-shop-id")
+    jwt_token: Optional[str] = Field(None, alias="x-jwt-token")
 
     @classmethod
     def from_headers(cls, headers: dict) -> 'Claims':
         raw_claims = {
             "x-user-id": headers.get("x-user-id"),
             "x-user-role": headers.get("x-user-role", "admin"),
-            "x-shop-id": headers.get("x-shop-id")
+            "x-shop-id": headers.get("x-shop-id"),
+            "x-jwt-token": headers.get("x-jwt-token")
         }
 
         try:
@@ -44,6 +46,12 @@ class Claims(BaseModel):
                 except ValueError as e:
                     raise ValueError(f"Invalid user_role: {e}")
 
+            if raw_claims["x-jwt-token"]:
+                try:
+                    raw_claims["x-jwt-token"] = str(raw_claims["x-jwt-token"])
+                except ValueError as e:
+                    raise ValueError(f"Invalid jwt token format: {e}")
+
             return cls(**raw_claims)
 
         except Exception as e:

{rb_commons-0.5.10 → rb_commons-0.5.12}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.10
+Version: 0.5.12
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.10 → rb_commons-0.5.12}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.5.10",
+    version="0.5.12",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",