compshare-cli 0.1.1__tar.gz → 0.1.3__tar.gz

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compshare-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Command-line client for CompShare GPU compute
 Author: CompShare
 License: Apache-2.0

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "compshare-cli"
-version = "0.1.1"
+version = "0.1.3"
 description = "Command-line client for CompShare GPU compute"
 readme = "README.md"
 requires-python = ">=3.9"

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/src/compshare_cli/__init__.py

@@ -1,3 +1,3 @@
 """CompShare command-line client."""
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/src/compshare_cli/cli.py

@@ -5,6 +5,7 @@ from typing import List, Optional
 
 import click
 import typer
+from typer import core as typer_core
 from typer.main import get_command
 
 from compshare_cli import __version__
@@ -15,9 +16,24 @@ from compshare_cli.i18n import configured_language, localize_command, normalize_
 from compshare_cli.output import Renderer
 from compshare_cli.runtime import Runtime
 
+_TYPER_CLICK = getattr(typer_core, "_click", click)
+_TYPER_CLICK_EXCEPTIONS = getattr(_TYPER_CLICK, "exceptions", _TYPER_CLICK)
+_CLICK_EXCEPTIONS = (click.ClickException, _TYPER_CLICK_EXCEPTIONS.ClickException)
+_ABORT_EXCEPTIONS = (click.Abort, _TYPER_CLICK_EXCEPTIONS.Abort)
+
+
+class RootGroup(typer_core.TyperGroup):
+    def list_commands(self, ctx):
+        names = super().list_commands(ctx)
+        if "config" not in names:
+            return names
+        return ["config", *(name for name in names if name != "config")]
+
+
 app = typer.Typer(
     name="compshare",
     help="Manage CompShare GPU compute from the terminal.",
+    cls=RootGroup,
     no_args_is_help=True,
     add_completion=False,
     context_settings={"help_option_names": ["-h", "--help"]},
@@ -198,6 +214,8 @@ def lang(
 
 def main(args: Optional[List[str]] = None) -> None:
     argv = list(sys.argv[1:] if args is None else args)
+    if not argv:
+        argv = ["-h"]
     try:
         language = configured_language()
         command = localize_command(get_command(app), language)
@@ -205,10 +223,10 @@ def main(args: Optional[List[str]] = None) -> None:
     except CLIError as error:
         Renderer("--json" in argv).error(str(error))
         raise SystemExit(2) from error
-    except click.ClickException as error:
+    except _CLICK_EXCEPTIONS as error:
         Renderer("--json" in argv).error(error.format_message())
         raise SystemExit(error.exit_code) from error
-    except click.Abort as error:
+    except _ABORT_EXCEPTIONS as error:
         Renderer("--json" in argv).error(tr("Aborted"))
         raise SystemExit(1) from error
     if isinstance(result, int) and result:

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/src/compshare_cli/i18n.py

@@ -500,7 +500,8 @@ def localize_command(command: click.Command, language: str) -> click.Command:
         return option
 
     command.get_help_option = localized_help_option  # type: ignore[method-assign]
-    if isinstance(command, click.Group):
-        for child in command.commands.values():
+    children = getattr(command, "commands", None)
+    if children is not None:
+        for child in children.values():
             localize_command(child, language)
     return command

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/src/compshare_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compshare-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Command-line client for CompShare GPU compute
 Author: CompShare
 License: Apache-2.0

{compshare_cli-0.1.1 → compshare_cli-0.1.3}/tests/test_cli.py

@@ -1,6 +1,5 @@
 import json
 
-import click
 import pytest
 from typer.main import get_command
 from typer.testing import CliRunner
@@ -30,12 +29,25 @@ def test_help_tree(args) -> None:
 
 def test_global_json_is_accepted_before_command(capsys) -> None:
     cli.main(["--json", "version"])
-    assert json.loads(capsys.readouterr().out) == {"version": "0.1.1"}
+    assert json.loads(capsys.readouterr().out) == {"version": "0.1.3"}
 
 
 def test_global_profile_is_accepted_before_command(capsys) -> None:
     cli.main(["--profile", "testing", "--json", "version"])
-    assert json.loads(capsys.readouterr().out) == {"version": "0.1.1"}
+    assert json.loads(capsys.readouterr().out) == {"version": "0.1.3"}
+
+
+def test_no_args_shows_help_without_error(capsys) -> None:
+    cli.main([])
+    captured = capsys.readouterr()
+    assert "Usage:" in captured.out
+    assert "Traceback" not in captured.err
+
+
+def test_root_help_lists_config_first(capsys) -> None:
+    cli.main(["-h"])
+    help_text = capsys.readouterr().out
+    assert help_text.index("config") < help_text.index("version")
 
 
 def test_global_options_after_command_are_rejected(capsys) -> None:
@@ -107,6 +119,7 @@ def test_lang_command_persists_help_language(monkeypatch, tmp_path, capsys) -> N
     cli.main(["--help"])
     chinese = capsys.readouterr().out
     assert "在终端管理优云智算 GPU 计算资源" in chinese
+    assert "管理 GPU 实例" in chinese
     assert "显示帮助并退出" in chinese
     assert "--install-completion" not in chinese
     assert "--lang" not in chinese
@@ -157,8 +170,9 @@ def test_every_command_has_chinese_and_english_description() -> None:
 
     def descriptions(command, prefix=()):
         result = []
-        if isinstance(command, click.Group):
-            for name, child in command.commands.items():
+        children = getattr(command, "commands", None)
+        if children is not None:
+            for name, child in children.items():
                 path = (*prefix, name)
                 result.append((path, child.help or child.short_help))
                 result.extend(descriptions(child, path))