Merge remote-tracking branch 'origin/api_keys' into api_updates_2

llama_stack/apis/agents/agents.py

@@ -51,6 +51,7 @@ class SearchToolDefinition(ToolDefinitionCommon):
     # NOTE: brave_search is just a placeholder since model always uses
     # brave_search as tool call name
     type: Literal[AgentTool.brave_search.value] = AgentTool.brave_search.value
+    api_key: str
     engine: SearchEngineType = SearchEngineType.brave
     remote_execution: Optional[RestAPIExecutionConfig] = None
 
@@ -58,6 +59,7 @@ class SearchToolDefinition(ToolDefinitionCommon):
 @json_schema_type
 class WolframAlphaToolDefinition(ToolDefinitionCommon):
     type: Literal[AgentTool.wolfram_alpha.value] = AgentTool.wolfram_alpha.value
+    api_key: str
     remote_execution: Optional[RestAPIExecutionConfig] = None
 
 

llama_stack/apis/agents/client.py

@@ -6,11 +6,12 @@
 
 import asyncio
 import json
+import os
 from typing import AsyncGenerator
 
 import fire
-
 import httpx
+from dotenv import load_dotenv
 
 from pydantic import BaseModel
 from termcolor import cprint
@@ -22,6 +23,9 @@ from .agents import *  # noqa: F403
 from .event_logger import EventLogger
 
 
+load_dotenv()
+
+
 async def get_client_impl(config: RemoteProviderConfig, _deps):
     return AgentsClient(config.url)
 
@@ -129,8 +133,11 @@ async def run_main(host: str, port: int):
     api = AgentsClient(f"http://{host}:{port}")
 
     tool_definitions = [
-        SearchToolDefinition(engine=SearchEngineType.bing),
-        WolframAlphaToolDefinition(),
+        SearchToolDefinition(
+            engine=SearchEngineType.bing,
+            api_key=os.getenv("BING_SEARCH_API_KEY"),
+        ),
+        WolframAlphaToolDefinition(api_key=os.getenv("WOLFRAM_ALPHA_API_KEY")),
         CodeInterpreterToolDefinition(),
     ]
     tool_definitions += [