Merge pull request #1499 from RS-PYTHON/feat-324/stac-view-of-prip-products_julien

Fix rs-server/resources/sync_config_files.py

Author: jgaucher-cs

.github/workflows/check-code-quality.yml

@@ -266,7 +266,7 @@ jobs:
           sed -i 's|<source>[^<]*</source>|<source>.</source>|g' ./cov-report.xml
 
       - name: Run SonarCloud Scanner
-        uses: SonarSource/sonarqube-scan-action@v5
+        uses: SonarSource/sonarqube-scan-action@v6
         with:
           # See doc:
           # https://docs.sonarsource.com/sonarqube/9.9/analyzing-source-code/languages/python/

poetry.lock

@@ -669,6 +669,9 @@ def update_single_value(input_value: Any, output_value: str) -> str:
             "services/cadip/config/cadip_ws_config.template.yaml",
             "services/cadip/config/cadip_ws_config.template_session.yaml",
         ],
+        ["services/prip/config/prip_search_config.template.yaml"],
+        ["services/prip/config/prip_ws_config_token_module.template.yaml"],
+        ["services/prip/config/prip_ws_config.template.yaml"],
     ):
         create_from_template(templates)
 
@@ -677,8 +680,10 @@ def update_single_value(input_value: Any, output_value: str) -> str:
         "services/common/config/rs-server.yaml",
         "services/adgs/config/adgs_ws_config.yaml",
         "services/cadip/config/cadip_ws_config.yaml",
+        "services/prip/config/prip_ws_config.yaml",
         "services/adgs/config/adgs_ws_config_token_module.yaml",
         "services/cadip/config/cadip_ws_config_token_module.yaml",
+        "services/prip/config/prip_ws_config_token_module.yaml",
     ):
         copy_to_demo(config_path_relative)
 
@@ -701,7 +706,6 @@ def remove_session_stations(output_config: dict):
         remove_session_stations,
     )
     copy_to_helm_or_infra([station_params], rs_helm_dir / "charts/rs-server-station-secrets/values.yaml")
-    copy_to_helm_or_infra([station_params], rs_deploy_dir / "apps/01-rs-server-station-secrets/values.yaml")
 
     copy_to_helm_or_infra(
         [
@@ -792,3 +796,37 @@ def remove_session_stations(output_config: dict):
         ],
         rs_helm_dir / "charts/rs-server-cadip/templates/configmap.yaml",
     )
+
+    copy_to_helm_or_infra(
+        [
+            HelmOrInfraParams(
+                "services/prip/config/prip_ws_config.yaml",
+                ["s1a"],  # use the first input station values for all other stations
+                [  # where to write in the output file
+                    "data",
+                    f"{DCB_OPEN} .Values.app.eodagConfigFile {DCB_CLOSE}",
+                    f"{DCB_OPEN}- range $k, $v := .Values.app.station {DCB_CLOSE}",
+                    f"{DCB_OPEN} $k {DCB_CLOSE}",
+                ],
+                0,  # output doc index
+            ),
+            HelmOrInfraParams(
+                "services/prip/config/prip_ws_config_token_module.yaml",
+                ["s1a"],  # use the first input station values for all other stations
+                [  # where to write in the output file
+                    "data",
+                    f"{DCB_OPEN} .Values.app.eodagConfigFileTokenModule {DCB_CLOSE}",
+                    f"{DCB_OPEN}- range $k, $v := .Values.app.station {DCB_CLOSE}",
+                    f"{DCB_OPEN} $k {DCB_CLOSE}",
+                ],
+                1,
+            ),
+            HelmOrInfraParams(
+                "services/prip/config/prip_search_config.yaml",
+                [],
+                ["data", f"{DCB_OPEN} .Values.app.pripSearchConfigFile {DCB_CLOSE}"],
+                2,
+            ),
+        ],
+        rs_helm_dir / "charts/rs-server-prip/templates/configmap.yaml",
+    )

resources/sync_config_files.py

@@ -35,6 +35,7 @@
 from rs_server_common.middlewares import (
     AuthenticationMiddleware,
     HandleExceptionsMiddleware,
+    PaginationLinksMiddleware,
     apply_middlewares,
     insert_middleware_after,
 )
@@ -126,6 +127,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -
 if common_settings.CLUSTER_MODE:
     app = apply_middlewares(app)
 
+app.add_middleware(PaginationLinksMiddleware)
 
 logger.debug(f"Middlewares: {app.user_middleware}")
 

services/adgs/poetry.lock

