mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-22 22:32:27 +00:00
abdfc47017
https://github.com/meta-llama/llama-stack/pull/2716/ broke commands like: ``` python -m llama_stack.distribution.server.server --config llama_stack/templates/starter/run.yaml ``` And will fail with: ``` Traceback (most recent call last): File "<frozen runpy>", line 198, in _run_module_as_main File "<frozen runpy>", line 88, in _run_code File "/Users/leseb/Documents/AI/llama-stack/llama_stack/distribution/server/server.py", line 626, in <module> main() File "/Users/leseb/Documents/AI/llama-stack/llama_stack/distribution/server/server.py", line 402, in main config_file = resolve_config_or_template(args.config, Mode.RUN) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/Users/leseb/Documents/AI/llama-stack/llama_stack/distribution/utils/config_resolution.py", line 43, in resolve_config_or_template config_path = Path(config_or_template) ^^^^^^^^^^^^^^^^^^^^^^^^ File "/opt/homebrew/Cellar/python@3.12/3.12.8/Frameworks/Python.framework/Versions/3.12/lib/python3.12/pathlib.py", line 1162, in __init__ super().__init__(*args) File "/opt/homebrew/Cellar/python@3.12/3.12.8/Frameworks/Python.framework/Versions/3.12/lib/python3.12/pathlib.py", line 373, in __init__ raise TypeError( TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType' ``` Complaining that no positional arguments are present. We now honour the deprecation until --config and --template are removed completely. Signed-off-by: Sébastien Han <seb@redhat.com>
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# All rights reserved.
|
|
#
|
|
# This source code is licensed under the terms described in the LICENSE file in
|
|
# the root directory of this source tree.
|
|
|
|
import argparse
|
|
|
|
from llama_stack.log import get_logger
|
|
|
|
logger = get_logger(name=__name__, category="cli")
|
|
|
|
|
|
def add_config_template_args(parser: argparse.ArgumentParser):
|
|
"""Add unified config/template arguments with backward compatibility."""
|
|
group = parser.add_mutually_exclusive_group(required=True)
|
|
|
|
group.add_argument(
|
|
"config",
|
|
nargs="?",
|
|
help="Configuration file path or template name",
|
|
)
|
|
|
|
# Backward compatibility arguments (deprecated)
|
|
group.add_argument(
|
|
"--config",
|
|
dest="config_deprecated",
|
|
help="(DEPRECATED) Use positional argument [config] instead. Configuration file path",
|
|
)
|
|
|
|
group.add_argument(
|
|
"--template",
|
|
dest="template_deprecated",
|
|
help="(DEPRECATED) Use positional argument [config] instead. Template name",
|
|
)
|
|
|
|
|
|
def get_config_from_args(args: argparse.Namespace) -> str | None:
|
|
"""Extract config value from parsed arguments, handling both new and deprecated forms."""
|
|
if args.config is not None:
|
|
return str(args.config)
|
|
elif hasattr(args, "config_deprecated") and args.config_deprecated is not None:
|
|
logger.warning("Using deprecated --config argument. Use positional argument [config] instead.")
|
|
return str(args.config_deprecated)
|
|
elif hasattr(args, "template_deprecated") and args.template_deprecated is not None:
|
|
logger.warning("Using deprecated --template argument. Use positional argument [config] instead.")
|
|
return str(args.template_deprecated)
|
|
return None
|