rb-commons 0.5.18__py3-none-any.whl → 0.5.20__py3-none-any.whl

rb_commons/orm/managers.py

@@ -12,6 +12,16 @@ from rb_commons.orm.exceptions import DatabaseException, InternalException
 
 ModelType = TypeVar('ModelType', bound=declarative_base())
 
+class QJSON:
+    def __init__(self, field: str, key: str, operator: str, value: Any):
+        self.field = field
+        self.key = key
+        self.operator = operator
+        self.value = value
+
+    def __repr__(self):
+        return f"QJSON(field={self.field}, key={self.key}, op={self.operator}, value={self.value})"
+
 class Q:
     """Boolean logic container that can be combined with `&`, `|`, and `~`."""
 
@@ -124,7 +134,10 @@ class BaseManager(Generic[ModelType]):
             return current.is_(None) if value else current.isnot(None)
         raise ValueError(f"Unsupported operator in lookup: {lookup}")
 
-    def _q_to_expr(self, q: Q):
+    def _q_to_expr(self, q: Union[Q, QJSON]):
+        if isinstance(q, QJSON):
+            return self._parse_qjson(q)
+
         clauses: List[Any] = [self._parse_lookup(k, v) for k, v in q.lookups.items()]
         for child in q.children:
             clauses.append(self._q_to_expr(child))
@@ -135,6 +148,29 @@ class BaseManager(Generic[ModelType]):
         )
         return ~combined if q.negated else combined
 
+    def _parse_qjson(self, qjson: QJSON):
+        col = getattr(self.model, qjson.field, None)
+        if col is None:
+            raise ValueError(f"Invalid JSON field: {qjson.field}")
+
+        json_expr = col[qjson.key].astext
+
+        if qjson.operator == "eq":
+            return json_expr == str(qjson.value)
+        if qjson.operator == "ne":
+            return json_expr != str(qjson.value)
+        if qjson.operator == "contains":
+            return json_expr.ilike(f"%{qjson.value}%")
+        if qjson.operator == "startswith":
+            return json_expr.ilike(f"{qjson.value}%")
+        if qjson.operator == "endswith":
+            return json_expr.ilike(f"%{qjson.value}")
+        if qjson.operator == "in":
+            if not isinstance(qjson.value, (list, tuple, set)):
+                raise ValueError(f"{qjson.field}[{qjson.key}]__in requires an iterable")
+            return json_expr.in_(qjson.value)
+        raise ValueError(f"Unsupported QJSON operator: {qjson.operator}")
+
     def _loader_from_path(self, path: str) -> Load:
         """
         Turn 'attributes.attribute.attribute_group' into
@@ -173,25 +209,31 @@ class BaseManager(Generic[ModelType]):
         return self
 
     def filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
-        """Add **AND** constraints (default behaviour).
+        """Add **AND** constraints (default behaviour)."""
 
-        * `expressions` can be raw SQLAlchemy clauses **or** `Q` objects.
-        * `lookups` are Django‑style keyword filters.
-        """
         self._filtered = True
         for expr in expressions:
-            self.filters.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                self.filters.append(self._q_to_expr(expr))
+            else:
+                self.filters.append(expr)
         for k, v in lookups.items():
             self.filters.append(self._parse_lookup(k, v))
         return self
 
     def or_filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
         """Add one OR group (shortcut for `filter(Q() | Q())`)."""
+
         or_clauses: List[Any] = []
         for expr in expressions:
-            or_clauses.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                or_clauses.append(self._q_to_expr(expr))
+            else:
+                or_clauses.append(expr)
+
         for k, v in lookups.items():
             or_clauses.append(self._parse_lookup(k, v))
+
         if or_clauses:
             self._filtered = True
             self.filters.append(or_(*or_clauses))

rb_commons/schemes/jwt.py

@@ -36,7 +36,7 @@ class Claims(BaseModel):
                 except ValueError as e:
                     raise ValueError(f"Invalid user_id format: {e}")
 
-            if raw_claims["x-customer-id"]:
+            if raw_claims["x-customer-id"] and raw_claims["x-customer-id"] is not None:
                 try:
                     raw_claims["x-customer-id"] = int(raw_claims["x-customer-id"])
                 except ValueError as e:

{rb_commons-0.5.18.dist-info → rb_commons-0.5.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.18
+Version: 0.5.20
 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.18.dist-info → rb_commons-0.5.20.dist-info}/RECORD

@@ -13,16 +13,16 @@ rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,186
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
-rb_commons/orm/managers.py,sha256=VMu3v-JzSVZ9pN2d4ZcAF6qZyqmBeXZ62kiHUY73v20,17163
+rb_commons/orm/managers.py,sha256=czc2czBswfVjm51vYvMEupDGxniinAYMqkTXbiMEC7Y,18660
 rb_commons/orm/services.py,sha256=71eRcJ4TxZvzNz-hLXo12X4U7PGK54ZfbLAb27AjZi8,1589
 rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/permissions/role_permissions.py,sha256=4dV89z6ggzLqCCiFYlMp7kQVJRESu6MHpkT5ZNjLo6A,1096
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/schemes/jwt.py,sha256=5J-VTAgRWnRrOU6cuumc8eDJQDyTm5y8cn-kLSLan_g,2453
+rb_commons/schemes/jwt.py,sha256=yeMe_HACL_tdtmfpMMkLJY8_9ZaWiXEtMGLd-bq634s,2497
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=J2Zi0J28DhcVQVzt-myNNVuzj9Msaetul53VjZtdDdc,820
-rb_commons-0.5.18.dist-info/METADATA,sha256=K4LUgXImE93aU2C4Sl9t0ttSj-WP3TLsTPV1hl9Ziws,6571
-rb_commons-0.5.18.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-rb_commons-0.5.18.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.18.dist-info/RECORD,,
+rb_commons-0.5.20.dist-info/METADATA,sha256=vl5IGgRH6CTF2qtk3DoyCHfoCeAmiCtXu0a4O-1qOwc,6571
+rb_commons-0.5.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.5.20.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.20.dist-info/RECORD,,

{rb_commons-0.5.18.dist-info → rb_commons-0.5.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any