Skip to content

Dependency jsons present locally are not downloaded #3344

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.

Sign up for GitHub

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

Merged
vineetbansal merged 2 commits into from
Jul 24, 2026
Merged

Dependency jsons present locally are not downloaded #3344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65af7ec
dependency jsons present locally are not downloaded
vineetbansal Jul 23, 2026
795ba30
help string about downloaded/existing dep jsons
vineetbansal Jul 23, 2026
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
10 changes: 7 additions & 3 deletions imap_processing/cli.py
View file
Open in desktop

@tmplummer tmplummer Jul 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add to the dependency_help string to clarify that if the json file doesn't exist locally, it will attempt to be downloaded using imap-data-access?

@vineetbansal vineetbansal Jul 23, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ def _parse_args() -> argparse.Namespace:
'{"major_version": 2, "minor_version": 1}}'
"}'"
" A path to a JSON file containing this same information may also be"
"passed in. If dependency is a string ending in '.json', it will be interpreted"
" as such a file path."
" passed in. If dependency is a string ending in '.json', it will be"
" interpreted as such a file path: an existing local file is used as-is,"
" otherwise the file is downloaded from the IMAP SDC."
)

parser = argparse.ArgumentParser(prog="imap_cli", description=description)
Expand Down Expand Up @@ -288,7 +289,10 @@ def _parse_args() -> argparse.Namespace:
logger.info(
f"Interpreting dependency argument as a JSON file: {args.dependency}"
)
dependency_filepath = download(args.dependency)
if not Path(args.dependency).exists():
dependency_filepath = download(args.dependency)
else:
dependency_filepath = args.dependency
with open(dependency_filepath) as f:
args.dependency = f.read()

Expand Down
29 changes: 29 additions & 0 deletions imap_processing/tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,35 @@ def test_parse_args_dependency_json_file(caplog, tmp_path):
)


def test_parse_args_dependency_local_json_not_downloaded(tmp_path):
"""A --dependency JSON that exists locally is read without downloading."""
test_json_content = {"dependency": [], "version": {}}
test_json_dst = tmp_path / "imap_ultra_l2_local-dependency_20250520_v001.0001.json"
with open(test_json_dst, "w") as f:
f.write(json.dumps(test_json_content))

test_args = [
"imap_cli",
"--instrument",
"mag",
"--dependency",
str(test_json_dst),
"--data-level",
"l1a",
"--start-date",
"20240430",
]
with (
mock.patch.object(sys, "argv", test_args),
mock.patch("imap_processing.cli.download") as mock_download,
):
args = _parse_args()

# Local file exists, so download must not be called and its content is read.
mock_download.assert_not_called()
assert json.loads(args.dependency) == test_json_content


@pytest.mark.parametrize(
"instrument, data_level, start_date, repointing, raises_value_error",
[
Expand Down
Loading