From c76f5f418f15972ecf1319d81de500a72e209c21 Mon Sep 17 00:00:00 2001 From: Dinesh Yeduguru Date: Tue, 24 Dec 2024 11:45:36 -0800 Subject: [PATCH] move brave and tavily to remote --- .../providers/registry/tool_runtime.py | 36 ++++++++++--------- .../tool_runtime/brave_search/__init__.py | 2 +- .../tool_runtime/brave_search/brave_search.py | 0 .../tool_runtime/brave_search/config.py | 0 .../tool_runtime/tavily_search/__init__.py | 2 +- .../tool_runtime/tavily_search/config.py | 0 .../tavily_search/tavily_search.py | 0 tests/client-sdk/agents/test_agents.py | 2 +- 8 files changed, 23 insertions(+), 19 deletions(-) rename llama_stack/providers/{inline => remote}/tool_runtime/brave_search/__init__.py (88%) rename llama_stack/providers/{inline => remote}/tool_runtime/brave_search/brave_search.py (100%) rename llama_stack/providers/{inline => remote}/tool_runtime/brave_search/config.py (100%) rename llama_stack/providers/{inline => remote}/tool_runtime/tavily_search/__init__.py (88%) rename llama_stack/providers/{inline => remote}/tool_runtime/tavily_search/config.py (100%) rename llama_stack/providers/{inline => remote}/tool_runtime/tavily_search/tavily_search.py (100%) diff --git a/llama_stack/providers/registry/tool_runtime.py b/llama_stack/providers/registry/tool_runtime.py index e4e61109f..b6b34edf0 100644 --- a/llama_stack/providers/registry/tool_runtime.py +++ b/llama_stack/providers/registry/tool_runtime.py @@ -17,14 +17,6 @@ from llama_stack.providers.datatypes import ( def available_providers() -> List[ProviderSpec]: return [ - InlineProviderSpec( - api=Api.tool_runtime, - provider_type="inline::brave-search", - pip_packages=[], - module="llama_stack.providers.inline.tool_runtime.brave_search", - config_class="llama_stack.providers.inline.tool_runtime.brave_search.config.BraveSearchToolConfig", - provider_data_validator="llama_stack.providers.inline.tool_runtime.brave_search.BraveSearchToolProviderDataValidator", - ), InlineProviderSpec( api=Api.tool_runtime, provider_type="inline::memory-runtime", @@ -33,14 +25,6 @@ def available_providers() -> List[ProviderSpec]: config_class="llama_stack.providers.inline.tool_runtime.memory.config.MemoryToolConfig", api_dependencies=[Api.memory, Api.memory_banks, Api.inference], ), - InlineProviderSpec( - api=Api.tool_runtime, - provider_type="inline::tavily-search", - pip_packages=[], - module="llama_stack.providers.inline.tool_runtime.tavily_search", - config_class="llama_stack.providers.inline.tool_runtime.tavily_search.config.TavilySearchToolConfig", - provider_data_validator="llama_stack.providers.inline.tool_runtime.tavily_search.TavilySearchToolProviderDataValidator", - ), InlineProviderSpec( api=Api.tool_runtime, provider_type="inline::code-interpreter", @@ -48,6 +32,26 @@ def available_providers() -> List[ProviderSpec]: module="llama_stack.providers.inline.tool_runtime.code_interpreter", config_class="llama_stack.providers.inline.tool_runtime.code_interpreter.config.CodeInterpreterToolConfig", ), + remote_provider_spec( + api=Api.tool_runtime, + adapter=AdapterSpec( + adapter_type="brave-search", + module="llama_stack.providers.remote.tool_runtime.brave_search", + config_class="llama_stack.providers.remote.tool_runtime.brave_search.config.BraveSearchToolConfig", + pip_packages=["requests"], + provider_data_validator="llama_stack.providers.remote.tool_runtime.brave_search.BraveSearchToolProviderDataValidator", + ), + ), + remote_provider_spec( + api=Api.tool_runtime, + adapter=AdapterSpec( + adapter_type="tavily-search", + module="llama_stack.providers.remote.tool_runtime.tavily_search", + config_class="llama_stack.providers.remote.tool_runtime.tavily_search.config.TavilySearchToolConfig", + pip_packages=["requests"], + provider_data_validator="llama_stack.providers.remote.tool_runtime.tavily_search.TavilySearchToolProviderDataValidator", + ), + ), remote_provider_spec( api=Api.tool_runtime, adapter=AdapterSpec( diff --git a/llama_stack/providers/inline/tool_runtime/brave_search/__init__.py b/llama_stack/providers/remote/tool_runtime/brave_search/__init__.py similarity index 88% rename from llama_stack/providers/inline/tool_runtime/brave_search/__init__.py rename to llama_stack/providers/remote/tool_runtime/brave_search/__init__.py index e9f0eeae8..0827e51d2 100644 --- a/llama_stack/providers/inline/tool_runtime/brave_search/__init__.py +++ b/llama_stack/providers/remote/tool_runtime/brave_search/__init__.py @@ -14,7 +14,7 @@ class BraveSearchToolProviderDataValidator(BaseModel): api_key: str -async def get_provider_impl(config: BraveSearchToolConfig, _deps): +async def get_adapter_impl(config: BraveSearchToolConfig, _deps): impl = BraveSearchToolRuntimeImpl(config) await impl.initialize() return impl diff --git a/llama_stack/providers/inline/tool_runtime/brave_search/brave_search.py b/llama_stack/providers/remote/tool_runtime/brave_search/brave_search.py similarity index 100% rename from llama_stack/providers/inline/tool_runtime/brave_search/brave_search.py rename to llama_stack/providers/remote/tool_runtime/brave_search/brave_search.py diff --git a/llama_stack/providers/inline/tool_runtime/brave_search/config.py b/llama_stack/providers/remote/tool_runtime/brave_search/config.py similarity index 100% rename from llama_stack/providers/inline/tool_runtime/brave_search/config.py rename to llama_stack/providers/remote/tool_runtime/brave_search/config.py diff --git a/llama_stack/providers/inline/tool_runtime/tavily_search/__init__.py b/llama_stack/providers/remote/tool_runtime/tavily_search/__init__.py similarity index 88% rename from llama_stack/providers/inline/tool_runtime/tavily_search/__init__.py rename to llama_stack/providers/remote/tool_runtime/tavily_search/__init__.py index 8061a250c..379e99081 100644 --- a/llama_stack/providers/inline/tool_runtime/tavily_search/__init__.py +++ b/llama_stack/providers/remote/tool_runtime/tavily_search/__init__.py @@ -14,7 +14,7 @@ class TavilySearchToolProviderDataValidator(BaseModel): api_key: str -async def get_provider_impl(config: TavilySearchToolConfig, _deps): +async def get_adapter_impl(config: TavilySearchToolConfig, _deps): impl = TavilySearchToolRuntimeImpl(config) await impl.initialize() return impl diff --git a/llama_stack/providers/inline/tool_runtime/tavily_search/config.py b/llama_stack/providers/remote/tool_runtime/tavily_search/config.py similarity index 100% rename from llama_stack/providers/inline/tool_runtime/tavily_search/config.py rename to llama_stack/providers/remote/tool_runtime/tavily_search/config.py diff --git a/llama_stack/providers/inline/tool_runtime/tavily_search/tavily_search.py b/llama_stack/providers/remote/tool_runtime/tavily_search/tavily_search.py similarity index 100% rename from llama_stack/providers/inline/tool_runtime/tavily_search/tavily_search.py rename to llama_stack/providers/remote/tool_runtime/tavily_search/tavily_search.py diff --git a/tests/client-sdk/agents/test_agents.py b/tests/client-sdk/agents/test_agents.py index ef3c087fa..1b2192949 100644 --- a/tests/client-sdk/agents/test_agents.py +++ b/tests/client-sdk/agents/test_agents.py @@ -191,7 +191,7 @@ def test_builtin_tool_code_execution(llama_stack_client, agent_config): messages=[ { "role": "user", - "content": "Write code to answer the question: What is the 100th prime number?", + "content": "Write code and execute it to find the answer for: What is the 100th prime number?", }, ], session_id=session_id,