Merge pull request #385 from jumpstarter-dev/faster-j

Avoid importing jmp cli when running j command

Author: NickCao

packages/jumpstarter-cli/jumpstarter_cli/__init__.py

@@ -1,46 +0,0 @@
-import logging
-
-import asyncclick as click
-from jumpstarter_cli_admin import admin
-from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
-from jumpstarter_cli_driver import driver
-
-from .config import config
-from .create import create
-from .delete import delete
-from .get import get
-from .j import j
-from .login import login
-from .run import run
-from .shell import shell
-from .update import update
-
-
-@click.group(cls=AliasedGroup)
-@opt_log_level
-def jmp(log_level):
-    """The Jumpstarter CLI"""
-
-    if log_level:
-        logging.basicConfig(level=log_level.upper())
-    else:
-        logging.basicConfig(level=logging.INFO)
-
-
-jmp.add_command(create)
-jmp.add_command(delete)
-jmp.add_command(update)
-jmp.add_command(get)
-jmp.add_command(shell)
-jmp.add_command(run)
-jmp.add_command(login)
-jmp.add_command(config)
-
-jmp.add_command(driver)
-jmp.add_command(admin)
-jmp.add_command(version)
-
-__all__ = ["jmp", "j"]
-
-if __name__ == "__main__":
-    jmp()

packages/jumpstarter-cli/jumpstarter_cli/__main__.py

@@ -1,6 +1,6 @@
 """Allow running Jumpstarter through `python -m jumpstarter_cli`."""
 
-from . import jmp
+from .jmp import jmp
 
 if __name__ == "__main__":
     jmp(prog_name="jmp")

packages/jumpstarter-cli/jumpstarter_cli/cli_test.py

@@ -1,7 +1,7 @@
 import pytest
 from asyncclick.testing import CliRunner
 
-from . import jmp
+from .jmp import jmp
 
 
 @pytest.mark.anyio

packages/jumpstarter-cli/jumpstarter_cli/j.py

@@ -18,3 +18,7 @@ def cli():
         except click.ClickException as e:
             e.show()
             sys.exit(1)
+
+
+if __name__ == "__main__":
+    j()

packages/jumpstarter-cli/jumpstarter_cli/jmp.py

@@ -0,0 +1,43 @@
+import logging
+
+import asyncclick as click
+from jumpstarter_cli_admin import admin
+from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
+from jumpstarter_cli_driver import driver
+
+from .config import config
+from .create import create
+from .delete import delete
+from .get import get
+from .login import login
+from .run import run
+from .shell import shell
+from .update import update
+
+
+@click.group(cls=AliasedGroup)
+@opt_log_level
+def jmp(log_level):
+    """The Jumpstarter CLI"""
+
+    if log_level:
+        logging.basicConfig(level=log_level.upper())
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+
+jmp.add_command(create)
+jmp.add_command(delete)
+jmp.add_command(update)
+jmp.add_command(get)
+jmp.add_command(shell)
+jmp.add_command(run)
+jmp.add_command(login)
+jmp.add_command(config)
+
+jmp.add_command(driver)
+jmp.add_command(admin)
+jmp.add_command(version)
+
+if __name__ == "__main__":
+    jmp()

packages/jumpstarter-cli/pyproject.toml

@@ -24,8 +24,8 @@ dev = [
 ]
 
 [project.scripts]
-jmp = "jumpstarter_cli:jmp"
-j = "jumpstarter_cli:j"
+jmp = "jumpstarter_cli.jmp:jmp"
+j = "jumpstarter_cli.j:j"
 
 [tool.hatch.build.targets.wheel]
 packages = ["jumpstarter_cli"]