rb-commons 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

rb_commons/orm/managers.py

@@ -75,6 +75,7 @@ class BaseManager(Generic[ModelType]):
         self.filters: List[Any] = []
         self._filtered: bool = False
         self._limit: Optional[int] = None
+        self._order_by: List[Any] = []
 
     async def _smart_commit(self, instance: Optional[ModelType] = None) -> Optional[ModelType]:
         if not self.session.in_transaction():
@@ -134,6 +135,22 @@ class BaseManager(Generic[ModelType]):
         )
         return ~combined if q.negated else combined
 
+    def order_by(self, *columns: Any):
+        """Collect ORDER BY clauses.
+        """
+        for col in columns:
+            if isinstance(col, str):
+                descending = col.startswith("-")
+                field_name = col.lstrip("+-")
+                sa_col = getattr(self.model, field_name, None)
+                if sa_col is None:
+                    raise ValueError(f"Invalid order_by field '{field_name}' for {self.model.__name__}")
+                self._order_by.append(sa_col.desc() if descending else sa_col.asc())
+            else:
+                self._order_by.append(col)
+
+        return self
+
     def filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
         """Add **AND** constraints (default behaviour).
 
@@ -198,6 +215,8 @@ class BaseManager(Generic[ModelType]):
         stmt = select(self.model)
         if self.filters:
             stmt = stmt.filter(and_(*self.filters))
+        if self._order_by:
+            stmt = stmt.order_by(*self._order_by)
         if self._limit:
             stmt = stmt.limit(self._limit)
         try:
@@ -208,6 +227,8 @@ class BaseManager(Generic[ModelType]):
     async def first(self, load_relations: Optional[Sequence[str]] = None):
         self._ensure_filtered()
         stmt = select(self.model).filter(and_(*self.filters))
+        if self._order_by:
+            stmt = stmt.order_by(*self._order_by)
         if load_relations:
             for rel in load_relations:
                 stmt = stmt.options(selectinload(getattr(self.model, rel)))
@@ -215,13 +236,12 @@ class BaseManager(Generic[ModelType]):
         self._reset_state()
         return result.scalars().first()
 
+
     async def last(self, load_relations: Optional[Sequence[str]] = None):
         self._ensure_filtered()
-        stmt = (
-            select(self.model)
-            .filter(and_(*self.filters))
-            .order_by(desc(self.model.id))
-        )
+        stmt = select(self.model).filter(and_(*self.filters))
+        order = self._order_by or [self.model.id.desc()]
+        stmt = stmt.order_by(*order[::-1])  # reverse for LAST
         if load_relations:
             for rel in load_relations:
                 stmt = stmt.options(selectinload(getattr(self.model, rel)))
@@ -229,6 +249,7 @@ class BaseManager(Generic[ModelType]):
         self._reset_state()
         return result.scalars().first()
 
+
     async def count(self) -> int:
         self._ensure_filtered()
         query = select(func.count()).select_from(self.model).filter(and_(*self.filters))
@@ -236,19 +257,12 @@ class BaseManager(Generic[ModelType]):
         self._reset_state()
         return result.scalar_one()
 
-    async def paginate(
-            self,
-            limit: int = 10,
-            offset: int = 0,
-            load_all_relations: bool = False,
-    ):
+    async def paginate(self, limit=10, offset=0, load_all_relations=False):
         self._ensure_filtered()
-        stmt = (
-            select(self.model)
-            .filter(and_(*self.filters))
-            .limit(limit)
-            .offset(offset)
-        )
+        stmt = select(self.model).filter(and_(*self.filters))
+        if self._order_by:
+            stmt = stmt.order_by(*self._order_by)
+        stmt = stmt.limit(limit).offset(offset)
         try:
             return await self._execute_query(stmt, load_all_relations)
         finally:

{rb_commons-0.5.1.dist-info → rb_commons-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.1
+Version: 0.5.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.5.1.dist-info → rb_commons-0.5.2.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=w0vTrGfugWDC1ccGU2b19DfGQ6_6X3CWMbBzkjpQiFs,14659
+rb_commons/orm/managers.py,sha256=N-iHsuWMUQDTV-unB1I8Ey5CLiwwLVvJPEcpdaVj-SU,15485
 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.1.dist-info/METADATA,sha256=VDh2GcvBL_Uhvka30qhbR_MCnAcxjP-swb4OPhXyz6Q,6570
-rb_commons-0.5.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.5.1.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.1.dist-info/RECORD,,
+rb_commons-0.5.2.dist-info/METADATA,sha256=uChN50M_0DtG_N9Qj7IA4V6RcqCtIUdbe8hPmaDk5-8,6570
+rb_commons-0.5.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.5.2.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.2.dist-info/RECORD,,