Merge pull request #195 from RS-PYTHON/s1-ard-julien

Use S1-ARD processor

Author: jgaucher-cs

.github/common/resources/post-install-dask-s1ard.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+set -x
+
+# This is a workaround for https://gitlab.eopf.copernicus.eu/S1/s1-ard-core/-/issues/10
+chmod -R a+w /usr/local/lib/python3.11/site-packages/pyproj/proj_dir/share/proj
+
+# Same as s1-ard-core/initialize_env.sh
+S1_ARD_PATH=$(python -c "import s1_ard_core;print(s1_ard_core.__path__[0])")
+SARSEN_PATH=$(python -c "import sarsen;print(sarsen.__path__[0])")
+SARPY_PATH=$(python -c "import sarpy;print(sarpy.__path__[0])")
+cp ${S1_ARD_PATH}/patch/sarsen/*py ${SARSEN_PATH}/
+cp ${S1_ARD_PATH}/patch/sarpy/sentinel.py ${SARPY_PATH}/io/complex/sentinel.py

.github/common/resources/requirements-dask-s1ard.txt

@@ -19,7 +19,15 @@
 # --extra-index-url https://gitlab.eopf.copernicus.eu/api/v4/projects/14/packages/pypi/simple # eopf cpm
 --extra-index-url https://__token__:${GITLAB_EOPF_TOKEN}@gitlab.eopf.copernicus.eu/api/v4/projects/114/packages/pypi/simple # s1-ard-core
 
+# s1 needs "eopf>=2.5.8" but we have errors with the latest versions. 
+# So we force this old version which is the same as in the uv.lock file at the root of the git repo.
+eopf==2.5.9
+
+# Install s1 v0.2.1.
+# WARNING: in case of version change, you should also update post-install-dask-s1ard.sh
+# if s1-ard-core/initialize_env.sh has changed.
 git+https://__token__:${GITLAB_EOPF_TOKEN}@gitlab.eopf.copernicus.eu/vincent.privat/s1-l12-rp@rspy
 
 # other python dependencies
+proj
 graphviz

.github/dask-gateway/Dockerfile

@@ -22,6 +22,7 @@ USER root
 
 COPY ./*.whl ./
 COPY ./resources/requirements-dask-*.txt /opt/
+COPY ./resources/post-install-dask-*.sh /opt/
 COPY ./resources/layer-cleanup.sh /usr/local/bin/
 RUN chmod 755 /usr/local/bin/layer-cleanup.sh
 
@@ -37,7 +38,7 @@ RUN wget -q -P /opt/ "https://raw.githubusercontent.com/dask/dask-gateway/refs/t
     pip install --no-cache-dir -r /opt/Dockerfile.requirements.txt && \
     layer-cleanup.sh
 
-# Install whatever
+# pip install the requirements.txt file for the requested image IMAGE2BUILD
 RUN --mount=type=secret,id=GITLAB_EOPF_TOKEN \
     GITLAB_EOPF_TOKEN=$(cat /run/secrets/GITLAB_EOPF_TOKEN) \
     RS_SERVER_COMMON_WHEEL=$(find . -maxdepth 1 -type f -name 'rs_server_common-*-py3-none-any.whl' | head -n 1) \
@@ -64,6 +65,11 @@ RUN pip install opentelemetry-distro opentelemetry-exporter-otlp opentelemetry-i
 RUN if [ "${IMAGE2BUILD}" != "dask-staging" ]; then \
         apt update && apt install -y python3-pydot graphviz && layer-cleanup.sh; \
     fi
+
+# Run post-install script as root if it exists
+RUN [ -f /opt/post-install-${IMAGE2BUILD}.sh ] && /opt/post-install-${IMAGE2BUILD}.sh && layer-cleanup.sh; \
+    rm -f /opt/post-install-dask-*.sh
+
 RUN apt autoremove -y gcc && layer-cleanup.sh
 
 # Add a default user