fix: additional update and update_many corrections. (#537)

Updates `update` and `update_many` to properly handle relationships and returning support.

Author: cofin

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
       - id: unasyncd
         additional_dependencies: ["ruff"]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.12.10"
+    rev: "v0.12.11"
     hooks:
       # Run the linter.
       - id: ruff

advanced_alchemy/repository/_async.py

@@ -53,6 +53,7 @@
     get_instrumented_attr,
 )
 from advanced_alchemy.repository.typing import MISSING, ModelT, OrderingPair, T
+from advanced_alchemy.service.typing import schema_dump
 from advanced_alchemy.utils.dataclass import Empty, EmptyType
 from advanced_alchemy.utils.text import slugify
 
@@ -1577,7 +1578,12 @@ async def update_many(
             error_messages=error_messages,
             default_messages=self.error_messages,
         )
-        data_to_update: list[dict[str, Any]] = [v.to_dict() if isinstance(v, self.model_type) else v for v in data]  # type: ignore[misc]
+        data_to_update: list[dict[str, Any]] = []
+        for v in data:
+            if isinstance(v, self.model_type) or (hasattr(v, "to_dict") and callable(v.to_dict)):
+                data_to_update.append(v.to_dict())
+            else:
+                data_to_update.append(cast("dict[str, Any]", schema_dump(v)))
         with wrap_sqlalchemy_exception(
             error_messages=error_messages, dialect_name=self._dialect.name, wrap_exceptions=self.wrap_exceptions
         ):
