Skip to content

[do not merge] make server and client private to reduce public api surface and clean up typing #44109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: lusu/agentserver-1110
Choose a base branch
from
Draft

[do not merge] make server and client private to reduce public api surface and clean up typing #44109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26a6aa7
rename
l0lawrence Nov 18, 2025
f07621d
no private external improts
l0lawrence Nov 18, 2025
aca54d7
this
l0lawrence Nov 18, 2025
c65d131
missed one
l0lawrence Nov 19, 2025
392ddee
can we remove
l0lawrence Nov 19, 2025
f83308d
sphinx
l0lawrence Nov 19, 2025
bf52eb2
Merge branch 'lusu/agentserver-1110' of https://github.com/Azure/azur…
l0lawrence Nov 19, 2025
3af92c2
async side too
l0lawrence Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...zure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...er/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/tool_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

@l0lawrence l0lawrence Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
from azure.ai.agentserver.core import AzureAIToolClient, FoundryTool
from azure.ai.agentserver.core.aio import AzureAIToolClient, FoundryTool


logger = get_logger()

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
"""
Expand Down
27 changes: 23 additions & 4 deletions sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 ...re/ai/agentserver/core/client/__init__.py → ...e/ai/agentserver/core/_client/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...agentserver/core/client/tools/__init__.py → ...gentserver/core/_client/tools/__init__.py
View file
Open in desktop
File renamed without changes.
8 changes: 1 addition & 7 deletions .../agentserver/core/client/tools/_client.py → ...agentserver/core/_client/tools/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

"""

Expand Down
0 ...erver/core/client/tools/_configuration.py → ...rver/core/_client/tools/_configuration.py
View file
Open in desktop
File renamed without changes.
0 ...ntserver/core/client/tools/_exceptions.py → ...tserver/core/_client/tools/_exceptions.py
View file
Open in desktop
File renamed without changes.
0 ...ntserver/core/client/tools/_model_base.py → ...tserver/core/_client/tools/_model_base.py
View file
Open in desktop
File renamed without changes.
0 ...r/core/client/tools/_utils/_model_base.py → .../core/_client/tools/_utils/_model_base.py
View file
Open in desktop
File renamed without changes.
0 ...tserver/core/client/tools/aio/__init__.py → ...server/core/_client/tools/aio/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...ntserver/core/client/tools/aio/_client.py → ...tserver/core/_client/tools/aio/_client.py
View file
Open in desktop
File renamed without changes.
0 ...r/core/client/tools/aio/_configuration.py → .../core/_client/tools/aio/_configuration.py
View file
Open in desktop
File renamed without changes.
0 ...lient/tools/aio/operations/_operations.py → ...lient/tools/aio/operations/_operations.py
View file
Open in desktop
File renamed without changes.
0 ...re/client/tools/operations/_operations.py → ...e/_client/tools/operations/_operations.py
View file
Open in desktop
File renamed without changes.
0 ...re/ai/agentserver/core/server/__init__.py → ...e/ai/agentserver/core/_server/__init__.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions .../azure/ai/agentserver/core/server/base.py → ...azure/ai/agentserver/core/_server/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...gentserver/core/server/common/__init__.py → ...entserver/core/_server/common/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/core/server/common/agent_run_context.py → .../core/_server/common/agent_run_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down
0 ...re/server/common/id_generator/__init__.py → ...e/_server/common/id_generator/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...mmon/id_generator/foundry_id_generator.py → ...mmon/id_generator/foundry_id_generator.py
View file
Open in desktop
File renamed without changes.
0 ...erver/common/id_generator/id_generator.py → ...erver/common/id_generator/id_generator.py
View file
Open in desktop
File renamed without changes.
18 changes: 18 additions & 0 deletions sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/aio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
]
8 changes: 0 additions & 8 deletions sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ azure.ai.agentserver.core package
:members:
:undoc-members:

Subpackages
-----------

.. toctree::
:maxdepth: 4

azure.ai.agentserver.core.server

Submodules
----------

Expand Down
26 changes: 0 additions & 26 deletions ...i-agentserver-core/doc/azure.ai.agentserver.core.server.common.id_generator.rst
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions ...erver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.common.rst
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions sdk/agentserver/azure-ai-agentserver-core/doc/azure.ai.agentserver.core.server.rst
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/langgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...entserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_response_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...-agentserver-langgraph/azure/ai/agentserver/langgraph/models/langgraph_state_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...er-langgraph/azure/ai/agentserver/langgraph/models/langgraph_stream_response_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...ure/ai/agentserver/langgraph/models/response_event_generators/response_event_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...graph/models/response_event_generators/response_function_call_argument_event_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...server/langgraph/models/response_event_generators/response_output_item_event_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...server/langgraph/models/response_event_generators/response_output_text_event_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...agentserver/langgraph/models/response_event_generators/response_stream_event_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions sdk/agentserver/azure-ai-agentserver-langgraph/azure/ai/agentserver/langgraph/tool_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
"""
Expand Down
2 changes: 1 addition & 1 deletion ...ver/azure-ai-agentserver-langgraph/samples/tool_client_example/use_tool_client_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down