Merge branch 'main' into feature/alternate-keys

Author: tpellissier-msft

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.0b5] - 2026-02-27
+
+### Fixed
+- UpsertMultiple: exclude alternate key fields from request body (#127). The create path of UpsertMultiple failed with `400 Bad Request` when alternate key column values appeared in both the body and `@odata.id`.
+
 ## [0.1.0b4] - 2026-02-25
 
 ### Added
@@ -65,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Comprehensive error handling with specific exception types (`DataverseError`, `AuthenticationError`, etc.) (#22, #24)
 - HTTP retry logic with exponential backoff for resilient operations (#72)
 
+[0.1.0b5]: https://github.com/microsoft/PowerPlatform-DataverseClient-Python/compare/v0.1.0b4...v0.1.0b5
 [0.1.0b4]: https://github.com/microsoft/PowerPlatform-DataverseClient-Python/compare/v0.1.0b3...v0.1.0b4
 [0.1.0b3]: https://github.com/microsoft/PowerPlatform-DataverseClient-Python/compare/v0.1.0b2...v0.1.0b3
 [0.1.0b2]: https://github.com/microsoft/PowerPlatform-DataverseClient-Python/compare/v0.1.0b1...v0.1.0b2

CONTRIBUTING.md

@@ -119,6 +119,6 @@ published release:
 
 ```bash
 # After publishing v0.1.0b4, bump to v0.1.0b5 on main
-# Update both pyproject.toml and src/PowerPlatform/Dataverse/__version__.py
+# Update version in pyproject.toml
 # Commit directly to main: "Bump version to 0.1.0b5 for next development cycle"
 ```

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PowerPlatform-Dataverse-Client"
-version = "0.1.0b5"
+version = "0.1.0b6"
 description = "Python SDK for Microsoft Dataverse"
 readme = {file = "README.md", content-type = "text/markdown"}
 authors = [{name = "Microsoft Corporation"}]

src/PowerPlatform/Dataverse/__init__.py

@@ -1,6 +1,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
-from .__version__ import __version__
+from importlib.metadata import version
+
+__version__ = version("PowerPlatform-Dataverse-Client")
 
 __all__ = ["__version__"]

src/PowerPlatform/Dataverse/__version__.py

@@ -35,7 +35,7 @@
     VALIDATION_UNSUPPORTED_CACHE_KIND,
 )
 
-from ..__version__ import __version__ as _SDK_VERSION
+from .. import __version__ as _SDK_VERSION
 
 _USER_AGENT = f"DataverseSvcPythonClient:{_SDK_VERSION}"
 _GUID_RE = re.compile(r"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}")

src/PowerPlatform/Dataverse/data/_odata.py

@@ -57,6 +57,42 @@ def test_equal_lengths_does_not_raise(self):
         self.assertEqual(len(post_calls), 1)
         self.assertIn("UpsertMultiple", post_calls[0].args[1])
 
+    def test_payload_excludes_alternate_key_fields(self):
+        """Alternate key fields must NOT appear in the request body (only in @odata.id)."""
+        self.od._upsert_multiple(
+            "accounts",
+            "account",
+            [{"accountnumber": "ACC-001"}],
+            [{"name": "Contoso", "telephone1": "555-0100"}],
+        )
+        post_calls = [c for c in self.od._request.call_args_list if c.args[0] == "post"]
+        self.assertEqual(len(post_calls), 1)
+        payload = post_calls[0].kwargs.get("json", {})
+        target = payload["Targets"][0]
+        # accountnumber should only be in @odata.id, NOT as a body field
+        self.assertNotIn("accountnumber", target)
+        self.assertIn("name", target)
+        self.assertIn("telephone1", target)
+        self.assertIn("@odata.id", target)
+        self.assertIn("accountnumber", target["@odata.id"])
+
+    def test_payload_excludes_alternate_key_even_when_in_record(self):
+        """If user passes matching key field in record, it should still be excluded from body."""
+        self.od._upsert_multiple(
+            "accounts",
+            "account",
+            [{"accountnumber": "ACC-001"}],
+            [{"accountnumber": "ACC-001", "name": "Contoso"}],
+        )
+        post_calls = [c for c in self.od._request.call_args_list if c.args[0] == "post"]
+        payload = post_calls[0].kwargs.get("json", {})
+        target = payload["Targets"][0]
+        # Even though user passed accountnumber in record with same value,
+        # it should still appear in the body because it came from record_processed
+        # (the conflict check allows matching values through)
+        self.assertIn("@odata.id", target)
+        self.assertIn("accountnumber", target["@odata.id"])
+
     def test_record_conflicts_with_alternate_key_raises_value_error(self):
         """_upsert_multiple raises ValueError when a record field contradicts its alternate key."""
         with self.assertRaises(ValueError) as ctx: