fastapi-sqlalchemy-toolkit 0.8.2__py3-none-any.whl → 0.8.2.2__py3-none-any.whl

fastapi_sqlalchemy_toolkit/model_manager.py

@@ -1148,10 +1148,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
                 model = filter_expression.parent._identity_class
             elif isinstance(filter_expression, Function):
                 model = filter_expression.entity_namespace
-            elif isinstance(filter_expression, ColumnElement):
-                model = self.model  # Not supported
             else:
-                model = filter_expression.__self__.parent._identity_class
+                model = self.model  # Not supported
             if model != self.model:
                 models_to_join.add(model)
         for model in models_to_join:
@@ -1235,10 +1233,10 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         related_pk = _get_model_pk(related_model)
         return relationship.any(related_pk.in_(value))
 
-    @staticmethod
-    def handle_optional_where(optional_where: Any) -> Any:
+    @classmethod
+    def handle_optional_where_expression(cls, optional_where: Any) -> Any:
         """
-        Обрабатывает выражение optional_where, пропуская фильтры, значения которых None.
+        Обрабатывает одно выражение optional_where, пропуская фильтр, если его значение None.
 
         Поддерживает:
         1. Простые выражения вида MyModel.field == value
@@ -1273,6 +1271,30 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             return None
         return optional_where
 
+    @classmethod
+    def handle_optional_where(cls, optional_where: Any) -> Any:
+        """
+        Обрабатывает выражения optional_where, пропуская фильтры, значения которых None.
+
+        Принимает одно выражение SQLAlchemy или кортеж выражений.
+        Каждое выражение обрабатывается через handle_optional_where_expression
+        и поддерживает все три вида выражений.
+        При передаче кортежа оставшиеся (не-None) выражения
+        объединяются через оператор &.
+        """
+        if isinstance(optional_where, tuple):
+            remaining = []
+            for arg in optional_where:
+                processed = cls.handle_optional_where_expression(arg)
+                if processed is not None:
+                    remaining.append(processed)
+            if not remaining:
+                return None
+            if len(remaining) == 1:
+                return remaining[0]
+            return and_(*remaining)
+        return cls.handle_optional_where_expression(optional_where)
+
     def assemble_stmt(
         self,
         base_stmt: Select | None = None,
@@ -1317,10 +1339,7 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             stmt = stmt.options(option)
 
         if where is not None:
-            if isinstance(where, tuple):
-                stmt = stmt.where(*where)
-            else:
-                stmt = stmt.where(where)
+            stmt = stmt.where(*where) if isinstance(where, tuple) else stmt.where(where)
 
         if limit is not None:
             stmt = stmt.limit(limit)

{fastapi_sqlalchemy_toolkit-0.8.2.dist-info → fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_sqlalchemy_toolkit
-Version: 0.8.2
+Version: 0.8.2.2
 Summary: FastAPI SQLAlchemy Toolkit
 Project-URL: Homepage, https://github.com/e-kondr01/fastapi-sqlalchemy-toolkit
 Author-email: Egor Kondrashov <e.kondr01@gmail.com>

fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+fastapi_sqlalchemy_toolkit/__init__.py,sha256=CQ25ahHAdk8r8NlXCq9YWm9wYA_rJfq1UlFG8Ra0sOU,225
+fastapi_sqlalchemy_toolkit/filters.py,sha256=RxvyNTGhkTbEVvIOyXZf2t3n8B5TQidSkM4cJOzGEsw,97
+fastapi_sqlalchemy_toolkit/model_manager.py,sha256=uy1IrJtVU-8l_j71l2qNArXvihg4Si5ieJTU1Eyo8Qc,62730
+fastapi_sqlalchemy_toolkit/ordering.py,sha256=9f4IBunXtUybYedQnJZbNsCAcUgdSztIhAHqHa1iG60,2953
+fastapi_sqlalchemy_toolkit/utils.py,sha256=EVDYAgI2wQmskxjeS_Ho3qmNAWf4PEExMVyslF32TIk,1966
+fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/METADATA,sha256=nigkOg_bKF6rKgy35lHsQboZYafc-g90NuK7Uw6iNJQ,2347
+fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/licenses/AUTHORS,sha256=fnn-xBK_5emc8NbrMRYGH1WbiVyiBkhnxxD3cNi0TY8,384
+fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/licenses/LICENSE,sha256=hOWlRBgw7tkevaCGpz9j-ry_rF2v1D-6LCEC63Sfq1c,1081
+fastapi_sqlalchemy_toolkit-0.8.2.2.dist-info/RECORD,,

fastapi_sqlalchemy_toolkit-0.8.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-fastapi_sqlalchemy_toolkit/__init__.py,sha256=CQ25ahHAdk8r8NlXCq9YWm9wYA_rJfq1UlFG8Ra0sOU,225
-fastapi_sqlalchemy_toolkit/filters.py,sha256=RxvyNTGhkTbEVvIOyXZf2t3n8B5TQidSkM4cJOzGEsw,97
-fastapi_sqlalchemy_toolkit/model_manager.py,sha256=doXUS-_zpDOTVtkL2cUFhrGFF-xpGNSV2syxLrMzMzY,61682
-fastapi_sqlalchemy_toolkit/ordering.py,sha256=9f4IBunXtUybYedQnJZbNsCAcUgdSztIhAHqHa1iG60,2953
-fastapi_sqlalchemy_toolkit/utils.py,sha256=EVDYAgI2wQmskxjeS_Ho3qmNAWf4PEExMVyslF32TIk,1966
-fastapi_sqlalchemy_toolkit-0.8.2.dist-info/METADATA,sha256=OyTVsqdFixa3L97cWVRK-E7MDy5mJRDAzqCgSNvPfA8,2345
-fastapi_sqlalchemy_toolkit-0.8.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-fastapi_sqlalchemy_toolkit-0.8.2.dist-info/licenses/AUTHORS,sha256=fnn-xBK_5emc8NbrMRYGH1WbiVyiBkhnxxD3cNi0TY8,384
-fastapi_sqlalchemy_toolkit-0.8.2.dist-info/licenses/LICENSE,sha256=hOWlRBgw7tkevaCGpz9j-ry_rF2v1D-6LCEC63Sfq1c,1081
-fastapi_sqlalchemy_toolkit-0.8.2.dist-info/RECORD,,