rb-commons 0.3.8__py3-none-any.whl → 0.4.1__py3-none-any.whl

rb_commons/orm/managers.py

@@ -3,7 +3,7 @@ from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union,
 from sqlalchemy import select, delete, update, and_, func, desc, inspect
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload
+from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload, RelationshipProperty
 
 from rb_commons.http.exceptions import NotFoundException
 from rb_commons.orm.exceptions import DatabaseException, InternalException
@@ -64,52 +64,93 @@ 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)))
+
+        return stmt
+
     def filter(self, **kwargs) -> 'BaseManager[ModelType]':
         """
-           Apply filtering conditions dynamically.
-
-           Supports:
-           - `field__eq`: Equal (`=`)
-           - `field__ne`: Not Equal (`!=`)
-           - `field__gt`: Greater Than (`>`)
-           - `field__lt`: Less Than (`<`)
-           - `field__gte`: Greater Than or Equal (`>=`)
-           - `field__lte`: Less Than or Equal (`<=`)
-           - `field__in`: IN Query
-           - `field__contains`: LIKE Query
-       """
+           Dynamically apply filters to the query.
+
+           Supported operators:
+             - __eq       (e.g., field__eq=value) or just field=value
+             - __ne       (field__ne=value)
+             - __gt       (field__gt=value)
+             - __lt       (field__lt=value)
+             - __gte      (field__gte=value)
+             - __lte      (field__lte=value)
+             - __in       (field__in=[val1, val2, ...])
+             - __contains (field__contains='text')
+
+           Additionally supports nested paths, e.g.,
+             product__shop_id=None
+             product__shop__country='US'
+        """
         self._filtered = True
         self.filters = []
 
         for key, value in kwargs.items():
-            if '__' in key:
-                field_name, operator = key.split('__', 1)
-            else:
-                field_name, operator = key, 'eq'
+            parts = key.split("__")
 
-            column = getattr(self.model, field_name, None)
-            if column is None or not isinstance(column, InstrumentedAttribute):
-                raise ValueError(f"Invalid filter field: {field_name}")
+            operator = "eq"
+
+            if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains"}:
+                operator = parts.pop()
+
+            current_attr = self.model
+
+            for field_name in parts:
+                attr_candidate = getattr(current_attr, field_name, None)
+                if attr_candidate is None:
+                    raise ValueError(f"Invalid filter field: {'.'.join(parts)}")
+
+                if hasattr(attr_candidate, "property") and isinstance(attr_candidate.property, RelationshipProperty):
+                    current_attr = attr_candidate.property.mapper.class_
+                else:
+                    current_attr = attr_candidate
 
             if operator == "eq":
-                self.filters.append(column == value)
+                # e.g., column == value
+                self.filters.append(current_attr == value)
+
             elif operator == "ne":
-                self.filters.append(column != value)
+                # e.g., column != value
+                self.filters.append(current_attr != value)
+
             elif operator == "gt":
-                self.filters.append(column > value)
+                self.filters.append(current_attr > value)
+
             elif operator == "lt":
-                self.filters.append(column < value)
+                self.filters.append(current_attr < value)
+
             elif operator == "gte":
-                self.filters.append(column >= value)
+                self.filters.append(current_attr >= value)
+
             elif operator == "lte":
-                self.filters.append(column <= value)
-            elif operator == "in" and isinstance(value, list):
+                self.filters.append(current_attr <= value)
+
+            elif operator == "in":
                 if not isinstance(value, list):
-                    raise ValueError(f"`{field_name}__in` requires a list, got {type(value)}")
+                    raise ValueError(f"{'.'.join(parts)}__in requires a list, got {type(value)}")
+                self.filters.append(current_attr.in_(value))
 
-                self.filters.append(column.in_(value))
             elif operator == "contains":
-                self.filters.append(column.ilike(f"%{value}%"))
+                # e.g., column ILIKE %value%
+                self.filters.append(current_attr.ilike(f"%{value}%"))
 
         return self
 
@@ -118,13 +159,11 @@ class BaseManager(Generic[ModelType]):
         if not self._filtered:
             raise RuntimeError("You must call `filter()` before using this method.")
 
-    async def all(self) -> List[ModelType]:
-        """Return all results based on applied filters."""
+    async def all(self, load_all_relations: bool = False) -> List[ModelType]:
         self._ensure_filtered()
 
-        query = select(self.model)
-        if self.filters:
-            query = query.filter(and_(*self.filters))
+        query = select(self.model).filter(and_(*self.filters))
+        query = self._apply_eager_loading(query, load_all_relations)
 
         result = await self.session.execute(query)
         return list(result.scalars().all())

{rb_commons-0.3.8.dist-info → rb_commons-0.4.1.dist-info}/METADATA

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

{rb_commons-0.3.8.dist-info → rb_commons-0.4.1.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=iAlsBfcxVt_GUfbJckTiFgTCIDYzWcXqyyat8qC4ThQ,12475
+rb_commons/orm/managers.py,sha256=PedAa8zEIrbeW0d9V0_2rrPvbYsJuB05_aVNnLewsI8,13893
 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=3ZTwKclavAKSheO58fybo2uLDeTkd-iluTY7hUEjRPk,957
@@ -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.3.8.dist-info/METADATA,sha256=QroXJUdprFJlGnWXdg2jfdOxC88PqY5cM36HDq57cFM,6570
-rb_commons-0.3.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.3.8.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.3.8.dist-info/RECORD,,
+rb_commons-0.4.1.dist-info/METADATA,sha256=lmDjCIO0rK2XvyaMM3lvE7T9YZi-BXBPXr_KJulRL5E,6570
+rb_commons-0.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.4.1.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.4.1.dist-info/RECORD,,