fix: use dict for external collection links (#85)

use a dict instead of a stac_pydantic link object for links from
external collections

Author: jlahovnik

stac_fastapi/eodag/core.py

@@ -38,7 +38,7 @@
 from stac_fastapi.types.rfc3339 import str_to_interval
 from stac_fastapi.types.search import BaseSearchPostRequest
 from stac_fastapi.types.stac import Collection, Collections, Item, ItemCollection
-from stac_pydantic.links import Links, Relations
+from stac_pydantic.links import Relations
 from stac_pydantic.shared import MimeTypes
 
 from eodag import EOProduct, SearchResult
@@ -154,8 +154,11 @@ def has_ecmwf_search_plugin(federation_backends, request):
         ):
             extension_names.remove("CollectionOrderExtension")
 
-        extra_links = (collection.links or Links([])).root
-        extended_coll_links = Links(extended_collection.get("links", [])).root
+        if collection.links:
+            extra_links = [link.model_dump() for link in collection.links.root]
+        else:
+            extra_links = []
+        extended_coll_links = extended_collection.get("links", [])
         extended_collection["links"] = CollectionLinks(
             collection_id=extended_collection["id"],
             request=request,
@@ -411,7 +414,7 @@ async def item_collection(
         item_collection = self._search_base(search_request, request)
         extension_names = [type(ext).__name__ for ext in self.extensions]
         links = ItemCollectionLinks(collection_id=collection_id, request=request).get_links(
-            extensions=extension_names, extra_links=Links(item_collection["links"]).root
+            extensions=extension_names, extra_links=item_collection["links"]
         )
         item_collection["links"] = links
         return item_collection

stac_fastapi/eodag/models/links.py

@@ -23,7 +23,7 @@
 import attr
 import orjson
 from stac_fastapi.types.requests import get_base_url
-from stac_pydantic.links import Link, Relations
+from stac_pydantic.links import Relations
 from stac_pydantic.shared import MimeTypes
 from starlette.requests import Request
 
@@ -105,7 +105,7 @@ def create_links(self, extensions: list[str]) -> list[dict[str, Any]]:
     def get_links(
         self,
         extensions: list[str],
-        extra_links: Optional[list[Link]] = None,
+        extra_links: Optional[list[dict[str, Any]]] = None,
         request_json: Optional[dict[str, Any]] = None,
     ) -> list[dict[str, Any]]:
         """
@@ -129,9 +129,11 @@ def get_links(
             # to be stored in pgstac and for the hrefs in the
             # links of response STAC objects to be resolved
             # to the request url.
-            for link in extra_links:
-                link.href = self.resolve(link.href)
-            links += [link.model_dump() for link in extra_links if link.rel not in INFERRED_LINK_RELS]
+            links += [
+                {**link, "href": self.resolve(link["href"])}
+                for link in extra_links
+                if link["rel"] not in INFERRED_LINK_RELS
+            ]
 
         return links