From 6b1b3d02ee5ec2985eaf87655f132d7430c50849 Mon Sep 17 00:00:00 2001 From: Xi Yan Date: Wed, 6 Nov 2024 13:09:04 -0800 Subject: [PATCH] fix msg, urls --- llama_stack/cli/stack/configure.py | 3 ++- llama_stack/cli/stack/run.py | 7 +++---- llama_stack/providers/adapters/inference/tgi/config.py | 3 ++- llama_stack/providers/datatypes.py | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/llama_stack/cli/stack/configure.py b/llama_stack/cli/stack/configure.py index c2f8b68c2..fa2ff9975 100644 --- a/llama_stack/cli/stack/configure.py +++ b/llama_stack/cli/stack/configure.py @@ -40,6 +40,7 @@ class StackConfigure(Subcommand): self.parser.error( """ DEPRECATED! llama stack configure has been deprecated. - Please use llama stack run --config instead. You may find example run.yaml in ./llamas_stack/templates + Please use llama stack run --config instead. + You may find example run.yaml in /distributions folder. """ ) diff --git a/llama_stack/cli/stack/run.py b/llama_stack/cli/stack/run.py index 9cd0314f3..842703d4c 100644 --- a/llama_stack/cli/stack/run.py +++ b/llama_stack/cli/stack/run.py @@ -70,13 +70,12 @@ class StackRun(Subcommand): if not config_file.exists(): self.parser.error( - f"File {str(config_file)} does not exist. Please run `llama stack build` to generate a run.yaml file" + f"File {str(config_file)} does not exist. Please run `llama stack build` to generate (and optionally edit) a run.yaml file" ) return - with open(config_file, "r") as f: - config_dict = yaml.safe_load(config_file.read_text()) - config = parse_and_maybe_upgrade_config(config_dict) + config_dict = yaml.safe_load(config_file.read_text()) + config = parse_and_maybe_upgrade_config(config_dict) if config.docker_image: script = pkg_resources.resource_filename( diff --git a/llama_stack/providers/adapters/inference/tgi/config.py b/llama_stack/providers/adapters/inference/tgi/config.py index 358c282f2..863f81bf7 100644 --- a/llama_stack/providers/adapters/inference/tgi/config.py +++ b/llama_stack/providers/adapters/inference/tgi/config.py @@ -14,10 +14,11 @@ from pydantic import BaseModel, Field class TGIImplConfig(BaseModel): host: str = "localhost" port: int = 8080 + protocol: str = "http" @property def url(self) -> str: - return f"http://{self.host}:{self.port}" + return f"{self.protocol}://{self.host}:{self.port}" api_token: Optional[str] = Field( default=None, diff --git a/llama_stack/providers/datatypes.py b/llama_stack/providers/datatypes.py index c0682df35..69255fc5f 100644 --- a/llama_stack/providers/datatypes.py +++ b/llama_stack/providers/datatypes.py @@ -146,10 +146,11 @@ Fully-qualified name of the module to import. The module is expected to have: class RemoteProviderConfig(BaseModel): host: str = "localhost" port: int = 0 + protocol: str = "http" @property def url(self) -> str: - return f"http://{self.host}:{self.port}" + return f"{self.protocol}://{self.host}:{self.port}" @json_schema_type