Migrate microsoft providers to common.compat

providers/microsoft/azure/pyproject.toml

@@ -58,6 +58,7 @@ requires-python = ">=3.10"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.7.4",  # + TODO: bump to next version
     "adlfs>=2023.10.0",
     "azure-batch>=8.0.0",
     "azure-cosmos>=4.6.0",

providers/microsoft/azure/src/airflow/providers/microsoft/azure/fs/adls.py

@@ -20,8 +20,8 @@
 
 from azure.identity import ClientSecretCredential
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import get_field, parse_blob_account_url
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from fsspec import AbstractFileSystem

providers/microsoft/azure/src/airflow/providers/microsoft/azure/fs/msgraph.py

@@ -19,8 +19,8 @@
 
 from typing import TYPE_CHECKING, Any
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import get_field
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from fsspec import AbstractFileSystem

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/adx.py

@@ -34,11 +34,11 @@
 from azure.kusto.data.exceptions import KustoServiceError
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from azure.kusto.data.response import KustoResponseDataSet

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/asb.py

@@ -37,12 +37,12 @@
     SubscriptionProperties,
 )
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     import datetime

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/base_azure.py

@@ -23,12 +23,12 @@
 from azure.identity import ClientSecretCredential, DefaultAzureCredential
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     AzureIdentityCredentialAdapter,
     add_managed_identity_connection_widgets,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from azure.core.credentials import AccessToken

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/batch.py

@@ -25,12 +25,12 @@
 from azure.batch import BatchServiceClient, batch_auth, models as batch_models
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     AzureIdentityCredentialAdapter,
     add_managed_identity_connection_widgets,
     get_field,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 from airflow.utils import timezone
 
 if TYPE_CHECKING:

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/container_registry.py

@@ -25,12 +25,12 @@
 from azure.mgmt.containerinstance.models import ImageRegistryCredential
 from azure.mgmt.containerregistry import ContainerRegistryManagementClient
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 
 class AzureContainerRegistryHook(BaseHook):

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/container_volume.py

@@ -21,12 +21,12 @@
 from azure.mgmt.containerinstance.models import AzureFileVolume, Volume
 from azure.mgmt.storage import StorageManagementClient
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 
 class AzureContainerVolumeHook(BaseHook):

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/cosmos.py

@@ -36,12 +36,12 @@
 from azure.mgmt.cosmosdb import CosmosDBManagementClient
 
 from airflow.exceptions import AirflowBadRequest, AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     PartitionKeyType = str | list[str]

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_factory.py

@@ -49,12 +49,12 @@
 from azure.mgmt.datafactory.aio import DataFactoryManagementClient as AsyncDataFactoryManagementClient
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_async_default_azure_credential,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from azure.core.polling import LROPoller

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/data_lake.py

@@ -33,13 +33,13 @@
 )
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     AzureIdentityCredentialAdapter,
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 Credentials = ClientSecretCredential | AzureIdentityCredentialAdapter | DefaultAzureCredential
 

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/fileshare.py

@@ -21,11 +21,11 @@
 
 from azure.storage.fileshare import FileProperties, ShareDirectoryClient, ShareFileClient, ShareServiceClient
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 
 class AzureFileShareHook(BaseHook):

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/msgraph.py

@@ -53,15 +53,15 @@
     AirflowNotFoundException,
     AirflowProviderDeprecationWarning,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 if TYPE_CHECKING:
     from azure.identity._internal.client_credential_base import ClientCredentialBase
     from kiota_abstractions.request_adapter import RequestAdapter
     from kiota_abstractions.response_handler import NativeResponseType
     from kiota_abstractions.serialization import ParsableFactory
 
-    from airflow.providers.microsoft.azure.version_compat import Connection
+    from airflow.providers.common.compat.sdk import Connection
 
 
 class DefaultResponseHandler(ResponseHandler):

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/synapse.py

@@ -25,12 +25,12 @@
 from azure.synapse.spark import SparkClient
 
 from airflow.exceptions import AirflowException, AirflowTaskTimeout
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_field,
     get_sync_default_azure_credential,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from azure.synapse.artifacts.models import CreateRunResponse, PipelineRun

providers/microsoft/azure/src/airflow/providers/microsoft/azure/hooks/wasb.py

@@ -45,13 +45,13 @@
 )
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.microsoft.azure.utils import (
     add_managed_identity_connection_widgets,
     get_async_default_azure_credential,
     get_sync_default_azure_credential,
     parse_blob_account_url,
 )
