Migrate alibaba provider to common.compat

providers/alibaba/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
     "oss2>=2.14.0",
     "alibabacloud_adb20211201>=1.0.0",
     "alibabacloud_tea_openapi>=0.3.7",
@@ -69,6 +70,7 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
 ]
 

providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/analyticdb_spark.py

@@ -34,7 +34,7 @@
 from alibabacloud_tea_openapi.models import Config
 
 from airflow.exceptions import AirflowException
-from airflow.providers.alibaba.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 

providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/base_alibaba.py

@@ -18,7 +18,7 @@
 
 from typing import Any, NamedTuple
 
-from airflow.providers.alibaba.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 
 class AccessKeyCredentials(NamedTuple):

providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py

@@ -27,13 +27,10 @@
 from oss2.exceptions import ClientError
 
 from airflow.exceptions import AirflowException
-from airflow.providers.alibaba.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 if TYPE_CHECKING:
-    try:
-        from airflow.sdk import Connection
-    except ImportError:
-        from airflow.models.connection import Connection  # type: ignore[assignment]
+    from airflow.providers.common.compat.sdk import Connection
 
 T = TypeVar("T", bound=Callable)
 

providers/alibaba/src/airflow/providers/alibaba/cloud/links/maxcompute.py

@@ -18,20 +18,13 @@
 
 from typing import TYPE_CHECKING
 
-from airflow.providers.alibaba.version_compat import AIRFLOW_V_3_0_PLUS
+from airflow.providers.common.compat.sdk import BaseOperatorLink, XCom
 
 if TYPE_CHECKING:
     from airflow.models.taskinstancekey import TaskInstanceKey
-    from airflow.providers.alibaba.version_compat import BaseOperator
+    from airflow.providers.common.compat.sdk import BaseOperator
     from airflow.utils.context import Context
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-    from airflow.models.xcom import XCom  # type: ignore[no-redef]
-
 
 class MaxComputeLogViewLink(BaseOperatorLink):
     """Helper class for constructing MaxCompute Log View Link."""

providers/alibaba/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py

@@ -24,7 +24,7 @@
 
 from airflow.exceptions import AirflowException
 from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState
-from airflow.providers.alibaba.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/alibaba/src/airflow/providers/alibaba/cloud/operators/maxcompute.py

@@ -24,7 +24,7 @@
 
 from airflow.providers.alibaba.cloud.hooks.maxcompute import MaxComputeHook
 from airflow.providers.alibaba.cloud.links.maxcompute import MaxComputeLogViewLink
-from airflow.providers.alibaba.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 
 if TYPE_CHECKING:
     from odps.models import Instance

providers/alibaba/src/airflow/providers/alibaba/cloud/operators/oss.py

@@ -22,7 +22,7 @@
 from typing import TYPE_CHECKING
 
 from airflow.providers.alibaba.cloud.hooks.oss import OSSHook
-from airflow.providers.alibaba.version_compat import BaseOperator
+from airflow.providers.common.compat.sdk import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/alibaba/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py

@@ -22,7 +22,7 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.providers.alibaba.cloud.hooks.analyticdb_spark import AnalyticDBSparkHook, AppState
-from airflow.providers.alibaba.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/alibaba/src/airflow/providers/alibaba/cloud/sensors/oss_key.py

@@ -26,7 +26,7 @@
 
 from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
 from airflow.providers.alibaba.cloud.hooks.oss import OSSHook
-from airflow.providers.alibaba.version_compat import BaseSensorOperator
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context

providers/alibaba/src/airflow/providers/alibaba/version_compat.py

@@ -35,15 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator, BaseSensorOperator
-else:
-    from airflow.models import BaseOperator
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator", "BaseSensorOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]