rb-commons 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

rb_commons/orm/managers.py

@@ -5,7 +5,7 @@ from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union,
 from sqlalchemy import select, delete, update, and_, func, desc, inspect, or_
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload, RelationshipProperty
+from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload, RelationshipProperty, Load
 
 from rb_commons.http.exceptions import NotFoundException
 from rb_commons.orm.exceptions import DatabaseException, InternalException
@@ -135,6 +135,27 @@ class BaseManager(Generic[ModelType]):
         )
         return ~combined if q.negated else combined
 
+    def _loader_from_path(self, path: str) -> Load:
+        """
+        Turn 'attributes.attribute.attribute_group' into
+        selectinload(Product.attributes)
+            .selectinload(Attribute.attribute)
+            .selectinload(ProductAttributeGroup.attribute_group)
+        """
+        parts = path.split(".")
+        current_model = self.model
+        loader = None
+
+        for segment in parts:
+            attr = getattr(current_model, segment, 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_  # step down the graph
+
+        return loader
+
     def order_by(self, *columns: Any):
         """Collect ORDER BY clauses.
         """
@@ -249,12 +270,18 @@ class BaseManager(Generic[ModelType]):
         self._reset_state()
         return result.scalars().first()
 
-
-    async def count(self) -> int:
+    async def count(self) -> int | None:
         self._ensure_filtered()
-        query = select(func.count()).select_from(self.model).filter(and_(*self.filters))
-        result = await self.session.execute(query)
-        return result.scalar_one()
+
+        stmt = select(func.count(self.model.id)).select_from(self.model)
+        if self.filters:
+            stmt = stmt.where(and_(*self.filters))
+
+        try:
+            result = await self.session.execute(stmt)
+            return int(result.scalar_one())
+        finally:
+            self._reset_state()
 
     async def paginate(self, limit=10, offset=0, load_all_relations=False):
         self._ensure_filtered()
@@ -368,7 +395,11 @@ class BaseManager(Generic[ModelType]):
         stmt = select(self.model).filter_by(id=pk)
         if load_relations:
             for rel in load_relations:
-                stmt = stmt.options(selectinload(getattr(self.model, rel)))
+                loader = (
+                    self._loader_from_path(rel) if "." in rel
+                    else selectinload(getattr(self.model, rel))
+                )
+                stmt = stmt.options(loader)
         result = await self.session.execute(stmt)
         instance = result.scalar_one_or_none()
         if instance is None:

{rb_commons-0.5.3.dist-info → rb_commons-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.3
+Version: 0.5.5
 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.3.dist-info → rb_commons-0.5.5.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=gTe2oL-DBFM2zaZU92Rl4PEL7qYvU8B64mAYYNFRpmM,15456
+rb_commons/orm/managers.py,sha256=mKpsN1OrPUDxF12KyZleZNMD7vBBQ503pWclIYjGWFE,16565
 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
@@ -20,7 +20,7 @@ rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,167
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.5.3.dist-info/METADATA,sha256=_WkjUP_eAPiat0t-NHTeBT085dnAxSs3HBh5dpT4SwA,6570
-rb_commons-0.5.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.5.3.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.3.dist-info/RECORD,,
+rb_commons-0.5.5.dist-info/METADATA,sha256=Q6QZet60caB50aSvjYzEeWzCDvftwoSEW4NH0ofmjRg,6570
+rb_commons-0.5.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.5.5.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.5.dist-info/RECORD,,