fix: get collection links without bug

rename internal core method '_get_collection()' to '_format_collection()'

remove label:assets if null

Author: anesson-cs

stac_fastapi/eodag/core.py

@@ -85,15 +85,14 @@ class EodagCoreClient(CustomCoreClient):
     post_request_model: type[BaseModel] = attr.ib(default=BaseSearchPostRequest)
     stac_metadata_model: type[CommonStacMetadata] = attr.ib(default=CommonStacMetadata)
 
-    def _get_collection(
-        self, collection: EodagCollection, request: Request, collections_providers: dict[str, set]
-    ) -> Collection:
-        """Convert a EODAG produt type to a STAC collection."""
+    def _format_collection(self, collection: EodagCollection, request: Request) -> Collection:
+        """Convert a EODAG STAC collection to a STAC collection for API."""
 
         # keep only federation backends which allow order mechanism
         # to create "retrieve" collection links from them
         # TODO: this needs to be changed: we cannot request the search plugins for each collection, it is too costly.
-        # TODO: We should find a way to know which federation backends support the order mechanism without requesting the plugins manager
+        # TODO: We should find a way to know which federation backends support
+        # the order mechanism without requesting the plugins manager
         def has_ecmwf_search_plugin(federation_backends, request):
             for fb in federation_backends:
                 search_plugins = request.app.state.dag._plugins_manager.get_search_plugins(provider=fb)
@@ -111,13 +110,20 @@ def has_ecmwf_search_plugin(federation_backends, request):
         ):
             extension_names.remove("CollectionOrderExtension")
 
-        coll_with_links = collection.model_dump(mode="json", exclude={"alias", "eodag_stac_collection"})
-        coll_with_links["links"] = CollectionLinks(
+        coll_dict = collection.model_dump(mode="json", exclude={"alias", "eodag_stac_collection"})
+        for link in coll_dict["links"]:
+            if link.get("label:assets") is None:
+                link.pop("label:assets")
+
+        # add API-required links
+        all_coll_links = CollectionLinks(
             collection_id=collection.id,
             request=request,
-        ).get_links(extensions=extension_names, extra_links=coll_with_links["links"])
+        ).get_links(extensions=extension_names, extra_links=coll_dict["links"])
 
-        return Collection(**coll_with_links)
+        # remove eodag-specific fields
+        coll_dict["links"] = all_coll_links
+        return Collection(**coll_dict)
 
     async def _search_base(self, search_request: BaseSearchPostRequest, request: Request) -> ItemCollection:
         eodag_args = prepare_search_base_args(search_request=search_request, model=self.stac_metadata_model)
@@ -237,7 +243,7 @@ async def all_collections(
                 limit=limit,
                 q=q,
                 cql2_json=cql2_json,
-                sortby=sortby
+                sortby=sortby,
             )
         )
 
@@ -269,7 +275,8 @@ async def all_collections(
 
             first_link = {"body": {"limit": limit, "offset": 0}}
 
-        formatted_collections = [self._get_collection(coll, request) for coll in collections]
+        # format collections
+        formatted_collections = [self._format_collection(coll, request) for coll in collections]
 
         extension_names = [type(ext).__name__ for ext in self.extensions]
 
@@ -298,18 +305,14 @@ async def get_collection(self, collection_id: str, request: Request, **kwargs: A
         :returns: The collection.
         :raises NotFoundError: If the collection does not exist.
         """
-        collection = cast(Optional[EodagCollection], await asyncio.to_thread(request.app.state.dag.get_collection, id=collection_id))
+        collection = cast(
+            Optional[EodagCollection], await asyncio.to_thread(request.app.state.dag.get_collection, id=collection_id)
+        )
 
         if collection is None:
             raise NotFoundError(f"Collection {collection_id} does not exist.")
 
-        providers = request.app.state.dag.providers
-        collection_providers: dict[str, set] = {collection._id: set()}
-        for p_name, p in providers.items():
-            if getattr(p.config, "products", None) and collection._id in p.config.products:
-                collection_providers[collection._id].add(p_name)
-
-        return self._get_collection(collection, request, collection_providers)
+        return self._format_collection(collection, request)
 
     async def item_collection(
         self,
@@ -352,10 +355,11 @@ async def item_collection(
         )
 
         search_request = self.post_request_model.model_validate(clean)
-        item_collection = await self._search_base(search_request, request)
+        item_collection = cast(ItemCollection, await self._search_base(search_request, request))
         extension_names = [type(ext).__name__ for ext in self.extensions]
+        extra_links = item_collection.get("links", [])
         links = ItemCollectionLinks(collection_id=collection_id, request=request).get_links(
-            extensions=extension_names, extra_links=item_collection["links"]
+            extensions=extension_names, extra_links=extra_links
         )
         item_collection["links"] = links
         return item_collection

stac_fastapi/eodag/dag.py

@@ -73,9 +73,7 @@ def init_dag(app: FastAPI) -> None:
     """Init EODataAccessGateway server instance, pre-running all time consuming tasks"""
     dag = EODataAccessGateway()
 
-    ext_stac_collections = fetch_external_stac_collections(
-        dag.list_collections()
-    )
+    ext_stac_collections = fetch_external_stac_collections(dag.list_collections())
 
     # update eodag collections config from external stac collections
     collections = {}

stac_fastapi/eodag/models/item.py

@@ -26,6 +26,7 @@
 from stac_fastapi.types.requests import get_base_url
 from stac_fastapi.types.stac import Item
 from stac_pydantic.api.version import STAC_API_VERSION
+from stac_pydantic.links import Link, Links
 from stac_pydantic.shared import Asset
 
 from eodag.api.product._product import EOProduct
@@ -182,11 +183,12 @@ def create_stac_item(
         if provider := eodag_args.get("provider", None):
             retrieve_body["federation:backends"] = [provider]
 
+    extra_links = Links(root=[Link(**link) for link in feature.get("links", [])])
     feature["links"] = ItemLinks(
         collection_id=product.collection,
         item_id=quoted_id,
         retrieve_body=retrieve_body,
         request=request,
-    ).get_links(extensions=extension_names, extra_links=feature.get("links"), request_json=request_json)
+    ).get_links(extensions=extension_names, extra_links=extra_links, request_json=request_json)
 
     return feature