refactor: move storing of download info to core

Author: jlahovnik

eodag/api/core.py

@@ -194,6 +194,7 @@ def __init__(
                         os.path.join(self.conf_dir, "shp"),
                     )
         self.set_locations_conf(locations_conf_path)
+        self.download_info = {}
 
     def get_version(self) -> str:
         """Get eodag package version"""
@@ -1741,6 +1742,17 @@ def _do_search(
                     )
                     eo_product.register_downloader(download_plugin, auth_plugin)
 
+                product_key = f"{eo_product.product_type}_{search_plugin.provider}_{eo_product.properties['id']}"
+                self.download_info[product_key] = {}
+                if "orderLink" in eo_product.properties:
+                    self.download_info[product_key][
+                        "orderLink"
+                    ] = eo_product.properties["orderLink"]
+                if "downloadLink" in eo_product.properties:
+                    self.download_info[product_key][
+                        "downloadLink"
+                    ] = eo_product.properties["downloadLink"]
+
             results.extend(res)
             total_results = None if nb_res is None else total_results + nb_res
             if count:

eodag/plugins/search/data_request_search.py

@@ -260,7 +260,7 @@ def _create_data_request(
             request_job.raise_for_status()
         except requests.RequestException as e:
             raise RequestError(
-                f"search job for product_type {product_type} could not be created: {str(e)}, {request_job.text}"
+                f"search job for product_type {product_type} could not be created: {str(e)}"
             )
         else:
             logger.info("search job for product_type %s created", product_type)
@@ -363,13 +363,7 @@ def _convert_result_data(
             p.properties["orderLink"] = p.properties["orderLink"].replace(
                 "requestJobId", str(data_request_id)
             )
-            # store download information to retrieve it later to avoid search_by_id
-            self.download_info[p.properties["id"]] = {
-                "requestJobId": data_request_id,
-                "orderLink": p.properties["orderLink"],
-                "downloadLink": p.properties["downloadLink"],
-                "provider": self.provider,
-            }
+
         return products, total_items_nb
 
     def _check_uses_custom_filters(self, product_type: str) -> bool:

eodag/plugins/search/qssearch.py

@@ -732,17 +732,6 @@ def normalize_results(
                 getattr(self.config, "product_type_config", {}), **product.properties
             )
             products.append(product)
-            self.download_info[product.properties["id"]] = {
-                "provider": self.provider,
-            }
-            if "downloadLink" in product.properties:
-                self.download_info[product.properties["id"]][
-                    "downloadLink"
-                ] = product.properties["downloadLink"]
-            if "orderLink" in product.properties:
-                self.download_info[product.properties["id"]][
-                    "orderLink"
-                ] = product.properties["orderLink"]
 
         return products
 

eodag/rest/utils.py

@@ -712,15 +712,14 @@ def download_stac_item_by_id_stream(
     provider_product_type_config = search_plugin.config.products.get(
         product_type, {}
     ) or search_plugin.config.products.get(GENERIC_PRODUCT_TYPE, {})
+
     if "." in item_id:
         id_without_ext = item_id.split(".")[0]
     else:
         id_without_ext = item_id
-    if (
-        getattr(search_plugin, "download_info", None)
-        and id_without_ext in search_plugin.download_info
-    ):
-        product_data = search_plugin.download_info[id_without_ext]
+    product_key = f"{product_type}_{provider}_{id_without_ext}"
+    if product_key in eodag_api.download_info:
+        product_data = eodag_api.download_info[product_key]
         properties = {
             "id": id_without_ext,
             "geometry": "-180 -90 180 90",