diff --git a/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py b/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py index 01929cd00040..453ff579fa00 100644 --- a/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py +++ b/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 azure.ai.agentserver.core 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 diff --git a/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py b/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py index 8b7142f0862a..4958a03c5a33 100644 --- a/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py +++ b/sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py @@ -9,7 +9,7 @@ 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 import AzureAIToolClient, FoundryTool logger = get_logger() @@ -21,13 +21,13 @@ class ToolClient: in a format compatible with Agent Framework agents. :param tool_client: The AzureAIToolClient instance to use for tool operations. - :type tool_client: ~azure.ai.agentserver.core.client.tools.aio.AzureAIToolClient + :type tool_client: ~azure.ai.agentserver.core.AzureAIToolClient .. admonition:: Example: .. code-block:: python - from azure.ai.agentserver.core.client.tools.aio import AzureAIToolClient + from azure.ai.agentserver.core import AzureAIToolClient from azure.ai.agentserver.agentframework import ToolClient from azure.identity.aio import DefaultAzureCredential @@ -55,7 +55,7 @@ def __init__(self, tool_client: "AzureAIToolClient") -> None: """Initialize the ToolClient. :param tool_client: The AzureAIToolClient instance to use for tool operations. - :type tool_client: ~azure.ai.agentserver.core.client.tools.aio.AzureAIToolClient + :type tool_client: ~azure.ai.agentserver.core.AzureAIToolClient """ self._tool_client = tool_client self._aifunction_cache: List[AIFunction] = None @@ -96,7 +96,7 @@ def _convert_to_agent_framework_tool(self, azure_tool: "FoundryTool") -> AIFunct """Convert an AzureAITool to an Agent Framework AI Function :param azure_tool: The AzureAITool to convert. - :type azure_tool: ~azure.ai.agentserver.core.client.tools.aio.FoundryTool + :type azure_tool: ~azure.ai.agentserver.core.FoundryTool :return: An AI Function Tool. :rtype: AIFunction """ diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/__init__.py index 895074d32ae3..86e867962c9b 100644 --- a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/__init__.py +++ b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/__init__.py @@ -5,10 +5,29 @@ from ._version import VERSION from .logger import configure as config_logging -from .server.base import FoundryCBAgent -from .server.common.agent_run_context import AgentRunContext -config_logging() +# Re-export public server types +from ._server.base import FoundryCBAgent +from ._server.common.agent_run_context import AgentRunContext +from ._server.common.id_generator.id_generator import IdGenerator -__all__ = ["FoundryCBAgent", "AgentRunContext"] +# Re-export public client types +from ._client.tools import ( + AzureAIToolClient, + FoundryTool, + MCPToolApprovalRequiredError, + OAuthConsentRequiredError, +) + +config_logging() # TODO: -- logging should be configured by the application using the SDK, not the SDK itself. + +__all__ = [ + "FoundryCBAgent", + "AgentRunContext", + "IdGenerator", + "AzureAIToolClient", + "FoundryTool", + "MCPToolApprovalRequiredError", + "OAuthConsentRequiredError", +] __version__ = VERSION diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_client.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_client.py similarity index 95% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_client.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_client.py index ee56a4d44a94..5deb06e29678 100644 --- a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_client.py +++ b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_client.py @@ -89,13 +89,7 @@ def list_tools(self) -> List[FoundryTool]: Retrieves tools from both MCP servers and Azure AI Tools API endpoints, returning them as FoundryTool instances ready for invocation. :return: List of available tools from all configured sources. - :rtype: List[~AzureAITool] - :raises ~exceptions.OAuthConsentRequiredError: - Raised when the service requires user OAuth consent. - :raises ~exceptions.MCPToolApprovalRequiredError: - Raised when tool access requires human approval. - :raises ~azure.core.exceptions.HttpResponseError: - Raised for HTTP communication failures. + :rtype: List[~AzureAITool] or ~exceptions.MCPToolApprovalRequiredError or ~azure.core.exceptions.HttpResponseError: """ diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_configuration.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_configuration.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_configuration.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_configuration.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_exceptions.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_exceptions.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_exceptions.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_exceptions.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_model_base.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_model_base.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_model_base.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_model_base.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_utils/_model_base.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_utils/_model_base.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/_utils/_model_base.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/_utils/_model_base.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/_client.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/_client.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/_client.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/_client.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/_configuration.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/_configuration.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/_configuration.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/_configuration.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/operations/_operations.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/operations/_operations.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/aio/operations/_operations.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/aio/operations/_operations.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/operations/_operations.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/operations/_operations.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/client/tools/operations/_operations.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_client/tools/operations/_operations.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/base.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/base.py similarity index 99% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/base.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/base.py index 2603fd997b0e..030ee4a68c53 100644 --- a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/base.py +++ b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/base.py @@ -31,8 +31,8 @@ ) from .common.agent_run_context import AgentRunContext -from ..client.tools.aio._client import AzureAIToolClient -from ..client.tools._utils._model_base import ToolDefinition, UserInfo +from .._client.tools.aio._client import AzureAIToolClient +from .._client.tools._utils._model_base import ToolDefinition, UserInfo logger = get_logger() DEBUG_ERRORS = os.environ.get(Constants.AGENT_DEBUG_ERRORS, "false").lower() == "true" diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/agent_run_context.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/agent_run_context.py similarity index 98% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/agent_run_context.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/agent_run_context.py index 5289df0b3524..564039fbb97e 100644 --- a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/agent_run_context.py +++ b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/agent_run_context.py @@ -7,7 +7,7 @@ from ...models.projects import AgentId, AgentReference, ResponseConversation1 from .id_generator.foundry_id_generator import FoundryIdGenerator from .id_generator.id_generator import IdGenerator -from ...client.tools._model_base import UserInfo +from ..._client.tools._model_base import UserInfo logger = get_logger() diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/__init__.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/__init__.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/__init__.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/foundry_id_generator.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/foundry_id_generator.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/foundry_id_generator.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/foundry_id_generator.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/id_generator.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/id_generator.py similarity index 100% rename from sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/common/id_generator/id_generator.py rename to sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/_server/common/id_generator/id_generator.py diff --git a/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/aio/__init__.py b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/aio/__init__.py new file mode 100644 index 000000000000..fe66dd04d76f --- /dev/null +++ b/sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/aio/__init__.py @@ -0,0 +1,18 @@ +# --------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# --------------------------------------------------------- + +# Re-export async client types +from .._client.tools.aio import ( + AzureAIToolClient, + FoundryTool, + MCPToolApprovalRequiredError, + OAuthConsentRequiredError, +) + +__all__ = [ + "AzureAIToolClient", + "FoundryTool", + "MCPToolApprovalRequiredError", + "OAuthConsentRequiredError", +] diff --git a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.rst b/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.rst index da01b083b0b3..c6c2a6b8e573 100644 --- a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.rst +++ b/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.rst @@ -6,14 +6,6 @@ azure.ai.agentserver.core package :members: :undoc-members: -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - azure.ai.agentserver.core.server - Submodules ---------- diff --git a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.id_generator.rst b/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.id_generator.rst deleted file mode 100644 index cf935aa1d1ed..000000000000 --- a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.id_generator.rst +++ /dev/null @@ -1,26 +0,0 @@ -azure.ai.agentserver.core.server.common.id\_generator package -============================================================= - -.. automodule:: azure.ai.agentserver.core.server.common.id_generator - :inherited-members: - :members: - :undoc-members: - -Submodules ----------- - -azure.ai.agentserver.core.server.common.id\_generator.foundry\_id\_generator module ------------------------------------------------------------------------------------ - -.. automodule:: azure.ai.agentserver.core.server.common.id_generator.foundry_id_generator - :inherited-members: - :members: - :undoc-members: - -azure.ai.agentserver.core.server.common.id\_generator.id\_generator module --------------------------------------------------------------------------- - -.. automodule:: azure.ai.agentserver.core.server.common.id_generator.id_generator - :inherited-members: - :members: - :undoc-members: diff --git a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.rst b/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.rst deleted file mode 100644 index 01e54afab103..000000000000 --- a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.rst +++ /dev/null @@ -1,27 +0,0 @@ -azure.ai.agentserver.core.server.common package -=============================================== - -.. automodule:: azure.ai.agentserver.core.server.common - :inherited-members: - :members: - :undoc-members: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - azure.ai.agentserver.core.server.common.id_generator - -Submodules ----------- - -azure.ai.agentserver.core.server.common.agent\_run\_context module ------------------------------------------------------------------- - -.. automodule:: azure.ai.agentserver.core.server.common.agent_run_context - :inherited-members: - :members: - :undoc-members: - :no-index: diff --git a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.rst b/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.rst deleted file mode 100644 index b82fa765b839..000000000000 --- a/sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.rst +++ /dev/null @@ -1,26 +0,0 @@ -azure.ai.agentserver.core.server package -======================================== - -.. automodule:: azure.ai.agentserver.core.server - :inherited-members: - :members: - :undoc-members: - -Subpackages ------------ - -.. toctree:: - :maxdepth: 4 - - azure.ai.agentserver.core.server.common - -Submodules ----------- - -azure.ai.agentserver.core.server.base module --------------------------------------------- - -.. automodule:: azure.ai.agentserver.core.server.base - :inherited-members: - :members: - :undoc-members: diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/langgraph.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/langgraph.py index e6bf10d0b5c2..691d43cd25b7 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/langgraph.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/langgraph.py @@ -11,11 +11,13 @@ from langchain_core.tools import StructuredTool from langgraph.graph.state import CompiledStateGraph -from azure.ai.agentserver.core.client.tools import OAuthConsentRequiredError +from azure.ai.agentserver.core import ( + AgentRunContext, + FoundryCBAgent, + OAuthConsentRequiredError, +) from azure.ai.agentserver.core.constants import Constants from azure.ai.agentserver.core.logger import get_logger -from azure.ai.agentserver.core.server.base import FoundryCBAgent -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext from .models import ( LanggraphMessageStateConverter, diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_response_converter.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_response_converter.py index 62560279cdc6..3a0adadcfed5 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_response_converter.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_response_converter.py @@ -11,7 +11,7 @@ from azure.ai.agentserver.core.logger import get_logger from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from .utils import extract_function_call diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_state_converter.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_state_converter.py index a1bc2181f919..0adeede27005 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_state_converter.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_state_converter.py @@ -26,7 +26,7 @@ from typing import Any, AsyncGenerator, AsyncIterator, Dict from azure.ai.agentserver.core.models import Response, ResponseStreamEvent -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from .langgraph_request_converter import LangGraphRequestConverter from .langgraph_response_converter import LangGraphResponseConverter diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_stream_response_converter.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_stream_response_converter.py index cba1db014ed8..c65ed506ae7c 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_stream_response_converter.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_stream_response_converter.py @@ -9,7 +9,7 @@ from azure.ai.agentserver.core.logger import get_logger from azure.ai.agentserver.core.models import ResponseStreamEvent -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from .response_event_generators import ( ResponseEventGenerator, diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_event_generator.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_event_generator.py index 2bea925ef2ed..3d6c3d6d7f07 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_event_generator.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_event_generator.py @@ -8,7 +8,7 @@ from langchain_core.messages import AnyMessage from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext class StreamEventState: diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_function_call_argument_event_generator.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_function_call_argument_event_generator.py index dbaed3ac9258..edeceed83039 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_function_call_argument_event_generator.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_function_call_argument_event_generator.py @@ -9,7 +9,7 @@ from langchain_core.messages import AnyMessage from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from ..utils import extract_function_call from . import ResponseEventGenerator, StreamEventState diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_item_event_generator.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_item_event_generator.py index a2606d1541c1..78ce72efa070 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_item_event_generator.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_item_event_generator.py @@ -9,8 +9,7 @@ from langchain_core.messages import AnyMessage from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext -from azure.ai.agentserver.core.server.common.id_generator.id_generator import IdGenerator +from azure.ai.agentserver.core import AgentRunContext, IdGenerator from . import ResponseEventGenerator, StreamEventState, item_resource_helpers from .response_content_part_event_generator import ResponseContentPartEventGenerator diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_text_event_generator.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_text_event_generator.py index c65eda157bbd..e670e8753c2e 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_text_event_generator.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_output_text_event_generator.py @@ -6,7 +6,7 @@ from typing import List from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from .response_event_generator import ( ResponseEventGenerator, diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_stream_event_generator.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_stream_event_generator.py index a6ad1cba7396..1918eec25420 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_stream_event_generator.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/models/response_event_generators/response_stream_event_generator.py @@ -9,7 +9,7 @@ from langchain_core import messages as langgraph_messages from azure.ai.agentserver.core.models import projects as project_models -from azure.ai.agentserver.core.server.common.agent_run_context import AgentRunContext +from azure.ai.agentserver.core import AgentRunContext from .response_event_generator import ( ResponseEventGenerator, diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/tool_client.py b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/tool_client.py index 78baf96bee80..9aef65e66eef 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/tool_client.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/tool_client.py @@ -9,7 +9,7 @@ from pydantic import BaseModel, Field, create_model if TYPE_CHECKING: - from azure.ai.agentserver.core.client.tools.aio import AzureAIToolClient, FoundryTool + from azure.ai.agentserver.core import AzureAIToolClient, FoundryTool # pylint: disable=client-accepts-api-version-keyword,missing-client-constructor-parameter-credential,missing-client-constructor-parameter-kwargs class ToolClient: @@ -20,13 +20,13 @@ class ToolClient: LangGraph's create_react_agent and StateGraph. :param tool_client: The AzureAIToolClient instance to use for tool operations. - :type tool_client: ~azure.ai.agentserver.core.client.tools.aio.AzureAIToolClient + :type tool_client: ~azure.ai.agentserver.core.AzureAIToolClient .. admonition:: Example: .. code-block:: python - from azure.ai.agentserver.core.client.tools.aio import AzureAIToolClient + from azure.ai.agentserver.core import AzureAIToolClient from azure.ai.agentserver.langgraph import ToolClient from azure.identity.aio import DefaultAzureCredential @@ -61,7 +61,7 @@ def __init__(self, tool_client: "AzureAIToolClient") -> None: """Initialize the ToolClient. :param tool_client: The AzureAIToolClient instance to use for tool operations. - :type tool_client: ~azure.ai.agentserver.core.client.tools.aio.AzureAIToolClient + :type tool_client: ~azure.ai.agentserver.core.AzureAIToolClient """ self._tool_client = tool_client self._langchain_tools_cache: Optional[List[StructuredTool]] = None @@ -105,7 +105,7 @@ def _convert_to_langchain_tool(self, azure_tool: "FoundryTool") -> StructuredToo """Convert an AzureAITool to a LangChain StructuredTool. :param azure_tool: The AzureAITool to convert. - :type azure_tool: ~azure.ai.agentserver.core.client.tools.aio.AzureAITool + :type azure_tool: ~azure.ai.agentserver.core.FoundryTool :return: A LangChain StructuredTool instance. :rtype: ~langchain_core.tools.StructuredTool """ diff --git a/sdk/agentserver/azure-ai-agentserver-langgraph/samples/tool_client_example/use_tool_client_example.py b/sdk/agentserver/azure-ai-agentserver-langgraph/samples/tool_client_example/use_tool_client_example.py index 7daa62d0ec9f..a1c58a73e6ef 100644 --- a/sdk/agentserver/azure-ai-agentserver-langgraph/samples/tool_client_example/use_tool_client_example.py +++ b/sdk/agentserver/azure-ai-agentserver-langgraph/samples/tool_client_example/use_tool_client_example.py @@ -14,7 +14,7 @@ from langchain_openai import AzureChatOpenAI from langgraph.checkpoint.memory import MemorySaver -from azure.ai.agentserver.core.client.tools.aio import AzureAIToolClient +from azure.ai.agentserver.core import AzureAIToolClient from azure.ai.agentserver.langgraph import ToolClient, from_langgraph from azure.identity.aio import DefaultAzureCredential