Fix on_duplicate and on_missing to be passed through methods not stored on body

Co-authored-by: SoulPancake <70265851+SoulPancake@users.noreply.github.com>

Author: Copilot

openfga_sdk/client/client.py

@@ -543,19 +543,21 @@ async def _write_with_transaction(
         kwargs = options_to_kwargs(options)
         conflict_options = options_to_conflict_info(options)
 
-        # Set conflict options on the body if provided
+        # Extract conflict options to pass to the tuple key methods
+        on_duplicate = None
+        on_missing = None
         if conflict_options:
             if conflict_options.on_duplicate_writes:
-                body.on_duplicate = conflict_options.on_duplicate_writes.value
+                on_duplicate = conflict_options.on_duplicate_writes.value
             if conflict_options.on_missing_deletes:
-                body.on_missing = conflict_options.on_missing_deletes.value
+                on_missing = conflict_options.on_missing_deletes.value
 
         writes_tuple_keys = None
         deletes_tuple_keys = None
-        if body.writes_tuple_keys:
-            writes_tuple_keys = body.writes_tuple_keys
-        if body.deletes_tuple_keys:
-            deletes_tuple_keys = body.deletes_tuple_keys
+        if body.writes:
+            writes_tuple_keys = body.writes_tuple_keys(on_duplicate=on_duplicate)
+        if body.deletes:
+            deletes_tuple_keys = body.deletes_tuple_keys(on_missing=on_missing)
 
         await self._api.write(
             WriteRequest(

openfga_sdk/client/models/write_request.py

@@ -24,13 +24,9 @@ def __init__(
         self,
         writes: list[ClientTuple] | None = None,
         deletes: list[ClientTuple] | None = None,
-        on_duplicate: str | None = None,
-        on_missing: str | None = None,
     ) -> None:
         self._writes = writes
         self._deletes = deletes
-        self._on_duplicate = on_duplicate
-        self._on_missing = on_missing
 
     @property
     def writes(self) -> list[ClientTuple] | None:
@@ -60,36 +56,9 @@ def deletes(self, value: list[ClientTuple] | None) -> None:
         """
         self._deletes = value
 
-    @property
-    def on_duplicate(self) -> str | None:
-        """
-        Return on_duplicate
-        """
-        return self._on_duplicate
-
-    @on_duplicate.setter
-    def on_duplicate(self, value: str | None) -> None:
-        """
-        Set on_duplicate
-        """
-        self._on_duplicate = value
-
-    @property
-    def on_missing(self) -> str | None:
-        """
-        Return on_missing
-        """
-        return self._on_missing
-
-    @on_missing.setter
-    def on_missing(self, value: str | None) -> None:
-        """
-        Set on_missing
-        """
-        self._on_missing = value
-
-    @property
-    def writes_tuple_keys(self) -> WriteRequestWrites | None:
+    def writes_tuple_keys(
+        self, on_duplicate: str | None = None
+    ) -> WriteRequestWrites | None:
         """
         Return the writes as tuple keys
         """
@@ -101,10 +70,11 @@ def writes_tuple_keys(self) -> WriteRequestWrites | None:
         if keys is None:
             return None
 
-        return WriteRequestWrites(tuple_keys=keys, on_duplicate=self._on_duplicate)
+        return WriteRequestWrites(tuple_keys=keys, on_duplicate=on_duplicate)
 
-    @property
-    def deletes_tuple_keys(self) -> WriteRequestDeletes | None:
+    def deletes_tuple_keys(
+        self, on_missing: str | None = None
+    ) -> WriteRequestDeletes | None:
         """
         Return the delete as tuple keys
         """
@@ -116,4 +86,4 @@ def deletes_tuple_keys(self) -> WriteRequestDeletes | None:
         if keys is None:
             return None
 
-        return WriteRequestDeletes(tuple_keys=keys, on_missing=self._on_missing)
+        return WriteRequestDeletes(tuple_keys=keys, on_missing=on_missing)

openfga_sdk/sync/client/client.py

@@ -543,19 +543,21 @@ def _write_with_transaction(
         kwargs = options_to_kwargs(options)
         conflict_options = options_to_conflict_info(options)
 
-        # Set conflict options on the body if provided
+        # Extract conflict options to pass to the tuple key methods
+        on_duplicate = None
+        on_missing = None
         if conflict_options:
             if conflict_options.on_duplicate_writes:
-                body.on_duplicate = conflict_options.on_duplicate_writes.value
+                on_duplicate = conflict_options.on_duplicate_writes.value
             if conflict_options.on_missing_deletes:
-                body.on_missing = conflict_options.on_missing_deletes.value
+                on_missing = conflict_options.on_missing_deletes.value
 
         writes_tuple_keys = None
         deletes_tuple_keys = None
-        if body.writes_tuple_keys:
-            writes_tuple_keys = body.writes_tuple_keys
-        if body.deletes_tuple_keys:
-            deletes_tuple_keys = body.deletes_tuple_keys
+        if body.writes:
+            writes_tuple_keys = body.writes_tuple_keys(on_duplicate=on_duplicate)
+        if body.deletes:
+            deletes_tuple_keys = body.deletes_tuple_keys(on_missing=on_missing)
 
         self._api.write(
             WriteRequest(