This is an automated email from the ASF dual-hosted git repository.
henry3260 pushed a commit to branch airflow-ctl/v0-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/airflow-ctl/v0-1-test by this
push:
new 2b72a7d839b [airflow-ctl/v0-1-test] Fix airflowctl list pagination
when the server caps the page size (#76268) (#76414)
2b72a7d839b is described below
commit 2b72a7d839b4dfe3d5319a0fc945ab1f73085d31
Author: Henry Chen <[email protected]>
AuthorDate: Wed Nov 4 21:41:11 2026 +0800
[airflow-ctl/v0-1-test] Fix airflowctl list pagination when the server caps
the page size (#76268) (#76414)
(cherry picked from commit 5308480f2eeb3f006bd92c7f748a48d38f4df0c8)
Conflict resolution: this branch validates pages through the local
safe_validate/fill_missing_fields helper instead of validate_response, and
it
has no "total_entries is None" guard because that handling is main-only, so
the
early return for a short collection is dropped rather than narrowed.
Co-authored-by: Rishabh <[email protected]>
---
airflow-ctl/src/airflowctl/api/operations.py | 18 ++++++----
.../tests/airflow_ctl/api/test_operations.py | 42 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/airflow-ctl/src/airflowctl/api/operations.py
b/airflow-ctl/src/airflowctl/api/operations.py
index 0057c45f00c..09fa2544229 100644
--- a/airflow-ctl/src/airflowctl/api/operations.py
+++ b/airflow-ctl/src/airflowctl/api/operations.py
@@ -256,20 +256,24 @@ class BaseOperations:
self.response = self.client.get(path, params={**shared_params,
"offset": offset})
first_pass = safe_validate(self.response.content)
total_entries = first_pass.total_entries
- if total_entries < limit:
- return first_pass
found_key = None
for key, value in first_pass.model_dump().items():
if key != "total_entries" and isinstance(value, list):
found_key = key
break
+ if found_key is None:
+ return first_pass
entry_list = getattr(first_pass, found_key)
- offset = offset + limit
- while offset < total_entries:
+ # The server may cap ``limit`` (``api.maximum_page_limit``), so
advance by the number of
+ # entries received rather than by the requested limit, or the
capped-off entries are skipped.
+ page_size = len(entry_list)
+ offset = offset + page_size
+ while page_size and offset < total_entries:
self.response = self.client.get(path, params={**shared_params,
"offset": offset})
- entry = safe_validate(self.response.content)
- offset = offset + limit
- entry_list.extend(getattr(entry, found_key))
+ page_entries = getattr(safe_validate(self.response.content),
found_key)
+ entry_list.extend(page_entries)
+ page_size = len(page_entries)
+ offset = offset + page_size
return data_model(**{found_key: entry_list, "total_entries":
total_entries})
diff --git a/airflow-ctl/tests/airflow_ctl/api/test_operations.py
b/airflow-ctl/tests/airflow_ctl/api/test_operations.py
index a03f410300d..1621bd015dc 100644
--- a/airflow-ctl/tests/airflow_ctl/api/test_operations.py
+++ b/airflow-ctl/tests/airflow_ctl/api/test_operations.py
@@ -297,6 +297,48 @@ class TestBaseOperations:
for call in mock_client.get.call_args_list:
assert call.kwargs["params"]["limit"] == 2
+ def
test_execute_list_advances_by_entries_received_when_server_caps_limit(self):
+ """A server with a lower ``api.maximum_page_limit`` returns fewer
entries than requested;
+ paging must continue from what was received or the entries in between
are skipped."""
+ mock_client = Mock(spec=Client)
+ mock_client.get.side_effect = [
+ Mock(content=json.dumps({"hellos": [{"name": "a"}, {"name": "b"}],
"total_entries": 5})),
+ Mock(content=json.dumps({"hellos": [{"name": "c"}, {"name": "d"}],
"total_entries": 5})),
+ Mock(content=json.dumps({"hellos": [{"name": "e"}],
"total_entries": 5})),
+ ]
+ base_operation = BaseOperations(client=mock_client)
+
+ response = base_operation.execute_list(path="hello",
data_model=HelloCollectionResponse, limit=50)
+
+ assert [hello.name for hello in response.hellos] == ["a", "b", "c",
"d", "e"]
+ assert [call.kwargs["params"]["offset"] for call in
mock_client.get.call_args_list] == [0, 2, 4]
+
+ def test_execute_list_stops_when_server_returns_an_empty_page(self):
+ mock_client = Mock()
+ mock_client.get.side_effect = [
+ Mock(content=json.dumps({"hellos": [{"name": "a"}],
"total_entries": 3})),
+ Mock(content=json.dumps({"hellos": [], "total_entries": 3})),
+ ]
+ base_operation = BaseOperations(client=mock_client)
+
+ response = base_operation.execute_list(path="hello",
data_model=HelloCollectionResponse, limit=50)
+
+ assert [hello.name for hello in response.hellos] == ["a"]
+ assert mock_client.get.call_count == 2
+
+ def
test_execute_list_returns_first_page_when_response_has_no_entries_list(self):
+ class _CountOnlyResponse(BaseModel):
+ total_entries: int
+
+ mock_client = Mock()
+ mock_client.get.return_value =
Mock(content=json.dumps({"total_entries": 5}))
+ base_operation = BaseOperations(client=mock_client)
+
+ response = base_operation.execute_list(path="hello",
data_model=_CountOnlyResponse, limit=2)
+
+ assert response == _CountOnlyResponse(total_entries=5)
+ assert mock_client.get.call_count == 1
+
def test_execute_list_sends_offset_to_server(self):
"""``offset`` must reach the server on the first request, not only on
subsequent pages."""
rows = [{"name": name} for name in "abcdef"]
