merge main

Author: schloerke

src/posit/connect/bundles.py

@@ -3,10 +3,13 @@
 from __future__ import annotations
 
 import io
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from . import resources, tasks
 
+if TYPE_CHECKING:
+    from .context import Context
+
 
 class BundleMetadata(resources.Resource):
     pass
@@ -15,13 +18,12 @@ class BundleMetadata(resources.Resource):
 class Bundle(resources.Resource):
     @property
     def metadata(self) -> BundleMetadata:
-        return BundleMetadata(self.params, **self.get("metadata", {}))
+        return BundleMetadata(self._ctx, **self.get("metadata", {}))
 
     def delete(self) -> None:
         """Delete the bundle."""
         path = f"v1/content/{self['content_guid']}/bundles/{self['id']}"
-        url = self.params.url + path
-        self.params.session.delete(url)
+        self._ctx.client.delete(path)
 
     def deploy(self) -> tasks.Task:
         """Deploy the bundle.
@@ -40,10 +42,9 @@ def deploy(self) -> tasks.Task:
         None
         """
         path = f"v1/content/{self['content_guid']}/deploy"
-        url = self.params.url + path
-        response = self.params.session.post(url, json={"bundle_id": self["id"]})
+        response = self._ctx.client.post(path, json={"bundle_id": self["id"]})
         result = response.json()
-        ts = tasks.Tasks(self.params)
+        ts = tasks.Tasks(self._ctx)
         return ts.get(result["task_id"])
 
     def download(self, output: io.BufferedWriter | str) -> None:
@@ -78,8 +79,7 @@ def download(self, output: io.BufferedWriter | str) -> None:
             )
 
         path = f"v1/content/{self['content_guid']}/bundles/{self['id']}/download"
-        url = self.params.url + path
-        response = self.params.session.get(url, stream=True)
+        response = self._ctx.client.get(path, stream=True)
         if isinstance(output, io.BufferedWriter):
             for chunk in response.iter_content():
                 output.write(chunk)
@@ -109,10 +109,10 @@ class Bundles(resources.Resources):
 
     def __init__(
         self,
-        params: resources.ResourceParameters,
+        ctx: Context,
         content_guid: str,
     ) -> None:
-        super().__init__(params)
+        super().__init__(ctx)
         self.content_guid = content_guid
 
     def create(self, archive: io.BufferedReader | bytes | str) -> Bundle:
@@ -164,10 +164,9 @@ def create(self, archive: io.BufferedReader | bytes | str) -> Bundle:
             )
 
         path = f"v1/content/{self.content_guid}/bundles"
-        url = self.params.url + path
-        response = self.params.session.post(url, data=data)
+        response = self._ctx.client.post(path, data=data)
         result = response.json()
-        return Bundle(self.params, **result)
+        return Bundle(self._ctx, **result)
 
     def find(self) -> List[Bundle]:
         """Find all bundles.
@@ -178,10 +177,9 @@ def find(self) -> List[Bundle]:
             List of all found bundles.
         """
         path = f"v1/content/{self.content_guid}/bundles"
-        url = self.params.url + path
-        response = self.params.session.get(url)
+        response = self._ctx.client.get(path)
         results = response.json()
-        return [Bundle(self.params, **result) for result in results]
+        return [Bundle(self._ctx, **result) for result in results]
 
     def find_one(self) -> Bundle | None:
         """Find a bundle.
@@ -208,7 +206,6 @@ def get(self, uid: str) -> Bundle:
             The bundle with the specified ID.
         """
         path = f"v1/content/{self.content_guid}/bundles/{uid}"
-        url = self.params.url + path
-        response = self.params.session.get(url)
+        response = self._ctx.client.get(path)
         result = response.json()
-        return Bundle(self.params, **result)
+        return Bundle(self._ctx, **result)

src/posit/connect/client.py

@@ -14,7 +14,7 @@
 from .groups import Groups
 from .metrics import Metrics
 from .oauth import OAuth
-from .resources import ResourceParameters, _PaginatedResourceSequence, _ResourceSequence
+from .resources import _PaginatedResourceSequence, _ResourceSequence
 from .system import System
 from .tags import Tags
 from .tasks import Tasks
@@ -23,7 +23,7 @@
 
 if TYPE_CHECKING:
     from .environments import Environments
