rb-commons 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

rb_commons/schemes/jwt.py

@@ -13,41 +13,38 @@ class UserRole(str, Enum):
 class Claims(BaseModel):
     model_config = ConfigDict(extra="ignore")
 
-    class Claims(BaseModel):
-        model_config = ConfigDict(extra="ignore")
-
-        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")
-
-        @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"),
-                "x-shop-id": headers.get("x-shop-id")
-            }
-
-            try:
-                if raw_claims["x-user-id"]:
-                    try:
-                        raw_claims["x-user-id"] = int(raw_claims["x-user-id"])
-                    except ValueError as e:
-                        raise ValueError(f"Invalid user_id format: {e}")
-
-                if raw_claims["x-shop-id"]:
-                    try:
-                        raw_claims["x-shop-id"] = uuid.UUID(raw_claims["x-shop-id"])
-                    except ValueError as e:
-                        raise ValueError(f"Invalid shop_id format: {e}")
-
-                if raw_claims["x-user-role"]:
-                    try:
-                        UserRole(raw_claims["x-user-role"].lower())
-                    except ValueError as e:
-                        raise ValueError(f"Invalid user_role: {e}")
-
-                return cls(**raw_claims)
-
-            except Exception as e:
-                raise ValueError(f"Failed to parse claims: {str(e)}")
+    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")
+
+    @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"),
+            "x-shop-id": headers.get("x-shop-id")
+        }
+
+        try:
+            if raw_claims["x-user-id"]:
+                try:
+                    raw_claims["x-user-id"] = int(raw_claims["x-user-id"])
+                except ValueError as e:
+                    raise ValueError(f"Invalid user_id format: {e}")
+
+            if raw_claims["x-shop-id"]:
+                try:
+                    raw_claims["x-shop-id"] = uuid.UUID(raw_claims["x-shop-id"])
+                except ValueError as e:
+                    raise ValueError(f"Invalid shop_id format: {e}")
+
+            if raw_claims["x-user-role"]:
+                try:
+                    UserRole(raw_claims["x-user-role"].lower())
+                except ValueError as e:
+                    raise ValueError(f"Invalid user_role: {e}")
+
+            return cls(**raw_claims)
+
+        except Exception as e:
+            raise ValueError(f"Failed to parse claims: {str(e)}")

{rb_commons-0.1.8.dist-info → rb_commons-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rb-commons
-Version: 0.1.8
+Version: 0.1.9
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/Abdulvoris101/rb-commons
 Author: Abdulvoris

{rb_commons-0.1.8.dist-info → rb_commons-0.1.9.dist-info}/RECORD

@@ -5,8 +5,8 @@ rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
 rb_commons/orm/managers.py,sha256=VopUw29sCXrPTriBALR9qwkG5yCu6BDHRgR7cCygNiE,6726
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/schemes/jwt.py,sha256=ZyUtcZuYmBoEpmnurArs0gWoYGhZ3y-0NsirHfxlnAo,1865
-rb_commons-0.1.8.dist-info/METADATA,sha256=VXmiZwkYkGQZ36sBl1yZkcuYA4ismeXsxjuAk5Z_aUo,6276
-rb_commons-0.1.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-rb_commons-0.1.8.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.1.8.dist-info/RECORD,,
+rb_commons/schemes/jwt.py,sha256=4dYL0Bg9kO7kiNgV0J1gBdhh8bYxm75cuqrWCwkV4iE,1666
+rb_commons-0.1.9.dist-info/METADATA,sha256=rMgfARa41IWEQsTE3AuMYtds_-n4DO_nJM0Lz3sMjDk,6276
+rb_commons-0.1.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+rb_commons-0.1.9.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.1.9.dist-info/RECORD,,