extra cli debug output

orgua · Mar 24, 2023 · 596cfaf · 596cfaf
1 parent 96f56bf
commit 596cfaf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/software/python-package/shepherd/cli.py b/software/python-package/shepherd/cli.py
@@ -24,6 +24,7 @@
 from periphery import GPIO
 
 from . import ShepherdDebug
+from . import __version__
 from . import get_verbose_level
 from . import run_emulator
 from . import run_recorder
@@ -82,6 +83,12 @@ def cli(ctx: click.Context, verbose: int = 2):
     Returns:
     """
     set_verbose_level(verbose)
+    logger.info("Shepherd-Sheep v%s", __version__)
+    logger.debug("Python v%s", sys.version)
+    logger.debug("Click v%s", click.__version__)
+    if not ctx.invoked_subcommand:
+        click.echo("Please specify a valid command")
+
     # test for correct usage -> fail early!
     try:
         sysfs_interface.get_mode()

diff --git a/software/shepherd-calibration/shepherd_cal/cli.py b/software/shepherd-calibration/shepherd_cal/cli.py
@@ -1,3 +1,4 @@
+import sys
 from datetime import datetime
 from pathlib import Path
 from time import time
@@ -8,6 +9,7 @@
 import numpy as np
 import yaml
 
+from . import __version__
 from .calibrator import INSTR_4WIRE
 from .calibrator import INSTR_CAL_EMU
 from .calibrator import INSTR_CAL_HRV
@@ -29,9 +31,15 @@
     help="4 Levels",
 )
 @click.version_option()
+@click.pass_context
 # @click.pass_context
-def cli(verbose: int):
+def cli(ctx: click.Context, verbose: int):
     set_verbose_level(verbose)
+    logger.info("Shepherd-Cal v%s", __version__)
+    logger.debug("Python v%s", sys.version)
+    logger.debug("Click v%s", click.__version__)
+    if not ctx.invoked_subcommand:
+        click.echo("Please specify a valid command")
 
 
 # #############################################################################

diff --git a/software/shepherd-herd/shepherd_herd/cli.py b/software/shepherd-herd/shepherd_herd/cli.py
@@ -9,6 +9,7 @@
 import yaml
 from fabric import Connection
 
+from . import __version__
 from .herd import Herd
 from .herd import logger
 from .herd import set_verbose_level
@@ -58,7 +59,7 @@ def cli(
     user: Optional[str],
     key_filepath: Optional[Path],
     verbose: int,
-) -> click.Context:
+) -> click.Context:  # TODO: return type can be removed?!?
     """A primary set of options to configure how to interface the herd
 
     :param ctx:
@@ -70,6 +71,12 @@ def cli(
     :return:
     """
     set_verbose_level(verbose)
+    logger.info("Shepherd-Data v%s", __version__)
+    logger.debug("Python v%s", sys.version)
+    logger.debug("Click v%s", click.__version__)
+    if not ctx.invoked_subcommand:
+        click.echo("Please specify a valid command")
+
     ctx.obj["herd"] = Herd(inventory, limit, user, key_filepath)
     return ctx  # calm linter