rb-commons 0.4.11__tar.gz → 0.4.13__tar.gz

{rb_commons-0.4.11 → rb_commons-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.4.11
+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.11 → rb_commons-0.4.13}/rb_commons/orm/managers.py

@@ -103,6 +103,7 @@ class BaseManager(Generic[ModelType]):
              - __lte      (field__lte=value)
              - __in       (field__in=[val1, val2, ...])
              - __contains (field__contains='text')
+             - __null     (field__null=True/False) - True for IS NULL, False for IS NOT NULL
 
            Additionally supports nested paths, e.g.,
              product__shop_id=None
@@ -116,7 +117,7 @@ class BaseManager(Generic[ModelType]):
 
             operator = "eq"
 
-            if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains"}:
+            if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains", "null"}:
                 operator = parts.pop()
 
             current_attr = self.model
@@ -159,6 +160,12 @@ class BaseManager(Generic[ModelType]):
             elif operator == "contains":
                 # e.g., column ILIKE %value%
                 self.filters.append(current_attr.ilike(f"%{value}%"))
+                
+            elif operator == "null":
+                if value is True:
+                    self.filters.append(current_attr.is_(None))
+                else:
+                    self.filters.append(current_attr.isnot(None))
 
         return self
 
@@ -174,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.11 → rb_commons-0.4.13}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.4.11
+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.11 → rb_commons-0.4.13}/setup.py

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