merge main branch

integration/tests/posit/connect/test_content_item_repository.py

@@ -2,7 +2,8 @@
 from packaging import version
 
 from posit import connect
-from posit.connect.content import ContentItem, ContentItemRepository
+from posit.connect.content import ContentItem
+from posit.connect.repository import ContentItemRepository
 
 from . import CONNECT_VERSION
 
@@ -76,12 +77,12 @@ def assert_repo(r: ContentItemRepository):
 
         # Update
         ex_branch = "main"
-        updated_repo = content_repo.update(branch=ex_branch)
-        assert updated_repo["branch"] == ex_branch
+        content_repo.update(branch=ex_branch)
+        assert content_repo["branch"] == ex_branch
 
-        assert updated_repo["repository"] == self.repo_repository
-        assert updated_repo["directory"] == self.repo_directory
-        assert updated_repo["polling"] is self.repo_polling
+        assert content_repo["repository"] == self.repo_repository
+        assert content_repo["directory"] == self.repo_directory
+        assert content_repo["polling"] is self.repo_polling
 
         # Delete
         content_repo.destroy()

integration/tests/posit/connect/test_tags.py

@@ -151,12 +151,12 @@ def test_tag_content_items(self):
         }
 
         # Update tag
-        tagDName = tagD.update(name="tagD_updated")
-        assert tagDName["name"] == "tagD_updated"
+        tagD.update(name="tagD_updated")
+        assert tagD["name"] == "tagD_updated"
         assert self.client.tags.get(tagD["id"])["name"] == "tagD_updated"
 
-        tagDParent = tagDName.update(parent=tagB)
-        assert tagDParent["parent_id"] == tagB["id"]
+        tagD.update(parent=tagB)
+        assert tagD["parent_id"] == tagB["id"]
         assert self.client.tags.get(tagD["id"])["parent_id"] == tagB["id"]
 
         # Cleanup

src/posit/connect/_utils.py

@@ -3,5 +3,28 @@
 from typing_extensions import Any
 
 
-def drop_none(x: dict[str, Any]) -> dict[str, Any]:
-    return {k: v for k, v in x.items() if v is not None}
+def update_dict_values(obj: dict[str, Any], /, **kwargs: Any) -> None:
+    """
+    Update the values of a dictionary.
+
+    This helper method exists as a workaround for the `dict.update` method. Sometimes, `super()` does not return the `dict` class and. If `super().update(**kwargs)` is called unintended behavior will occur.
+
+    Therefore, this helper method exists to update the `dict`'s values.
+
+    Parameters
+    ----------
+    obj : dict[str, Any]
+        The object to update.
+    kwargs : Any
+        The key-value pairs to update the object with.
+
+    See Also
+    --------
+    * https://github.com/posit-dev/posit-sdk-py/pull/366#discussion_r1887845267
+    """
+    # Could also be performed with:
+    # for key, value in kwargs.items():
+    #     obj[key] = value
+
+    # Use the `dict` class to explicity update the object in-place
+    dict.update(obj, **kwargs)