-    from .packages import _Packages
+    from .packages import Packages
 
 
 class Client(ContextManager):
@@ -160,7 +160,6 @@ def __init__(self, *args, **kwargs) -> None:
         session.hooks["response"].append(hooks.check_for_deprecation_header)
         session.hooks["response"].append(hooks.handle_errors)
         self.session = session
-        self.resource_params = ResourceParameters(session, self.cfg.url)
         self._ctx = Context(self)
 
     @property
@@ -208,7 +207,7 @@ def tasks(self) -> Tasks:
         tasks.Tasks
             The tasks resource instance.
         """
-        return Tasks(self.resource_params)
+        return Tasks(self._ctx)
 
     @property
     def users(self) -> Users:
@@ -282,7 +281,7 @@ def metrics(self) -> Metrics:
         >>> len(events)
         24
         """
-        return Metrics(self.resource_params)
+        return Metrics(self._ctx)
 
     @property
     @requires(version="2024.08.0")
@@ -295,16 +294,16 @@ def oauth(self) -> OAuth:
         OAuth
             The oauth API instance.
         """
-        return OAuth(self.resource_params, self.cfg.api_key)
+        return OAuth(self._ctx, self.cfg.api_key)
 
     @property
     @requires(version="2024.11.0")
-    def packages(self) -> _Packages:
+    def packages(self) -> Packages:
         return _PaginatedResourceSequence(self._ctx, "v1/packages", uid="name")
 
     @property
     def vanities(self) -> Vanities:
-        return Vanities(self.resource_params)
+        return Vanities(self._ctx)
 
     @property
     def system(self) -> System:

src/posit/connect/content.py

@@ -32,10 +32,8 @@
 from .resources import (
     Active,
     Resource,
-    ResourceParameters,
     Resources,
     _Resource,
-    _ResourcePatch,
     _ResourceSequence,
     _ResourceUpdatePatchMixin,
 )
@@ -46,7 +44,7 @@
 if TYPE_CHECKING:
     from .context import Context
     from .jobs import Jobs
-    from .packages import _ContentPackages
+    from .packages import ContentPackages
     from .tasks import Task
 
 
@@ -115,13 +113,13 @@ def update(
 
 
 class ContentItemOAuth(Resource):
-    def __init__(self, params: ResourceParameters, content_guid: str) -> None:
-        super().__init__(params)
+    def __init__(self, ctx: Context, content_guid: str) -> None:
+        super().__init__(ctx)
         self["content_guid"] = content_guid
 
     @property
     def associations(self) -> ContentItemAssociations:
-        return ContentItemAssociations(self.params, content_guid=self["content_guid"])
+        return ContentItemAssociations(self._ctx, content_guid=self["content_guid"])
 
 
 class ContentItemOwner(Resource):
@@ -208,12 +206,12 @@ def __init__(
     def __getitem__(self, key: Any) -> Any:
         v = super().__getitem__(key)
         if key == "owner" and isinstance(v, dict):
-            return ContentItemOwner(params=self.params, **v)
+            return ContentItemOwner(self._ctx, **v)
         return v
 
     @property
     def oauth(self) -> ContentItemOAuth:
-        return ContentItemOAuth(self.params, content_guid=self["guid"])
+        return ContentItemOAuth(self._ctx, content_guid=self["guid"])
 
     @property
     def repository(self) -> ContentItemRepository | None:
@@ -270,8 +268,7 @@ def create_repository(self, /, **attributes) -> ContentItemRepository:
     def delete(self) -> None:
         """Delete the content item."""
         path = f"v1/content/{self['guid']}"
-        url = self._ctx.url + path
-        self._ctx.session.delete(url)
+        self._ctx.client.delete(path)
 
     def deploy(self) -> tasks.Task:
         """Deploy the content.
