Python: Fix imports for durabletask package

python/packages/azurefunctions/agent_framework_azurefunctions/__init__.py

@@ -2,8 +2,6 @@
 
 import importlib.metadata
 
-from agent_framework_durabletask import AgentCallbackContext, AgentResponseCallbackProtocol, DurableAIAgent
-
 from ._app import AgentFunctionApp
 
 try:
@@ -12,9 +10,6 @@
     __version__ = "0.0.0"  # Fallback for development mode
 
 __all__ = [
-    "AgentCallbackContext",
     "AgentFunctionApp",
-    "AgentResponseCallbackProtocol",
-    "DurableAIAgent",
     "__version__",
 ]

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

@@ -4,9 +4,9 @@
 from typing import Any
 
 _IMPORTS: dict[str, tuple[str, str]] = {
-    "AgentCallbackContext": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "AgentCallbackContext": ("agent_framework_durabletask", "agent-framework-durabletask"),
     "AgentFunctionApp": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
-    "AgentResponseCallbackProtocol": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "AgentResponseCallbackProtocol": ("agent_framework_durabletask", "agent-framework-durabletask"),
     "AzureAIAgentClient": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
     "AzureAIAgentOptions": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
     "AzureAIClient": ("agent_framework_azure_ai", "agent-framework-azure-ai"),
@@ -23,7 +23,10 @@
     "AzureOpenAIResponsesOptions": ("agent_framework.azure._responses_client", "agent-framework-core"),
     "AzureOpenAISettings": ("agent_framework.azure._shared", "agent-framework-core"),
     "AzureUserSecurityContext": ("agent_framework.azure._chat_client", "agent-framework-core"),
-    "DurableAIAgent": ("agent_framework_azurefunctions", "agent-framework-azurefunctions"),
+    "DurableAIAgent": ("agent_framework_durabletask", "agent-framework-durabletask"),
+    "DurableAIAgentClient": ("agent_framework_durabletask", "agent-framework-durabletask"),
+    "DurableAIAgentOrchestrationContext": ("agent_framework_durabletask", "agent-framework-durabletask"),
+    "DurableAIAgentWorker": ("agent_framework_durabletask", "agent-framework-durabletask"),
     "get_entra_auth_token": ("agent_framework.azure._entra_id_authentication", "agent-framework-core"),
 }
 

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

@@ -8,11 +8,14 @@ from agent_framework_azure_ai import (
     AzureAISettings,
 )
 from agent_framework_azure_ai_search import AzureAISearchContextProvider, AzureAISearchSettings
