rb-commons 0.5.22__py3-none-any.whl → 0.5.24__py3-none-any.whl

rb_commons/orm/managers.py

@@ -86,6 +86,7 @@ class BaseManager(Generic[ModelType]):
         self._filtered: bool = False
         self._limit: Optional[int] = None
         self._order_by: List[Any] = []
+        self._joins: set[str] = set()
 
     async def _smart_commit(self, instance: Optional[ModelType] = None) -> Optional[ModelType]:
         if not self.session.in_transaction():
@@ -96,19 +97,28 @@ class BaseManager(Generic[ModelType]):
         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
-        # walk relationships
+        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
 
@@ -208,17 +218,21 @@ class BaseManager(Generic[ModelType]):
 
         return self
 
-    def filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
-        """Add **AND** constraints (default behaviour)."""
-
+    def filter(self, *expressions: Any, **lookups: Any) -> "BaseManager":
         self._filtered = True
-        for expr in expressions:
-            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():
+            root = k.split("__", 1)[0]
+            if hasattr(self.model, root):
+                attr = getattr(self.model, root)
+                if hasattr(attr, "property") and isinstance(attr.property, RelationshipProperty):
+                    self._joins.add(root)
+
             self.filters.append(self._parse_lookup(k, v))
+
+        for expr in expressions:
+            self.filters.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+
         return self
 
     def or_filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
@@ -273,9 +287,23 @@ class BaseManager(Generic[ModelType]):
         self.filters.clear()
         self._filtered = False
         self._limit = None
+        self._joins.clear()
 
     async def all(self, load_all_relations: bool = False):
         stmt = select(self.model)
+
+        for rel_path in self._joins:
+            rel_model = self.model
+            join_attr = None
+
+            for part in rel_path.split("__"):
+                join_attr = getattr(rel_model, part)
+                if not hasattr(join_attr, "property"):
+                    raise ValueError(f"Invalid join path: {rel_path}")
+                rel_model = join_attr.property.mapper.class_
+
+            stmt = stmt.join(join_attr)
+
         if self.filters:
             stmt = stmt.filter(and_(*self.filters))
         if self._order_by:

{rb_commons-0.5.22.dist-info → rb_commons-0.5.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.22
+Version: 0.5.24
 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.22.dist-info → rb_commons-0.5.24.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=mWLwcJmdQJxtmjQ4ZWCTQRvBF_ukborgyqGW70oodgA,18794
+rb_commons/orm/managers.py,sha256=wFYZx6RxsB58p2_nJStS8BLiiW4pGYF-zgQ3X9R8esM,19767
 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.22.dist-info/METADATA,sha256=a_gA3J0YHykn1itXgtZvolgR73tRAh9mq1mElTlQasY,6571
-rb_commons-0.5.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rb_commons-0.5.22.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.22.dist-info/RECORD,,
+rb_commons-0.5.24.dist-info/METADATA,sha256=SXvgYuSQpp5vNxAunOl9g76z8OHHDwKwPpzxYyJDNcY,6571
+rb_commons-0.5.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.5.24.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.24.dist-info/RECORD,,