Reorganize compat files

Author: andystaples

azure-functions-durable/azure/durable_functions/__init__.py

@@ -9,14 +9,14 @@
 from .decorators.durable_app import Blueprint, DFApp
 from .client import DurableFunctionsClient
 from .orchestrator import Orchestrator
-from .retry_options import RetryOptions
-from .orchestration_runtime_status import OrchestrationRuntimeStatus
-from .durable_orchestration_status import DurableOrchestrationStatus
-from .purge_history_result import PurgeHistoryResult
-from .entity_state_response import EntityStateResponse
-from .entity_id import EntityId
-from .token_source import ManagedIdentityTokenSource, TokenSource
-from .compat_aliases import (
+from .internal.compat.retry_options import RetryOptions
+from .internal.compat.orchestration_runtime_status import OrchestrationRuntimeStatus
+from .internal.compat.durable_orchestration_status import DurableOrchestrationStatus
+from .internal.compat.purge_history_result import PurgeHistoryResult
+from .internal.compat.entity_state_response import EntityStateResponse
+from .internal.compat.entity_id import EntityId
+from .internal.compat.token_source import ManagedIdentityTokenSource, TokenSource
+from .internal.compat.compat_aliases import (
     DurableEntityContext,
     DurableOrchestrationClient,
     DurableOrchestrationContext,

azure-functions-durable/azure/durable_functions/client.py

@@ -18,10 +18,10 @@
 from .internal.azurefunctions_grpc_interceptor import AzureFunctionsAsyncDefaultClientInterceptorImpl
 from .internal.serialization import DEFAULT_FUNCTIONS_DATA_CONVERTER
 from .http import HttpManagementPayload
-from .durable_orchestration_status import DurableOrchestrationStatus
-from .entity_state_response import EntityStateResponse
-from .orchestration_runtime_status import OrchestrationRuntimeStatus, to_durabletask_statuses
-from .purge_history_result import PurgeHistoryResult
+from .internal.compat.durable_orchestration_status import DurableOrchestrationStatus
+from .internal.compat.entity_state_response import EntityStateResponse
+from .internal.compat.orchestration_runtime_status import OrchestrationRuntimeStatus, to_durabletask_statuses
+from .internal.compat.purge_history_result import PurgeHistoryResult
 
 
 # Client class used for Durable Functions

azure-functions-durable/azure/durable_functions/internal/compat/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""Backwards-compatibility shims for the v1 azure-functions-durable API.
+
+The public names defined here are re-exported from ``azure.durable_functions``;
+import them from there rather than from this internal package.
+"""

…zure/durable_functions/compat_aliases.py …ctions/internal/compat/compat_aliases.pyazure-functions-durable/azure/durable_functions/compat_aliases.py renamed to azure-functions-durable/azure/durable_functions/internal/compat/compat_aliases.py azure-functions-durable/azure/durable_functions/compat_aliases.py renamed to azure-functions-durable/azure/durable_functions/internal/compat/compat_aliases.py

@@ -8,7 +8,7 @@
 from durabletask.entities import EntityContext
 from durabletask.task import OrchestrationContext
 
-from .client import DurableFunctionsClient
+from ...client import DurableFunctionsClient
 from .token_source import TokenSource