From e860c536da3d7ddf5dbbabaa6a04f474261eb332 Mon Sep 17 00:00:00 2001 From: Xi Yan Date: Tue, 18 Mar 2025 18:01:40 -0700 Subject: [PATCH] pre --- llama_stack/apis/eval/eval.py | 4 +--- llama_stack/apis/graders/graders.py | 2 +- llama_stack/distribution/stack.py | 24 ++++++------------------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/llama_stack/apis/eval/eval.py b/llama_stack/apis/eval/eval.py index 2cb1390dc..51c38b16a 100644 --- a/llama_stack/apis/eval/eval.py +++ b/llama_stack/apis/eval/eval.py @@ -135,9 +135,7 @@ class Eval(Protocol): """ ... - @webmethod( - route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result", method="GET" - ) + @webmethod(route="/eval/benchmarks/{benchmark_id}/jobs/{job_id}/result", method="GET") async def job_result(self, benchmark_id: str, job_id: str) -> EvaluateResponse: """Get the result of a job. diff --git a/llama_stack/apis/graders/graders.py b/llama_stack/apis/graders/graders.py index 522559c3f..23c870e27 100644 --- a/llama_stack/apis/graders/graders.py +++ b/llama_stack/apis/graders/graders.py @@ -13,8 +13,8 @@ from typing import ( Literal, Optional, Protocol, - runtime_checkable, Union, + runtime_checkable, ) from pydantic import BaseModel, Field diff --git a/llama_stack/distribution/stack.py b/llama_stack/distribution/stack.py index a5fa0fe39..ccd75f6f6 100644 --- a/llama_stack/distribution/stack.py +++ b/llama_stack/distribution/stack.py @@ -117,9 +117,7 @@ class EnvVarError(Exception): def __init__(self, var_name: str, path: str = ""): self.var_name = var_name self.path = path - super().__init__( - f"Environment variable '{var_name}' not set or empty{f' at {path}' if path else ''}" - ) + super().__init__(f"Environment variable '{var_name}' not set or empty{f' at {path}' if path else ''}") def redact_sensitive_fields(data: Dict[str, Any]) -> Dict[str, Any]: @@ -210,9 +208,7 @@ def validate_env_pair(env_pair: str) -> tuple[str, str]: if not key: raise ValueError(f"Empty key in environment variable pair: {env_pair}") if not all(c.isalnum() or c == "_" for c in key): - raise ValueError( - f"Key must contain only alphanumeric characters and underscores: {key}" - ) + raise ValueError(f"Key must contain only alphanumeric characters and underscores: {key}") return key, value except ValueError as e: raise ValueError( @@ -225,20 +221,14 @@ def validate_env_pair(env_pair: str) -> tuple[str, str]: async def construct_stack( run_config: StackRunConfig, provider_registry: Optional[ProviderRegistry] = None ) -> Dict[Api, Any]: - dist_registry, _ = await create_dist_registry( - run_config.metadata_store, run_config.image_name - ) - impls = await resolve_impls( - run_config, provider_registry or get_provider_registry(), dist_registry - ) + dist_registry, _ = await create_dist_registry(run_config.metadata_store, run_config.image_name) + impls = await resolve_impls(run_config, provider_registry or get_provider_registry(), dist_registry) await register_resources(run_config, impls) return impls def get_stack_run_config_from_template(template: str) -> StackRunConfig: - template_path = ( - importlib.resources.files("llama_stack") / f"templates/{template}/run.yaml" - ) + template_path = importlib.resources.files("llama_stack") / f"templates/{template}/run.yaml" with importlib.resources.as_file(template_path) as path: if not path.exists(): @@ -281,9 +271,7 @@ def run_config_from_adhoc_config_spec( # call method "sample_run_config" on the provider spec config class provider_config_type = instantiate_class_type(provider_spec.config_class) - provider_config = replace_env_vars( - provider_config_type.sample_run_config(__distro_dir__=distro_dir) - ) + provider_config = replace_env_vars(provider_config_type.sample_run_config(__distro_dir__=distro_dir)) provider_configs_by_api[api_str] = [ Provider(