Skip to content

Add support for input retrieval from CDSE #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 78 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
ce5fb25
fix of GPF graphs from pull request by Aleksandr Tulenkov
martin-boettcher Oct 4, 2024
366b40b
make Dockerfile work on Ubuntu 20
martin-boettcher Oct 4, 2024
c30ed83
add support for CDSE as replacement for SciHub
martin-boettcher Oct 4, 2024
cc5fba9
ignore IDEA ide files
martin-boettcher Oct 4, 2024
508a5e6
add first application script for pre-processing
martin-boettcher Oct 8, 2024
cc708ec
add first application script for pre-processing
martin-boettcher Oct 8, 2024
fb44518
add first application script for pre-processing
martin-boettcher Oct 8, 2024
ca4b547
add first application script for pre-processing
martin-boettcher Oct 8, 2024
98867ce
add first application script for pre-processing
martin-boettcher Oct 8, 2024
98ff312
add first application script for pre-processing
martin-boettcher Oct 8, 2024
3babde9
add first application script for pre-processing
martin-boettcher Oct 8, 2024
c8ead14
Add CWL file for Notebook 1 workflow
pont-us Oct 8, 2024
d1030b9
attempt to fix conversion from DIMAP to TIFF
martin-boettcher Oct 9, 2024
990f8c0
avoid access to CDSE if input is already available
martin-boettcher Oct 9, 2024
5f5bd7d
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
d1e4963
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
45f1f63
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
8b7d2df
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
a5edd99
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
bf13b78
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
343289e
run in mounted external dir, create input dir structure, attempt to g…
martin-boettcher Oct 9, 2024
0a37ca5
generate tiff, place DEMs in working dir outside of container
martin-boettcher Oct 9, 2024
2eaef49
Add STAC input and output to preprocessing.py
pont-us Oct 11, 2024
c7f77b4
preprocessing.py: reformat code
pont-us Oct 30, 2024
eea0796
Refactor and tidy up preprocessing.py
pont-us Oct 30, 2024
254befb
preprocessing.py: more refactoring
pont-us Oct 30, 2024
85d6dae
preprocessing.py: improve logging
pont-us Oct 30, 2024
a908e70
preprocessing.py: output to CWD, not /home/ost/shared
pont-us Oct 30, 2024
6fe38a3
preprocessing.py: output TIFF, not DIMAP
pont-us Oct 30, 2024
80228c2
preprocessing: copy input data if link fails
pont-us Nov 5, 2024
7cd322a
preprocessing: add --dry-run option for testing
pont-us Nov 5, 2024
4f89480
preprocessing: fix boolean argument handling
pont-us Nov 5, 2024
ba545ba
preprocessing: fix a typo
pont-us Nov 5, 2024
18cb512
Several improvements to preprocessing.py
pont-us Nov 5, 2024
d87dfa4
preprocessing: explicitly specify output STAC root
pont-us Nov 5, 2024
05345c6
Updates to Dockerfile and context
pont-us Nov 6, 2024
060e3f6
Updates to CWL file
pont-us Nov 6, 2024
829ed86
Dockerfile: improve wget progress for OTB download
pont-us Nov 6, 2024
9dc9716
Add an example for Application Package execution
pont-us Nov 6, 2024
0c69345
Merge pull request #1 from bcdev/version2
pont-us Nov 6, 2024
e5bda67
Dockerfile: build from bcdev repo default branch
pont-us Nov 6, 2024
e4ddfb3
Start adding support for non-zipped input
pont-us Dec 12, 2024
74b79c5
Preprocessor: minor refactoring
pont-us Dec 13, 2024
d794102
Preprocessor: handle SAFE directory input
pont-us Dec 13, 2024
e92c93e
Preprocessor: add a logging message
pont-us Dec 16, 2024
74bbec4
Add more logging to s1scene
pont-us Dec 17, 2024
fa31ffc
Some updates to CWL file
pont-us Dec 18, 2024
6dc44d8
Dockerfile: add ost_branch argument
pont-us Dec 18, 2024
52ada17
Merge pull request #2 from bcdev/pont-safe-directory
pont-us Jan 3, 2025
a672a65
CWL file: set Docker image tag to "version3"
pont-us Jan 3, 2025
2a7f536
Merge branch 'main' of github.com:bcdev/OpenSarToolkit into main
pont-us Jan 3, 2025
8ae2cb3
proposed changes to CWL - remove cdse and rename workflow ID
simonevaccari Jan 15, 2025
0db963d
Merge pull request #3 from simonevaccari/main
pont-us Jan 20, 2025
c802394
Add jq to packages installed by Dockerfile
pont-us Mar 20, 2025
ebc2dcc
Dockerfile: install jq in a separate command
pont-us Mar 20, 2025
204e266
Run apt-get update before installing jq
pont-us Mar 20, 2025
f5b29a0
Update CWL docker requirement to version 4
pont-us Mar 20, 2025
cc03eb8
Preprocessor: correct geometry in STAC; reformat
pont-us Apr 17, 2025
e17aecd
Add "visual" role to output STAC item
pont-us Apr 17, 2025
9684826
Preprocessor: adjust output location and STAC
pont-us Apr 17, 2025
0b47e49
Add more STAC asset keys; tile dry-run output
pont-us Apr 17, 2025
914cd27
Fix asset writing bug; improve dry-run dummy image
pont-us Apr 17, 2025
39f2a79
Preprocessor: tile RGB output TIFFs
pont-us Apr 17, 2025
1e17ef7
Add --wipe-cwd option
pont-us Apr 25, 2025
5456f0b
Several updates for version 5
pont-us Apr 25, 2025
bb136cf
Preprocessor: fix bug in determining input path
pont-us May 16, 2025
af17cc8
preprocessor: a further input resolution bugfix
pont-us May 16, 2025
52e4fc6
Update Docker and CWL references to version6
pont-us May 30, 2025
d5f4d5d
Fix STAC geometry structure; validate STAC output
pont-us Jul 1, 2025
07da757
Update Docker and CWL references to version 7
pont-us Jul 2, 2025
3e538cc
Preprocessing: implement COG output
pont-us Jul 24, 2025
44a73c7
Fix COG generation bug
pont-us Jul 24, 2025
768d889
Fix COG generation bug
pont-us Jul 24, 2025
ce130b1
Delete original TIFF after creating COG
pont-us Jul 24, 2025
3ac87b8
Update media_type in STAC output
pont-us Jul 25, 2025
cc654cd
Add raster bands data to STAC output
pont-us Jul 25, 2025
1e6729a
Add rendering metadata to STAC output
pont-us Jul 25, 2025
f4d43d2
Update Docker and CWL references to version 8
pont-us Jul 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,4 @@ dmypy.json

