Merge branch 'main' into fix-logging-docs

Author: markurtz

.pre-commit-config.yaml

@@ -42,7 +42,6 @@ repos:
         pydantic_settings,
 
         # types
-        types-click,
         types-PyYAML,
         types-requests,
         types-toml,

pyproject.toml

@@ -43,7 +43,7 @@ keywords = [
     "vllm",
 ]
 dependencies = [
-    "click",
+    "click>=8.0.0,<8.2.0",
     "datasets",
     "ftfy>=6.0.0",
     "httpx[http2]<1.0.0",
@@ -91,7 +91,6 @@ dev = [
     "mdformat-gfm~=0.3.6",
 
     # type-checking
-    "types-click~=7.1.8",
     "types-PyYAML~=6.0.1",
     "types-requests~=2.32.0",
     "types-toml",

src/guidellm/__main__.py

@@ -19,8 +19,8 @@
 from guidellm.utils import DefaultGroupHandler
 from guidellm.utils import cli as cli_tools
 
-STRATEGY_PROFILE_CHOICES = set(
-    list(get_args(ProfileType)) + list(get_args(StrategyType))
+STRATEGY_PROFILE_CHOICES = list(
+    set(list(get_args(ProfileType)) + list(get_args(StrategyType)))
 )
 
 
@@ -320,10 +320,7 @@ def run(
     )
 
 
-@benchmark.command(
-    "from-file",
-    help="Load a saved benchmark report."
-)
+@benchmark.command("from-file", help="Load a saved benchmark report.")
 @click.argument(
     "path",
     type=click.Path(file_okay=True, dir_okay=False, exists=True),

src/guidellm/utils/default_group.py

@@ -68,7 +68,8 @@ def resolve_command(self, ctx, args):
         cmd_name, cmd, args = super().resolve_command(ctx, args)
         if hasattr(ctx, "arg0"):
             args.insert(0, ctx.arg0)
-            cmd_name = cmd.name
+            if cmd is not None:
+                cmd_name = cmd.name
         return cmd_name, cmd, args
 
     def format_commands(self, ctx, formatter):
@@ -79,7 +80,7 @@ def format_commands(self, ctx, formatter):
         return super().format_commands(ctx, formatter)
 
 
-class DefaultCommandFormatter:
+class DefaultCommandFormatter(click.HelpFormatter):
     """
     Wraps a formatter to edit the line for the default command to mark it
     with the specified mark string.