pre-commit fixes

llama_stack/providers/remote/tool_runtime/bing_search/bing_search.py

@@ -7,7 +7,7 @@
 import json
 from typing import Any, Dict, List, Optional
 
-import requests
+import httpx
 
 from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.tools import (
@@ -31,7 +31,7 @@ class BingSearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsRequestP
     async def initialize(self):
         pass
 
-    async def register_tool(self, tool: Tool):
+    async def register_tool(self, tool: Tool) -> None:
         pass
 
     async def unregister_tool(self, tool_id: str) -> None:
@@ -77,12 +77,13 @@ class BingSearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsRequestP
             "q": kwargs["query"],
         }
 
-        response = requests.get(
-            url=self.url,
-            params=params,
-            headers=headers,
-        )
-        response.raise_for_status()
+        async with httpx.AsyncClient() as client:
+            response = await client.get(
+                url=self.url,
+                params=params,
+                headers=headers,
+            )
+            response.raise_for_status()
 
         return ToolInvocationResult(content=json.dumps(self._clean_response(response.json())))
 

llama_stack/providers/remote/tool_runtime/bing_search/config.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from pydantic import BaseModel
 
@@ -14,3 +14,9 @@ class BingSearchToolConfig(BaseModel):
 
     api_key: Optional[str] = None
     top_k: int = 3
+
+    @classmethod
+    def sample_run_config(cls, __distro_dir__: str, **kwargs: Any) -> Dict[str, Any]:
+        return {
+            "api_key": "${env.BING_API_KEY:}",
+        }

llama_stack/providers/remote/tool_runtime/brave_search/brave_search.py

@@ -6,7 +6,7 @@
 
 from typing import Any, Dict, List, Optional
 
-import requests
+import httpx
 
 from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.tools import (
@@ -30,7 +30,7 @@ class BraveSearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsRequest
     async def initialize(self):
         pass
 
-    async def register_tool(self, tool: Tool):
+    async def register_tool(self, tool: Tool) -> None:
         pass
 
     async def unregister_tool(self, tool_id: str) -> None:
@@ -74,8 +74,13 @@ class BraveSearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsRequest
             "Accept": "application/json",
         }
         payload = {"q": kwargs["query"]}
-        response = requests.get(url=url, params=payload, headers=headers)
-        response.raise_for_status()
+        async with httpx.AsyncClient() as client:
+            response = await client.get(
+                url=url,
+                params=payload,
+                headers=headers,
+            )
+            response.raise_for_status()
         results = self._clean_brave_response(response.json())
         content_items = "\n".join([str(result) for result in results])
         return ToolInvocationResult(

llama_stack/providers/remote/tool_runtime/model_context_protocol/config.py

@@ -4,8 +4,12 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
+from typing import Any, Dict
+
 from pydantic import BaseModel
 
 
 class ModelContextProtocolConfig(BaseModel):
-    pass
+    @classmethod
+    def sample_run_config(cls, __distro_dir__: str, **kwargs: Any) -> Dict[str, Any]:
+        return {}

llama_stack/providers/remote/tool_runtime/tavily_search/tavily_search.py

@@ -7,7 +7,7 @@
 import json
 from typing import Any, Dict, List, Optional
 
-import requests
+import httpx
 
 from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.tools import (
@@ -30,7 +30,7 @@ class TavilySearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsReques
     async def initialize(self):
         pass
 
-    async def register_tool(self, tool: Tool):
+    async def register_tool(self, tool: Tool) -> None:
         pass
 
     async def unregister_tool(self, tool_id: str) -> None:
@@ -66,10 +66,12 @@ class TavilySearchToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsReques
 
     async def invoke_tool(self, tool_name: str, kwargs: Dict[str, Any]) -> ToolInvocationResult:
         api_key = self._get_api_key()
-        response = requests.post(
-            "https://api.tavily.com/search",
-            json={"api_key": api_key, "query": kwargs["query"]},
-        )
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
+                "https://api.tavily.com/search",
+                json={"api_key": api_key, "query": kwargs["query"]},
+            )
+            response.raise_for_status()
 
         return ToolInvocationResult(content=json.dumps(self._clean_tavily_response(response.json())))
 

llama_stack/providers/remote/tool_runtime/wolfram_alpha/config.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from pydantic import BaseModel
 
@@ -13,3 +13,9 @@ class WolframAlphaToolConfig(BaseModel):
     """Configuration for WolframAlpha Tool Runtime"""
 
     api_key: Optional[str] = None
+
+    @classmethod
+    def sample_run_config(cls, __distro_dir__: str, **kwargs: Any) -> Dict[str, Any]:
+        return {
+            "api_key": "${env.WOLFRAM_ALPHA_API_KEY:}",
+        }

llama_stack/providers/remote/tool_runtime/wolfram_alpha/wolfram_alpha.py

@@ -7,7 +7,7 @@
 import json
 from typing import Any, Dict, List, Optional
 
-import requests
+import httpx
 
 from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.tools import (
@@ -31,7 +31,7 @@ class WolframAlphaToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsReques
     async def initialize(self):
         pass
 
-    async def register_tool(self, tool: Tool):
+    async def register_tool(self, tool: Tool) -> None:
         pass
 
     async def unregister_tool(self, tool_id: str) -> None:
@@ -73,11 +73,9 @@ class WolframAlphaToolRuntimeImpl(ToolsProtocolPrivate, ToolRuntime, NeedsReques
             "format": "plaintext",
             "output": "json",
         }
-        response = requests.get(
-            self.url,
-            params=params,
-        )
-
+        async with httpx.AsyncClient() as client:
+            response = await client.get(params=params, url=self.url)
+            response.raise_for_status()
         return ToolInvocationResult(content=json.dumps(self._clean_wolfram_alpha_response(response.json())))
 
     def _clean_wolfram_alpha_response(self, wa_response):