-from agent_framework_azurefunctions import (
+from agent_framework_azurefunctions import AgentFunctionApp
+from agent_framework_durabletask import (
     AgentCallbackContext,
-    AgentFunctionApp,
     AgentResponseCallbackProtocol,
     DurableAIAgent,
+    DurableAIAgentClient,
+    DurableAIAgentOrchestrationContext,
+    DurableAIAgentWorker,
 )
 
 from agent_framework.azure._assistants_client import AzureOpenAIAssistantsClient
@@ -37,5 +40,8 @@ __all__ = [
     "AzureOpenAIResponsesClient",
     "AzureOpenAISettings",
     "DurableAIAgent",
+    "DurableAIAgentClient",
+    "DurableAIAgentOrchestrationContext",
+    "DurableAIAgentWorker",
     "get_entra_auth_token",
 ]

python/packages/durabletask/README.md

@@ -16,7 +16,7 @@ The durable task integration lets you host Microsoft Agent Framework agents usin
 
 ```python
 from durabletask import TaskHubGrpcWorker
-from agent_framework_durabletask import AgentWorker
+from agent_framework.azure import DurableAIAgentWorker
 
 # Create the worker
 with DurableTaskSchedulerWorker(...) as worker:

python/packages/durabletask/agent_framework_durabletask/__init__.py

@@ -2,6 +2,8 @@
 
 """Durable Task integration for Microsoft Agent Framework."""
 
+import importlib.metadata
+
 from ._callbacks import AgentCallbackContext, AgentResponseCallbackProtocol
 from ._client import DurableAIAgentClient
 from ._constants import (
@@ -49,6 +51,11 @@
 from ._shim import DurableAIAgent
 from ._worker import DurableAIAgentWorker
 
+try:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0"  # Fallback for development mode
+
 __all__ = [
     "DEFAULT_MAX_POLL_RETRIES",
     "DEFAULT_POLL_INTERVAL_SECONDS",
@@ -96,6 +103,7 @@
     "DurableAgentThread",
     "DurableStateFields",
     "RunRequest",
+    "__version__",
     "ensure_response_format",
     "load_agent_response",
 ]

python/packages/durabletask/agent_framework_durabletask/_client.py

@@ -27,7 +27,7 @@ class DurableAIAgentClient(DurableAgentProvider[AgentResponse]):
     Example:
         ```python
         from durabletask import TaskHubGrpcClient
-        from agent_framework_durabletask import DurableAIAgentClient
+        from agent_framework.azure import DurableAIAgentClient
 
         # Create the underlying client
         client = TaskHubGrpcClient(host_address="localhost:4001")

python/packages/durabletask/agent_framework_durabletask/_orchestration_context.py

@@ -27,7 +27,7 @@ class DurableAIAgentOrchestrationContext(DurableAgentProvider[DurableAgentTask])
     Example:
         ```python
         from durabletask import Orchestration
-        from agent_framework_durabletask import DurableAIAgentOrchestrationContext
+        from agent_framework.azure import DurableAIAgentOrchestrationContext
 
 
         def my_orchestration(context: OrchestrationContext):

python/packages/durabletask/agent_framework_durabletask/_worker.py

@@ -30,7 +30,7 @@ class DurableAIAgentWorker:
         ```python
         from durabletask import TaskHubGrpcWorker
         from agent_framework import ChatAgent
-        from agent_framework_durabletask import DurableAIAgentWorker
+        from agent_framework.azure import DurableAIAgentWorker
 
         # Create the underlying worker
         worker = TaskHubGrpcWorker(host_address="localhost:4001")

python/samples/getting_started/durabletask/01_single_agent/client.py

@@ -14,7 +14,7 @@
 import logging
 import os
 
-from agent_framework_durabletask import DurableAIAgentClient
+from agent_framework.azure import DurableAIAgentClient
 from azure.identity import DefaultAzureCredential
 from durabletask.azuremanaged.client import DurableTaskSchedulerClient
 

python/samples/getting_started/durabletask/01_single_agent/worker.py

@@ -13,8 +13,7 @@
 import logging
 import os
 
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker
 

python/samples/getting_started/durabletask/02_multi_agent/client.py

@@ -15,7 +15,7 @@
 import logging
 import os
 
-from agent_framework_durabletask import DurableAIAgentClient
+from agent_framework.azure import DurableAIAgentClient
 from azure.identity import DefaultAzureCredential
 from durabletask.azuremanaged.client import DurableTaskSchedulerClient
 

python/samples/getting_started/durabletask/02_multi_agent/worker.py

@@ -15,8 +15,7 @@
 import os
 from typing import Any
 
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker
 

python/samples/getting_started/durabletask/03_single_agent_streaming/client.py

@@ -20,7 +20,7 @@
 from datetime import timedelta
 
 import redis.asyncio as aioredis
-from agent_framework_durabletask import DurableAIAgentClient
+from agent_framework.azure import DurableAIAgentClient
 from azure.identity import DefaultAzureCredential
 from durabletask.azuremanaged.client import DurableTaskSchedulerClient
 

python/samples/getting_started/durabletask/03_single_agent_streaming/worker.py

@@ -19,8 +19,12 @@
 
 import redis.asyncio as aioredis
 from agent_framework import AgentResponseUpdate
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import AgentCallbackContext, AgentResponseCallbackProtocol, DurableAIAgentWorker
+from agent_framework.azure import (
+    AgentCallbackContext,
+    AgentResponseCallbackProtocol,
+    AzureOpenAIChatClient,
+    DurableAIAgentWorker,
+)
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker
 

python/samples/getting_started/durabletask/04_single_agent_orchestration_chaining/worker.py

@@ -16,8 +16,7 @@
 import os
 
 from agent_framework import AgentResponse
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentOrchestrationContext, DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentOrchestrationContext, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.task import OrchestrationContext, Task
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker

python/samples/getting_started/durabletask/05_multi_agent_orchestration_concurrency/worker.py

@@ -17,8 +17,7 @@
 from typing import Any
 
 from agent_framework import AgentResponse
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentOrchestrationContext, DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentOrchestrationContext, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.task import OrchestrationContext, when_all, Task
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker

python/samples/getting_started/durabletask/06_multi_agent_orchestration_conditionals/worker.py

@@ -17,8 +17,7 @@
 from typing import Any, cast
 
 from agent_framework import AgentResponse
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentOrchestrationContext, DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentOrchestrationContext, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.task import ActivityContext, OrchestrationContext, Task
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker

python/samples/getting_started/durabletask/07_single_agent_orchestration_hitl/worker.py

@@ -18,8 +18,7 @@
 from typing import Any, cast
 
 from agent_framework import AgentResponse
-from agent_framework.azure import AzureOpenAIChatClient
-from agent_framework_durabletask import DurableAIAgentOrchestrationContext, DurableAIAgentWorker
+from agent_framework.azure import AzureOpenAIChatClient, DurableAIAgentOrchestrationContext, DurableAIAgentWorker
 from azure.identity import AzureCliCredential, DefaultAzureCredential
 from durabletask.task import ActivityContext, OrchestrationContext, Task, when_any  # type: ignore
 from durabletask.azuremanaged.worker import DurableTaskSchedulerWorker