From 2d04a7ebebdddb8d71cfcbca13b1128330881754 Mon Sep 17 00:00:00 2001 From: Xi Yan Date: Mon, 9 Dec 2024 15:37:40 -0800 Subject: [PATCH] braintrust api key in config --- llama_stack/providers/inline/scoring/braintrust/braintrust.py | 2 +- llama_stack/providers/inline/scoring/braintrust/config.py | 2 +- llama_stack/templates/bedrock/run.yaml | 2 +- llama_stack/templates/fireworks/run.yaml | 2 +- llama_stack/templates/hf-endpoint/run-with-safety.yaml | 2 +- llama_stack/templates/hf-endpoint/run.yaml | 2 +- llama_stack/templates/hf-serverless/run-with-safety.yaml | 2 +- llama_stack/templates/hf-serverless/run.yaml | 2 +- llama_stack/templates/meta-reference-gpu/run-with-safety.yaml | 2 +- llama_stack/templates/meta-reference-gpu/run.yaml | 2 +- llama_stack/templates/meta-reference-quantized-gpu/run.yaml | 2 +- llama_stack/templates/ollama/run-with-safety.yaml | 2 +- llama_stack/templates/ollama/run.yaml | 2 +- llama_stack/templates/tgi/run-with-safety.yaml | 2 +- llama_stack/templates/tgi/run.yaml | 2 +- llama_stack/templates/together/run.yaml | 2 +- llama_stack/templates/vllm-gpu/run.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/llama_stack/providers/inline/scoring/braintrust/braintrust.py b/llama_stack/providers/inline/scoring/braintrust/braintrust.py index ee515d588..1f266a236 100644 --- a/llama_stack/providers/inline/scoring/braintrust/braintrust.py +++ b/llama_stack/providers/inline/scoring/braintrust/braintrust.py @@ -86,7 +86,7 @@ class BraintrustScoringImpl( async def set_api_key(self) -> None: # api key is in the request headers - if self.config.openai_api_key is None: + if self.config.openai_api_key is None or not self.config.openai_api_key: provider_data = self.get_request_provider_data() if provider_data is None or not provider_data.openai_api_key: raise ValueError( diff --git a/llama_stack/providers/inline/scoring/braintrust/config.py b/llama_stack/providers/inline/scoring/braintrust/config.py index 25732b3d7..e12249432 100644 --- a/llama_stack/providers/inline/scoring/braintrust/config.py +++ b/llama_stack/providers/inline/scoring/braintrust/config.py @@ -15,5 +15,5 @@ class BraintrustScoringConfig(BaseModel): @classmethod def sample_run_config(cls, **kwargs) -> Dict[str, Any]: return { - "openai_api_key": "${env.OPENAI_API_KEY}", + "openai_api_key": "${env.OPENAI_API_KEY:}", } diff --git a/llama_stack/templates/bedrock/run.yaml b/llama_stack/templates/bedrock/run.yaml index c35ef0847..47885b536 100644 --- a/llama_stack/templates/bedrock/run.yaml +++ b/llama_stack/templates/bedrock/run.yaml @@ -64,7 +64,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/fireworks/run.yaml b/llama_stack/templates/fireworks/run.yaml index e9c6f5977..70e2c1e5c 100644 --- a/llama_stack/templates/fireworks/run.yaml +++ b/llama_stack/templates/fireworks/run.yaml @@ -66,7 +66,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/hf-endpoint/run-with-safety.yaml b/llama_stack/templates/hf-endpoint/run-with-safety.yaml index c5037b37f..845abf0dc 100644 --- a/llama_stack/templates/hf-endpoint/run-with-safety.yaml +++ b/llama_stack/templates/hf-endpoint/run-with-safety.yaml @@ -71,7 +71,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/hf-endpoint/run.yaml b/llama_stack/templates/hf-endpoint/run.yaml index 2382971c7..815ee7f03 100644 --- a/llama_stack/templates/hf-endpoint/run.yaml +++ b/llama_stack/templates/hf-endpoint/run.yaml @@ -66,7 +66,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/hf-serverless/run-with-safety.yaml b/llama_stack/templates/hf-serverless/run-with-safety.yaml index 51ddf2d71..82276ca8f 100644 --- a/llama_stack/templates/hf-serverless/run-with-safety.yaml +++ b/llama_stack/templates/hf-serverless/run-with-safety.yaml @@ -71,7 +71,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/hf-serverless/run.yaml b/llama_stack/templates/hf-serverless/run.yaml index 23df29f8c..6f87c04e2 100644 --- a/llama_stack/templates/hf-serverless/run.yaml +++ b/llama_stack/templates/hf-serverless/run.yaml @@ -66,7 +66,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml index 256191b89..044c1e7fd 100644 --- a/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml +++ b/llama_stack/templates/meta-reference-gpu/run-with-safety.yaml @@ -73,7 +73,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/meta-reference-gpu/run.yaml b/llama_stack/templates/meta-reference-gpu/run.yaml index 1fcba7438..e8fdb10c2 100644 --- a/llama_stack/templates/meta-reference-gpu/run.yaml +++ b/llama_stack/templates/meta-reference-gpu/run.yaml @@ -67,7 +67,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/meta-reference-quantized-gpu/run.yaml b/llama_stack/templates/meta-reference-quantized-gpu/run.yaml index 411128ef3..0232ec51c 100644 --- a/llama_stack/templates/meta-reference-quantized-gpu/run.yaml +++ b/llama_stack/templates/meta-reference-quantized-gpu/run.yaml @@ -69,7 +69,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/ollama/run-with-safety.yaml b/llama_stack/templates/ollama/run-with-safety.yaml index 63e2964ce..fcb1b2dba 100644 --- a/llama_stack/templates/ollama/run-with-safety.yaml +++ b/llama_stack/templates/ollama/run-with-safety.yaml @@ -65,7 +65,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/ollama/run.yaml b/llama_stack/templates/ollama/run.yaml index 9bc8b77ac..2e739aac2 100644 --- a/llama_stack/templates/ollama/run.yaml +++ b/llama_stack/templates/ollama/run.yaml @@ -65,7 +65,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/tgi/run-with-safety.yaml b/llama_stack/templates/tgi/run-with-safety.yaml index eb8c2cef6..a7375a90f 100644 --- a/llama_stack/templates/tgi/run-with-safety.yaml +++ b/llama_stack/templates/tgi/run-with-safety.yaml @@ -69,7 +69,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/tgi/run.yaml b/llama_stack/templates/tgi/run.yaml index 1e2f8fdbe..a3e21075f 100644 --- a/llama_stack/templates/tgi/run.yaml +++ b/llama_stack/templates/tgi/run.yaml @@ -65,7 +65,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/together/run.yaml b/llama_stack/templates/together/run.yaml index 864e55ae6..529bf7873 100644 --- a/llama_stack/templates/together/run.yaml +++ b/llama_stack/templates/together/run.yaml @@ -66,7 +66,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite diff --git a/llama_stack/templates/vllm-gpu/run.yaml b/llama_stack/templates/vllm-gpu/run.yaml index e6a80a256..8353dbd51 100644 --- a/llama_stack/templates/vllm-gpu/run.yaml +++ b/llama_stack/templates/vllm-gpu/run.yaml @@ -69,7 +69,7 @@ providers: - provider_id: braintrust provider_type: inline::braintrust config: - openai_api_key: ${env.OPENAI_API_KEY} + openai_api_key: ${env.OPENAI_API_KEY:} metadata_store: namespace: null type: sqlite