Merge branch 'feat-324/stac-view-of-prip-products' into feat-rspy760/producttype_config

Author: Padeanu

.github/scripts/git_debug_image.sh

@@ -29,12 +29,13 @@ BRANCH_NAME="$1" # git branch name
 . /etc/os-release
 echo "deb http://deb.debian.org/debian $VERSION_CODENAME main" > /etc/apt/sources.list
 apt update
-apt install -y git vim emacs-nox
+apt install -y --no-install-recommends git vim-tiny mg
 
 # Add aliases to bash
 cat << EOF >> /home/user/.bashrc
 alias ll='ls -alFh'
 alias ls='ls --color=auto'
+alias vim='vim.tiny'
 EOF
 
 # Git clone the project branch with HTTP authentication so we don't need any

services/adgs/rs_server_adgs/adgs_utils.py

@@ -25,7 +25,7 @@
 import stac_pydantic
 import yaml
 from fastapi import HTTPException, status
-from rs_server_common.stac_api_common import map_stac_platform
+from rs_server_common.utils.utils import reverse_adgs_prip_map_mission
 
 ADGS_CONFIG = Path(osp.realpath(osp.dirname(__file__))).parent / "config"
 search_yaml = ADGS_CONFIG / "adgs_search_config.yaml"
@@ -86,70 +86,10 @@ def serialize_adgs_asset(feature_collection, products):
     return feature_collection
 
 
-def auxip_map_mission(platform: str, constellation: str) -> tuple[str | None, str | None]:
-    """
-    Custom function for ADGS, to read constellation mapper and return propper
-    values for platform and serial.
-    Eodag maps this values to platformShortName, platformSerialIdentifier
-
-    Input: platform = sentinel-1a       Output: sentinel-1, A
-    Input: platform = sentinel-5P       Output: sentinel-5p, None
-    Input: constellation = sentinel-1   Output: sentinel-1, None
-    """
-    data = map_stac_platform()
-    platform_short_name: str | None = None
-    platform_serial_identifier: str | None = None
-    try:
-        if platform:
-            config = next(satellite[platform] for satellite in data["satellites"] if platform in satellite)
-            platform_short_name = config.get("constellation", None)
-            platform_serial_identifier = config.get("serialid", None)
-        if constellation:
-            if platform_short_name and platform_short_name != constellation:
-                # Inconsistent combination of platform / constellation case
-                raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                    detail="Invalid combination of platform-constellation",
-                )
-            if any(
-                satellite[list(satellite.keys())[0]]["constellation"] == constellation
-                for satellite in data["satellites"]
-            ):
-                platform_short_name = constellation
-                platform_serial_identifier = None
-            else:
-                raise KeyError
-    except (KeyError, IndexError, StopIteration) as exc:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail="Cannot map platform/constellation",
-        ) from exc
-    return platform_short_name, platform_serial_identifier
-
-
-def adgs_reverse_map_mission(
-    platform: str | None,
-    constellation: str | None,
-) -> tuple[str | None, str | None]:
-    """Function used to re-map platform and constellation based on satellite value."""
-    if not (constellation or platform):
-        return None, None
-
-    if constellation:
-        constellation = constellation.lower()  # type: ignore
-
-    for satellite in map_stac_platform()["satellites"]:
-        for key, info in satellite.items():
-            # Check for matching serialid and constellation
-            if info.get("serialid") == platform and info.get("constellation").lower() == constellation:
-                return key, info.get("constellation")
-    return None, None
-
-
 def prepare_collection(collection: stac_pydantic.ItemCollection) -> stac_pydantic.ItemCollection:
     """Used to create a more complex mapping on platform/constallation from odata to stac."""
     for feature in collection.features:
