rb-commons 0.5.25__py3-none-any.whl → 0.5.26__py3-none-any.whl

rb_commons/orm/managers.py

@@ -96,53 +96,55 @@ class BaseManager(Generic[ModelType]):
             return instance
         return None
 
-    def _parse_lookup(self, lookup: str, value: Any):
-        root = lookup.split("__", 1)[0]
-
-        if hasattr(self.model, root):
-            attr0 = getattr(self.model, root)
-            if hasattr(attr0, "property") and isinstance(attr0.property, RelationshipProperty):
-                self._joins.add(root)
-                parts = lookup.split("__")
-
-        parts = lookup.split("__")
-        operator = "eq"
-        if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains", "null"}:
-            operator = parts.pop()
-
-        current: Union[Type[ModelType], InstrumentedAttribute] = self.model
-        path_parts = []
-        for field in parts:
-            attr = getattr(current, field, None)
-            if attr is None:
-                raise ValueError(f"Invalid filter field: {'.'.join(parts)}")
-            if hasattr(attr, "property") and isinstance(attr.property, RelationshipProperty):
-                current = attr.property.mapper.class_
-                path_parts.append(field)
-            else:
-                current = attr
-
+    def _build_comparison(self, col, operator: str, value: Any):
         if operator == "eq":
-            return current == value
+            return col == value
         if operator == "ne":
-            return current != value
+            return col != value
         if operator == "gt":
-            return current > value
+            return col > value
         if operator == "lt":
-            return current < value
+            return col < value
         if operator == "gte":
-            return current >= value
+            return col >= value
         if operator == "lte":
-            return current <= value
+            return col <= value
         if operator == "in":
-            if not isinstance(value, (list, tuple, set)):
-                raise ValueError(f"{lookup}__in requires an iterable")
-            return current.in_(value)
+            return col.in_(value)
         if operator == "contains":
-            return current.ilike(f"%{value}%")
+            return col.ilike(f"%{value}%")
         if operator == "null":
-            return current.is_(None) if value else current.isnot(None)
-        raise ValueError(f"Unsupported operator in lookup: {lookup}")
+            return col.is_(None) if value else col.isnot(None)
+        raise ValueError(f"Unsupported operator: {operator}")
+
+    def _parse_lookup(self, lookup: str, value: Any):
+        parts = lookup.split("__")
+        operator = "eq"
+        if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains", "null"}:
+            operator = parts.pop()
+
+        current_model = self.model
+        attr = None
+        relationship_attr = None
+        for idx, part in enumerate(parts):
+            candidate = getattr(current_model, part, None)
+            if candidate is None:
+                raise ValueError(f"Invalid filter field: {lookup!r}")
+
+            prop = getattr(candidate, "property", None)
+            if prop and isinstance(prop, RelationshipProperty):
+                relationship_attr = candidate
+                current_model = prop.mapper.class_
+            else:
+                attr = candidate
+
+        if relationship_attr:
+            col = attr
+            expr = self._build_comparison(col, operator, value)
+            return relationship_attr.any(expr)
+
+        col = getattr(self.model, parts[0], None) if len(parts) == 1 else attr
+        return self._build_comparison(col, operator, value)
 
     def _q_to_expr(self, q: Union[Q, QJSON]):
         if isinstance(q, QJSON):

{rb_commons-0.5.25.dist-info → rb_commons-0.5.26.dist-info}/METADATA

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

@@ -13,7 +13,7 @@ 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=vELttfVNHoBOeFLV5XmBh4cS_1PAYAPfyCLbBDkzjc0,19827
+rb_commons/orm/managers.py,sha256=le1mQVEr9gIEkd56nCyiEYZNcESqErv6Jsxf1PGhPvA,19761
 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
@@ -22,7 +22,7 @@ rb_commons/schemes/jwt.py,sha256=ZKLJ5D3fcEmEKySjzbxEgUcza4K-oPoHr14_Z0r9Yic,249
 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.25.dist-info/METADATA,sha256=DQmBk2r4PKfLLFtGYRYuUF266dCEu86o-KR5bQHkYqE,6571
-rb_commons-0.5.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rb_commons-0.5.25.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.25.dist-info/RECORD,,
+rb_commons-0.5.26.dist-info/METADATA,sha256=ZfmInMrRweoC6XQhn1Q8YQ9chd4fkyMLZ8t7_lyIPCA,6571
+rb_commons-0.5.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.5.26.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.26.dist-info/RECORD,,