rb-commons 0.4.12__py3-none-any.whl → 0.4.13__py3-none-any.whl

rb_commons/orm/managers.py

@@ -181,15 +181,27 @@ class BaseManager(Generic[ModelType]):
         unique_by_pk = {obj.id: obj for obj in rows}
         return list(unique_by_pk.values())
 
-    async def all(self, load_all_relations: bool = False) -> List[ModelType]:
-        self._ensure_filtered()
-        stmt = select(self.model).filter(and_(*self.filters))
+    async def all(self, load_all_relations: bool = False) -> List[ModelType] | None:
+        try:
+            stmt = select(self.model)
 
-        if self._limit:
-            stmt = stmt.limit(self._limit)
-            self._limit = None
+            if self._filtered:
+                stmt = stmt.filter(and_(*self.filters))
 
-        return await self._execute_query_and_unique_data(stmt, load_all_relations)
+            if self._limit:
+                stmt = stmt.limit(self._limit)
+
+            self._clear_query_state()
+
+            return await self._execute_query_and_unique_data(stmt, load_all_relations)
+        finally:
+            self._clear_query_state()
+
+    def _clear_query_state(self):
+        """Clear all query state after execution"""
+        self._filtered = False
+        self.filters = []
+        self._limit = None
 
     async def paginate(self, limit: int = 10, offset: int = 0, load_all_relations: bool = False) -> List[ModelType]:
         self._ensure_filtered()

{rb_commons-0.4.12.dist-info → rb_commons-0.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.4.12
+Version: 0.4.13
 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.12.dist-info → rb_commons-0.4.13.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=vQ1S7g_wM0sg467HjJh6en-s5qmoO6i4-grjBSZCtgU,16634
+rb_commons/orm/managers.py,sha256=dip4cVh6BHPJJP91gsdvC9ez0m1Z3zvZkWz0Fom2C_0,16944
 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.4.12.dist-info/METADATA,sha256=nOLVXYvtQKAzUVihH3SaKNNF7AUQsUOjxCezGQ_vECw,6571
-rb_commons-0.4.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.4.12.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.4.12.dist-info/RECORD,,
+rb_commons-0.4.13.dist-info/METADATA,sha256=5rjQ8F4d_351Pc-2ZX9BD7jxoFyfE7aNV6Q0HP3JQkA,6571
+rb_commons-0.4.13.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.4.13.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.4.13.dist-info/RECORD,,