@@ -290,10 +287,9 @@ def deploy(self) -> tasks.Task:
         None
         """
         path = f"v1/content/{self['guid']}/deploy"
-        url = self._ctx.url + path
-        response = self._ctx.session.post(url, json={"bundle_id": None})
+        response = self._ctx.client.post(path, json={"bundle_id": None})
         result = response.json()
-        ts = tasks.Tasks(self.params)
+        ts = tasks.Tasks(self._ctx)
         return ts.get(result["task_id"])
 
     def render(self) -> Task:
@@ -346,8 +342,8 @@ def restart(self) -> None:
             self.environment_variables.create(key, unix_epoch_in_seconds)
             self.environment_variables.delete(key)
             # GET via the base Connect URL to force create a new worker thread.
-            url = posixpath.join(dirname(self._ctx.url), f"content/{self['guid']}")
-            self._ctx.session.get(url)
+            path = f"../content/{self['guid']}"
+            self._ctx.client.get(path)
             return None
         else:
             raise ValueError(
@@ -417,23 +413,22 @@ def update(
         -------
         None
         """
-        url = self._ctx.url + f"v1/content/{self['guid']}"
-        response = self._ctx.session.patch(url, json=attrs)
+        response = self._ctx.client.patch(f"v1/content/{self['guid']}", json=attrs)
         super().update(**response.json())
 
     # Relationships
 
     @property
     def bundles(self) -> Bundles:
-        return Bundles(self.params, self["guid"])
+        return Bundles(self._ctx, self["guid"])
 
     @property
     def environment_variables(self) -> EnvVars:
-        return EnvVars(self.params, self["guid"])
+        return EnvVars(self._ctx, self["guid"])
 
     @property
     def permissions(self) -> Permissions:
-        return Permissions(self.params, self["guid"])
+        return Permissions(self._ctx, self["guid"])
 
     @property
     def owner(self) -> dict:
@@ -450,7 +445,7 @@ def owner(self) -> dict:
 
     @property
     def _variants(self) -> Variants:
-        return Variants(self.params, self["guid"])
+        return Variants(self._ctx, self["guid"])
 
     @property
     def is_interactive(self) -> bool:
@@ -494,7 +489,7 @@ def jobs(self) -> Jobs:
 
     @property
     @requires(version="2024.11.0")
-    def packages(self) -> _ContentPackages:
+    def packages(self) -> ContentPackages:
         path = posixpath.join(self._path, "packages")
         return _ResourceSequence(self._ctx, path, uid="name")
 
@@ -518,7 +513,7 @@ def __init__(
         *,
         owner_guid: str | None = None,
     ) -> None:
-        super().__init__(ctx.client.resource_params)
+        super().__init__(ctx)
         self.owner_guid = owner_guid
         self._ctx = ctx
 
@@ -594,9 +589,7 @@ def create(
         -------
         ContentItem
         """
-        path = "v1/content"
-        url = self._ctx.url + path
-        response = self._ctx.session.post(url, json=attrs)
+        response = self._ctx.client.post("v1/content", json=attrs)
         return ContentItem(self._ctx, **response.json())
 
     @overload
@@ -682,9 +675,7 @@ def find(self, include: Optional[str | list[Any]] = None, **conditions) -> List[
         if self.owner_guid:
             conditions["owner_guid"] = self.owner_guid
 
-        path = "v1/content"
-        url = self._ctx.url + path
-        response = self._ctx.session.get(url, params=conditions)
+        response = self._ctx.client.get("v1/content", params=conditions)
         return [
             ContentItem(
                 self._ctx,
@@ -855,7 +846,5 @@ def get(self, guid: str) -> ContentItem:
         -------
         ContentItem
         """
-        path = f"v1/content/{guid}"
-        url = self._ctx.url + path
-        response = self._ctx.session.get(url)
+        response = self._ctx.client.get(f"v1/content/{guid}")
         return ContentItem(self._ctx, **response.json())

src/posit/connect/context.py

@@ -7,10 +7,7 @@
 from packaging.version import Version
 
 if TYPE_CHECKING:
-    import requests
-
     from .client import Client
-    from .urls import Url
 
 
 def requires(version: str):
@@ -31,17 +28,14 @@ def wrapper(instance: ContextManager, *args, **kwargs):
 
 class Context:
     def __init__(self, client: Client):
-        self.session: requests.Session = client.session
-        self.url: Url = client.cfg.url
         # Since this is a child object of the client, we use a weak reference to avoid circular
         # references (which would prevent garbage collection)
         self.client: Client = weakref.proxy(client)
 
     @property
     def version(self) -> str | None:
         if not hasattr(self, "_version"):
-            endpoint = self.url + "server_settings"
-            response = self.session.get(endpoint)
+            response = self.client.get("server_settings")
             result = response.json()
             self._version: str | None = result.get("version")