rb-commons 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

rb_commons/orm/managers.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import re
 import uuid
 from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union, Sequence, Any, Iterable
-from sqlalchemy import select, delete, update, and_, func, desc, inspect, or_, asc
+from sqlalchemy import select, delete, update, and_, func, desc, inspect, or_, asc, true
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import declarative_base, selectinload, RelationshipProperty, Load
@@ -150,9 +151,13 @@ class BaseManager(Generic[ModelType]):
     def _parse_lookup(self, lookup: str, value: Any):
         parts, operator, rel_attr, col_attr = self._parse_lookup_meta(lookup)
         expr = self._build_comparison(col_attr, operator, value)
+
         if rel_attr:
-            prop = rel_attr.property
-            return prop.uselist and rel_attr.any(expr) or rel_attr.has(expr)
+            if rel_attr.property.uselist:
+                return rel_attr.any(expr)
+            else:
+                return rel_attr.has(expr)
+
         return expr
 
     def _q_to_expr(self, q: Union[Q, QJSON]):
@@ -162,11 +167,14 @@ class BaseManager(Generic[ModelType]):
         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))
-        combined = (
-            True
-            if not clauses
-            else (or_(*clauses) if q._operator == "OR" else and_(*clauses))
-        )
+
+        if not clauses:
+            combined = true()
+        elif q._operator == "OR":
+            combined = or_(*clauses)
+        else:
+            combined = and_(*clauses)
+
         return ~combined if q.negated else combined
 
     def _parse_qjson(self, qjson: QJSON):
@@ -250,19 +258,58 @@ class BaseManager(Generic[ModelType]):
         self._limit = value
         return self
 
-    def _build_relation_loaders(self, model: Any, relations: Sequence[str]) -> List[Load]:
+    def _build_relation_loaders(
+            self,
+            model: Any,
+            relations: Sequence[str] | None = None
+    ) -> List[Load]:
         """
-            Turn ['cat','product__tags'] into
-            [selectinload(model.cat),
-             selectinload(model.product).selectinload('tags')]
+        Given e.g. ["media", "properties.property", "properties__property"],
+        returns [
+            selectinload(Product.media),
+            selectinload(Product.properties).selectinload(Property.property)
+        ].
+
+        If `relations` is None or empty, recurse *all* relationships once (cycle-safe).
         """
         loaders: List[Load] = []
-        for path in relations:
-            parts = path.split("__")
-            loader = selectinload(getattr(model, parts[0]))
-            for sub in parts[1:]:
-                loader = loader.selectinload(sub)
-            loaders.append(loader)
+
+        if relations:
+            for path in relations:
+                parts = re.split(r"\.|\_\_", path)
+                current_model = model
+                loader: Load | None = None
+
+                for part in parts:
+                    attr = getattr(current_model, part, None)
+                    if attr is None or not hasattr(attr, "property"):
+                        raise ValueError(f"Invalid relationship path: {path!r}")
+                    loader = selectinload(attr) if loader is None else loader.selectinload(attr)
+                    current_model = attr.property.mapper.class_
+
+                loaders.append(loader)
+
+            return loaders
+
+        visited = set()
+
+        def recurse(curr_model: Any, curr_loader: Load | None = None):
+            mapper = inspect(curr_model)
+            if mapper in visited:
+                return
+            visited.add(mapper)
+
+            for rel in mapper.relationships:
+                attr = getattr(curr_model, rel.key)
+                loader = (
+                    selectinload(attr)
+                    if curr_loader is None
+                    else curr_loader.selectinload(attr)
+                )
+                loaders.append(loader)
+                recurse(rel.mapper.class_, loader)
+
+        recurse(model)
         return loaders
 
     async def _execute_query(self, stmt):

{rb_commons-0.7.0.dist-info → rb_commons-0.7.2.dist-info}/METADATA

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

{rb_commons-0.7.0.dist-info → rb_commons-0.7.2.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=TIIoZzxlUGscNFj0diWdNNwsajF8ncFFF24mptjxGxU,18312
+rb_commons/orm/managers.py,sha256=f9F84tljRzrWOlJQeFQl7c_ZEnxBTROTS2MuclcCshA,19700
 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.7.0.dist-info/METADATA,sha256=xIB-Y4RnBQGO9Y_UxBecnp_QWChADCuGmqw3SeRuARQ,6570
-rb_commons-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rb_commons-0.7.0.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.7.0.dist-info/RECORD,,
+rb_commons-0.7.2.dist-info/METADATA,sha256=Pn9mMU6eTTncfarrpeySkfFEfd-imHZHEVzgbm62mOM,6570
+rb_commons-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.7.2.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.7.2.dist-info/RECORD,,