eodag 4.0.0a1__py3-none-any.whl → 4.0.0a3__py3-none-any.whl

eodag/plugins/search/cop_marine.py

@@ -34,6 +34,7 @@ from dateutil.utils import today
 
 from eodag import EOProduct
 from eodag.api.product import AssetsDict
+from eodag.api.search_result import SearchResult
 from eodag.config import PluginConfig
 from eodag.plugins.search import PreparedSearch
 from eodag.plugins.search.static_stac_search import StaticStacSearch
@@ -211,9 +212,12 @@ class CopMarineSearch(StaticStacSearch):
         dataset_item: dict[str, Any],
         collection_dict: dict[str, Any],
         use_dataset_dates: bool = False,
+        product_id: Optional[str] = None,
     ) -> Optional[EOProduct]:
 
         item_id = os.path.splitext(item_key.split("/")[-1])[0]
+        if product_id and product_id != item_id:
+            return None
         download_url = s3_url + "/" + item_key
         geometry = (
             get_geometry_from_various(**dataset_item)
@@ -294,19 +298,29 @@ class CopMarineSearch(StaticStacSearch):
         self,
         prep: PreparedSearch = PreparedSearch(),
         **kwargs: Any,
-    ) -> tuple[list[EOProduct], Optional[int]]:
+    ) -> SearchResult:
         """
         Implementation of search for the Copernicus Marine provider
         :param prep: object containing search parameterds
         :param kwargs: additional search arguments
         :returns: list of products and total number of products
         """
-        page = prep.page
         items_per_page = prep.items_per_page
+        token_value = getattr(prep, "next_page_token") or prep.page
 
         # only return 1 page if pagination is disabled
-        if page is None or items_per_page is None or page > 1 and items_per_page <= 0:
-            return ([], 0) if prep.count else ([], None)
+        if (
+            token_value is None
+            or items_per_page is None
+            or int(token_value) > 1
+            and items_per_page <= 0
+        ):
+            result = SearchResult([])
+            if prep.count:
+                result.number_matched = 0
+            return result
+
+        token = int(token_value)
 
         collection = kwargs.get("collection", prep.collection)
         if not collection:
@@ -316,7 +330,7 @@ class CopMarineSearch(StaticStacSearch):
         collection_dict, datasets_items_list = self._get_collection_info(collection)
         geometry = kwargs.pop("geometry", None)
         products: list[EOProduct] = []
-        start_index = items_per_page * (page - 1) + 1
+        start_index = items_per_page * (token - 1) + 1
         num_total = 0
         for i, dataset_item in enumerate(datasets_items_list):
             # Filter by geometry
@@ -374,9 +388,12 @@ class CopMarineSearch(StaticStacSearch):
                         dataset_item,
                         collection_dict,
                         True,
+                        kwargs.get("id"),
                     )
                     if product:
                         products.append(product)
+                    if product and kwargs.get("id"):
+                        break
                     continue
 
             s3_client = _get_s3_client(endpoint_url)
@@ -394,7 +411,10 @@ class CopMarineSearch(StaticStacSearch):
                     )
                 if "Contents" not in s3_objects:
                     if len(products) == 0 and i == len(datasets_items_list) - 1:
-                        return ([], 0) if prep.count else ([], None)
+                        result = SearchResult([])
+                        if prep.count:
+                            result.number_matched = 0
+                        return result
                     else:
                         break
 
@@ -408,7 +428,11 @@ class CopMarineSearch(StaticStacSearch):
                         collection_dict,
                     )
                     if product:
-                        return [product], 1
+                        formated_result = SearchResult(
+                            [product],
+                            1,
+                        )
+                        return formated_result
                     current_object = s3_objects["Contents"][-1]["Key"]
                     continue
 
@@ -478,4 +502,20 @@ class CopMarineSearch(StaticStacSearch):
                                 products.append(product)
                     current_object = item_key
 
-        return products, num_total
+        search_params = (
+            kwargs
+            | {"items_per_page": prep.items_per_page}
+            | {"collection": collection}
+            | {"provider": self.provider}
+            | {"geometry": geometry}
+            if geometry
+            else {}
+        )
+
+        formated_result = SearchResult(
+            products,
+            num_total,
+            search_params=search_params,
+            next_page_token=str(start_index + 1),
+        )
+        return formated_result

eodag/plugins/search/csw.py

@@ -35,6 +35,7 @@ from shapely import geometry, wkt
 
 from eodag.api.product import EOProduct
 from eodag.api.product.metadata_mapping import properties_from_xml
+from eodag.api.search_result import SearchResult
 from eodag.plugins.search import PreparedSearch
 from eodag.plugins.search.base import Search
 from eodag.utils import DEFAULT_PROJ
@@ -107,11 +108,14 @@ class CSWSearch(Search):
         self,
         prep: PreparedSearch = PreparedSearch(),
         **kwargs: Any,
-    ) -> tuple[list[EOProduct], Optional[int]]:
+    ) -> SearchResult:
         """Perform a search on a OGC/CSW-like interface"""
         collection = kwargs.get("collection")
         if collection is None:
-            return ([], 0) if prep.count else ([], None)
+            result = SearchResult([])
+            if prep.count:
+                result.number_matched = 0
+            return result
         auth = kwargs.get("auth")
         if auth:
             self.__init_catalog(**getattr(auth.config, "credentials", {}))
@@ -157,7 +161,13 @@ class CSWSearch(Search):
                 results.extend(partial_results)
         logger.info("Found %s overall results", len(results))
         total_results = len(results) if prep.count else None
-        return results, total_results
+        if not prep.count and "number_matched" in kwargs:
+            total_results = kwargs["number_matched"]
+        formated_result = SearchResult(
+            results,
+            total_results,
+        )
+        return formated_result
 
     def __init_catalog(
         self, username: Optional[str] = None, password: Optional[str] = None
@@ -237,18 +247,18 @@ class CSWSearch(Search):
         constraints: list[OgcExpression] = []
         # How the match should be performed (fuzzy, prefix, postfix or exact).
         # defaults to fuzzy
-        pt_tag, matching = (
+        col_tag, matching = (
             collection_def["name"],
             collection_def.get("matching", "fuzzy"),
         )
         if matching == "prefix":
-            constraints.append(PropertyIsLike(pt_tag, "{}%".format(collection)))
+            constraints.append(PropertyIsLike(col_tag, "{}%".format(collection)))
         elif matching == "postfix":
-            constraints.append(PropertyIsLike(pt_tag, "%{}".format(collection)))
+            constraints.append(PropertyIsLike(col_tag, "%{}".format(collection)))
         elif matching == "exact":
-            constraints.append(PropertyIsEqualTo(pt_tag, collection))
+            constraints.append(PropertyIsEqualTo(col_tag, collection))
         else:  # unknown matching is considered to be equal to 'fuzzy'
-            constraints.append(PropertyIsLike(pt_tag, "%{}%".format(collection)))
+            constraints.append(PropertyIsLike(col_tag, "%{}%".format(collection)))
 
         # `footprint`
         fp = params.get("geometry")