Merge pull request #22 from dataiku/bug/sc-87910-rfc-5988-pagination-broken-on-some-servers

Fix for [sc-87910] broken rfc-5988 pagination mode on some servers

Author: alexbourret

python-lib/pagination.py

@@ -23,6 +23,7 @@ def __init__(self, config=None, skip_key=None, limit_key=None, total_key=None, n
         self.is_first_batch = None
         self.is_paging_started = None
         self.next_page_number = None
+        self.params_must_be_blanked = False
 
     def configure_paging(self, config=None, skip_key=None, limit_key=None, total_key=None, next_page_key=None, url=None, pagination_type="na"):
         config = {} if config is None else config
@@ -60,6 +61,7 @@ def update_next_page(self, data, response_links=None):
         self.next_page_number = self.next_page_number + 1
         if next_page_url:
             self.next_page_url = next_page_url
+            self.params_must_be_blanked = True
         if isinstance(data, list):
             batch_size = len(data)
             self.records_to_skip = self.records_to_skip + batch_size

python-lib/rest_api_client.py

@@ -160,10 +160,13 @@ def request_with_redirect_retry(self, method, url, **kwargs):
         return response
 
     def paginated_api_call(self, can_raise_exeption=True):
-        pagination_params = self.pagination.get_params()
-        params = self.requests_kwargs.get("params")
-        params.update(pagination_params)
-        self.requests_kwargs.update({"params": params})
+        if self.pagination.params_must_be_blanked:
+            self.requests_kwargs["params"] = {}
+        else:
+            pagination_params = self.pagination.get_params()
+            params = self.requests_kwargs.get("params")
+            params.update(pagination_params)
+            self.requests_kwargs.update({"params": params})
         return self.request(self.http_method, self.pagination.get_next_page_url(), can_raise_exeption, **self.requests_kwargs)
 
     def empty_json_response(self):