phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-08-01 16:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check for nullish-ness

Browse source
This commit is contained in:
Ashwin Bharambe 2024-11-13 11:08:31 -08:00
parent 4074fcf83c
commit 0b22c84bb7
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
llama_stack/distribution/server/server.py
View file

@ -265,7 +265,7 @@ class EnvVarError(Exception):
self.var_name = var_name self.var_name = var_name
self.path = path self.path = path
super().__init__( super().__init__(
f"Environment variable '{var_name}' not set{f' at {path}' if path else ''}" f"Environment variable '{var_name}' not set or empty{f' at {path}' if path else ''}"
) )
@ -295,14 +295,11 @@ def replace_env_vars(config: Any, path: str = "") -> Any:
env_var = match.group(1) env_var = match.group(1)
default_val = match.group(2) default_val = match.group(2)
if default_val is None: value = os.environ.get(env_var)
if env_var not in os.environ: if not value:
if default_val is None:
raise EnvVarError(env_var, path) raise EnvVarError(env_var, path)
value = os.environ[env_var] else:
else:
# use the default if env var is "nullish"
value = os.environ.get(env_var)
if not value:
value = default_val value = default_val
return value return value