-        feature.properties.platform, feature.properties.constellation = adgs_reverse_map_mission(
+        feature.properties.platform, feature.properties.constellation = reverse_adgs_prip_map_mission(
             feature.properties.platform,
             feature.properties.constellation,
         )

services/adgs/rs_server_adgs/api/adgs_search.py

@@ -32,7 +32,6 @@
 from fastapi.responses import RedirectResponse
 from rs_server_adgs import adgs_retriever, adgs_tags
 from rs_server_adgs.adgs_utils import (
-    auxip_map_mission,
     auxip_odata_to_stac_template,
     auxip_stac_mapper,
     prepare_collection,
@@ -59,7 +58,11 @@
     split_multiple_values,
 )
 from rs_server_common.utils.logging import Logging
-from rs_server_common.utils.utils import validate_inputs_format, validate_sort_input
+from rs_server_common.utils.utils import (
+    map_auxip_prip_mission,
+    validate_inputs_format,
+    validate_sort_input,
+)
 from stac_fastapi.api.models import GeoJSONResponse
 
 # pylint: disable=duplicate-code # with cadip_search
@@ -89,7 +92,7 @@ def __init__(self, request: Request | None = None, readwrite: Literal["r", "w"]
             all_collections=lambda: read_conf()["collections"],
             select_config=select_config,
             stac_to_odata=stac_to_odata,
-            map_mission=auxip_map_mission,
+            map_mission=map_auxip_prip_mission,
             temporal_mapping={"start_datetime": "ContentDate/Start", "end_datetime": "ContentDate/End"},
         )
 

services/cadip/rs_server_cadip/cadip_utils.py

@@ -30,9 +30,8 @@
 import yaml
 from fastapi import HTTPException, status
 from rs_server_common.rspy_models import Item
-from rs_server_common.stac_api_common import map_stac_platform
 from rs_server_common.utils.logging import Logging
-from rs_server_common.utils.utils import strftime_millis
+from rs_server_common.utils.utils import map_stac_platform, strftime_millis
 from stac_pydantic import ItemCollection, ItemProperties
 from stac_pydantic.shared import Asset
 

services/common/config/prip_queryables.yaml

@@ -105,6 +105,66 @@ sat:orbit_state:
   format: string
   description: string
   enum: [ascending, descending]
+processing:lineage:
+  type: string
+  title: processing:lineage
+  format: string
+  description: string
+eopf:origin_datetime:
+  type: datetime
+  title: eopf:origin_datetime
+  format: datetime
+  description: string
+eopf:datatake_id:
+  type: string
+  title: eopf:datatake_id
+  format: string
+  description: string
+eopf:instrument_configuration_id:
+  type: string
+  title: eopf:instrument_configuration_id
+  format: string
+  description: string
+expires:
+  type: datetime
+  title: expires
+  format: datetime
+  description: string
+eviction_datetime:
+  type: datetime
+  title: eviction_datetime
+  format: datetime
+  description: string
+file:size:
+  type: integer
+  title: file:size
+  format: integer
+  description: string
+type:
+  type: string
+  title: type
+  format: string
+  description: string
+file:checksum:
+  type: string
+  title: file:checksum
+  format: string
+  description: string
+instruments:
+  type: string
+  title: instruments
+  format: string
+  description: string
+sat:orbit_cycle:
+  type: integer
+  title: sat:orbit_cycle
+  format: integer
+  description: string
+sar:polarizations:
+  type: string
+  title: sar:polarizations
+  format: string
+  description: string
 intersects:
   type: string
   title: intersects

services/common/rs_server_common/stac_api_common.py

@@ -228,12 +228,9 @@ def get_queryables(
 
             return queryables
 
-        if self.prip:  # pylint: disable=too-many-branches
-            can_query = True
-            if can_query:  # pylint: disable=too-many-branches
-                for queryable_name, queryable_data in get_prip_queryables().items():
-                    queryables.update({queryable_name: QueryableField(**queryable_data)})
-
+        if self.prip:
+            for queryable_name, queryable_data in get_prip_queryables().items():
+                queryables.update({queryable_name: QueryableField(**queryable_data)})
             return queryables
 
         # Idem for satellite or platform
@@ -1159,13 +1156,6 @@ def filter_allowed_collections(all_collections: list[dict], role: ServiceRole |
     return stac_collections
 
 
-@lru_cache
-def map_stac_platform() -> dict:
-    """Function used to read and interpret from constellation.yaml"""
-    with open(Path(__file__).parent.parent / "config" / "constellation.yaml", encoding="utf-8") as cf:
-        return yaml.safe_load(cf)
-
-
 @lru_cache
 def get_cadip_queryables() -> dict:
     """Function used to read and interpret from cadip_queryables.yaml"""

services/common/rs_server_common/utils/utils.py

@@ -20,6 +20,7 @@
 from collections.abc import Callable, Iterable, Sequence
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
+from functools import lru_cache
 from pathlib import Path
 from threading import Thread
 from typing import Any
@@ -152,6 +153,73 @@ def to_dt(dates: list[str]) -> list[datetime | None]:
     return fixed_date_dt, start_date_dt, stop_date_dt
 
 
+@lru_cache
+def map_stac_platform() -> dict:
+    """Function used to read and interpret from constellation.yaml"""
+    with open(Path(__file__).parent.parent.parent / "config" / "constellation.yaml", encoding="utf-8") as cf:
+        return yaml.safe_load(cf)
+
+
+def map_auxip_prip_mission(platform: str, constellation: str) -> tuple[str | None, str | None]:
+    """
+    Custom function for ADGS/PRIP, to read constellation mapper and return propper
+    values for platform and serial.
+    Eodag maps this values to platformShortName, platformSerialIdentifier
+
+    Input: platform = sentinel-1a       Output: sentinel-1, A
+    Input: platform = sentinel-5P       Output: sentinel-5p, None
+    Input: constellation = sentinel-1   Output: sentinel-1, None
+    """
+    data = map_stac_platform()
+    platform_short_name: str | None = None
+    platform_serial_identifier: str | None = None
+    try:
+        if platform:
+            config = next(satellite[platform] for satellite in data["satellites"] if platform in satellite)
+            platform_short_name = config.get("constellation", None)
+            platform_serial_identifier = config.get("serialid", None)
+        if constellation:
+            if platform_short_name and platform_short_name != constellation:
+                # Inconsistent combination of platform / constellation case
+                raise HTTPException(
+                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    detail="Invalid combination of platform-constellation",
+                )
+            if any(
+                satellite[list(satellite.keys())[0]]["constellation"] == constellation
+                for satellite in data["satellites"]
+            ):
+                platform_short_name = constellation
+                platform_serial_identifier = None
+            else:
+                raise KeyError
+    except (KeyError, IndexError, StopIteration) as exc:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail="Cannot map platform/constellation",
+        ) from exc
+    return platform_short_name, platform_serial_identifier
+
+
+def reverse_adgs_prip_map_mission(
+    platform: str | None,
+    constellation: str | None,
+) -> tuple[str | None, str | None]:
+    """Function used to re-map platform and constellation based on satellite value."""
+    if not (constellation or platform):
+        return None, None
+
+    if constellation:
+        constellation = constellation.lower()  # type: ignore
+
+    for satellite in map_stac_platform()["satellites"]:
+        for key, info in satellite.items():
+            # Check for matching serialid and constellation
+            if info.get("serialid") == platform and info.get("constellation").lower() == constellation:
+                return key, info.get("constellation")
+    return None, None
+
+
 def odata_to_stac(
     feature_template: dict,
     odata_dict: dict,

services/prip/config/prip_search_config.template.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024 CS Group
+# Copyright 2025 CS Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ template:
       title: "Legal notice on the use of Copernicus Sentinel Data and Service Information"
       type: "application/pdf"
     - rel: describedby
-      href: "https://sentiwiki.copernicus.eu/web/copernicus-operations#CopernicusOperations-AuxiliaryDataGathering"
-      title: "Auxiliary Data"
+      href: "https://sentiwiki.copernicus.eu/web/copernicus-operations#CopernicusOperations-SystematicProduction"
+      title: "Production Service"
       type: "text/html"
   providers:
     - name: "European Union/ESA/Copernicus"
@@ -51,21 +51,42 @@ collections:
 
   # All stations deployed in the CS cluster, without queries
 
-  - id: adgs
-    station: adgs
-    title: "All from 'adgs' station"
-    description: "All from 'adgs' station"
+  - id: s1a
+    station: s1a
+    title: "All from 's1a' station"
+    description: "All from 's1a' station"
 
-  - id: adgs2
-    station: adgs2
-    title: "All from 'adgs2' station"
-    description: "All from 'adgs2' station"
+  - id: s2b
+    station: s2b
+    title: "All from 's2b' station"
+    description: "All from 's2b' station"
 
   # Idem with one collection per product type
 
-  - id: adgs_aux_pp2
-    station: adgs
+  - id: S1A_L0_IW_RAW
+    station: s1a
     query:
-      productType: AUX_PP2
-    title: "AUX_PP2 'adgs' station"
-    description: "AUX_PP2 'adgs' station"
+      productType: IW_RAW__0N
+    title: "s1a 'prip' station"
+    description: "s1a 'prip' station"
+
+  - id: S2B_L0_DS
+    station: s2b
+    query:
+      productType: OPER_MSI
+    title: "s2b 'prip' station"
+    description: "s2b 'prip' station"
+
+  - id: S2B_L0_GR
+    station: s2b
+    query:
+      productType: OPER_MSI_L0
+    title: "S2B_L0_GR 'prip' station"
+    description: "S2B_L0_GR 'prip' station"
+
+  - id: S2B_L2A_TL
+    station: s2b
+    query:
+      productType: OPER_MSI_L2A
+    title: "S2B_L2A_TL 'prip' station"
+    description: "S2B_L2A_TL 'prip' station"

services/prip/config/prip_search_config.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024 CS Group
+# Copyright 2025 CS Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.