Skip to content

Lock click to older version #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 10, 2025
Merged

Lock click to older version #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecf2413
Lock click to pre 8.2
sjmonson Jun 25, 2025
23376b1
Drop deprecated types-click
sjmonson Jun 25, 2025
a177665
Arg type must be a sequence not set
sjmonson Jul 10, 2025
bb61071
Fix missing check for command name
sjmonson Jul 10, 2025
a3571a3
Merge branch 'main' into fix/click_ver
markurtz Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ repos:
pydantic_settings,

# types
types-click,
types-PyYAML,
types-requests,
types-toml,
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 3 additions & 6 deletions src/guidellm/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
)


Expand Down Expand Up @@ -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),
Expand Down
5 changes: 3 additions & 2 deletions src/guidellm/utils/default_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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.
Expand Down