Merge pull request #2904 from ASFHyP3/develop

jtherrmann · web-flow · commit a6f8b38539a1 · 2025-09-17T14:23:06.000-08:00
Release v10.11.5
diff --git a/.github/workflows/deploy-custom-prod.yml b/.github/workflows/deploy-custom-prod.yml
@@ -295,14 +295,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-custom-test.yml b/.github/workflows/deploy-custom-test.yml
@@ -135,14 +135,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-daac-prod.yml b/.github/workflows/deploy-daac-prod.yml
@@ -49,8 +49,8 @@ jobs:
             job_files: >-
               job_spec/OPERA_RTC_S1_SLC.yml
             instance_types: c6i.2xlarge,c6id.2xlarge,c7i.2xlarge,c6i.4xlarge,c6id.4xlarge,c7i.4xlarge
-            default_max_vcpus: 10000
-            expanded_max_vcpus: 10000
+            default_max_vcpus: 12000
+            expanded_max_vcpus: 12000
             required_surplus: 0
             security_environment: EDC
             ami_id: /ngap/amis/image_id_ecs_al2023_x86
@@ -64,14 +64,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-daac-test.yml b/.github/workflows/deploy-daac-test.yml
@@ -67,14 +67,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-lavas-prod.yml b/.github/workflows/deploy-lavas-prod.yml
@@ -43,14 +43,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-lavas-test.yml b/.github/workflows/deploy-lavas-test.yml
@@ -42,14 +42,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-plus-prod.yml b/.github/workflows/deploy-plus-prod.yml
@@ -1,4 +1,4 @@
-name: Deploy Enterprise prod to AWS
+name: Deploy HyP3+ prod to AWS
 
 on:
   push:
@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - environment: hyp3-enterprise
-            domain: hyp3-enterprise.asf.alaska.edu
+          - environment: hyp3-plus
+            domain: hyp3-plus.asf.alaska.edu
             template_bucket: cf-templates-qgq5ahzym464-us-west-2
             image_tag: latest
             product_lifetime_in_days: 30
@@ -44,14 +44,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-plus-test.yml b/.github/workflows/deploy-plus-test.yml
@@ -1,4 +1,4 @@
-name: Deploy Enterprise test to AWS
+name: Deploy HyP3+ test to AWS
 
 on:
   push:
@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - environment: hyp3-enterprise-test
-            domain: hyp3-enterprise-test.asf.alaska.edu
+          - environment: hyp3-plus-test
+            domain: hyp3-plus-test.asf.alaska.edu
             template_bucket: cf-templates-qgq5ahzym464-us-west-2
             image_tag: test
             product_lifetime_in_days: 30