@@ -30,6 +30,7 @@
 from rs_server_common.authentication.oauth2 import AUTH_PREFIX
 from rs_server_common.middlewares import (
     HandleExceptionsMiddleware,
+    PaginationLinksMiddleware,
     StacLinksTitleMiddleware,
 )
 from rs_server_common.schemas.health_schema import HealthSchema
@@ -224,6 +225,10 @@ async def patched_landing_page(self, request, **kwargs):
 
     # This middleware allows to have consistant http/https protocol in stac links
     app.add_middleware(ProxyHeaderMiddleware)
+
+    # Middleware for implementing first and last buttons in STAC Browser
+    app.add_middleware(PaginationLinksMiddleware)
+
     app.add_middleware(StacLinksTitleMiddleware, title="My STAC Title")
     # Add CORS requests from the STAC browser
     if settings.CORS_ORIGINS:

services/cadip/poetry.lock

@@ -17,9 +17,10 @@
 import os
 import traceback
 from collections.abc import Callable
-from typing import ParamSpec, TypedDict
+from typing import Any, ParamSpec, TypedDict
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
+import brotli
 from fastapi import FastAPI, Request, Response, status
 from fastapi.responses import JSONResponse
 from rs_server_common import settings as common_settings
@@ -131,6 +132,111 @@ def is_bad_request(self, request: Request, e: Exception) -> bool:
         )
 
 
+class PaginationLinksMiddleware(BaseHTTPMiddleware):
+    """
+    Middleware to implement 'first' button's functionality in STAC Browser
+    """
+
+    async def dispatch(
+        self,
+        request: Request,
+        call_next: Callable,
+    ):  # pylint: disable=too-many-branches,too-many-statements
+
+        # Only for /search in auxip, prip, cadip
+        if request.url.path in ["/auxip/search", "/cadip/search", "/prip/search", "/catalog/search"]:
+
+            first_link: dict[str, Any] = {
+                "rel": "first",
+                "type": "application/geo+json",
+                "method": request.method,
+                "href": f"{str(request.base_url).rstrip('/')}{request.url.path}",
+                "title": "First link",
+            }
+
+            if common_settings.CLUSTER_MODE:
+                first_link["href"] = f"https://{str(request.base_url.hostname).rstrip('/')}{request.url.path}"
+
+            if request.method == "GET":
+                # parse query params to remove any 'prev' or 'next'
+                query_dict = dict(request.query_params)
+
+                query_dict.pop("token", None)
+                if "page" in query_dict:
+                    query_dict["page"] = "1"
+                new_query_string = urlencode(query_dict, doseq=True)
+                first_link["href"] += f"?{new_query_string}"
+
+            elif request.method == "POST":
+                try:
+                    query = await request.json()
+                    body = {}
+
+                    for key in ["datetime", "limit"]:
+                        if key in query and query[key] is not None:
+                            body[key] = query[key]
+
+                    if "token" in query and request.url.path != "/catalog/search":
+                        body["token"] = "page=1"  # nosec
+
+                    first_link["body"] = body
+                except Exception:  # pylint: disable = broad-exception-caught
+                    logger.error(traceback.format_exc())
+
+            response = await call_next(request)
+
+            encoding = response.headers.get("content-encoding", "")
+            if encoding == "br":
+                body_bytes = b"".join([section async for section in response.body_iterator])
+                response_body = brotli.decompress(body_bytes)
+
+                if request.url.path == "/catalog/search":
+                    first_link["auth:refs"] = ["apikey", "openid", "oauth2"]
+            else:
+                response_body = b""
+                async for chunk in response.body_iterator:
+                    response_body += chunk
+
+            try:
+                data = json.loads(response_body)
+
+                links = data.get("links", [])
+                has_prev = any(link.get("rel") == "previous" for link in links)
+
+                if has_prev is True:
+                    links.append(first_link)
+                    data["links"] = links
+
+                headers = dict(response.headers)
+                headers.pop("content-length", None)
+
+                if encoding == "br":
+                    new_body = brotli.compress(json.dumps(data).encode("utf-8"))
+                else:
+                    new_body = json.dumps(data).encode("utf-8")
+
+                response = Response(
+                    content=new_body,
+                    status_code=response.status_code,
+                    headers=headers,
+                    media_type="application/json",
+                )
+            except Exception:  # pylint: disable = broad-exception-caught
+                headers = dict(response.headers)
+                headers.pop("content-length", None)
+
+                response = Response(
+                    content=response_body,
+                    status_code=response.status_code,
+                    headers=headers,
+                    media_type=response.headers.get("content-type"),
+                )
+        else:
+            return await call_next(request)
+
+        return response
+
+
 def get_link_title(link: dict, entity: dict) -> str:
     """
     Determine a human-readable STAC link title based on the link relation and context.