rb-commons 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

rb_commons/orm/managers.py

@@ -65,22 +65,29 @@ class BaseManager(Generic[ModelType]):
         return instance
 
     def _apply_eager_loading(self, stmt, load_all_relations: bool = False):
-        """
-        Apply selectinload for eager loading relationships.
-
-        :param stmt: SQLAlchemy select statement
-        :param load_all_relations: If True, load all relationships
-        :return: Modified statement with eager loading applied
-        """
-        if load_all_relations:
-            mapper = inspect(self.model)
-            load_relations = [rel.key for rel in mapper.relationships]
-
-            if load_relations:
-                for rel in load_relations:
-                    stmt = stmt.options(selectinload(getattr(self.model, rel)))
+        if not load_all_relations:
+            return stmt
+
+        opts = []
+        visited = set()
+
+        def recurse(model, loader=None):
+            mapper = inspect(model)
+            if mapper in visited:
+                return
+            visited.add(mapper)
+
+            for rel in mapper.relationships:
+                attr = getattr(model, rel.key)
+                if loader is None:
+                    this_loader = selectinload(attr)
+                else:
+                    this_loader = loader.selectinload(attr)
+                opts.append(this_loader)
+                recurse(rel.mapper.class_, this_loader)
 
-        return stmt
+        recurse(self.model)
+        return stmt.options(*opts)
 
     def filter(self, **kwargs) -> 'BaseManager[ModelType]':
         """
@@ -162,16 +169,13 @@ class BaseManager(Generic[ModelType]):
     async def all(self, load_all_relations: bool = False) -> List[ModelType]:
         self._ensure_filtered()
 
-        query = select(self.model).filter(and_(*self.filters))
-        query = self._apply_eager_loading(query, load_all_relations)
+        stmt = select(self.model).filter(and_(*self.filters))
+        stmt = self._apply_eager_loading(stmt, load_all_relations)
 
-        result = await self.session.execute(query)
+        result = await self.session.execute(stmt)
         rows = result.scalars().all()
 
-        unique_by_pk = {}
-        for obj in rows:
-            unique_by_pk[obj.id] = obj
-
+        unique_by_pk = {obj.id: obj for obj in rows}
         return list(unique_by_pk.values())
 
     async def first(self, load_relations: Sequence[str] = None) -> Optional[ModelType]:

{rb_commons-0.4.3.dist-info → rb_commons-0.4.4.dist-info}/METADATA

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

{rb_commons-0.4.3.dist-info → rb_commons-0.4.4.dist-info}/RECORD

@@ -11,7 +11,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=vil3mFmKA8dbmycnOfVuISdKAX-8VNGSbHjPdeeob2c,14028
+rb_commons/orm/managers.py,sha256=Aengp0w2WsA1xvV1DoUDRDa4r7oaThpE11QpYWtTcfs,14100
 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=HL50s5RHW1nk2U3-YTESg0EDGkJDu1vN4QchcfK-L5g,988
@@ -19,7 +19,7 @@ rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.4.3.dist-info/METADATA,sha256=8109-UeVW00s8WWOosclBlsJ-N-njhOlgfC2bo6tQv4,6570
-rb_commons-0.4.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.4.3.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.4.3.dist-info/RECORD,,
+rb_commons-0.4.4.dist-info/METADATA,sha256=ZA7wI6H21f_Sb41G_UD7_SyyQbT4EAeBbSzEArfycYo,6570
+rb_commons-0.4.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.4.4.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.4.4.dist-info/RECORD,,