[settings] finalized command structure

Author: MrClock8163

src/instrumentman/__init__.py

@@ -64,10 +64,13 @@ def cli_download() -> None:
     """Download data from the instrument."""
 
 
+@cli.group("upload")  # type: ignore[misc]
+def cli_upload() -> None:
+    """Upload data to the instrument."""
+
+
 cli.add_command(morse.cli)
 cli.add_command(terminal.cli)
-cli.add_command(settings.cli_load)
-cli.add_command(settings.cli_save)
 cli_measure.add_command(setmeasurement.cli_measure)
 cli_measure.add_command(setup.cli_measure)
 cli_measure.add_command(inclination.cli_measure)
@@ -83,3 +86,5 @@ def cli_download() -> None:
 cli_list.add_command(filetransfer.cli_list)
 cli_list.add_command(jobs.cli_list)
 cli_download.add_command(filetransfer.cli_download)
+cli_download.add_command(settings.cli_download)
+cli_upload.add_command(settings.cli_upload)

src/instrumentman/settings/__init__.py

@@ -17,7 +17,7 @@
 
 
 @extra_command(
-    "save",
+    "settings",
     params=None,
     context_settings={"auto_envvar_prefix": None}
 )  # type: ignore[misc]
@@ -54,15 +54,15 @@
     If(IsSet("add_defaults"), require_all),
     ["add_defaults", "save_all"]
 )
-def cli_save(**kwargs: Any) -> None:
+def cli_download(**kwargs: Any) -> None:
     """Save instrument settings to file."""
     from .save import main
 
     main(**kwargs)
 
 
 @extra_command(
-    "load",
+    "settings",
     params=None,
     context_settings={"auto_envvar_prefix": None}
 )  # type: ignore[misc]
@@ -80,7 +80,7 @@ def cli_save(**kwargs: Any) -> None:
     type=Choice(["auto", "json", "yaml", "toml"], case_sensitive=False),
     default="auto"
 )
-def cli_load(**kwargs: Any) -> None:
+def cli_upload(**kwargs: Any) -> None:
     """Load instrument settings from file."""
     from .load import main