fastapi-sqlalchemy-toolkit 0.8.0__tar.gz → 0.8.1__tar.gz

{fastapi_sqlalchemy_toolkit-0.8.0 → fastapi_sqlalchemy_toolkit-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_sqlalchemy_toolkit
-Version: 0.8.0
+Version: 0.8.1
 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.0 → fastapi_sqlalchemy_toolkit-0.8.1}/fastapi_sqlalchemy_toolkit/model_manager.py

@@ -26,6 +26,7 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.orm.relationships import Relationship
 from sqlalchemy.sql import Select
 from sqlalchemy.sql.elements import UnaryExpression
+from sqlalchemy.sql.expression import BinaryExpression, ColumnElement
 from sqlalchemy.sql.functions import Function
 from sqlalchemy.sql.schema import ScalarElementColumnDefault
 from sqlalchemy.sql.selectable import Exists
@@ -524,7 +525,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = ...,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = ...,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = ...,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = ...,
@@ -540,7 +542,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = ...,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = ...,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = ...,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = ...,
@@ -555,7 +558,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = None,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = None,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = None,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = None,
@@ -618,7 +622,10 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         )
 
         for filter_expression, value in filter_expressions.items():
-            if isinstance(filter_expression, InstrumentedAttribute | Function):
+            if isinstance(
+                filter_expression,
+                InstrumentedAttribute | Function | BinaryExpression | ColumnElement,
+            ):
                 stmt = stmt.filter(filter_expression == value)
             else:
                 stmt = stmt.filter(filter_expression(value))
@@ -716,7 +723,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = ...,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = ...,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = ...,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = ...,
@@ -735,7 +743,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = ...,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = ...,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = ...,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = ...,
@@ -753,7 +762,8 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self,
         session: AsyncSession,
         order_by: InstrumentedAttribute | UnaryExpression | None = None,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any] | None = None,
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any]
+        | None = None,
         nullable_filter_expressions: (
             dict[InstrumentedAttribute | Callable, Any] | None
         ) = None,
@@ -830,7 +840,10 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         )
 
         for filter_expression, value in filter_expressions.items():
-            if isinstance(filter_expression, InstrumentedAttribute):
+            if isinstance(
+                filter_expression,
+                InstrumentedAttribute | BinaryExpression | ColumnElement,
+            ):
                 stmt = stmt.filter(filter_expression == value)
             else:
                 stmt = stmt.filter(filter_expression(value))
@@ -1075,7 +1088,7 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
     def get_joins(
         self,
         base_query: Select,
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any],
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any],
         options: List[Any] | None = None,
         order_by: InstrumentedAttribute | UnaryExpression | None = None,
     ) -> Select:
@@ -1108,6 +1121,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
             if model != self.model:
@@ -1157,7 +1172,7 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
 
     @staticmethod
     def handle_filter_expressions(
-        filter_expressions: dict[InstrumentedAttribute | Callable, Any],
+        filter_expressions: dict[InstrumentedAttribute | Callable | ColumnElement, Any],
     ) -> None:
         for filter_expression, value in filter_expressions.copy().items():
             if value is None:
@@ -1169,7 +1184,9 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
 
     @staticmethod
     def handle_nullable_filter_expressions(
-        nullable_filter_expressions: dict[InstrumentedAttribute | Callable, Any],
+        nullable_filter_expressions: dict[
+            InstrumentedAttribute | Callable | ColumnElement, Any
+        ],
     ) -> None:
         for filter_expression, value in nullable_filter_expressions.copy().items():
             if value in null_query_values:

{fastapi_sqlalchemy_toolkit-0.8.0 → fastapi_sqlalchemy_toolkit-0.8.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fastapi_sqlalchemy_toolkit"
-version = "0.8.0"
+version = "0.8.1"
 authors = [
   { name="Egor Kondrashov", email="e.kondr01@gmail.com" },
 ]