Merge 2a34226727 into ea15f2a270

llama_stack/providers/inline/scoring/braintrust/__init__.py

@@ -5,7 +5,7 @@
 # the root directory of this source tree.
 from typing import Any
 
-from pydantic import BaseModel
+from pydantic import BaseModel, SecretStr
 
 from llama_stack.core.datatypes import Api
 
@@ -13,7 +13,7 @@ from .config import BraintrustScoringConfig
 
 
 class BraintrustProviderDataValidator(BaseModel):
-    openai_api_key: str
+    openai_api_key: SecretStr
 
 
 async def get_provider_impl(

llama_stack/providers/inline/scoring/braintrust/braintrust.py

@@ -17,7 +17,7 @@ from autoevals.ragas import (
     ContextRelevancy,
     Faithfulness,
 )
-from pydantic import BaseModel
+from pydantic import BaseModel, SecretStr
 
 from llama_stack.apis.datasetio import DatasetIO
 from llama_stack.apis.datasets import Datasets
@@ -152,9 +152,9 @@ class BraintrustScoringImpl(
                 raise ValueError(
                     'Pass OpenAI API Key in the header X-LlamaStack-Provider-Data as { "openai_api_key": <your api key>}'
                 )
-            self.config.openai_api_key = provider_data.openai_api_key
+            self.config.openai_api_key = SecretStr(provider_data.openai_api_key)
 
-        os.environ["OPENAI_API_KEY"] = self.config.openai_api_key
+        os.environ["OPENAI_API_KEY"] = self.config.openai_api_key.get_secret_value()
 
     async def score_batch(
         self,

llama_stack/providers/inline/scoring/braintrust/config.py

@@ -5,12 +5,11 @@
 # the root directory of this source tree.
 from typing import Any
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, SecretStr
 
 
 class BraintrustScoringConfig(BaseModel):
-    openai_api_key: str | None = Field(
-        default=None,
+    openai_api_key: SecretStr = Field(
         description="The OpenAI API Key",
     )
 

llama_stack/providers/inline/telemetry/meta_reference/console_span_processor.py

@@ -64,6 +64,7 @@ class ConsoleSpanProcessor(SpanProcessor):
                 for key, value in event.attributes.items():
                     if key.startswith("__") or key in ["message", "severity"]:
                         continue
+
                     logger.info(f"[dim]{key}[/dim]: {value}")
 
     def shutdown(self) -> None: