fastapi-sqlalchemy-toolkit 0.7.14__tar.gz → 0.7.16__tar.gz

{fastapi_sqlalchemy_toolkit-0.7.14 → fastapi_sqlalchemy_toolkit-0.7.16}/PKG-INFO

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

@@ -38,7 +38,7 @@ ModelDict = dict[str, Any]
 
 def sqlalchemy_model_to_dict(model: DeclarativeBase) -> dict:
     db_obj_dict = model.__dict__.copy()
-    del db_obj_dict["_sa_instance_state"]
+    db_obj_dict.pop("_sa_instance_state", None)
     return db_obj_dict
 
 
@@ -65,27 +65,14 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
         self.fk_name_to_model: dict[str, type[ModelT]] = {}
 
         self.unique_constraints: List[List[str]] = []
-        self.nullable_unique_constraints: List[List[str]] = []
 
         if hasattr(self.model, "__table_args__"):
             for table_arg in self.model.__table_args__:
                 if isinstance(table_arg, UniqueConstraint):
-                    # Проверяем наличие атрибута postgresql_nulls_not_distinct
-                    # и его значение
-                    if table_arg.dialect_kwargs.get("postgresql_nulls_not_distinct"):
-                        if table_arg.columns.keys():
-                            self.nullable_unique_constraints.append(
-                                table_arg.columns.keys()
-                            )
-                        else:
-                            self.nullable_unique_constraints.append(
-                                table_arg._pending_colargs
-                            )
+                    if table_arg.columns.keys():
+                        self.unique_constraints.append(table_arg.columns.keys())
                     else:
-                        if table_arg.columns.keys():
-                            self.unique_constraints.append(table_arg.columns.keys())
-                        else:
-                            self.unique_constraints.append(table_arg._pending_colargs)
+                        self.unique_constraints.append(table_arg._pending_colargs)
 
         self.reverse_relationships: dict[str, type[ModelT]] = {}
         self.m2m_relationships: dict[str, type[ModelT]] = {}
@@ -878,7 +865,6 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             await self.handle_m2m_fields(session, in_obj)
         await self.validate_unique_fields(session, in_obj, db_obj=db_obj)
         await self.validate_unique_constraints(session, in_obj)
-        await self.validate_nullable_unique_constraints(session, in_obj)
         return in_obj
 
     def get_select(self, base_stmt: Select | None = None, **_kwargs: Any) -> Select:
@@ -1093,47 +1079,20 @@ class ModelManager(Generic[ModelT, CreateSchemaT, UpdateSchemaT]):
             for field in unique_constraint:
                 if in_obj[field] is not None:
                     query[field] = in_obj[field]
-            object_exists = await self.exists(
-                session, **query, where=(self.model.id != in_obj.get("id"))
-            )
-            if object_exists:
-                conflicting_fields = ", ".join(unique_constraint)
-                raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                    detail=(
-                        f"{self.model.__tablename__} с такими "
-                        + conflicting_fields
-                        + " уже существует."
-                    ),
-                )
-
-    async def validate_nullable_unique_constraints(
-        self, session: AsyncSession, in_obj: ModelDict
-    ) -> None:
-        """
-        Проверяет, не нарушаются ли nullable UniqueConstraint модели.
-        Поля со значением NULL игнорируются при проверке и не считаются дублированием.
-        """
-        for unique_constraint in self.nullable_unique_constraints:
-            query = {}
-            if any(in_obj[field] is None for field in unique_constraint):
-                continue
-
-            for field in unique_constraint:
-                query[field] = in_obj[field]
-            object_exists = await self.exists(
-                session, **query, where=(self.model.id != in_obj.get("id"))
-            )
-            if object_exists:
-                conflicting_fields = ", ".join(unique_constraint)
-                raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                    detail=(
-                        f"{self.model.__tablename__} с такими "
-                        + conflicting_fields
-                        + " уже существует."
-                    ),
+            if query:
+                object_exists = await self.exists(
+                    session, **query, where=(self.model.id != in_obj.get("id"))
                 )
+                if object_exists:
+                    conflicting_fields = ", ".join(unique_constraint)
+                    raise HTTPException(
+                        status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                        detail=(
+                            f"{self.model.__tablename__} с такими "
+                            + conflicting_fields
+                            + " уже существует."
+                        ),
+                    )
 
     async def validate_unique_fields(
         self,

{fastapi_sqlalchemy_toolkit-0.7.14 → fastapi_sqlalchemy_toolkit-0.7.16}/pyproject.toml

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