Python: renamed ai search and cleanup of samples and unified import logic (#2369)

* renamed ai search and cleanup of samples and unified import logic

* fixed error messages

* fixed folder name

* remove old samples from readme

python/packages/azure-ai-search/README.md

@@ -3,7 +3,7 @@
 Please install this package via pip:
 
 ```bash
-pip install agent-framework-aisearch --pre
+pip install agent-framework-azure-ai-search --pre
 ```
 
 ## Azure AI Search Integration

python/packages/azure-ai-search/agent_framework_azure_ai_search/_search_provider.py

@@ -1,15 +1,5 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-"""Azure AI Search Context Provider for Agent Framework.
-
-This module provides context providers for Azure AI Search integration with two modes:
-- Agentic: Recommended for most scenarios. Uses Knowledge Bases for query planning and
-  multi-hop reasoning. Slightly slower with more token consumption, but more accurate.
-- Semantic: Fast hybrid search (vector + keyword) with semantic ranker. Best for simple
-  queries where speed is critical.
-
-See: https://techcommunity.microsoft.com/blog/azure-ai-foundry-blog/foundry-iq-boost-response-relevance-by-36-with-agentic-retrieval/4470720
-"""
 
 import sys
 from collections.abc import Awaitable, Callable, MutableSequence
@@ -111,6 +101,18 @@ if sys.version_info >= (3, 12):
 else:
     from typing_extensions import override  # type: ignore[import] # pragma: no cover
 
+"""Azure AI Search Context Provider for Agent Framework.
+
+This module provides context providers for Azure AI Search integration with two modes:
+- Agentic: Recommended for most scenarios. Uses Knowledge Bases for query planning and
+  multi-hop reasoning. Slightly slower with more token consumption, but more accurate.
+- Semantic: Fast hybrid search (vector + keyword) with semantic ranker. Best for simple
+  queries where speed is critical.
+
+See: https://techcommunity.microsoft.com/blog/azure-ai-foundry-blog/foundry-iq-boost-response-relevance-by-36-with-agentic-retrieval/4470720
+"""
+
+
 # Module-level constants
 logger = get_logger("agent_framework.azure")
 _DEFAULT_AGENTIC_MESSAGE_HISTORY_COUNT = 10

python/packages/azure-ai-search/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "agent-framework-aisearch"
+name = "agent-framework-azure-ai-search"
 description = "Azure AI Search integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
@@ -76,15 +76,15 @@ disallow_incomplete_defs = true
 disallow_untyped_decorators = true
 
 [tool.bandit]
-targets = ["agent_framework_aisearch"]
+targets = ["agent_framework_azure_ai_search"]
 exclude_dirs = ["tests"]
 
 [tool.poe]
 executor.type = "uv"
 include = "../../shared_tasks.toml"
 [tool.poe.tasks]
-mypy = "mypy --config-file $POE_ROOT/pyproject.toml agent_framework_aisearch"
-test = "pytest --cov=agent_framework_aisearch --cov-report=term-missing:skip-covered tests"
+mypy = "mypy --config-file $POE_ROOT/pyproject.toml agent_framework_azure_ai_search"
+test = "pytest --cov=agent_framework_azure_ai_search --cov-report=term-missing:skip-covered tests"
 
 [build-system]
 requires = ["flit-core >= 3.11,<4.0"]

python/packages/azure-ai-search/tests/test_search_provider.py

@@ -6,13 +6,11 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from agent_framework import ChatMessage, Context, Role
-from agent_framework.azure import AzureAISearchContextProvider
+from agent_framework.azure import AzureAISearchContextProvider, AzureAISearchSettings
 from agent_framework.exceptions import ServiceInitializationError
 from azure.core.credentials import AzureKeyCredential
 from azure.core.exceptions import ResourceNotFoundError
 
-from agent_framework_aisearch import AzureAISearchSettings
-
 
 @pytest.fixture
 def mock_search_client() -> AsyncMock:
@@ -246,7 +244,7 @@ class TestSemanticSearch:
     """Test semantic search functionality."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_semantic_search_basic(
         self, mock_search_class: MagicMock, sample_messages: list[ChatMessage]
     ) -> None:
@@ -275,7 +273,7 @@ class TestSemanticSearch:
         assert "Test document content" in context.messages[1].text
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_semantic_search_empty_query(self, mock_search_class: MagicMock) -> None:
         """Test that empty queries return empty context."""
         mock_search_client = AsyncMock()
@@ -295,7 +293,7 @@ class TestSemanticSearch:
         assert len(context.messages) == 0
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_semantic_search_with_vector_query(
         self, mock_search_class: MagicMock, sample_messages: list[ChatMessage]
     ) -> None:
@@ -332,8 +330,8 @@ class TestKnowledgeBaseSetup:
     """Test Knowledge Base setup for agentic mode."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_ensure_knowledge_base_creates_when_not_exists(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -369,8 +367,8 @@ class TestKnowledgeBaseSetup:
         mock_index_client.create_or_update_knowledge_base.assert_called_once()
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_ensure_knowledge_base_skips_when_exists(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -406,7 +404,7 @@ class TestContextProviderLifecycle:
     """Test context provider lifecycle methods."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_context_manager(self, mock_search_class: MagicMock) -> None:
         """Test that provider can be used as async context manager."""
         mock_search_client = AsyncMock()
@@ -422,9 +420,9 @@ class TestContextProviderLifecycle:
             assert isinstance(provider, AzureAISearchContextProvider)
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.KnowledgeBaseRetrievalClient")
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.KnowledgeBaseRetrievalClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_context_manager_agentic_cleanup(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock, mock_retrieval_class: MagicMock
     ) -> None:
@@ -470,7 +468,7 @@ class TestMessageFiltering:
     """Test message filtering functionality."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_filters_non_user_assistant_messages(self, mock_search_class: MagicMock) -> None:
         """Test that only USER and ASSISTANT messages are processed."""
         # Setup mock
@@ -502,7 +500,7 @@ class TestMessageFiltering:
         mock_search_client.search.assert_called_once()
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_filters_empty_messages(self, mock_search_class: MagicMock) -> None:
         """Test that empty/whitespace messages are filtered out."""
         mock_search_client = AsyncMock()
@@ -532,7 +530,7 @@ class TestCitations:
     """Test citation functionality."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_citations_included_in_semantic_search(self, mock_search_class: MagicMock) -> None:
         """Test that citations are included in semantic search results."""
         # Setup mock with document ID
@@ -564,9 +562,9 @@ class TestAgenticSearch:
     """Test agentic search functionality."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.KnowledgeBaseRetrievalClient")
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.KnowledgeBaseRetrievalClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_agentic_search_basic(
         self,
         mock_search_class: MagicMock,
@@ -593,7 +591,7 @@ class TestAgenticSearch:
         mock_content = MagicMock()
         mock_content.text = "Agentic search result"
         # Make it pass isinstance check
-        from agent_framework_aisearch._search_provider import _agentic_retrieval_available
+        from agent_framework_azure_ai_search._search_provider import _agentic_retrieval_available
 
         if _agentic_retrieval_available:
             from azure.search.documents.knowledgebases.models import KnowledgeBaseMessageTextContent
@@ -623,9 +621,9 @@ class TestAgenticSearch:
         assert len(context.messages) >= 1
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.KnowledgeBaseRetrievalClient")
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.KnowledgeBaseRetrievalClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_agentic_search_no_results(
         self,
         mock_search_class: MagicMock,
@@ -670,9 +668,9 @@ class TestAgenticSearch:
         assert len(context.messages) >= 1
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.KnowledgeBaseRetrievalClient")
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.KnowledgeBaseRetrievalClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_agentic_search_with_medium_reasoning(
         self,
         mock_search_class: MagicMock,
@@ -696,7 +694,7 @@ class TestAgenticSearch:
         mock_message = MagicMock()
         mock_content = MagicMock()
         mock_content.text = "Medium reasoning result"
-        from agent_framework_aisearch._search_provider import _agentic_retrieval_available
+        from agent_framework_azure_ai_search._search_provider import _agentic_retrieval_available
 
         if _agentic_retrieval_available:
             from azure.search.documents.knowledgebases.models import KnowledgeBaseMessageTextContent
@@ -730,8 +728,8 @@ class TestVectorFieldAutoDiscovery:
     """Test vector field auto-discovery functionality."""
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_auto_discovers_single_vector_field(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -795,8 +793,8 @@ class TestVectorFieldAutoDiscovery:
         assert is_vector_3 is False
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_no_false_positives_on_string_fields(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -839,8 +837,8 @@ class TestVectorFieldAutoDiscovery:
         assert provider._auto_discovered_vector_field is True
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_multiple_vector_fields_without_vectorizer(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -884,8 +882,8 @@ class TestVectorFieldAutoDiscovery:
         assert provider._auto_discovered_vector_field is True
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_multiple_vectorizable_fields(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:
@@ -941,8 +939,8 @@ class TestVectorFieldAutoDiscovery:
         assert provider._auto_discovered_vector_field is True
 
     @pytest.mark.asyncio
-    @patch("agent_framework_aisearch._search_provider.SearchIndexClient")
-    @patch("agent_framework_aisearch._search_provider.SearchClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchIndexClient")
+    @patch("agent_framework_azure_ai_search._search_provider.SearchClient")
     async def test_single_vectorizable_field_detected(
         self, mock_search_class: MagicMock, mock_index_class: MagicMock
     ) -> None:

python/packages/core/agent_framework/_workflows/__init__.pyi

@@ -1,185 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-
-from ._agent import WorkflowAgent
-from ._agent_executor import (
-    AgentExecutor,
-    AgentExecutorRequest,
-    AgentExecutorResponse,
-)
-from ._checkpoint import (
-    CheckpointStorage,
-    FileCheckpointStorage,
-    InMemoryCheckpointStorage,
-    WorkflowCheckpoint,
-)
-from ._checkpoint_summary import WorkflowCheckpointSummary, get_checkpoint_summary
-from ._concurrent import ConcurrentBuilder
-from ._const import DEFAULT_MAX_ITERATIONS
-from ._edge import (
-    Case,
-    Default,
-    Edge,
-    FanInEdgeGroup,
-    FanOutEdgeGroup,
-    SingleEdgeGroup,
-    SwitchCaseEdgeGroup,
-    SwitchCaseEdgeGroupCase,
-    SwitchCaseEdgeGroupDefault,
-)
-from ._edge_runner import create_edge_runner
-from ._events import (
-    AgentRunEvent,
-    AgentRunUpdateEvent,
-    ExecutorCompletedEvent,
-    ExecutorEvent,
-    ExecutorFailedEvent,
-    ExecutorInvokedEvent,
-    RequestInfoEvent,
-    SuperStepCompletedEvent,
-    SuperStepStartedEvent,
-    WorkflowErrorDetails,
-    WorkflowEvent,
-    WorkflowEventSource,
-    WorkflowFailedEvent,
-    WorkflowLifecycleEvent,
-    WorkflowOutputEvent,
-    WorkflowRunState,
-    WorkflowStartedEvent,
-    WorkflowStatusEvent,
-)
-from ._executor import (
-    Executor,
-    handler,
-)
-from ._function_executor import FunctionExecutor, executor
-from ._group_chat import (
-    DEFAULT_MANAGER_INSTRUCTIONS,
-    DEFAULT_MANAGER_STRUCTURED_OUTPUT_PROMPT,
-    GroupChatBuilder,
-    GroupChatDirective,
-    GroupChatStateSnapshot,
-)
-from ._handoff import HandoffBuilder, HandoffUserInputRequest
-from ._magentic import (
-    MagenticAgentDeltaEvent,
-    MagenticAgentMessageEvent,
-    MagenticBuilder,
-    MagenticContext,
-    MagenticFinalResultEvent,
-    MagenticManagerBase,
-    MagenticOrchestratorMessageEvent,
-    MagenticPlanReviewDecision,
-    MagenticPlanReviewReply,
-    MagenticPlanReviewRequest,
-    StandardMagenticManager,
-)
-from ._orchestration_state import OrchestrationState
-from ._request_info_mixin import response_handler
-from ._runner import Runner
-from ._runner_context import (
-    InProcRunnerContext,
-    Message,
-    RunnerContext,
-)
-from ._sequential import SequentialBuilder
-from ._shared_state import SharedState
-from ._validation import (
-    EdgeDuplicationError,
-    GraphConnectivityError,
-    TypeCompatibilityError,
-    ValidationTypeEnum,
-    WorkflowValidationError,
-    validate_workflow_graph,
-)
-from ._viz import WorkflowViz
-from ._workflow import Workflow, WorkflowRunResult
-from ._workflow_builder import WorkflowBuilder
-from ._workflow_context import WorkflowContext
-from ._workflow_executor import SubWorkflowRequestMessage, SubWorkflowResponseMessage, WorkflowExecutor
-
-__all__ = [
-    "DEFAULT_MANAGER_INSTRUCTIONS",
-    "DEFAULT_MANAGER_STRUCTURED_OUTPUT_PROMPT",
-    "DEFAULT_MAX_ITERATIONS",
-    "AgentExecutor",
-    "AgentExecutorRequest",
-    "AgentExecutorResponse",
-    "AgentRunEvent",
-    "AgentRunUpdateEvent",
-    "Case",
-    "CheckpointStorage",
-    "ConcurrentBuilder",
-    "Default",
-    "Edge",
-    "EdgeDuplicationError",
-    "Executor",
-    "ExecutorCompletedEvent",
-    "ExecutorEvent",
-    "ExecutorFailedEvent",
-    "ExecutorInvokedEvent",
-    "FanInEdgeGroup",
-    "FanOutEdgeGroup",
-    "FileCheckpointStorage",
-    "FunctionExecutor",
-    "GraphConnectivityError",
-    "GroupChatBuilder",
-    "GroupChatDirective",
-    "GroupChatStateSnapshot",
-    "HandoffBuilder",
-    "HandoffUserInputRequest",
-    "InMemoryCheckpointStorage",
-    "InProcRunnerContext",
-    "MagenticAgentDeltaEvent",
-    "MagenticAgentMessageEvent",
-    "MagenticBuilder",
-    "MagenticContext",
-    "MagenticFinalResultEvent",
-    "MagenticManagerBase",
-    "MagenticOrchestratorMessageEvent",
-    "MagenticPlanReviewDecision",
-    "MagenticPlanReviewReply",
-    "MagenticPlanReviewRequest",
-    "Message",
-    "OrchestrationState",
-    "RequestInfoEvent",
-    "Runner",
-    "RunnerContext",
-    "SequentialBuilder",
-    "SharedState",
-    "SingleEdgeGroup",
-    "StandardMagenticManager",
-    "SubWorkflowRequestMessage",
-    "SubWorkflowResponseMessage",
-    "SuperStepCompletedEvent",
-    "SuperStepStartedEvent",
-    "SwitchCaseEdgeGroup",
-    "SwitchCaseEdgeGroupCase",
-    "SwitchCaseEdgeGroupDefault",
-    "TypeCompatibilityError",
-    "ValidationTypeEnum",
-    "Workflow",
-    "WorkflowAgent",
-    "WorkflowBuilder",
-    "WorkflowCheckpoint",
-    "WorkflowCheckpointSummary",
-    "WorkflowContext",
-    "WorkflowErrorDetails",
-    "WorkflowEvent",
-    "WorkflowEventSource",
-    "WorkflowExecutor",
-    "WorkflowFailedEvent",
-    "WorkflowLifecycleEvent",
-    "WorkflowOutputEvent",
-    "WorkflowRunResult",
-    "WorkflowRunState",
-    "WorkflowStartedEvent",
-    "WorkflowStatusEvent",
-    "WorkflowValidationError",
-    "WorkflowViz",
-    "create_edge_runner",
-    "executor",
-    "get_checkpoint_summary",
-    "handler",
-    "response_handler",
-    "validate_workflow_graph",
-]

python/packages/core/agent_framework/a2a/__init__.py

@@ -3,20 +3,20 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_a2a"
-PACKAGE_EXTRA = "a2a"
+IMPORT_PATH = "agent_framework_a2a"
+PACKAGE_NAME = "agent-framework-a2a"
 _IMPORTS = ["__version__", "A2AAgent"]
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/a2a/__init__.pyi

@@ -1,5 +1,11 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework_a2a import A2AAgent, __version__
+from agent_framework_a2a import (
+    A2AAgent,
+    __version__,
+)
 
-__all__ = ["A2AAgent", "__version__"]
+__all__ = [
+    "A2AAgent",
+    "__version__",
+]

python/packages/core/agent_framework/ag_ui/__init__.py

@@ -3,8 +3,8 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_ag_ui"
-PACKAGE_EXTRA = "ag-ui"
+IMPORT_PATH = "agent_framework_ag_ui"
+PACKAGE_NAME = "agent-framework-ag-ui"
 _IMPORTS = [
     "__version__",
     "AgentFrameworkAgent",
@@ -23,12 +23,12 @@ _IMPORTS = [
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/anthropic/__init__.py

@@ -3,20 +3,20 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_anthropic"
-PACKAGE_EXTRA = "anthropic"
+IMPORT_PATH = "agent_framework_anthropic"
+PACKAGE_NAME = "agent-framework-anthropic"
 _IMPORTS = ["__version__", "AnthropicClient"]
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/anthropic/__init__.pyi

@@ -1,5 +1,11 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework_anthropic import AnthropicClient, __version__
+from agent_framework_anthropic import (
+    AnthropicClient,
+    __version__,
+)
 
-__all__ = ["AnthropicClient", "__version__"]
+__all__ = [
+    "AnthropicClient",
+    "__version__",
+]

python/packages/core/agent_framework/azure/__init__.py

@@ -1,36 +1,35 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-
 import importlib
 from typing import Any
 
 _IMPORTS: dict[str, tuple[str, str]] = {
-    "AgentCallbackContext": ("agent_framework_azurefunctions", "azurefunctions"),
-    "AgentFunctionApp": ("agent_framework_azurefunctions", "azurefunctions"),
-    "AgentResponseCallbackProtocol": ("agent_framework_azurefunctions", "azurefunctions"),
-    "AzureAIAgentClient": ("agent_framework_azure_ai", "azure-ai"),
-    "AzureAIClient": ("agent_framework_azure_ai", "azure-ai"),
-    "AzureAISearchContextProvider": ("agent_framework_aisearch", "aisearch"),
-    "AzureAISearchSettings": ("agent_framework_aisearch", "aisearch"),
-    "AzureOpenAIAssistantsClient": ("agent_framework.azure._assistants_client", "core"),
-    "AzureOpenAIChatClient": ("agent_framework.azure._chat_client", "core"),
-    "AzureAISettings": ("agent_framework_azure_ai", "azure-ai"),
-    "AzureOpenAISettings": ("agent_framework.azure._shared", "core"),
-    "AzureOpenAIResponsesClient": ("agent_framework.azure._responses_client", "core"),
-    "DurableAIAgent": ("agent_framework_azurefunctions", "azurefunctions"),
-    "get_entra_auth_token": ("agent_framework.azure._entra_id_authentication", "core"),
+    "AgentCallbackContext": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "AgentFunctionApp": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "AgentResponseCallbackProtocol": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "AzureAIAgentClient": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
+    "AzureAIClient": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
+    "AzureAISearchContextProvider": ("agent_framework_azure_ai_search", "agent-framework-azure-ai-search"),
+    "AzureAISearchSettings": ("agent_framework_azure_ai_search", "agent-framework-azure-ai-search"),
+    "AzureAISettings": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
+    "AzureOpenAIAssistantsClient": ("agent_framework.azure._assistants_client", "agent-framework-core"),
+    "AzureOpenAIChatClient": ("agent_framework.azure._chat_client", "agent-framework-core"),
+    "AzureOpenAIResponsesClient": ("agent_framework.azure._responses_client", "agent-framework-core"),
+    "AzureOpenAISettings": ("agent_framework.azure._shared", "agent-framework-core"),
+    "DurableAIAgent": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "get_entra_auth_token": ("agent_framework.azure._entra_id_authentication", "agent-framework-core"),
 }
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
-        package_name, package_extra = _IMPORTS[name]
+        import_path, package_name = _IMPORTS[name]
         try:
-            return getattr(importlib.import_module(package_name), name)
+            return getattr(importlib.import_module(import_path), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"please use `pip install agent-framework-{package_extra}`, "
-                "or update your requirements.txt or pyproject.toml file."
+                f"The package {package_name} is required to use `{name}`. "
+                f"Please use `pip install {package_name}`, or update your requirements.txt or pyproject.toml file."
             ) from exc
     raise AttributeError(f"Module `azure` has no attribute {name}.")
 

python/packages/core/agent_framework/azure/__init__.pyi

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
 
 from agent_framework_azure_ai import AzureAIAgentClient, AzureAIClient, AzureAISettings
+from agent_framework_azure_ai_search import AzureAISearchContextProvider, AzureAISearchSettings
 from agent_framework_azurefunctions import (
     AgentCallbackContext,
     AgentFunctionApp,
@@ -20,6 +21,8 @@ __all__ = [
     "AgentResponseCallbackProtocol",
     "AzureAIAgentClient",
     "AzureAIClient",
+    "AzureAISearchContextProvider",
+    "AzureAISearchSettings",
     "AzureAISettings",
     "AzureOpenAIAssistantsClient",
     "AzureOpenAIChatClient",

python/packages/core/agent_framework/chatkit/__init__.py

@@ -3,20 +3,20 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_chatkit"
-PACKAGE_EXTRA = "chatkit"
+IMPORT_PATH = "agent_framework_chatkit"
+PACKAGE_NAME = "agent-framework-chatkit"
 _IMPORTS = ["__version__", "ThreadItemConverter", "simple_to_agent_input", "stream_agent_response"]
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/chatkit/__init__.pyi

@@ -7,4 +7,9 @@ from agent_framework_chatkit import (
     stream_agent_response,
 )
 
-__all__ = ["ThreadItemConverter", "__version__", "simple_to_agent_input", "stream_agent_response"]
+__all__ = [
+    "ThreadItemConverter",
+    "__version__",
+    "simple_to_agent_input",
+    "stream_agent_response",
+]

python/packages/core/agent_framework/devui/__init__.py

@@ -3,8 +3,8 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_devui"
-PACKAGE_EXTRA = "devui"
+IMPORT_PATH = "agent_framework_devui"
+PACKAGE_NAME = "agent-framework-devui"
 _IMPORTS = [
     "AgentFrameworkRequest",
     "DevServer",
@@ -22,12 +22,12 @@ _IMPORTS = [
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/devui/__init__.pyi

@@ -1,4 +1,5 @@
 # Copyright (c) Microsoft. All rights reserved.
+
 from agent_framework_devui import (
     AgentFrameworkRequest,
     DevServer,

python/packages/core/agent_framework/mem0/__init__.py

@@ -3,20 +3,20 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_mem0"
-PACKAGE_EXTRA = "mem0"
+IMPORT_PATH = "agent_framework_mem0"
+PACKAGE_NAME = "agent-framework-mem0"
 _IMPORTS = ["__version__", "Mem0Provider"]
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/mem0/__init__.pyi

@@ -1,5 +1,11 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework_mem0 import Mem0Provider, __version__
+from agent_framework_mem0 import (
+    Mem0Provider,
+    __version__,
+)
 
-__all__ = ["Mem0Provider", "__version__"]
+__all__ = [
+    "Mem0Provider",
+    "__version__",
+]

python/packages/core/agent_framework/microsoft/__init__.py

@@ -3,35 +3,33 @@
 import importlib
 from typing import Any
 
-_IMPORTS: dict[str, tuple[str, list[str]]] = {
-    "CopilotStudioAgent": ("agent_framework_copilotstudio", ["microsoft-copilotstudio", "copilotstudio"]),
-    "__version__": ("agent_framework_copilotstudio", ["microsoft-copilotstudio", "copilotstudio"]),
-    "acquire_token": ("agent_framework_copilotstudio", ["microsoft-copilotstudio", "copilotstudio"]),
-    # Purview (Graph Data Security & Governance) integration exports
-    "PurviewPolicyMiddleware": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewChatPolicyMiddleware": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewSettings": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewAppLocation": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewLocationType": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewAuthenticationError": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewPaymentRequiredError": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewRateLimitError": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewRequestError": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "PurviewServiceError": ("agent_framework_purview", ["microsoft-purview", "purview"]),
-    "CacheProvider": ("agent_framework_purview", ["microsoft-purview", "purview"]),
+_IMPORTS: dict[str, tuple[str, str]] = {
+    "CopilotStudioAgent": ("agent_framework_copilotstudio", "agent-framework-copilotstudio"),
+    "__version__": ("agent_framework_copilotstudio", "agent-framework-copilotstudio"),
+    "acquire_token": ("agent_framework_copilotstudio", "agent-framework-copilotstudio"),
+    "PurviewPolicyMiddleware": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewChatPolicyMiddleware": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewSettings": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewAppLocation": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewLocationType": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewAuthenticationError": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewPaymentRequiredError": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewRateLimitError": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewRequestError": ("agent_framework_purview", "agent-framework-purview"),
+    "PurviewServiceError": ("agent_framework_purview", "agent-framework-purview"),
+    "CacheProvider": ("agent_framework_purview", "agent-framework-purview"),
 }
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
-        package_name, package_extra = _IMPORTS[name]
+        import_path, package_name = _IMPORTS[name]
         try:
-            return getattr(importlib.import_module(package_name), name)
+            return getattr(importlib.import_module(import_path), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The {' or '.join(package_extra)} extra is not installed, "
-                f"please use `pip install agent-framework-{package_extra[0]}`, "
-                "or update your requirements.txt or pyproject.toml file."
+                f"The package {package_name} is required to use `{name}`. "
+                f"Please use `pip install {package_name}`, or update your requirements.txt or pyproject.toml file."
             ) from exc
     raise AttributeError(f"Module `microsoft` has no attribute {name}.")
 

python/packages/core/agent_framework/microsoft/__init__.pyi

@@ -1,6 +1,10 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework_copilotstudio import CopilotStudioAgent, __version__, acquire_token
+from agent_framework_copilotstudio import (
+    CopilotStudioAgent,
+    __version__,
+    acquire_token,
+)
 from agent_framework_purview import (
     CacheProvider,
     PurviewAppLocation,

python/packages/core/agent_framework/openai/_shared.py

@@ -46,9 +46,7 @@ RESPONSE_TYPE = Union[
 OPTION_TYPE = Union[ChatOptions, dict[str, Any]]
 
 
-__all__ = [
-    "OpenAISettings",
-]
+__all__ = ["OpenAISettings"]
 
 
 def _check_openai_version_for_callable_api_key() -> None:

python/packages/core/agent_framework/redis/__init__.py

@@ -3,20 +3,20 @@
 import importlib
 from typing import Any
 
-PACKAGE_NAME = "agent_framework_redis"
-PACKAGE_EXTRA = "redis"
+IMPORT_PATH = "agent_framework_redis"
+PACKAGE_NAME = "agent-framework-redis"
 _IMPORTS = ["__version__", "RedisProvider", "RedisChatMessageStore"]
 
 
 def __getattr__(name: str) -> Any:
     if name in _IMPORTS:
         try:
-            return getattr(importlib.import_module(PACKAGE_NAME), name)
+            return getattr(importlib.import_module(IMPORT_PATH), name)
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
-                f"The '{PACKAGE_EXTRA}' extra is not installed, please do `pip install agent-framework-{PACKAGE_EXTRA}`"
+                f"The '{PACKAGE_NAME}' package is not installed, please do `pip install {PACKAGE_NAME}`"
             ) from exc
-    raise AttributeError(f"Module {PACKAGE_NAME} has no attribute {name}.")
+    raise AttributeError(f"Module {IMPORT_PATH} has no attribute {name}.")
 
 
 def __dir__() -> list[str]:

python/packages/core/agent_framework/redis/__init__.pyi

@@ -1,5 +1,13 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-from agent_framework_redis import RedisChatMessageStore, RedisProvider, __version__
+from agent_framework_redis import (
+    RedisChatMessageStore,
+    RedisProvider,
+    __version__,
+)
 
-__all__ = ["RedisChatMessageStore", "RedisProvider", "__version__"]
+__all__ = [
+    "RedisChatMessageStore",
+    "RedisProvider",
+    "__version__",
+]

python/packages/core/pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
 all = [
     "agent-framework-a2a",
     "agent-framework-ag-ui",
-    "agent-framework-aisearch",
+    "agent-framework-azure-ai-search",
     "agent-framework-anthropic",
     "agent-framework-azure-ai",
     "agent-framework-azurefunctions",