Expose more "plugins" as tools.

Author: tjprescott

packages/python-packages/apiview-copilot/src/agent/_agent.py

@@ -13,10 +13,17 @@
 from typing import Optional
 
 from azure.ai.agents import AgentsClient
-from azure.ai.agents.models import MessageRole, MessageTextContent, ToolSet
+from azure.ai.agents.models import (
+    FunctionTool,
+    MessageRole,
+    MessageTextContent,
+    ToolSet,
+)
 from src._credential import get_credential
 from src._settings import SettingsManager
+from src.agent.tools._api_review_tools import ApiReviewTools
 from src.agent.tools._search_tools import SearchTools
+from src.agent.tools._utility_tools import UtilityTools
 
 
 async def invoke_agent(
@@ -88,13 +95,15 @@ def get_main_agent():
     credential = get_credential()
     client = AgentsClient(endpoint=endpoint, credential=credential)
 
+    # TODO: These were treated as subagents before and may not be applicable in the new format.
     # delete_agent = await stack.enter_async_context(get_delete_agent())
     # create_agent = await stack.enter_async_context(get_create_agent())
     # retrieve_agent = await stack.enter_async_context(get_retrieve_agent())
     # link_agent = await stack.enter_async_context(get_link_agent())
 
     toolset = ToolSet()
-    toolset.add(SearchTools().all_tools())
+    tools = SearchTools().all_tools() + ApiReviewTools().all_tools() + UtilityTools().all_tools()
+    toolset.add(FunctionTool(tools))
 
     agent = client.create_agent(
         name="APIView Copilot Main Agent",
@@ -106,21 +115,6 @@ def get_main_agent():
     # enable all tools by default
     client.enable_auto_function_calls(tools=toolset)
 
-    # agent = AzureAIAgent(
-    #     client=client,
-    #     definition=agent_definition,
-    #     plugins=[
-    #         SearchPlugin(),
-    #         UtilityPlugin(),
-    #         ApiReviewPlugin(),
-    #         delete_agent,
-    #         create_agent,
-    #         retrieve_agent,
-    #         link_agent,
-    #     ],
-    #     polling_options=RunPollingOptions(run_polling_interval=timedelta(seconds=1)),
-    #     kernel=kernel,
-    # )
     try:
         yield client, agent.id
     finally:

packages/python-packages/apiview-copilot/src/agent/tools/__init__.py

@@ -8,7 +8,7 @@
 This module initializes the plugins for the agent.
 """
 
-from ._api_review_tools import ApiReviewTool
+from ._api_review_tools import ApiReviewTools
 from ._database_tools import (
     get_create_agent,
     get_delete_agent,
@@ -19,7 +19,7 @@
 from ._utility_tools import UtilityTools
 
 __all__ = [
-    "ApiReviewTool",
+    "ApiReviewTools",
     "SearchTools",
     "UtilityTools",
     "get_create_agent",

packages/python-packages/apiview-copilot/src/agent/tools/_api_review_tools.py

@@ -16,7 +16,7 @@
 from src.agent.tools._base import Tool
 
 
-class ApiReviewTool(Tool):
+class ApiReviewTools(Tool):
     """Tools for API review operations."""
 
     async def review_api(self, *, language: str, target: str):

packages/python-packages/apiview-copilot/src/agent/tools/_base.py

@@ -4,8 +4,6 @@
 # license information.
 # --------------------------------------------------------------------------
 
-from azure.ai.agents.models import FunctionTool
-
 
 class Tool:
     """Base class for agent tools. Provides automatic tool discovery."""
@@ -17,4 +15,4 @@ def all_tools(self):
             for name in dir(self)
             if not name.startswith("_") and callable(getattr(self, name)) and name != "all_tools"
         ]
-        return FunctionTool(tools)
+        return tools