Skip to content

Commit a131d4a

Browse files
haijie11abetlen
authored andcommitted
fix(server): show falsey defaults in CLI help
1 parent 03307d8 commit a131d4a

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
- feat: update llama.cpp to ggml-org/llama.cpp@4df29be4f
1111
- fix(example): retain recurrent state for server MTP rollback
1212
- feat: update llama.cpp to ggml-org/llama.cpp@adb55e514
13+
- fix(server): show falsey defaults in CLI help by @cupkk in #2355
1314

1415
## [0.3.34]
1516

‎llama_cpp/server/cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def add_args_from_model(parser: argparse.ArgumentParser, model: Type[BaseModel])
8484

8585
for name, field in model.model_fields.items():
8686
description = field.description
87-
if field.default and description and not field.is_required():
87+
if description and not field.is_required() and field.default is not None:
8888
description += f" (default: {field.default})"
8989
base_type = (
9090
_get_base_type(field.annotation) if field.annotation is not None else str

‎tests/test_server_cli.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import argparse
2+
3+
from pydantic import BaseModel, Field
4+
5+
from llama_cpp.server.cli import add_args_from_model
6+
7+
8+
class ServerCliSettings(BaseModel):
9+
enabled: bool = Field(default=False, description="Enable feature")
10+
retries: int = Field(default=0, description="Retry count")
11+
workers: int = Field(default=2, description="Worker count")
12+
required_value: str = Field(description="Required value")
13+
14+
15+
def test_add_args_from_model_includes_falsey_defaults_in_help():
16+
parser = argparse.ArgumentParser()
17+
18+
add_args_from_model(parser, ServerCliSettings)
19+
20+
help_by_dest = {action.dest: action.help for action in parser._actions}
21+
assert help_by_dest["enabled"] == "Enable feature (default: False)"
22+
assert help_by_dest["retries"] == "Retry count (default: 0)"
23+
assert help_by_dest["workers"] == "Worker count (default: 2)"
24+
assert help_by_dest["required_value"] == "Required value"

0 commit comments

Comments
 (0)