Merge abea9a244a into c5916a3b66

thousandeyes-sdk-core/README.md

@@ -2,28 +2,18 @@
 
 This package provides core functionality for interacting with the ThousandEyes API and should be installed before using any of the published SDKs.
 
-`PaginatorIterator` is unbounded, so wrap it with `itertools.islice` to cap the number of items and avoid making unintended, potentially expensive API calls. 
-Pick a slice size that matches your UI or batch size so you only fetch what you plan to process:
+Usage example for iterating paginated responses:
 
 ```python
-from thousandeyes_sdk.core import Configuration, ApiClient, PaginatorIterator
-from thousandeyes_sdk.dashboards import DashboardsApi
-from itertools import islice
+from thousandeyes_sdk.core import PaginatorIterator
+from thousandeyes_sdk.dashboards.api.dashboards_api import DashboardsApi
 
-configuration = Configuration(
-    host = "https://api.thousandeyes.com/v7",
-    access_token = "an_access_token",
-)
-
-
-def get_dashboard_widget_data():
-    with ApiClient(configuration) as client:
-        dashboards_api = DashboardsApi(client)
-        for item in list(islice(PaginatorIterator(
+dashboards_api = DashboardsApi()
+for widget_data in PaginatorIterator(
     dashboards_api.get_dashboard_widget_data,
-            lambda response: response.data.tests,
-            dashboard_id="a_dashboard_id",
-            widget_id="a_widget_id",
-        ), 20)):
-            print(item.test_id)
+    lambda response: response.data.tests if response.data else [],
+    dashboard_id="dashboard-id",
+    widget_id="widget-id",
+):
+    print(widget_data)
 ```

thousandeyes-sdk-core/src/thousandeyes_sdk/core/pagination_iterator.py

@@ -60,8 +60,7 @@ class PaginatorIterator(Generic[P, R, I]):
 
         while True:
             response = self._method(**params)
-            items = self._items_getter(response)
-            for item in items if items else []:
+            for item in self._items_getter(response):
                 yield item
 
             next_cursor = self._next_cursor_from_response(response)
@@ -72,10 +71,14 @@ class PaginatorIterator(Generic[P, R, I]):
             last_cursor = next_cursor
 
     def _next_cursor_from_response(self, response: Any) -> Optional[str]:
-        links = getattr(response, "links", None)
+        data = getattr(response, "data", response)
+        links = getattr(data, "links", None)
 
         if links is None:
-            links = getattr(response, "_links", None)
+            links = getattr(data, "_links", None)
+
+        if links is None and isinstance(data, Mapping):
+            links = data.get("_links") or data.get("links")
 
         if links is None:
             return None

thousandeyes-sdk-core/test/test_pagination_iterator.py

@@ -14,7 +14,8 @@ def test_iterator_uses_cursor_from_next_href():
         else:
             links = SimpleNamespace(next=None)
             items = ["third"]
-        return SimpleNamespace(links=links, items=items)
+        data = SimpleNamespace(links=links)
+        return SimpleNamespace(data=data, items=items)
 
     responses = list(PaginatorIterator(method, lambda response: response.items))
 
@@ -28,12 +29,12 @@ def test_iterator_reads_cursor_from_links_mapping():
     def method(**params):
         calls.append(params.copy())
         if params.get("pageCursor") is None:
-            links = {"next": {"href": "https://example.com?foo=1&pageCursor=xyz"}}
+            data = {"_links": {"next": {"href": "https://example.com?foo=1&pageCursor=xyz"}}}
             items = ["alpha"]
         else:
-            links = {"next": None}
+            data = {"_links": {"next": None}}
             items = ["beta"]
-        return SimpleNamespace(links=links, items=items)
+        return SimpleNamespace(data=data, items=items)
 
     responses = list(PaginatorIterator(method, lambda response: response.items, cursor_param="pageCursor"))
 
@@ -47,12 +48,12 @@ def test_iterator_stops_when_no_cursor_param_present():
     def method(**params):
         calls.append(params.copy())
         if params.get("cursor") is None:
-            links = {"next": "/next/page"}
+            data = {"links": {"next": "/next/page"}}
             items = ["one"]
         else:
-            links = {"next": None}
+            data = {"links": {"next": None}}
             items = ["two"]
-        return SimpleNamespace(links=links, items=items)
+        return SimpleNamespace(data=data, items=items)
 
     responses = list(PaginatorIterator(method, lambda response: response.items))
 
@@ -65,8 +66,8 @@ def test_iterator_stops_on_repeated_cursor():
 
     def method(**params):
         calls.append(params.copy())
-        links = {"next": "https://example.com?cursor=same"}
-        return SimpleNamespace(links=links, items=["only"])
+        data = {"links": {"next": "https://example.com?cursor=same"}}
+        return SimpleNamespace(data=data, items=["only"])
 
     responses = list(PaginatorIterator(method, lambda response: response.items, cursor="same"))