Skip to content

Prevent fetch from downloading unnecessary data and skipping data download for certain instruments #175

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
j-atkins merged 2 commits into from
May 2, 2025
Merged

Prevent fetch from downloading unnecessary data and skipping data download for certain instruments #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b8c613
fixes for over-extensive data downloads and skipping certain instruments
j-atkins May 1, 2025
f73f07c
fixes based on PR feedback #175
j-atkins May 2, 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
16 changes: 9 additions & 7 deletions src/virtualship/cli/_fetch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def _fetch(path: str | Path, username: str | None, password: str | None) -> None
be provided on prompt, via command line arguments, or via a YAML config file. Run
`virtualship fetch` on an expedition for more info.
"""
from virtualship.expedition.instrument_type import InstrumentType

if sum([username is None, password is None]) == 1:
raise ValueError("Both username and password must be provided when using CLI.")

Expand Down Expand Up @@ -88,10 +90,10 @@ def _fetch(path: str | Path, username: str | None, password: str | None) -> None
{"XBT", "CTD", "SHIP_UNDERWATER_ST"}
& set(instrument.name for instrument in instruments_in_schedule)
)
or hasattr(ship_config, "ship_underwater_st_config")
or hasattr(ship_config, "adcp_config")
or ship_config.ship_underwater_st_config is not None
or ship_config.adcp_config is not None
):
print("Ship data will be downloaded")
print("Ship data will be downloaded. Please wait...")

# Define all ship datasets to download, including bathymetry
download_dict = {
Expand Down Expand Up @@ -145,8 +147,8 @@ def _fetch(path: str | Path, username: str | None, password: str | None) -> None
complete_download(download_folder)
click.echo("Ship data download based on space-time region completed.")

if "DRIFTER" in instruments_in_schedule:
print("Drifter data will be downloaded")
if InstrumentType.DRIFTER in instruments_in_schedule:
print("Drifter data will be downloaded. Please wait...")
drifter_download_dict = {
"UVdata": {
"dataset_id": "cmems_mod_glo_phy-cur_anfc_0.083deg_PT6H-i",
Expand Down Expand Up @@ -188,8 +190,8 @@ def _fetch(path: str | Path, username: str | None, password: str | None) -> None
complete_download(download_folder)
click.echo("Drifter data download based on space-time region completed.")

if "ARGO_FLOAT" in instruments_in_schedule:
print("Argo float data will be downloaded")
if InstrumentType.ARGO_FLOAT in instruments_in_schedule:
print("Argo float data will be downloaded. Please wait...")
argo_download_dict = {
"UVdata": {
"dataset_id": "cmems_mod_glo_phy-cur_anfc_0.083deg_PT6H-i",
Expand Down