-from airflow.providers.microsoft.azure.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from azure.core.credentials import TokenCredential

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/adls.py

@@ -19,8 +19,8 @@
 from collections.abc import Iterable, Sequence
 from typing import IO, TYPE_CHECKING, Any, AnyStr
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.data_lake import AzureDataLakeHook, AzureDataLakeStorageV2Hook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/adx.py

@@ -24,8 +24,8 @@
 from typing import TYPE_CHECKING
 
 from airflow.configuration import conf
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.adx import AzureDataExplorerHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from azure.kusto.data._models import KustoResultTable

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/asb.py

@@ -20,8 +20,8 @@
 from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.asb import AdminClientHook, MessageHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     import datetime

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/batch.py

@@ -24,8 +24,8 @@
 from azure.batch import models as batch_models
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.batch import AzureBatchHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/container_instances.py

@@ -40,10 +40,10 @@
 from msrestazure.azure_exceptions import CloudError
 
 from airflow.exceptions import AirflowException, AirflowTaskTimeout
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.container_instance import AzureContainerInstanceHook
 from airflow.providers.microsoft.azure.hooks.container_registry import AzureContainerRegistryHook
 from airflow.providers.microsoft.azure.hooks.container_volume import AzureContainerVolumeHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/cosmos.py

@@ -20,8 +20,8 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.cosmos import AzureCosmosDBHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/data_factory.py

@@ -24,32 +24,20 @@
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook, BaseOperator, BaseOperatorLink, XCom
 from airflow.providers.microsoft.azure.hooks.data_factory import (
     AzureDataFactoryHook,
     AzureDataFactoryPipelineRunException,
     AzureDataFactoryPipelineRunStatus,
     get_field,
 )
 from airflow.providers.microsoft.azure.triggers.data_factory import AzureDataFactoryTrigger
-from airflow.providers.microsoft.azure.version_compat import (
-    BaseHook,
-    BaseOperator,
-)
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
     from airflow.models.taskinstancekey import TaskInstanceKey
     from airflow.utils.context import Context
 
-from airflow.providers.microsoft.azure.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import XCom
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-
 
 class AzureDataFactoryPipelineRunLink(LoggingMixin, BaseOperatorLink):
     """Construct a link to monitor a pipeline run in Azure Data Factory."""

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/msgraph.py

@@ -27,12 +27,12 @@
 )
 
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning, TaskDeferred
+from airflow.providers.common.compat.sdk import XCOM_RETURN_KEY, BaseOperator
 from airflow.providers.microsoft.azure.hooks.msgraph import KiotaRequestAdapterHook
 from airflow.providers.microsoft.azure.triggers.msgraph import (
     MSGraphTrigger,
     ResponseSerializer,
 )
-from airflow.providers.microsoft.azure.version_compat import XCOM_RETURN_KEY, BaseOperator
 
 if TYPE_CHECKING:
     from io import BytesIO

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py

@@ -21,16 +21,13 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator, BaseOperatorLink
 from airflow.providers.microsoft.azure.hooks.powerbi import PowerBIHook
 from airflow.providers.microsoft.azure.triggers.powerbi import (
     PowerBIDatasetListTrigger,
     PowerBITrigger,
     PowerBIWorkspaceListTrigger,
 )
-from airflow.providers.microsoft.azure.version_compat import (
-    BaseOperator,
-    BaseOperatorLink,
-)
 
 if TYPE_CHECKING:
     from msgraph_core import APIVersion

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/synapse.py

@@ -22,33 +22,21 @@
 from urllib.parse import urlencode
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook, BaseOperator, BaseOperatorLink, XCom
 from airflow.providers.microsoft.azure.hooks.synapse import (
     AzureSynapseHook,
     AzureSynapsePipelineHook,
     AzureSynapsePipelineRunException,
     AzureSynapsePipelineRunStatus,
     AzureSynapseSparkBatchRunStatus,
 )
-from airflow.providers.microsoft.azure.version_compat import (
-    BaseHook,
-    BaseOperator,
-)
 
 if TYPE_CHECKING:
     from azure.synapse.spark.models import SparkBatchJobOptions
 
     from airflow.models.taskinstancekey import TaskInstanceKey
     from airflow.utils.context import Context
 
-from airflow.providers.microsoft.azure.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import XCom
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-
 
 class AzureSynapseRunSparkBatchOperator(BaseOperator):
     """

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/wasb_delete_blob.py

@@ -20,8 +20,8 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.microsoft.azure.hooks.wasb import WasbHook
-from airflow.providers.microsoft.azure.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context