From a6dfb94252caf3937334df574543d3795c51f7b8 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 20 Jun 2024 12:14:58 -0600 Subject: [PATCH 01/18] Include hls-vi tools. --- Dockerfile | 5 ++--- scripts/sentinel.sh | 31 +++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9eea1b..a65b4b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,17 +111,16 @@ RUN pip3 install --upgrade awscli RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.3 - RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.5 - RUN pip3 install git+https://github.com/NASA-IMPACT/hls-manifest@v2.0 - RUN pip3 install wheel RUN pip3 install git+https://github.com/NASA-IMPACT/hls-browse_imagery@v1.7 RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.1 + COPY ./scripts/* ${PREFIX}/bin/ ENV OMP_NUM_THREADS=4 diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index 10b5ee7..00fd35e 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -1,15 +1,17 @@ #!/bin/bash # shellcheck disable=SC2153 -# shellcheck disable=SC1091 +# shellcheck disable=SC1091 # Exit on any error set -o errexit jobid="$AWS_BATCH_JOB_ID" granulelist="$GRANULE_LIST" bucket="$OUTPUT_BUCKET" +vi_bucket="$VI_OUTPUT_BUCKET" # shellcheck disable=SC2034 inputbucket="$INPUT_BUCKET" workingdir="/var/scratch/${jobid}" +vidir="${workingdir}/vi" bucket_role_arn="$GCC_ROLE_ARN" debug_bucket="$DEBUG_BUCKET" replace_existing="$REPLACE_EXISTING" @@ -54,6 +56,7 @@ set_output_names () { output_metadata="${workingdir}/${outputname}.cmr.xml" output_stac_metadata="${workingdir}/${outputname}_stac.json" bucket_key="s3://${bucket}/S30/data/${year}${day_of_year}/${outputname}${twinkey}" + vi_bucket_key="s3://${vi_bucket}/S30/data/${year}${day_of_year}/${outputname}${twinkey}" gibs_dir="${workingdir}/gibs" gibs_bucket_key="s3://${gibs_bucket}/S30/data/${year}${day_of_year}" # We also need to obtain the sensor for the Bandpass parameters file @@ -171,7 +174,7 @@ create_thumbnail -i "$workingdir" -o "$output_thumbnail" -s S30 # Create metadata echo "Creating metadata" -create_metadata "$output_hdf" --save "$output_metadata" +create_metadata "$output_hdf" --save "$output_metadata" # Create STAC metadata cmr_to_stac_item "$output_metadata" "$output_stac_metadata" \ @@ -202,7 +205,7 @@ if [ -z "$debug_bucket" ]; then # Copy manifest to S3 to signal completion. aws s3 cp "$manifest" "${bucket_key}/${manifest_name}" --profile gccprofile else - # Create + # Create # Convert intermediate hdf to COGs hdf_to_cog "$resample30m" --output-dir "$workingdir" --product S30 --debug-mode hdf_to_cog "$nbarIntermediate" --output-dir "$workingdir" --product S30 --debug-mode @@ -227,7 +230,7 @@ for gibs_id_dir in "$gibs_dir"/* ; do subtile_basename=$(basename "$xml" .xml) subtile_manifest_name="${subtile_basename}.json" subtile_manifest="${gibs_id_dir}/${subtile_manifest_name}" - gibs_id_bucket_key="$gibs_bucket_key/${gibsid}" + gibs_id_bucket_key="$gibs_bucket_key/${gibsid}" echo "Gibs id bucket key is ${gibs_id_bucket_key}" create_manifest "$gibs_id_dir" "$subtile_manifest" \ @@ -252,3 +255,23 @@ for gibs_id_dir in "$gibs_dir"/* ; do fi done echo "All GIBS tiles created" + +# Generate VI files +echo "Generating VI files" +vi_generate_indices -i "$workingdir" -o "$vidir" -id "$outputname" +vi_generate_metadata -- "$workingdir" -o "$vidir" + +if [ -z "$debug_bucket" ]; then + aws s3 cp "$vidir" "$vi_bucket_key" --exclude "*" --include "*.tif" \ + --include "*.xml" --include "*.jpg" --include "*_stac.json" \ + --profile gccprofile --recursive + + # Copy manifest to S3 to signal completion. + # aws s3 cp "$manifest" "${bucket_key}/${manifest_name}" --profile gccprofile +else + # Copy all vi files to debug bucket. + echo "Copy files to debug bucket" + debug_bucket_key=s3://${debug_bucket}/${outputname} + aws s3 cp "$vidir" "$debug_bucket_key" --recursive --acl public-read +fi + From 56f5b5e061badbb2f6f960ea95159c8dc122af33 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 20 Jun 2024 13:43:51 -0600 Subject: [PATCH 02/18] Remove unecessary vi_bucket env variable. --- scripts/sentinel.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index 00fd35e..32b3978 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -7,7 +7,6 @@ set -o errexit jobid="$AWS_BATCH_JOB_ID" granulelist="$GRANULE_LIST" bucket="$OUTPUT_BUCKET" -vi_bucket="$VI_OUTPUT_BUCKET" # shellcheck disable=SC2034 inputbucket="$INPUT_BUCKET" workingdir="/var/scratch/${jobid}" @@ -56,7 +55,7 @@ set_output_names () { output_metadata="${workingdir}/${outputname}.cmr.xml" output_stac_metadata="${workingdir}/${outputname}_stac.json" bucket_key="s3://${bucket}/S30/data/${year}${day_of_year}/${outputname}${twinkey}" - vi_bucket_key="s3://${vi_bucket}/S30/data/${year}${day_of_year}/${outputname}${twinkey}" + vi_bucket_key="s3://${bucket}/S30_VI/data/${year}${day_of_year}/${outputname}${twinkey}" gibs_dir="${workingdir}/gibs" gibs_bucket_key="s3://${gibs_bucket}/S30/data/${year}${day_of_year}" # We also need to obtain the sensor for the Bandpass parameters file From 1ade9821e43a6250b3f2815aa56a02ae1094c4e5 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 20 Jun 2024 14:30:33 -0600 Subject: [PATCH 03/18] Fix incorrect vi inputdir arg. --- scripts/sentinel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index 32b3978..e8a8ad0 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -258,7 +258,7 @@ echo "All GIBS tiles created" # Generate VI files echo "Generating VI files" vi_generate_indices -i "$workingdir" -o "$vidir" -id "$outputname" -vi_generate_metadata -- "$workingdir" -o "$vidir" +vi_generate_metadata -i "$workingdir" -o "$vidir" if [ -z "$debug_bucket" ]; then aws s3 cp "$vidir" "$vi_bucket_key" --exclude "*" --include "*.tif" \ From 7e59a5e191a9a8ea829f2ba29a052358f984eab3 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Fri, 21 Jun 2024 11:04:46 -0600 Subject: [PATCH 04/18] Use new version of hls-vi that will non-wheel rasterio from container. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a65b4b0..7e00696 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.1 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.2 COPY ./scripts/* ${PREFIX}/bin/ From 6abc2fb8c8b0e8903e178e4938de9a02363a39cc Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Fri, 21 Jun 2024 13:11:20 -0600 Subject: [PATCH 05/18] Use hls-vi 1.3 to handle dataclass dependency for Python 3.6. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e00696..7d37ff8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.2 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.3 COPY ./scripts/* ${PREFIX}/bin/ From 47aa7ad7c11314c846bd9c1dc6b1ebdc6f079a60 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Mon, 24 Jun 2024 11:41:58 -0600 Subject: [PATCH 06/18] Update hls-vi with correct option parsing. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d37ff8..61c3fec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.3 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.4 COPY ./scripts/* ${PREFIX}/bin/ From 0f947e3e3347151569335b28292ff7bbd8ad016b Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Tue, 25 Jun 2024 11:05:06 -0600 Subject: [PATCH 07/18] Update vi_generate_indices short idstring param. --- scripts/sentinel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index e8a8ad0..269dc91 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -257,7 +257,7 @@ echo "All GIBS tiles created" # Generate VI files echo "Generating VI files" -vi_generate_indices -i "$workingdir" -o "$vidir" -id "$outputname" +vi_generate_indices -i "$workingdir" -o "$vidir" -s "$outputname" vi_generate_metadata -i "$workingdir" -o "$vidir" if [ -z "$debug_bucket" ]; then From b410d15cc8f2921afc71c10c583aff2b1a03f22b Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Tue, 25 Jun 2024 19:54:11 -0600 Subject: [PATCH 08/18] Update hls-vi to 1.5 for correct metadata tag names. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 61c3fec..3014b22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.4 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.5 COPY ./scripts/* ${PREFIX}/bin/ From 140a075c1ecf4b5c7a7ff7e2e451cb0894d11de2 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Tue, 9 Jul 2024 10:56:10 -0600 Subject: [PATCH 09/18] Include VI manifest for LPDAAC notification. --- Dockerfile | 2 +- scripts/sentinel.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3014b22..f0a01f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,7 @@ RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.5 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-manifest@v2.0 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-manifest@v2.1 RUN pip3 install wheel RUN pip3 install git+https://github.com/NASA-IMPACT/hls-browse_imagery@v1.7 RUN pip3 install libxml2-python3 diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index 269dc91..aabe50d 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -47,6 +47,7 @@ set_output_names () { hlsversion="v2.0" day_of_year=$(get_doy "${year}" "${month}" "${day}") outputname="HLS.S30.${granulecomponents[5]}.${year}${day_of_year}${hms}.${hlsversion}" + vi_outputname="HLS-VI.S30.${granulecomponents[5]}.${year}${day_of_year}${hms}.${hlsversion}" output_hdf="${workingdir}/${outputname}.hdf" nbar_name="HLS.S30.${granulecomponents[5]}.${year}${day_of_year}.${hms}.${hlsversion}" nbar_input="${workingdir}/${nbar_name}.hdf" @@ -260,13 +261,19 @@ echo "Generating VI files" vi_generate_indices -i "$workingdir" -o "$vidir" -s "$outputname" vi_generate_metadata -i "$workingdir" -o "$vidir" +echo "Generating VI manifest" +vi_manifest_name="${vi_outputname}.json" +vi_manifest="${vidir}/${vi_manifest_name}" +create_manifest "$vidir" "$vi_manifest" "$vi_bucket_key" "HLSS30_VI" \ + "$vi_outputname" "$jobid" false + if [ -z "$debug_bucket" ]; then aws s3 cp "$vidir" "$vi_bucket_key" --exclude "*" --include "*.tif" \ --include "*.xml" --include "*.jpg" --include "*_stac.json" \ --profile gccprofile --recursive - # Copy manifest to S3 to signal completion. - # aws s3 cp "$manifest" "${bucket_key}/${manifest_name}" --profile gccprofile + # Copy vi manifest to S3 to signal completion. + aws s3 cp "$vi_manifest" "${vi_bucket_key}/${vi_manifest_name}" --profile gccprofile else # Copy all vi files to debug bucket. echo "Copy files to debug bucket" From 4c90a9597592c3394567b82da1bb3227704fd132 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 25 Jul 2024 11:56:49 -0400 Subject: [PATCH 10/18] Update hls-vi to 1.7. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f0a01f0..1627186 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.5 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.7 COPY ./scripts/* ${PREFIX}/bin/ From 04ae839957733490b122731eecf8ad65c09bcd7d Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 1 Aug 2024 18:06:56 -0600 Subject: [PATCH 11/18] Update hls-vi to 1.8 to handle end date padding correction. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1627186..14a2d69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.7 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.8 COPY ./scripts/* ${PREFIX}/bin/ From 34c61c815f8221a9afcb3a9cf33e885510a56417 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Wed, 7 Aug 2024 15:40:37 -0600 Subject: [PATCH 12/18] Update hls-vi to 1.9 to handle lxml library incompatibility. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14a2d69..f273fda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.8 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.9 COPY ./scripts/* ${PREFIX}/bin/ From a5f0c97d46be0b0fab3f78b31128a4664b49185f Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 8 Aug 2024 16:25:42 -0600 Subject: [PATCH 13/18] Update hls-vi to 1.10 to handle schema packaging issue. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f273fda..9a4a656 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.9 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.10 COPY ./scripts/* ${PREFIX}/bin/ From dae17ad2d39414c2cece597d797623b42ad0ede2 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Fri, 9 Aug 2024 13:16:18 -0600 Subject: [PATCH 14/18] Update hls-vi to 1.11. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a4a656..b405f41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.10 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.11 COPY ./scripts/* ${PREFIX}/bin/ From e93a0a5cf14a3c9b9d4e6b6ee1ca790ac1c38b8c Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Mon, 12 Aug 2024 15:46:10 -0600 Subject: [PATCH 15/18] Update hls-vi to 1.12. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b405f41..a210274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.11 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.12 COPY ./scripts/* ${PREFIX}/bin/ From 825fb102f1c5f65470ae8f374af7586b787407fb Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Tue, 27 Aug 2024 17:07:58 -0400 Subject: [PATCH 16/18] Update hls-vi to 1.13. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a210274..ae74194 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.12 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.13 COPY ./scripts/* ${PREFIX}/bin/ From 84a9eadcc72a693a818a811cbf240f6d7d62856c Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 19 Sep 2024 19:23:44 -0400 Subject: [PATCH 17/18] Update hls-vi to 1.14 and update VI output key structure. --- Dockerfile | 2 +- scripts/sentinel.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae74194..50b769f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.13 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.14 COPY ./scripts/* ${PREFIX}/bin/ diff --git a/scripts/sentinel.sh b/scripts/sentinel.sh index aabe50d..27cf14d 100755 --- a/scripts/sentinel.sh +++ b/scripts/sentinel.sh @@ -56,7 +56,7 @@ set_output_names () { output_metadata="${workingdir}/${outputname}.cmr.xml" output_stac_metadata="${workingdir}/${outputname}_stac.json" bucket_key="s3://${bucket}/S30/data/${year}${day_of_year}/${outputname}${twinkey}" - vi_bucket_key="s3://${bucket}/S30_VI/data/${year}${day_of_year}/${outputname}${twinkey}" + vi_bucket_key="s3://${bucket}/S30_VI/data/${year}${day_of_year}/${vi_outputname}${twinkey}" gibs_dir="${workingdir}/gibs" gibs_bucket_key="s3://${gibs_bucket}/S30/data/${year}${day_of_year}" # We also need to obtain the sensor for the Bandpass parameters file From 7f8bf89a8cc9d5639d8dcf76fc8efe851ef1fc03 Mon Sep 17 00:00:00 2001 From: sharkinsspatial Date: Thu, 7 Nov 2024 13:37:10 -0500 Subject: [PATCH 18/18] Update hls-vi util to 1.15 for metadata updates. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 50b769f..02923a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN pip3 install libxml2-python3 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-utilities@v1.9 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-cmr_stac@v1.7 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.14 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-vi@v1.15 COPY ./scripts/* ${PREFIX}/bin/