Refactor so get() is hard coded to always use all include fields

Author: cgraham-rs

integration/tests/posit/connect/test_content.py

@@ -23,15 +23,17 @@ def test_count(self):
         assert self.client.content.count() == 1
 
     def test_get(self):
-        assert self.client.content.get(self.content["guid"]) == self.content
-
-    def test_get_with_include_string(self):
-        assert self.client.content.get(self.content["guid"], include="owner")
-
-    def test_get_with_include_list(self):
-        assert self.client.content.get(
-            self.content["guid"], include=["owner", "tags", "vanity_url"]
-        )
+        item = self.client.content.get(self.content["guid"])
+        # get() always includes owner, tags, and vanity_url. Owner data is always present in all
+        # content, tags and vanity_url is only present if explicitly set in the content.
+        # Check that essential fields match instead of exact equality
+        for key in self.content:
+            assert key in item
+            assert item[key] == self.content[key]
+        # Also verify we have the additional fields that should always be included
+        assert "owner" in item
+        assert "tags" not in item
+        assert "vanity_url" not in item
 
     def test_find(self):
         assert self.client.content.find()

src/posit/connect/content.py

@@ -983,34 +983,20 @@ def find_one(self, **conditions) -> Optional[ContentItem]:
         items = self.find(**conditions)
         return next(iter(items), None)
 
-    def get(
-        self,
-        guid: str,
-        *,
-        include: Optional[
-            Literal["owner", "tags", "vanity_url"] | list[Literal["owner", "tags", "vanity_url"]]
-        ] = None,
-    ) -> ContentItem:
+    def get(self, guid: str) -> ContentItem:
         """Get a content item.
 
         Parameters
         ----------
         guid : str
             The unique identifier of the content item.
-        include : str or list of str, optional
-            Additional details to include in the response.
-            Allowed values: 'owner', 'tags', 'vanity_url'.
 
         Returns
         -------
         ContentItem
         """
-        params = {}
-        if include is not None:
-            if isinstance(include, list):
-                params["include"] = ",".join(include)
-            else:
-                params["include"] = include
+        # Always request all available optional fields for the content item
+        params = {"include": "owner,tags,vanity_url"}
 
         response = self._ctx.client.get(f"v1/content/{guid}", params=params)
         return ContentItem(self._ctx, **response.json())

tests/posit/connect/test_content.py

@@ -365,62 +365,16 @@ def test_params_include_none(self):
 class TestContentsGet:
     @responses.activate
     def test(self):
+        # All calls to get() should automatically include all available optional fields
         responses.get(
             "https://connect.example/__api__/v1/content/f2f37341-e21d-3d80-c698-a935ad614066",
             json=load_mock("v1/content/f2f37341-e21d-3d80-c698-a935ad614066.json"),
+            match=[matchers.query_param_matcher({"include": "owner,tags,vanity_url"})],
         )
         con = Client("https://connect.example", "12345")
         get_one = con.content.get("f2f37341-e21d-3d80-c698-a935ad614066")
         assert get_one["name"] == "Performance-Data-1671216053560"
 
-    @responses.activate
-    def test_params_include_string(self):
-        guid = "f2f37341-e21d-3d80-c698-a935ad614066"
-        mock_get = responses.get(
-            f"https://connect.example/__api__/v1/content/{guid}",
-            json=load_mock(f"v1/content/{guid}.json"),
-            match=[matchers.query_param_matcher({"include": "owner"})],
-        )
-
-        con = Client("https://connect.example", "12345")
-        content = con.content.get(guid, include="owner")
-        assert content["guid"] == guid
-
-        #  assert
-        assert mock_get.call_count == 1
-
-    @responses.activate
-    def test_params_include_list(self):
-        guid = "f2f37341-e21d-3d80-c698-a935ad614066"
-        mock_get = responses.get(
-            f"https://connect.example/__api__/v1/content/{guid}",
-            json=load_mock(f"v1/content/{guid}.json"),
-            match=[matchers.query_param_matcher({"include": "owner,tags,vanity_url"})],
-        )
-
-        con = Client("https://connect.example", "12345")
-        content = con.content.get(guid, include=["owner", "tags", "vanity_url"])
-        assert content["guid"] == guid
-
-        #  assert
-        assert mock_get.call_count == 1
-
-    @responses.activate
-    def test_params_include_none(self):
-        guid = "f2f37341-e21d-3d80-c698-a935ad614066"
-        mock_get = responses.get(
-            f"https://connect.example/__api__/v1/content/{guid}",
-            json=load_mock(f"v1/content/{guid}.json"),
-            match=[matchers.query_param_matcher({})],
-        )
-
-        con = Client("https://connect.example", "12345")
-        content = con.content.get(guid, include=None)
-        assert content["guid"] == guid
-
-        # assert
-        assert mock_get.call_count == 1
-
 
 class TestContentsCount:
     @responses.activate