feat(tinyagent): Updates to use AnyLLM class API. (#900)

* feat(tinyagent): Updates to use AnyLLM class API.

Allows to reuse the clients which is specially important when interacting with any-llm.ai to reduce the overhead of re-authenticating (which involves solving challenge, etc)

* tests: Add missing `mock_verify_api_key`.

Author: daavoo

src/any_agent/frameworks/tinyagent.py

@@ -5,7 +5,7 @@
 import json
 from typing import TYPE_CHECKING, Any
 
-from any_llm import AnyLLM, LLMProvider, acompletion
+from any_llm import AnyLLM, LLMProvider
 from mcp.types import CallToolResult, TextContent
 
 from any_agent.config import AgentConfig, AgentFramework
@@ -95,24 +95,28 @@ def __init__(self, config: AgentConfig) -> None:
         super().__init__(config)
         self.clients: dict[str, ToolExecutor] = {}
 
-        self.completion_params = {
-            "model": self.config.model_id,
-            "tools": [],
-            "tool_choice": "required",
-            **(self.config.model_args or {}),
-        }
-
         provider_name, model_id = AnyLLM.split_model_provider(self.config.model_id)
         if provider_name == "gateway":
             provider_name, model_id = AnyLLM.split_model_provider(model_id)
         self.uses_openai = provider_name == LLMProvider.OPENAI
-        if not self.uses_openai and self.completion_params["tool_choice"] == "required":
-            self.config.tools.append(final_answer)
 
+        # Create the LLM instance using the AnyLLM class pattern
+        llm_kwargs: dict[str, Any] = {}
         if self.config.api_key:
-            self.completion_params["api_key"] = self.config.api_key
+            llm_kwargs["api_key"] = self.config.api_key
         if self.config.api_base:
-            self.completion_params["api_base"] = self.config.api_base
+            llm_kwargs["api_base"] = self.config.api_base
+        self.llm = AnyLLM.create(provider_name, **llm_kwargs)
+
+        self.completion_params: dict[str, Any] = {
+            "model": model_id,
+            "tools": [],
+            "tool_choice": "required",
+            **(self.config.model_args or {}),
+        }
+
+        if not self.uses_openai and self.completion_params["tool_choice"] == "required":
+            self.config.tools.append(final_answer)
 
     async def _load_agent(self) -> None:
         """Load the agent and its tools."""
@@ -288,7 +292,7 @@ async def _return_output_type(
         )
 
     async def call_model(self, **completion_params: dict[str, Any]) -> ChatCompletion:
-        return await acompletion(**completion_params)  # type: ignore[return-value, arg-type]
+        return await self.llm.acompletion(**completion_params)  # type: ignore[return-value, arg-type]
 
     async def update_output_type_async(
         self, output_type: type[BaseModel] | None

src/any_agent/testing/helpers.py

@@ -14,7 +14,7 @@
 LLM_IMPORT_PATHS = {
     AgentFramework.GOOGLE: "any_agent.frameworks.google.acompletion",
     AgentFramework.LANGCHAIN: "any_agent.frameworks.langchain.acompletion",
-    AgentFramework.TINYAGENT: "any_agent.frameworks.tinyagent.acompletion",
+    AgentFramework.TINYAGENT: "any_llm.AnyLLM.acompletion",
     AgentFramework.AGNO: "any_agent.frameworks.agno.acompletion",
     AgentFramework.OPENAI: "any_llm.AnyLLM.acompletion",
     AgentFramework.SMOLAGENTS: "any_llm.completion",

tests/unit/conftest.py

@@ -1,11 +1,19 @@
 import os
 from collections.abc import Generator
+from unittest.mock import patch
 
 import pytest
 
 from any_agent.config import AgentFramework
 
 
+@pytest.fixture(autouse=True)
+def mock_verify_api_key() -> Generator[None, None, None]:
+    """Mock AnyLLM._verify_and_set_api_key to skip API key validation in unit tests."""
+    with patch("any_llm.AnyLLM._verify_and_set_api_key"):
+        yield
+
+
 @pytest.fixture(autouse=True)
 def mock_api_keys_for_unit_tests(
     request: pytest.FixtureRequest,