@@ -44,14 +44,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/deploy-services-sandbox.yml b/.github/workflows/deploy-services-sandbox.yml
@@ -42,14 +42,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.V2_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.V2_AWS_SECRET_ACCESS_KEY }}
           aws-session-token: ${{ secrets.V2_AWS_SESSION_TOKEN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -24,7 +24,7 @@ jobs:
         security_environment: [ASF, EDC, JPL, JPL-public]
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
       - run: |
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5.0.0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
       - run: |
@@ -55,7 +55,7 @@ jobs:
         with:
           ruby-version: 2.7
       - run: gem install statelint
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
       - run: |
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5.0.0
       - uses: snyk/actions/setup@0.4.0
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
       - run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5.0.0
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.11.5]
+
+### Added
+- A `DistS1` compute environment with `m6id` On Demand instances for the `OEPERA_DIST_S1` job type to avoid spot interruptions.
+
+### Changed
+- `OPERA_DIST_S1` jobs now time out after 1 hour instead of 3 hours.
+- `OPERA_DIST_S1` jobs utilize less workers for normal parameter estimation and despeckling due to RAM constraints.
+- Increased min/max vCPUs to 12,000 in the `hyp3-opera-prod` deployment
+- Change hyp3-enterprise over to hyp3-plus
+
 ## [10.11.4]
 
 ### Added
@@ -71,7 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added new deployment for AK-FIRE-SAFE.
 - The OpenAPI Specification version can now be specified in `render.py` via the `--openapi-spec` argument.
 - The `AUTORIFT_ITS_LIVE.yml` job spec has a new `use_static_files` parameter to specify whether to use Sentinel-1 static geometries for processing or not.
-  - This parameter has been hard-coded to `False` in the `AUTORIFT.yml` and `ARIA_AUTORIFT.yml` to ensure there is no change in the workflow for those job types. 
+  - This parameter has been hard-coded to `False` in the `AUTORIFT.yml` and `ARIA_AUTORIFT.yml` to ensure there is no change in the workflow for those job types.
 
 ### Fixed
 - The `openapi-spec.yml` and the `api-cf.yml` will now always specify the same OpenAPI Specification version.
@@ -83,7 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - The credit cost in EDC/DAAC deployments has been halved accordingly
 
 ### Removed
-- Removed the deprecated `S1_CORRECTION_ITS_LIVE` job spec that's no longer supported by the hyp3-autorift plugin. 
+- Removed the deprecated `S1_CORRECTION_ITS_LIVE` job spec that's no longer supported by the hyp3-autorift plugin.
 
 ## [10.9.2]
 
diff --git a/job_spec/OPERA_DIST_S1.yml b/job_spec/OPERA_DIST_S1.yml
@@ -77,9 +77,9 @@ OPERA_DIST_S1:
       api_schema:
         description: N CPUs to use for despeckling the bursts
         type: integer
-        default: 8
+        default: 4
         minimum: 1
-        example: 8
+        example: 4
     device:
       api_schema:
         description: Device to use for transformer model inference of normal parameters
@@ -95,9 +95,9 @@ OPERA_DIST_S1:
       api_schema:
         description: Number of CPUs to use for normal parameter estimation
         type: integer
-        default: 8
+        default: 4
         minimum: 1
-        example: 8
+        example: 4
     model_source:
       api_schema:
         description: What model to load; external means load model from cfg and wts paths specified in parameters
@@ -184,8 +184,8 @@ OPERA_DIST_S1:
         - Ref::model_compilation
         - --use_date_encoding
         - Ref::use_date_encoding
-      timeout: 10800  # 3 hr
-      compute_environment: Default
+      timeout: 3600  # 1 hr
+      compute_environment: DistS1
       vcpu: 1
       memory: 31500
       secrets:
diff --git a/job_spec/config/compute_environments.yml b/job_spec/config/compute_environments.yml
@@ -20,6 +20,10 @@ compute_environments:
     instance_types: m6id.xlarge,m6id.2xlarge,m6id.4xlarge,m6id.8xlarge
     allocation_type: EC2
     allocation_strategy: BEST_FIT_PROGRESSIVE
+  DistS1:
+    instance_types: m6id.2xlarge,m6id.4xlarge,m6id.8xlarge
+    allocation_type: EC2
+    allocation_strategy: BEST_FIT_PROGRESSIVE
   ItsLiveMeta:
     instance_types: r6id.xlarge,r6id.2xlarge,r6id.4xlarge,r6id.8xlarge,r6idn.xlarge,r6idn.2xlarge,r6idn.4xlarge,r6idn.8xlarge
     ami_id: ami-0aece254fc7c27a77  # /aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -5,14 +5,14 @@
 -r requirements-apps-disable-private-dns.txt
 -r requirements-apps-search-archive.txt
 -r requirements-apps-update-db.txt
-boto3==1.40.21
+boto3==1.40.30
 jinja2==3.1.6
-moto[dynamodb]==5.1.11
-pytest==8.4.1
+moto[dynamodb]==5.1.12
+pytest==8.4.2
 PyYAML==6.0.2
 responses==0.25.8
-ruff==0.12.11
-mypy==1.17.1
+ruff==0.13.0
+mypy==1.18.1
 setuptools==80.9.0
 setuptools_scm==9.2.0
 openapi-spec-validator==0.7.2
diff --git a/requirements-apps-disable-private-dns.txt b/requirements-apps-disable-private-dns.txt
@@ -1 +1 @@
-boto3==1.40.21
+boto3==1.40.30
diff --git a/requirements-apps-get-files.txt b/requirements-apps-get-files.txt
@@ -1,2 +1,2 @@
-boto3==1.40.21
+boto3==1.40.30
 ./lib/dynamo/
diff --git a/requirements-apps-search-archive.txt b/requirements-apps-search-archive.txt
@@ -1,4 +1,4 @@
 ./lib/dynamo/
 ./lib/lambda_logging/
 asf_enumeration==0.3.0
-asf_search==10.0.2
+asf_search==10.0.4
diff --git a/requirements-apps-start-execution.txt b/requirements-apps-start-execution.txt
@@ -1,3 +1,3 @@
-boto3==1.40.21
+boto3==1.40.30
 ./lib/dynamo/
 ./lib/lambda_logging/
