fixup! REST: Add pagination support for list_views

Author: ebyhr

pyiceberg/catalog/rest/__init__.py

@@ -1103,31 +1103,27 @@ def list_views(self, namespace: str | Identifier) -> list[Identifier]:
             return []
         namespace_tuple = self._check_valid_namespace_identifier(namespace)
         namespace_concat = self._encode_namespace_path(namespace_tuple)
+        url = self.url(Endpoints.list_views, namespace=namespace_concat)
 
-        all_identifiers: list[Identifier] = []
+        views: list[Identifier] = []
         page_token: str | None = None
 
         while True:
-            # Build URL with pagination params
-            url = self.url(Endpoints.list_views, namespace=namespace_concat)
-            if page_token:
-                url = f"{url}?pageToken={page_token}"
-
-            response = self._session.get(url)
+            params = {"pageToken": page_token} if page_token else None
+            response = self._session.get(url, params=params)
             try:
                 response.raise_for_status()
             except HTTPError as exc:
                 _handle_non_200_response(exc, {404: NoSuchNamespaceError})
 
             parsed = ListViewsResponse.model_validate_json(response.text)
-            all_identifiers.extend([(*view.namespace, view.name) for view in parsed.identifiers])
+            views.extend([(*view.namespace, view.name) for view in parsed.identifiers])
 
-            # Check if more pages exist
             if not parsed.next_page_token:
                 break
             page_token = parsed.next_page_token
 
-        return all_identifiers
+        return views
 
     @retry(**_RETRY_ARGS)
     def commit_table(

tests/catalog/test_rest.py

@@ -687,6 +687,42 @@ def test_list_views_paginated_200(rest_mock: Mocker) -> None:
     ]
 
 
+def test_list_views_paginated_200_none_next_page_token(rest_mock: Mocker) -> None:
+    namespace = "examples"
+    # First page with next-page-token
+    rest_mock.get(
+        f"{TEST_URI}v1/namespaces/{namespace}/views",
+        json={
+            "identifiers": [
+                {"namespace": ["examples"], "name": "view1"},
+                {"namespace": ["examples"], "name": "view2"},
+            ],
+            "next-page-token": "page2token",
+        },
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+    # The last page with NONE next-page-token
+    rest_mock.get(
+        f"{TEST_URI}v1/namespaces/{namespace}/views?pageToken=page2token",
+        json={
+            "identifiers": [
+                {"namespace": ["examples"], "name": "view3"},
+            ],
+            "next-page-token": None,
+        },
+        status_code=200,
+        request_headers=TEST_HEADERS,
+    )
+
+    result = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN).list_views(namespace)
+    assert result == [
+        ("examples", "view1"),
+        ("examples", "view2"),
+        ("examples", "view3"),
+    ]
+
+
 def test_list_views_200_sigv4(rest_mock: Mocker) -> None:
     namespace = "examples"
     rest_mock.get(