# IDE
.vscode
.idea
22 changes: 16 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ ENV TBX="esa-snap_sentinel_unix_${TBX_VERSION}_${TBX_SUBVERSION}.sh" \
HOME=/home/ost \
PATH=$PATH:/home/ost/programs/snap/bin:/home/ost/programs/OTB-${OTB_VERSION}-Linux64/bin

RUN apt-get update && apt-get install -yq wget libquadmath0

RUN wget http://archive.ubuntu.com/ubuntu/pool/universe/g/gcc-6/gcc-6-base_6.4.0-17ubuntu1_amd64.deb && \
dpkg -i gcc-6-base_6.4.0-17ubuntu1_amd64.deb && \
wget http://archive.ubuntu.com/ubuntu/pool/universe/g/gcc-6/libgfortran3_6.4.0-17ubuntu1_amd64.deb && \
dpkg -i libgfortran3_6.4.0-17ubuntu1_amd64.deb

# install all dependencies
RUN groupadd -r ost && \
useradd -r -g ost ost && \
Expand All @@ -29,7 +36,6 @@ RUN groupadd -r ost && \
libgdal-dev \
python3-gdal \
libspatialindex-dev \
libgfortran3 \
wget \
unzip \
imagemagick \
Expand All @@ -46,7 +52,7 @@ RUN alias python=python3 && \
rm $TBX && \
rm snap.varfile && \
cd /home/ost/programs && \
wget https://www.orfeo-toolbox.org/packages/${OTB} && \
wget https://www.orfeo-toolbox.org/packages/archives/OTB/${OTB} && \
chmod +x $OTB && \
./${OTB} && \
rm -f OTB-${OTB_VERSION}-Linux64.run
Expand All @@ -60,11 +66,15 @@ RUN /home/ost/programs/snap/bin/snap --nosplash --nogui --modules --update-all 2
# set usable memory to 12G
RUN echo "-Xmx12G" > /home/ost/programs/snap/bin/gpt.vmoptions

COPY requirements.txt $HOME

# get OST and tutorials
RUN python3 -m pip install git+https://github.com/ESA-PhiLab/OpenSarToolkit.git && \
git clone https://github.com/ESA-PhiLab/OST_Notebooks && \
jupyter labextension install @jupyter-widgets/jupyterlab-manager && \
jupyter nbextension enable --py widgetsnbextension
RUN python3 -m pip install git+https://github.com/ESA-PhiLab/OpenSarToolkit.git -c requirements.txt && \
git clone https://github.com/ESA-PhiLab/OST_Notebooks

#RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager
#RUN jupyter nbextension enable --py widgetsnbextension
RUN pip install widgetsnbextension

EXPOSE 8888
CMD jupyter lab --ip='0.0.0.0' --port=8888 --no-browser --allow-root
9 changes: 9 additions & 0 deletions examples/application-package/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The contents of this directory support testing of the OpenSarToolkit
CWL Workflow as an OGC EO Application Package. The JSON files
(which in a real deployment would be generated by the EOAP platform's
data stage-in process) provide a STAC catalogue for a specified input
item. The file input.yaml specifies the parameters for the workflow.
After setting the parameters appropriately in input.yaml, the workflow
can be executed in the manner of an Application Package by running

cwltool opensar.cwl inputs.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"stac_version": "1.1.0",
"type": "Feature",
"id": "S1A_IW_GRDH_1SDV_20221004T164316_20221004T164341_045295_056A44_13CB",
"geometry": null,
"properties": {
"datetime": "2022-10-04T16:43:16Z",
"platform": "sentinel-1a",
"constellation": "sentinel-1"
},
"assets": {
"GRD": {
"type": "application/zip",
"roles": [ "data" ],
"href": "S1A_IW_GRDH_1SDV_20221004T164316_20221004T164341_045295_056A44_13CB.zip"
}
},
"links": [
{
"rel": "parent",
"href": "../catalog.json"
}
]
}
13 changes: 13 additions & 0 deletions examples/application-package/SAR/GRD/2022/10/04/catalog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"stac_version": "1.1.0",
"id": "catalog",
"type": "Catalog",
"description": "Root catalog",
"links": [
{
"type": "application/json",
"rel": "item",
"href": "./S1A_IW_GRDH_1SDV_20221004T164316_20221004T164341_045295_056A44_13CB.json"
}
]
}
11 changes: 11 additions & 0 deletions examples/application-package/inputs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
input:
class: Directory
path: /data/opensar/SAR/GRD/2022/10/04
resolution: 100
ard-type: Earth-Engine
with-speckle-filter: false
resampling-method: BILINEAR_INTERPOLATION
cdse-user: <USERNAME>
cdse-password: <PASSWORD>
dry-run: true
Empty file added ost/app/__init__.py
Empty file.
Loading