fix args

Author: cjber

python/examples/adapter_google_adk/README.md

@@ -12,10 +12,10 @@ First, ensure you have Python 3.10+ installed. Then install the required package
 
 ```bash
 # Using pip
-pip install "thirdweb-ai[autogen]"
+pip install "thirdweb-ai[google-adk]"
 
 # Using uv
-uv add "thirdweb-ai[autogen]"
+uv add "thirdweb-ai[google-adk]"
 ```
 
 ## Usage

python/examples/adapter_google_adk/example.py

@@ -39,10 +39,12 @@ async def setup_agent() -> Runner:
     for tool_count, tool in enumerate(adk_tools, start=1):
         print(f"- Tool #{tool_count} {tool.name}")
 
+    # Create the agent with the tools
     agent = LlmAgent(
-        model=LiteLlm(model="gpt-4o-mini"), 
-        name="thirdweb_insight_agent", 
-        tools=adk_tools
+        model=LiteLlm(model="gpt-4o-mini"),
+        name="thirdweb_insight_agent",
+        # Convert BaseTool to the expected type for LlmAgent
+        tools=adk_tools,  # type: ignore
     )
 
     # Set up session
@@ -54,18 +56,26 @@ async def setup_agent() -> Runner:
     return Runner(agent=agent, app_name=APP_NAME, session_service=session_service)
 
 
-async def call_agent(query):
+async def call_agent(query: str) -> None:
+    """Run a query through the agent.
+
+    Args:
+        query: The query to send to the agent
+    """
     runner = await setup_agent()
-    content = types.Content(role='user', parts=[types.Part(text=query)])
+    content = types.Content(role="user", parts=[types.Part(text=query)])
     events = runner.run(user_id=USER_ID, session_id=SESSION_ID, new_message=content)
 
     for event in events:
-        if event.is_final_response():
+        if (
+            hasattr(event, "is_final_response")
+            and event.is_final_response()
+            and (event.content and hasattr(event.content, "parts") and event.content.parts)
+        ):
             final_response = event.content.parts[0].text
             print("Agent Response: ", final_response)
 
 
-
 if __name__ == "__main__":
-    test_query = "Get details of 0x0cd2de80bb87b327a0e32576ddddc8af6c73d163dca2d00e8777117918e3d056 transaction"
+    test_query = "Find information on transaction: 0x45027cce9d2b990349b4a1e015ec29ca7c7ef15d82487d898f24866a09e8b84c."
     asyncio.run(call_agent(test_query))

python/thirdweb-ai/src/thirdweb_ai/adapters/google_adk/google_adk.py

@@ -1,22 +1,73 @@
-from typing import Any, Dict
+from typing import Any
+
+from google.adk.tools import BaseTool, ToolContext
+from google.genai import types
+
+from thirdweb_ai.tools.tool import Tool, ToolSchema
 
-from google.adk.agents.llm_agent import ToolUnion
-from google.adk.tools import BaseTool
 from pydantic import BaseModel
 
-from thirdweb_ai import Tool
+class GoogleAdkTool(BaseTool):
+    """Adapter for Thirdweb Tool to Google ADK BaseTool.
+
+    This allows Thirdweb tools to be used with Google ADK agents.
+    """
+
+    def __init__(self, tool: Tool):
+        """Initialize the Google ADK Tool wrapper.
+
+        Args:
+            tool: The Thirdweb Tool to wrap
+        """
+        self.tool = tool
+        super().__init__(
+            name=tool.name,
+            description=tool.description,
+        )
+
+    @property
+    def schema(self) -> ToolSchema:
+        """Return the schema for the tool.
+
+        Returns:
+            The schema for the function declaration
+        """
+        return self.tool.schema
+
+    def _get_declaration(self) -> types.FunctionDeclaration:
+        """Generate the function declaration for Google ADK.
+
+        Returns:
+            A FunctionDeclaration for Google ADK
+        """
+        parameters = self.tool.schema["parameters"]
+        del parameters["additionalProperties"]
+        return types.FunctionDeclaration(
+            name=self.name,
+            description=self.description,
+            parameters=parameters,
+        )
+
+    # Override the method with the expected signature based on the error message
+    # and adapting from the reference implementation
+    async def run_async(self, args: dict[str, Any], tool_context: ToolContext) -> Any:
+        """Execute the tool asynchronously.
+
+        This method adapts the Thirdweb tool to work with Google ADK's async execution.
+
+        Returns:
+            The result of running the tool
+        """
+        return self.tool.run_json(args)
 
 
 def get_google_adk_tools(tools: list[Tool]) -> list[BaseTool]:
-    class WrappedTool(BaseTool):
-        def __init__(self, tool: Tool):
-            self.tool = tool
-            super().__init__(
-                name=tool.name,
-                description=tool.description,
-            )
-
-        async def run(self, args: BaseModel) -> Any:
-            return self.tool.run_async(args.model_dump())
-
-    return [WrappedTool(tool) for tool in tools]
+    """Convert Thirdweb tools to Google ADK tools.
+
+    Args:
+        tools: List of Thirdweb tools to convert
+
+    Returns:
+        List of Google ADK tools
+    """
+    return [GoogleAdkTool(tool) for tool in tools]