test: update tests

mercator-ocean · Jul 12, 2024 · 3e0e300 · 3e0e300
1 parent 9780a41
commit 3e0e300
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/copernicusmarine/command_line_interface/group_get.py b/copernicusmarine/command_line_interface/group_get.py
@@ -59,7 +59,7 @@ def cli_group_get() -> None:
     "--dataset-id",
     "-i",
     type=str,
-    required=True,
+    default=None,
     help="The datasetID.",
 )
 @force_dataset_version_option
@@ -245,7 +245,7 @@ def cli_group_get() -> None:
 )
 @log_exception_and_exit
 def get(
-    dataset_id: str,
+    dataset_id: Optional[str],
     dataset_version: Optional[str],
     dataset_part: Optional[str],
     username: Optional[str],

diff --git a/copernicusmarine/command_line_interface/group_subset.py b/copernicusmarine/command_line_interface/group_subset.py
@@ -77,7 +77,7 @@ def cli_group_subset() -> None:
     "--dataset-id",
     "-i",
     type=str,
-    required=True,
+    default=None,
     help="The datasetID.",
 )
 @force_dataset_version_option

diff --git a/copernicusmarine/core_functions/get.py b/copernicusmarine/core_functions/get.py
@@ -27,7 +27,7 @@
 
 
 def get_function(
-    dataset_id: str,
+    dataset_id: Optional[str],
     force_dataset_version: Optional[str],
     force_dataset_part: Optional[str],
     username: Optional[str],
@@ -58,9 +58,11 @@ def get_function(
             "Data will come from the staging environment."
         )
 
-    get_request = GetRequest(dataset_id=dataset_id)
+    get_request = GetRequest(dataset_id=dataset_id or "")
     if request_file:
         get_request.from_file(request_file)
+    if not get_request.dataset_id:
+        raise ValueError("Please provide a dataset id for a get request.")
     request_update_dict = {
         "dataset_id": dataset_id,
         "force_dataset_version": force_dataset_version,

diff --git a/copernicusmarine/core_functions/subset.py b/copernicusmarine/core_functions/subset.py
@@ -38,7 +38,7 @@
 
 
 def subset_function(
-    dataset_id: str,
+    dataset_id: Optional[str],
     force_dataset_version: Optional[str],
     force_dataset_part: Optional[str],
     username: Optional[str],
@@ -85,9 +85,11 @@ def subset_function(
             "--netcdf-compression-level option"
         )
 
-    subset_request = SubsetRequest(dataset_id=dataset_id)
+    subset_request = SubsetRequest(dataset_id=dataset_id or "")
     if request_file:
         subset_request.from_file(request_file)
+    if not subset_request.dataset_id:
+        raise ValueError("Please provide a dataset id for a subset request.")
     if motu_api_request:
         motu_api_subset_request = convert_motu_api_request_to_structure(
             motu_api_request

diff --git a/copernicusmarine/python_interface/get.py b/copernicusmarine/python_interface/get.py
@@ -18,7 +18,7 @@
 @deprecated_python_option(**DEPRECATED_OPTIONS.dict_old_names_to_new_names)
 @log_exception_and_exit
 def get(
-    dataset_id: str,
+    dataset_id: Optional[str],
     dataset_version: Optional[str] = None,
     dataset_part: Optional[str] = None,
     username: Optional[str] = None,

diff --git a/copernicusmarine/python_interface/read_dataframe.py b/copernicusmarine/python_interface/read_dataframe.py
@@ -65,7 +65,6 @@ def read_dataframe(
     subset_method: SubsetMethod = DEFAULT_SUBSET_METHOD,
     force_service: Optional[str] = None,
     credentials_file: Optional[Union[pathlib.Path, str]] = None,
-    disable_progress_bar: bool = False,
 ) -> pandas.DataFrame:
     """
     Immediately loads a Pandas DataFrame into memory from a specified dataset.

diff --git a/copernicusmarine/python_interface/subset.py b/copernicusmarine/python_interface/subset.py
@@ -22,7 +22,7 @@
 @deprecated_python_option(**DEPRECATED_OPTIONS.dict_old_names_to_new_names)
 @log_exception_and_exit
 def subset(
-    dataset_id: str,
+    dataset_id: Optional[str],
     dataset_version: Optional[str] = None,
     dataset_part: Optional[str] = None,
     username: Optional[str] = None,