@@ -1606,7 +1612,17 @@ async def update_many(
                 return instances
             await self.session.execute(statement, data_to_update, execution_options=execution_options)
             await self._flush_or_commit(auto_commit=auto_commit)
-            return data
+
+            # For non-RETURNING backends, fetch updated instances from database
+            updated_ids: list[Any] = [item[self.id_attribute] for item in data_to_update]
+            updated_instances = await self.list(
+                getattr(self.model_type, self.id_attribute).in_(updated_ids),
+                load=loader_options,
+                execution_options=execution_options,
+            )
+            for instance in updated_instances:
+                self._expunge(instance, auto_expunge=auto_expunge)
+            return updated_instances
 
     def _get_update_many_statement(
         self,

advanced_alchemy/repository/_sync.py

@@ -54,6 +54,7 @@
     get_instrumented_attr,
 )
 from advanced_alchemy.repository.typing import MISSING, ModelT, OrderingPair, T
+from advanced_alchemy.service.typing import schema_dump
 from advanced_alchemy.utils.dataclass import Empty, EmptyType
 from advanced_alchemy.utils.text import slugify
 
@@ -1578,7 +1579,12 @@ def update_many(
             error_messages=error_messages,
             default_messages=self.error_messages,
         )
-        data_to_update: list[dict[str, Any]] = [v.to_dict() if isinstance(v, self.model_type) else v for v in data]  # type: ignore[misc]
+        data_to_update: list[dict[str, Any]] = []
+        for v in data:
+            if isinstance(v, self.model_type) or (hasattr(v, "to_dict") and callable(v.to_dict)):
+                data_to_update.append(v.to_dict())
+            else:
+                data_to_update.append(cast("dict[str, Any]", schema_dump(v)))
         with wrap_sqlalchemy_exception(
             error_messages=error_messages, dialect_name=self._dialect.name, wrap_exceptions=self.wrap_exceptions
         ):
@@ -1607,7 +1613,17 @@ def update_many(
                 return instances
             self.session.execute(statement, data_to_update, execution_options=execution_options)
             self._flush_or_commit(auto_commit=auto_commit)
-            return data
+
+            # For non-RETURNING backends, fetch updated instances from database
+            updated_ids: list[Any] = [item[self.id_attribute] for item in data_to_update]
+            updated_instances = self.list(
+                getattr(self.model_type, self.id_attribute).in_(updated_ids),
+                load=loader_options,
+                execution_options=execution_options,
+            )
+            for instance in updated_instances:
+                self._expunge(instance, auto_expunge=auto_expunge)
+            return updated_instances
 
     def _get_update_many_statement(
         self,

advanced_alchemy/service/_async.py

@@ -27,15 +27,18 @@
 from advanced_alchemy.repository.typing import MISSING, ModelT, OrderingPair, SQLAlchemyAsyncRepositoryT
 from advanced_alchemy.service._util import ResultConverter
 from advanced_alchemy.service.typing import (
+    UNSET,
     BulkModelDictT,
     ModelDictListT,
     ModelDictT,
     asdict,
+    attrs_nothing,
     is_attrs_instance,
     is_dict,
     is_dto_data,
     is_msgspec_struct,
     is_pydantic_model,
+    schema_dump,
 )
 from advanced_alchemy.utils.dataclass import Empty, EmptyType
 
@@ -448,20 +451,26 @@ async def to_model(
             )
 
         if is_msgspec_struct(data):
-            from msgspec import UNSET
-
             return model_from_dict(
                 model=self.model_type,
-                **{f: val for f in data.__struct_fields__ if (val := getattr(data, f, None)) != UNSET},
+                **{
+                    f: getattr(data, f)
+                    for f in data.__struct_fields__
+                    if hasattr(data, f) and getattr(data, f) is not UNSET
+                },
             )
 
         if is_dto_data(data):
             return cast("ModelT", data.create_instance())
 
         if is_attrs_instance(data):
+            # Filter out attrs.NOTHING values for partial updates
+            def filter_unset(attr: Any, value: Any) -> bool:  # noqa: ARG001
+                return value is not attrs_nothing
+
             return model_from_dict(
                 model=self.model_type,
-                **asdict(data),
+                **asdict(data, filter=filter_unset),
             )
 
         # Fallback for objects with __dict__ (e.g., regular classes)
@@ -729,11 +738,16 @@ async def update(
         Returns:
             Updated representation.
         """
-        if is_dict(data) and item_id is not None:
+        if (
+            is_dict(data) or is_pydantic_model(data) or is_msgspec_struct(data) or is_attrs_instance(data)
+        ) and item_id is not None:
             existing_instance = await self.repository.get(
                 item_id, id_attribute=id_attribute, load=load, execution_options=execution_options
             )
-            update_data = await self.to_model_on_update(data)
+            update_data = (
+                await self.to_model_on_update(data) if is_dict(data) else schema_dump(data, exclude_unset=True)
+            )
+
             if is_dict(update_data):
                 for key, value in update_data.items():
                     if getattr(existing_instance, key, MISSING) is not MISSING:

advanced_alchemy/service/_sync.py

@@ -26,15 +26,18 @@
 from advanced_alchemy.repository.typing import MISSING, ModelT, OrderingPair, SQLAlchemySyncRepositoryT
 from advanced_alchemy.service._util import ResultConverter
 from advanced_alchemy.service.typing import (
+    UNSET,
     BulkModelDictT,
     ModelDictListT,
     ModelDictT,
     asdict,
+    attrs_nothing,
     is_attrs_instance,
     is_dict,
     is_dto_data,
     is_msgspec_struct,
     is_pydantic_model,
+    schema_dump,
 )
 from advanced_alchemy.utils.dataclass import Empty, EmptyType
 
@@ -447,20 +450,26 @@ def to_model(
             )
 
         if is_msgspec_struct(data):
-            from msgspec import UNSET
-
             return model_from_dict(
                 model=self.model_type,
-                **{f: val for f in data.__struct_fields__ if (val := getattr(data, f, None)) != UNSET},
+                **{
+                    f: getattr(data, f)
+                    for f in data.__struct_fields__
+                    if hasattr(data, f) and getattr(data, f) is not UNSET
+                },
             )
 
         if is_dto_data(data):
             return cast("ModelT", data.create_instance())
 
         if is_attrs_instance(data):
+            # Filter out attrs.NOTHING values for partial updates
+            def filter_unset(attr: Any, value: Any) -> bool:  # noqa: ARG001
+                return value is not attrs_nothing
+
             return model_from_dict(
                 model=self.model_type,
-                **asdict(data),
+                **asdict(data, filter=filter_unset),
             )
 
         # Fallback for objects with __dict__ (e.g., regular classes)
@@ -728,11 +737,14 @@ def update(
         Returns:
             Updated representation.
         """
-        if is_dict(data) and item_id is not None:
+        if (
+            is_dict(data) or is_pydantic_model(data) or is_msgspec_struct(data) or is_attrs_instance(data)
+        ) and item_id is not None:
             existing_instance = self.repository.get(
                 item_id, id_attribute=id_attribute, load=load, execution_options=execution_options
             )
-            update_data = self.to_model_on_update(data)
+            update_data = self.to_model_on_update(data) if is_dict(data) else schema_dump(data, exclude_unset=True)
+
             if is_dict(update_data):
                 for key, value in update_data.items():
                     if getattr(existing_instance, key, MISSING) is not MISSING:

advanced_alchemy/service/_typing.py

@@ -255,8 +255,19 @@ def attrs_has_stub(*args: Any, **kwargs: Any) -> bool:  # noqa: ARG001
     return False
 
 
+class AttrsNothingStub:
+    """Placeholder for attrs.NOTHING sentinel value"""
+
+    def __repr__(self) -> str:
+        return "NOTHING"
+
+
+ATTRS_NOTHING_STUB = AttrsNothingStub()
+
+
 # Try to import real implementations at runtime
 try:
+    from attrs import NOTHING as _real_attrs_nothing  # noqa: N811
     from attrs import AttrsInstance as _RealAttrsInstance  # pyright: ignore
     from attrs import asdict as _real_attrs_asdict
     from attrs import define as _real_attrs_define
@@ -270,6 +281,7 @@ def attrs_has_stub(*args: Any, **kwargs: Any) -> bool:  # noqa: ARG001
     attrs_field = _real_attrs_field
     attrs_fields = _real_attrs_fields
     attrs_has = _real_attrs_has
+    attrs_nothing = _real_attrs_nothing
     ATTRS_INSTALLED = True  # pyright: ignore[reportConstantRedefinition]
 except ImportError:
     AttrsInstance = AttrsLike  # type: ignore[misc]
@@ -278,6 +290,7 @@ def attrs_has_stub(*args: Any, **kwargs: Any) -> bool:  # noqa: ARG001
     attrs_field = attrs_field_stub
     attrs_fields = attrs_fields_stub
     attrs_has = attrs_has_stub  # type: ignore[assignment]
+    attrs_nothing = ATTRS_NOTHING_STUB  # type: ignore[assignment]
     ATTRS_INSTALLED = False  # pyright: ignore[reportConstantRedefinition]
 
 try:
@@ -309,6 +322,7 @@ class EmptyEnum(enum.Enum):
 
 __all__ = (
     "ATTRS_INSTALLED",
+    "ATTRS_NOTHING_STUB",
     "CATTRS_INSTALLED",
     "LITESTAR_INSTALLED",
     "MSGSPEC_INSTALLED",
@@ -317,6 +331,7 @@ class EmptyEnum(enum.Enum):
     "UNSET_STUB",
     "AttrsInstance",
     "AttrsLike",
+    "AttrsNothingStub",
     "BaseModel",
     "BaseModelLike",
     "DTOData",
@@ -346,6 +361,7 @@ class EmptyEnum(enum.Enum):
     "attrs_fields_stub",
     "attrs_has",
     "attrs_has_stub",
+    "attrs_nothing",
     "cattrs_structure",
     "cattrs_unstructure",
     "convert",

advanced_alchemy/service/typing.py

@@ -38,6 +38,7 @@
     T,
     TypeAdapter,
     UnsetType,
+    attrs_nothing,
     convert,
 )
 from advanced_alchemy.service._typing import attrs_asdict as asdict
@@ -480,9 +481,20 @@ def schema_dump(
         return data.model_dump(exclude_unset=exclude_unset)
     if is_msgspec_struct(data):
         if exclude_unset:
-            return {f: val for f in data.__struct_fields__ if (val := getattr(data, f, None)) != UNSET}
+            return {
+                f: getattr(data, f)
+                for f in data.__struct_fields__
+                if hasattr(data, f) and getattr(data, f) is not UNSET
+            }
         return {f: getattr(data, f, None) for f in data.__struct_fields__}
     if is_attrs_instance(data):
+        if exclude_unset:
+            # Filter out attrs.NOTHING values for partial updates
+            def filter_unset_attrs(attr: Any, value: Any) -> bool:  # noqa: ARG001
+                return value is not attrs_nothing
+
+            return asdict(data, filter=filter_unset_attrs)
+
         # Use cattrs for enhanced performance and type-aware serialization when available
         if CATTRS_INSTALLED:
             return unstructure(data)  # type: ignore[no-any-return]
@@ -522,6 +534,7 @@ def schema_dump(
     "TypeAdapter",
     "UnsetType",
     "asdict",
+    "attrs_nothing",
     "convert",
     "fields",
     "get_attrs_fields",