Add --data-type to upload CLI command (#168)

* add --data-type to upload cli

* process-> data type

* update readme

* --process deprecated

* oops its not a flag

Author: nathanthorpe

README.md

@@ -53,7 +53,7 @@ Options:
   --name TEXT             Name of the dataset
   --description TEXT      Description of the dataset (optional)
   --project TEXT          Name or ID of the project
-  --process TEXT          Name or ID of the ingest process
+  --data-type TEXT        Name or ID of the data type (ingest process)
   --data-directory TEXT   Directory you wish to upload
   -i, --interactive       Gather arguments interactively
   --help                  Show this message and exit.

cirro/cli/cli.py

@@ -59,8 +59,8 @@ def download(**kwargs):
               default='')
 @click.option('--project',
               help='Name or ID of the project')
-@click.option('--process',
-              help='Name or ID of the ingest process')
+@click.option('--data-type', '--process',
+              help='Name or ID of the data type (--process is deprecated)')
 @click.option('--data-directory',
               help='Directory you wish to upload')
 @click.option('-i', '--interactive',

cirro/cli/controller.py

@@ -82,14 +82,14 @@ def run_ingest(input_params: UploadArguments, interactive=False):
         directory = input_params['data_directory']
     else:
         input_params['project'] = get_id_from_name(projects, input_params['project'])
-        input_params['process'] = get_id_from_name(processes, input_params['process'])
+        input_params['data_type'] = get_id_from_name(processes, input_params['data_type'])
         directory = input_params['data_directory']
         files = get_files_in_directory(directory)
 
     if len(files) == 0:
         raise InputError("No files to upload")
 
-    process = get_item_from_name_or_id(processes, input_params['process'])
+    process = get_item_from_name_or_id(processes, input_params['data_type'])
     logger.info(f"Validating expected files: {process.name}")
     try:
         cirro.processes.check_dataset_files(process_id=process.id, files=files, directory=directory)

cirro/cli/interactive/upload_args.py

@@ -168,7 +168,7 @@ def gather_upload_arguments(input_params: UploadArguments, projects: List[Projec
 
     confirm_data_files(input_params['data_directory'], files)
 
-    input_params['process'] = ask_process(processes, input_params.get('process'))
+    input_params['data_type'] = ask_process(processes, input_params.get('data_type'))
 
     data_directory_name = Path(input_params['data_directory']).name
     default_name = input_params.get('name') or data_directory_name

cirro/cli/models.py

@@ -12,7 +12,7 @@ class UploadArguments(TypedDict):
     name: str
     description: str
     project: str
-    process: str
+    data_type: str
     data_directory: str
     include_hidden: bool
     interactive: bool