rb-commons 0.4.3__tar.gz → 0.4.4__tar.gz

{rb_commons-0.4.3 → rb_commons-0.4.4}/PKG-INFO

@@ -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 → rb_commons-0.4.4}/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 → rb_commons-0.4.4}/rb_commons.egg-info/PKG-INFO

@@ -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 → rb_commons-0.4.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.4.3",
+    version="0.4.4",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",