fix: Pagination internal FDP providers (#79)

Fix pagination for spacenet and internal_fdp provider

---------

Co-authored-by: jlahovnik <julia.lahovnik@csgroup.eu>

Author: cauriol

stac_fastapi/eodag/app.py

@@ -122,6 +122,7 @@
 
 # item_collection extensions
 itm_col_extensions_map = {
+    "query": QueryExtension(conformance_classes=[QueryConformanceClasses.COLLECTIONS]),
     "token": TokenPaginationExtension(),
     "sort": SortExtension(conformance_classes=[SortConformanceClasses.ITEMS]),
     "filter": FilterExtension(client=FiltersClient(stac_metadata_model=stac_metadata_model)),

stac_fastapi/eodag/core.py

@@ -377,6 +377,7 @@ async def item_collection(
         filter_expr: Optional[str] = None,
         filter_lang: Optional[str] = "cql2-text",
         token: Optional[str] = None,
+        query: Optional[str] = None,
         **kwargs: Any,
     ) -> ItemCollection:
         """
@@ -400,15 +401,11 @@ async def item_collection(
         # If collection does not exist, NotFoundError wil be raised
         await self.get_collection(collection_id, request=request)
 
-        base_args = {
-            "collections": [collection_id],
-            "bbox": bbox,
-            "datetime": datetime,
-            "limit": limit,
-            "token": token,
-        }
+        base_args = {"collections": [collection_id], "bbox": bbox, "datetime": datetime, "limit": limit, "token": token}
 
-        clean = self._clean_search_args(base_args, sortby=sortby, filter_expr=filter_expr, filter_lang=filter_lang)
+        clean = self._clean_search_args(
+            base_args, sortby=sortby, filter_expr=filter_expr, filter_lang=filter_lang, query=query
+        )
 
         search_request = self.post_request_model.model_validate(clean)
         item_collection = self._search_base(search_request, request)

stac_fastapi/eodag/models/links.py

@@ -18,7 +18,7 @@
 """link helpers."""
 
 from typing import Any, Optional
-from urllib.parse import ParseResult, parse_qs, unquote, urlencode, urljoin, urlparse
+from urllib.parse import ParseResult, parse_qs, quote, unquote, urlencode, urljoin, urlparse
 
 import attr
 import orjson
@@ -162,10 +162,12 @@ def link_next(self) -> Optional[dict[str, Any]]:
 
         if method == "GET":
             params = {"token": [str(self.next)]}
+            existing_query = {}
             if "query" in self.request.query_params:
                 existing_query = orjson.loads(self.request.query_params["query"])
-                combined_query = {**existing_query, **federation_filter.get("query", {})}
-                params["query"] = [orjson.dumps(combined_query).decode("utf-8")]
+            combined_query = {**existing_query, **federation_filter.get("query", {})}
+            query_json = orjson.dumps(combined_query).decode()
+            params["query"] = [quote(query_json)]
             link["href"] = merge_params(self.url, params)
 
         if method == "POST":

tests/test_search.py

@@ -17,6 +17,8 @@
 # limitations under the License.
 """Search tests."""
 
+from urllib.parse import unquote
+
 import pytest
 from eodag import EOProduct, SearchResult
 from eodag.api.product.metadata_mapping import ONLINE_STATUS
@@ -844,10 +846,11 @@ async def test_pagination_with_federation_backend(request_valid, defaults, metho
     assert next_link["method"] == method
 
     if method == "GET":
-        assert f"token={backend_token}" in next_link["href"]
-        assert "query=" in next_link["href"]
-        assert "federation:backends" in next_link["href"]
-        assert "test_provider" in next_link["href"]
+        next_link_url = unquote(next_link["href"])
+        assert f"token={backend_token}" in next_link_url
+        assert "query=" in next_link_url
+        assert "federation:backends" in next_link_url
+        assert "test_provider" in next_link_url
     else:  # POST
         assert "body" in next_link
         assert next_link["body"]["token"] == backend_token
@@ -869,7 +872,7 @@ async def test_pagination_limit_handling(request_valid, defaults, method, limit,
     """Test that pagination respects limit parameter for both GET and POST."""
     # Create a mock search result
     search_result = SearchResult(
-        [EOProduct("test_provider", {"id": "_", "collection": "_"})] * 10, next_page_token="limit_token_123"
+        [EOProduct("creodias", {"id": "_", "collection": "_"})] * 10, next_page_token="limit_token_123"
     )
 
     if method == "GET":