[agentserver] Refactor tool api

sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py

@@ -12,7 +12,7 @@
 from agent_framework.azure import AzureAIClient  # pylint: disable=no-name-in-module
 from opentelemetry import trace
 
-from azure.ai.agentserver.core.client.tools import OAuthConsentRequiredError
+from ..core.tools._exceptions import OAuthConsentRequiredError
 from azure.ai.agentserver.core import AgentRunContext, FoundryCBAgent
 from azure.ai.agentserver.core.constants import Constants as AdapterConstants
 from azure.ai.agentserver.core.logger import APPINSIGHT_CONNSTR_ENV_NAME, get_logger

sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py

@@ -9,7 +9,8 @@
 from pydantic import Field, create_model
 from azure.ai.agentserver.core.logger import get_logger
 if TYPE_CHECKING:
-    from azure.ai.agentserver.core.client.tools.aio import AzureAIToolClient, FoundryTool
+    from azure.ai.agentserver.core.tools._client import FoundryToolClient
+    from azure.ai.agentserver.core.tools._models import ResolvedFoundryTool
 
 logger = get_logger()
 
@@ -51,7 +52,7 @@ class ToolClient:
     :meta private:
     """
 
-    def __init__(self, tool_client: "AzureAIToolClient") -> None:
+    def __init__(self, tool_client: "FoundryToolClient") -> None:
         """Initialize the ToolClient.
 
         :param tool_client: The AzureAIToolClient instance to use for tool operations.
@@ -92,7 +93,7 @@ async def list_tools(self) -> List[AIFunction]:
 
         return self._aifunction_cache
 
-    def _convert_to_agent_framework_tool(self, azure_tool: "FoundryTool") -> AIFunction:
+    def _convert_to_agent_framework_tool(self, azure_tool: "ResolvedFoundryTool") -> AIFunction:
         """Convert an AzureAITool to an Agent Framework AI Function
 
         :param azure_tool: The AzureAITool to convert.