Repository navigation
Merged
Conversation
Optional File?/Directory? inputs left empty at submission are now omitted from inputs.yml instead of crashing on os.path.basename(None) or attempting STAC staging from an empty URI. Empty required File/Directory inputs fail early with a clear error. Closes #12
fix(create_inputs): skip empty optional File/Directory inputs
ci: bump GitHub Actions to Node 24 versions and pin ubuntu-24.04
test: fix stale stage_in tests, pin pystac, run tests in CI
* Create MAAP client lazily in stage_in Avoids the /api/environment/config call at import time for jobs with no file inputs (fixes #10). Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XHifpuJ7Q83CrNkchsbuRj * test(stage_in): fix duplicate self_href test left by merge, use _get_maap patch --------- Co-authored-by: Claude <noreply@anthropic.com>
* fix: add timeout, retry and clear errors to get_maap_pgt_token - 5s connect / 30s read timeout; up to 6 attempts with exponential backoff and jitter on connect errors, timeouts and 5xx - 4xx and malformed responses fail immediately with PgtTokenError - on failure, message goes to stderr (stdout is captured into MAAP_PGT), _alt_error.txt is written for the HySDS job `error` field, and the script exits 78; dps_wrapper.sh propagates the exit code - resolve MAAP_API_HOST at call time instead of import time Closes #8 * refactor: use urllib3 Retry for get_maap_pgt_token retries Replace the hand-rolled retry loop with a requests session mounting an HTTPAdapter(Retry(...)): exponential backoff with jitter (backoff_jitter needs urllib3>=2), retries on connect errors, timeouts and 5xx. Pin urllib3>=2 in the Dockerfile and CI. Retry behaviour is tested against a local flaky HTTP server.
Fail with exit 78 and _alt_error.txt when _job.json has no username or the API returns an empty/non-string session_key, instead of printing nothing (or an empty token) and letting the container start. Refs #9
…#23) - stage_in: call download_granule (downloadGranule is a raising stub in maap-py v5, so every asset download failed with an unexpected 'online_access_url' keyword error) - pin maap-py==5.1.0 in environment.yaml and the Dockerfile - create_inputs: retry transient HTTP errors (e.g. CMR 503) with backoff and a timeout, and raise a clear error instead of an AttributeError when a STAC input cannot be loaded - tests: maap-py signature contract test, retry and download_granule tests
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Promotes
developtomainfor the next release (previous tag: v1.1.0).Fixes included
File?/Directory?inputs instead of failing withInvalid URL 'None'. Empty required File/Directory inputs now fail early with a clear error. (Closes create_inputs.py: skip empty optional File/Directory inputs instead of crashing #12)download_granule(downloadGranuleis a raising stub in v5), pinmaap-py==5.1.0, retry transient STAC fetch errors (e.g. CMR 502/503), and raise a clear error when a STAC input cannot be loaded.get_maap_pgt_token: timeout, retry, clear errors, and never emit an emptyMAAP_PGT.stage_in.Verified
UAT:
mocca-v29601(optionalmodis03_file_3/modis06_file_3omitted) ran to completion on thedevelopimage: optional inputs skipped, all STAC inputs staged, PGE succeeded, stage-out produced the outputs. Unit tests: 77 pass.Known follow-ups (not in this release)
stage_inare still only printed (e.g.s3://alternate assets logNo connection adapters)..github/workflows/docker-build.ymlinstallsmaap-pyunpinned; it should match the5.1.0pin.After merge
Tag the release (suggest
v1.2.0) to publish the versioned image, then point the OGC executor config at it.