fix: asset type property and item extensions (#73)

fixes 2 bugs:

- `type` in assets was displayed as `product:type`
- some stac extensions were missing in items

---------

Co-authored-by: Sylvain Brunato <sylvain.brunato@c-s.fr>

Author: jlahovnik

stac_fastapi/eodag/extensions/stac.py

@@ -237,7 +237,7 @@ class StorageFields(BaseModel):
     platform: Optional[str] = Field(default=None)
     region: Optional[str] = Field(default=None)
     requester_pays: Optional[bool] = Field(default=None)
-    tier: Optional[str] = Field(default=None, validation_alias="order:status")
+    tier: Optional[str] = Field(default=None, validation_alias="storage:tier")
 
     @field_validator("tier")
     @classmethod

stac_fastapi/eodag/models/stac_metadata.py

@@ -40,7 +40,7 @@
 from stac_pydantic.api.extensions.sort import SortDirections, SortExtension
 from stac_pydantic.api.version import STAC_API_VERSION
 from stac_pydantic.item import ItemProperties
-from stac_pydantic.shared import Provider
+from stac_pydantic.shared import Asset, Provider
 from typing_extensions import Self
 
 from eodag.api.product._product import EOProduct
@@ -300,8 +300,7 @@ def create_stac_item(
     ):
         for k, v in product.assets.items():
             # TODO: download extension with origin link (make it optional ?)
-            asset_model = model.model_validate(v)
-            stac_extensions.update(asset_model.get_conformance_classes())
+            asset_model = Asset.model_validate(v)
             feature["assets"][k] = asset_model.model_dump(exclude_none=True)
 
             if asset_proxy_url:
@@ -342,7 +341,12 @@ def create_stac_item(
                     },
                 }
 
-    feature_model = model.model_validate({**product.properties, **{"federation:backends": [product.provider]}})
+    feature_model = model.model_validate(
+        {
+            **product.properties,
+            **{"federation:backends": [product.provider], "storage:tier": product.properties.get("order:status")},
+        }
+    )
     stac_extensions.update(feature_model.get_conformance_classes())
 
     # filter properties we do not want to expose
@@ -351,10 +355,6 @@ def create_stac_item(
     }
     feature["properties"].pop("qs", None)
 
-    # append order:status property as it was replaced in feature with storage:tier
-    if order_status := product.properties.get("order:status"):
-        feature["properties"]["order:status"] = order_status
-
     feature["stac_extensions"] = list(stac_extensions)
 
     if extension_names and product.provider not in auto_order_whitelist:
@@ -390,8 +390,14 @@ def _get_conformance_classes(self) -> list[str]:
     """Extract list of conformance classes from set fields metadata"""
     conformance_classes: set[str] = set()
 
+    model_fields_by_alias = {
+        field_info.serialization_alias: field_info
+        for name, field_info in self.model_fields.items()
+        if field_info.serialization_alias
+    }
+
     for f in self.model_fields_set:
-        mf = self.model_fields.get(f)
+        mf = model_fields_by_alias.get(f) or self.model_fields.get(f)
         if not mf or not isinstance(mf, FieldInfo) or not mf.metadata:
             continue
         extension = next(

tests/conftest.py

@@ -143,7 +143,7 @@ def mock_search_result():
                         "eo:snow_cover": None,
                         "gsd": None,
                         "end_datetime": "2018-02-16T00:12:14.035Z",
-                        "keyword": [],
+                        "keywords": [],
                         "product:type": "OCN",
                         "eodag:download_link": (
                             "https://peps.cnes.fr/resto/collections/S1/578f1768-e66e-5b86-9363-b19f8931cc7b/download"

tests/test_search.py

@@ -146,6 +146,15 @@ async def test_items_response(request_valid, defaults):
         res[0]["assets"]["asset1"]["href"]
         == f"http://testserver/data/peps/{res[0]['collection']}/{res[0]['id']}/asset1"
     )
+    expected_extensions = [
+        "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
+        "https://stac-extensions.github.io/product/v0.1.0/schema.json",
+        "https://api.openeo.org/extensions/federation/0.1.0",
+        "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+        "https://stac-extensions.github.io/storage/v1.0.0/schema.json",
+    ]
+    for ext in expected_extensions:
+        assert ext in res[0]["stac_extensions"]
 
     # check order status and storage tier properties of the "OFFLINE" item when peps is whitelisted
     auto_order_whitelist = get_settings().auto_order_whitelist