Skip to content

Move Base imports to version_compat for Alibaba provider Airflow 3.0 compatibility #52777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amoghrajesh merged 3 commits into from
Jul 7, 2025
Merged

Move Base imports to version_compat for Alibaba provider Airflow 3.0 compatibility #52777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f867d17
Move BaseHook, BaseOperator, and BaseSensorOperator imports to versio…
sunank200 Jul 3, 2025
254792b
Fix PR comments
sunank200 Jul 7, 2025
dd33ba4
Merge branch 'main' into move-basehook-alibaba
amoghrajesh Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/analyticdb_spark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
from alibabacloud_tea_openapi.models import Config

from airflow.exceptions import AirflowException

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.alibaba.version_compat import BaseHook
from airflow.utils.log.logging_mixin import LoggingMixin


Expand Down
5 changes: 1 addition & 4 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/base_alibaba.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@

from typing import Any, NamedTuple

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.alibaba.version_compat import BaseHook


class AccessKeyCredentials(NamedTuple):
Expand Down
6 changes: 1 addition & 5 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/hooks/oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
from oss2.exceptions import ClientError

from airflow.exceptions import AirflowException

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.providers.alibaba.version_compat import BaseHook

if TYPE_CHECKING:
try:
Expand Down
2 changes: 1 addition & 1 deletion providers/alibaba/src/airflow/providers/alibaba/cloud/links/maxcompute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from airflow.providers.alibaba.version_compat import AIRFLOW_V_3_0_PLUS

if TYPE_CHECKING:
from airflow.models import BaseOperator
from airflow.models.taskinstancekey import TaskInstanceKey
from airflow.providers.alibaba.version_compat import BaseOperator
from airflow.utils.context import Context

if AIRFLOW_V_3_0_PLUS:
Expand Down
7 changes: 1 addition & 6 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/operators/analyticdb_spark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +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 AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator
else:
from airflow.models import BaseOperator
from airflow.providers.alibaba.version_compat import BaseOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
Expand Down
7 changes: 1 addition & 6 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/operators/maxcompute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +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 AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator
else:
from airflow.models import BaseOperator
from airflow.providers.alibaba.version_compat import BaseOperator

if TYPE_CHECKING:
from odps.models import Instance
Expand Down
7 changes: 1 addition & 6 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/operators/oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@
from typing import TYPE_CHECKING

from airflow.providers.alibaba.cloud.hooks.oss import OSSHook
from airflow.providers.alibaba.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator
else:
from airflow.models import BaseOperator
from airflow.providers.alibaba.version_compat import BaseOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
Expand Down
7 changes: 1 addition & 6 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/sensors/analyticdb_spark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +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 AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseSensorOperator
else:
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]
from airflow.providers.alibaba.version_compat import BaseSensorOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
Expand Down
7 changes: 1 addition & 6 deletions providers/alibaba/src/airflow/providers/alibaba/cloud/sensors/oss_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@

from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning
from airflow.providers.alibaba.cloud.hooks.oss import OSSHook
from airflow.providers.alibaba.version_compat import AIRFLOW_V_3_0_PLUS

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseSensorOperator
else:
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]
from airflow.providers.alibaba.version_compat import BaseSensorOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
Expand Down
14 changes: 14 additions & 0 deletions providers/alibaba/src/airflow/providers/alibaba/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,17 @@ 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[attr-defined,no-redef]

__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator", "BaseSensorOperator"]