Update Paginator to accept a Context and path

Author: schloerke

src/posit/connect/groups.py

@@ -219,8 +219,7 @@ def find(self) -> list[User]:
         from .users import User
 
         path = f"v1/groups/{self._group_guid}/members"
-        url = self._ctx.url + path
-        paginator = Paginator(self._ctx.session, url)
+        paginator = Paginator(self._ctx, path)
         member_dicts = paginator.fetch_results()
 
         # For each member in the group
@@ -335,8 +334,7 @@ def find(self, **kwargs):
         * https://docs.posit.co/connect/api/#get-/v1/groups
         """
         path = "v1/groups"
-        url = self._ctx.url + path
-        paginator = Paginator(self._ctx.session, url, params=kwargs)
+        paginator = Paginator(self._ctx, path, params=kwargs)
         results = paginator.fetch_results()
         return [
             Group(
@@ -373,8 +371,7 @@ def find_one(self, **kwargs) -> Group | None:
         * https://docs.posit.co/connect/api/#get-/v1/groups
         """
         path = "v1/groups"
-        url = self._ctx.url + path
-        paginator = Paginator(self._ctx.session, url, params=kwargs)
+        paginator = Paginator(self._ctx, path, params=kwargs)
         pages = paginator.fetch_pages()
         results = (result for page in pages for result in page.results)
         groups = (

src/posit/connect/packages.py

@@ -148,8 +148,7 @@ class _Fetch(TypedDict, total=False):
 
     def fetch(self, **conditions: Unpack[_Fetch]) -> Generator["Package"]:  # type: ignore
         # todo - add pagination support to ActiveSequence
-        url = self._ctx.url + self._path
-        paginator = Paginator(self._ctx.session, url, dict(**conditions))
+        paginator = Paginator(self._ctx, self._path, dict(**conditions))
         for page in paginator.fetch_pages():
             results = page.results
             yield from (self._create_instance("", **result) for result in results)

src/posit/connect/paginator.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Generator, List
 
 if TYPE_CHECKING:
-    import requests
+    from .context import Context
 
 # The maximum page size supported by the API.
 _MAX_PAGE_SIZE = 500
@@ -43,15 +43,15 @@ class Paginator:
 
     def __init__(
         self,
-        session: requests.Session,
-        url: str,
+        ctx: Context,
+        path: str,
         params: dict | None = None,
     ) -> None:
         if params is None:
             params = {}
-        self.session = session
-        self.url = url
-        self.params = params
+        self._ctx = ctx
+        self._path = path
+        self._params = params
 
     def fetch_results(self) -> List[dict]:
         """
@@ -106,9 +106,9 @@ def fetch_page(self, page_number: int) -> Page:
 
         """
         params = {
-            **self.params,
+            **self._params,
             "page_number": page_number,
             "page_size": _MAX_PAGE_SIZE,
         }
-        response = self.session.get(self.url, params=params)
+        response = self._ctx.client.get(self._path, params=params)
         return Page(**response.json())

src/posit/connect/users.py

@@ -431,8 +431,8 @@ def find(self, **conditions: Unpack[FindUser]) -> List[User]:
         --------
         * https://docs.posit.co/connect/api/#get-/v1/users
         """
-        url = self._ctx.url + "v1/users"
-        paginator = Paginator(self._ctx.session, url, params={**conditions})
+        path = "v1/users"
+        paginator = Paginator(self._ctx, path, params={**conditions})
         results = paginator.fetch_results()
         return [
             User(
@@ -478,8 +478,8 @@ def find_one(self, **conditions: Unpack[FindUser]) -> User | None:
         --------
         * https://docs.posit.co/connect/api/#get-/v1/users
         """
-        url = self._ctx.url + "v1/users"
-        paginator = Paginator(self._ctx.session, url, params={**conditions})
+        path = "v1/users"
+        paginator = Paginator(self._ctx, path, params={**conditions})
         pages = paginator.fetch_pages()
         results = (result for page in pages for result in page.results)
         users = (