Converted CLIs to lazy loading logic

Author: MrClock8163

src/instrumentman/__main__.py

@@ -0,0 +1,23 @@
+from typing import Any
+
+from click_extra import extra_command
+
+from ..utils import (
+    com_baud_option,
+    com_timeout_option,
+    com_port_argument
+)
+
+
+@extra_command(
+    "test",
+    params=None,
+    context_settings={"auto_envvar_prefix": None}
+)  # type: ignore[misc]
+@com_port_argument()
+@com_baud_option()
+@com_timeout_option()
+def cli(**kwargs: Any) -> None:
+    from .app import main
+
+    main(**kwargs)

src/instrumentman/geocomtest/__init__.py

@@ -1,5 +1,4 @@
 from click_extra import (
-    extra_command,
     echo,
     prompt
 )
@@ -9,13 +8,10 @@
 from geocompy.geo.gctypes import GeoComCode
 from geocompy.communication import open_serial
 
-from .utils import (
+from ..utils import (
     echo_red,
     echo_green,
-    echo_yellow,
-    com_baud_option,
-    com_timeout_option,
-    com_port_argument
+    echo_yellow
 )
 
 
@@ -59,23 +55,11 @@ def tests(tps: GeoCom) -> None:
         echo_yellow(f"Mororization unavailable ({resp_changeface.response})")
 
 
-@extra_command(
-    "test",
-    params=None,
-    context_settings={"auto_envvar_prefix": None}
-)  # type: ignore[misc]
-@com_port_argument()
-@com_baud_option()
-@com_timeout_option()
-def cli(
+def main(
     port: str,
     baud: int = 9600,
     timeout: int = 15
 ) -> None:
-    """Rudimentary tests for determining what GeoCom functions are
-    available on an instrument.
-    """
-
     try:
         with open_serial(
             port,

src/instrumentman/geocomtest.py renamed to src/instrumentman/geocomtest/app.py

@@ -0,0 +1,69 @@
+from typing import Any
+
+from click_extra import (
+    extra_command,
+    option,
+    option_group,
+    argument,
+    Choice,
+    IntRange
+)
+
+from ..utils import (
+    com_baud_option,
+    com_timeout_option,
+    com_port_argument
+)
+
+
+@extra_command(
+    "morse",
+    params=None,
+    context_settings={"auto_envvar_prefix": None}
+)  # type: ignore[misc]
+@com_port_argument()
+@argument(
+    "message",
+    help="message to relay as a string of ASCII characters",
+    type=str
+)
+@option(
+    "-i",
+    "--intensity",
+    help="beeping intensity",
+    type=IntRange(0, 100),
+    default=100
+)
+@option(
+    "-u",
+    "--unittime",
+    help="beep unit time in milliseconds [ms]",
+    type=IntRange(min=50),
+    default=50
+)
+@option(
+    "-c",
+    "--compatibility",
+    help="instrument compatibility",
+    type=Choice(["none", "TPS1000"], case_sensitive=False),
+    default="none"
+)
+@option(
+    "--ignore-non-ascii",
+    help="suppress encoding errors and skip non-ASCII characters",
+    is_flag=True
+)
+@option_group(
+    "Connection options",
+    "Options related to the serial connection",
+    com_baud_option(),
+    com_timeout_option()
+)
+def cli(**kwargs: Any) -> None:
+    """Play a Morse encoded ASCII message through the beep signals
+        of a GeoCom capable total station.
+        """
+
+    from .app import main
+
+    main(**kwargs)

src/instrumentman/morse/__init__.py

@@ -1,25 +1,14 @@
 from time import sleep
 from typing import Callable, Any
 
-from click_extra import (
-    extra_command,
-    option,
-    option_group,
-    argument,
-    Choice,
-    IntRange,
-    progressbar
-)
+from click_extra import progressbar
 
 from geocompy.geo import GeoCom
 from geocompy.communication import open_serial
 
-from .utils import (
+from ..utils import (
     echo_red,
-    echo_green,
-    com_baud_option,
-    com_timeout_option,
-    com_port_argument
+    echo_green
 )
 
 
@@ -128,50 +117,7 @@ def relay_message(
                     )
 
 
-@extra_command(
-    "morse",
-    params=None,
-    context_settings={"auto_envvar_prefix": None}
-)  # type: ignore[misc]
-@com_port_argument()
-@argument(
-    "message",
-    help="message to relay as a string of ASCII characters",
-    type=str
-)
-@option(
-    "-i",
-    "--intensity",
-    help="beeping intensity",
-    type=IntRange(0, 100),
-    default=100
-)
-@option(
-    "-u",
-    "--unittime",
-    help="beep unit time in milliseconds [ms]",
-    type=IntRange(min=50),
-    default=50
-)
-@option(
-    "-c",
-    "--compatibility",
-    help="instrument compatibility",
-    type=Choice(["none", "TPS1000"], case_sensitive=False),
-    default="none"
-)
-@option(
-    "--ignore-non-ascii",
-    help="suppress encoding errors and skip non-ASCII characters",
-    is_flag=True
-)
-@option_group(
-    "Connection options",
-    "Options related to the serial connection",
-    com_baud_option(),
-    com_timeout_option()
-)
-def cli(
+def main(
     port: str,
     message: str,
     intensity: int = 100,
@@ -181,9 +127,6 @@ def cli(
     unittime: int = 50,
     compatibility: str = "none",
 ) -> None:
-    """Play a Morse encoded ASCII message through the beep signals
-        of a GeoCom capable total station.
-        """
     if not ignore_non_ascii:
         try:
             message.casefold().encode("ascii")
@@ -209,7 +152,3 @@ def cli(
             unittime * 1e-3
         )
         echo_green("Message complete.")
-
-
-if __name__ == "__main__":
-    cli()