refactor: add url class in place of urls module functions (#244)

Author: tdstein

src/posit/connect/bundles.py

@@ -142,7 +142,7 @@ def metadata(self) -> BundleMetadata:
     def delete(self) -> None:
         """Delete the bundle."""
         path = f"v1/content/{self.content_guid}/bundles/{self.id}"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         self.session.delete(url)
 
     def deploy(self) -> tasks.Task:
@@ -162,7 +162,7 @@ def deploy(self) -> tasks.Task:
         None
         """
         path = f"v1/content/{self.content_guid}/deploy"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.post(url, json={"bundle_id": self.id})
         result = response.json()
         ts = tasks.Tasks(self.config, self.session)
@@ -200,7 +200,7 @@ def download(self, output: io.BufferedWriter | str) -> None:
             )
 
         path = f"v1/content/{self.content_guid}/bundles/{self.id}/download"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.get(url, stream=True)
         if isinstance(output, io.BufferedWriter):
             for chunk in response.iter_content():
@@ -287,7 +287,7 @@ def create(self, input: io.BufferedReader | bytes | str) -> Bundle:
             )
 
         path = f"v1/content/{self.content_guid}/bundles"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.post(url, data=data)
         result = response.json()
         return Bundle(self.config, self.session, **result)
@@ -301,7 +301,7 @@ def find(self) -> List[Bundle]:
             List of all found bundles.
         """
         path = f"v1/content/{self.content_guid}/bundles"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.get(url)
         results = response.json()
         return [
@@ -333,7 +333,7 @@ def get(self, id: str) -> Bundle:
             The bundle with the specified ID.
         """
         path = f"v1/content/{self.content_guid}/bundles/{id}"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.get(url)
         result = response.json()
         return Bundle(self.config, self.session, **result)

src/posit/connect/client.py

@@ -318,7 +318,7 @@ def request(self, method: str, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.request(method, url, **kwargs)
 
     def get(self, path: str, **kwargs) -> Response:
@@ -339,7 +339,7 @@ def get(self, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.get(url, **kwargs)
 
     def post(self, path: str, **kwargs) -> Response:
@@ -360,7 +360,7 @@ def post(self, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.post(url, **kwargs)
 
     def put(self, path: str, **kwargs) -> Response:
@@ -381,7 +381,7 @@ def put(self, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.put(url, **kwargs)
 
     def patch(self, path: str, **kwargs) -> Response:
@@ -402,7 +402,7 @@ def patch(self, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.patch(url, **kwargs)
 
     def delete(self, path: str, **kwargs) -> Response:
@@ -423,5 +423,5 @@ def delete(self, path: str, **kwargs) -> Response:
         Response
             A [](`requests.Response`) object.
         """
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         return self.session.delete(url, **kwargs)

src/posit/connect/config.py

@@ -56,4 +56,4 @@ def __init__(
         self, api_key: Optional[str] = None, url: Optional[str] = None
     ) -> None:
         self.api_key = api_key or _get_api_key()
-        self.url = urls.create(url or _get_url())
+        self.url = urls.Url(url or _get_url())

src/posit/connect/content.py

@@ -144,7 +144,7 @@ class ContentItem(Resource):
     def delete(self) -> None:
         """Delete the content item."""
         path = f"v1/content/{self.guid}"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         self.session.delete(url)
 
     def deploy(self) -> tasks.Task:
@@ -164,7 +164,7 @@ def deploy(self) -> tasks.Task:
         None
         """
         path = f"v1/content/{self.guid}/deploy"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.post(url, json={"bundle_id": None})
         result = response.json()
         ts = tasks.Tasks(self.config, self.session)
@@ -237,7 +237,7 @@ def restart(self) -> None:
             self.environment_variables.create(key, random_hash)
             self.environment_variables.delete(key)
             # GET via the base Connect URL to force create a new worker thread.
-            url = urls.append(dirname(self.config.url), f"content/{self.guid}")
+            url = dirname(self.config.url) + f"/content/{self.guid}"
             self.session.get(url)
             return None
         else:
@@ -314,7 +314,7 @@ def update(self, *args, **kwargs) -> None:
     def update(self, *args, **kwargs) -> None:
         """Update the content item."""
         body = dict(*args, **kwargs)
-        url = urls.append(self.config.url, f"v1/content/{self.guid}")
+        url = self.config.url + f"v1/content/{self.guid}"
         response = self.session.patch(url, json=body)
         super().update(**response.json())
 
@@ -548,7 +548,7 @@ def __init__(
         *,
         owner_guid: str | None = None,
     ) -> None:
-        self.url = urls.append(config.url, "v1/content")
+        self.url = config.url + "v1/content"
         self.config = config
         self.session = session
         self.owner_guid = owner_guid
@@ -656,7 +656,7 @@ def create(self, *args, **kwargs) -> ContentItem:
         """
         body = dict(*args, **kwargs)
         path = "v1/content"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.post(url, json=body)
         return ContentItem(self.config, self.session, **response.json())
 
@@ -798,6 +798,6 @@ def get(self, guid: str) -> ContentItem:
         -------
         ContentItem
         """
-        url = urls.append(self.url, guid)
+        url = self.url + guid
         response = self.session.get(url)
         return ContentItem(self.config, self.session, **response.json())

src/posit/connect/env.py

@@ -71,7 +71,7 @@ def clear(self) -> None:
         >>> clear()
         """
         path = f"v1/content/{self.content_guid}/environment"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         self.session.put(url, json=[])
 
     def create(self, key: str, value: str, /) -> None:
@@ -129,7 +129,7 @@ def find(self) -> List[str]:
         ['DATABASE_URL']
         """
         path = f"v1/content/{self.content_guid}/environment"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.get(url)
         return response.json()
 
@@ -204,5 +204,5 @@ def update(self, other=(), /, **kwargs: Optional[str]):
 
         body = [{"name": key, "value": value} for key, value in d.items()]
         path = f"v1/content/{self.content_guid}/environment"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         self.session.patch(url, json=body)

src/posit/connect/groups.py

@@ -39,7 +39,7 @@ def owner_guid(self) -> str:
     def delete(self) -> None:
         """Delete the group."""
         path = f"v1/groups/{self.guid}"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         self.session.delete(url)
 
 
@@ -90,7 +90,7 @@ def create(self, *args, **kwargs) -> Group:
         ...
         body = dict(*args, **kwargs)
         path = "v1/groups"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response = self.session.post(url, json=body)
         return Group(self.config, self.session, **response.json())
 
@@ -117,7 +117,7 @@ def find(self, *args, **kwargs):
         """
         params = dict(*args, **kwargs)
         path = "v1/groups"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = Paginator(self.session, url, params=params)
         results = paginator.fetch_results()
         return [
@@ -152,7 +152,7 @@ def find_one(self, *args, **kwargs) -> Group | None:
         """
         params = dict(*args, **kwargs)
         path = "v1/groups"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = Paginator(self.session, url, params=params)
         pages = paginator.fetch_pages()
         results = (result for page in pages for result in page.results)
@@ -177,7 +177,7 @@ def get(self, guid: str) -> Group:
         -------
         Group
         """
-        url = urls.append(self.config.url, f"v1/groups/{guid}")
+        url = self.config.url + f"v1/groups/{guid}"
         response = self.session.get(url)
         return Group(
             config=self.config,
@@ -193,7 +193,7 @@ def count(self) -> int:
         int
         """
         path = "v1/groups"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         response: requests.Response = self.session.get(
             url, params={"page_size": 1}
         )

src/posit/connect/me.py

@@ -18,6 +18,6 @@ def get(config: Config, session: requests.Session) -> User:
     -------
         User: The current user.
     """
-    url = urls.append(config.url, "v1/user")
+    url = config.url + "v1/user"
     response = session.get(url)
     return User(config, session, **response.json())

src/posit/connect/metrics/shiny_usage.py

@@ -109,7 +109,7 @@ def find(self, *args, **kwargs) -> List[ShinyUsageEvent]:
         params = rename_params(params)
 
         path = "/v1/instrumentation/shiny/usage"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = CursorPaginator(self.session, url, params=params)
         results = paginator.fetch_results()
         return [
@@ -168,7 +168,7 @@ def find_one(self, *args, **kwargs) -> ShinyUsageEvent | None:
         params = dict(*args, **kwargs)
         params = rename_params(params)
         path = "/v1/instrumentation/shiny/usage"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = CursorPaginator(self.session, url, params=params)
         pages = paginator.fetch_pages()
         results = (result for page in pages for result in page.results)

src/posit/connect/metrics/visits.py

@@ -141,7 +141,7 @@ def find(self, *args, **kwargs) -> List[VisitEvent]:
         params = rename_params(params)
 
         path = "/v1/instrumentation/content/visits"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = CursorPaginator(self.session, url, params=params)
         results = paginator.fetch_results()
         return [
@@ -200,7 +200,7 @@ def find_one(self, *args, **kwargs) -> VisitEvent | None:
         params = dict(*args, **kwargs)
         params = rename_params(params)
         path = "/v1/instrumentation/content/visits"
-        url = urls.append(self.config.url, path)
+        url = self.config.url + path
         paginator = CursorPaginator(self.session, url, params=params)
         pages = paginator.fetch_pages()
         results = (result for page in pages for result in page.results)

src/posit/connect/oauth.py

@@ -15,7 +15,7 @@ class Credentials(TypedDict, total=False):
 
 class OAuthIntegration:
     def __init__(self, config: Config, session: Session) -> None:
-        self.url = urls.append(config.url, "v1/oauth/integrations/credentials")
+        self.url = config.url + "v1/oauth/integrations/credentials"
         self.config = config
         self.session = session