From 5aec610cf9089539ca43d90ef097404309335277 Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Mon, 30 Jun 2025 10:48:44 +0300 Subject: [PATCH] Revert "Replace models.BaseOperator to Task SDK for http (#52506)" This reverts commit a9a7fcc5192946f0546f70053d6fd498de381f76. --- .../http/src/airflow/providers/http/operators/http.py | 2 +- .../http/src/airflow/providers/http/sensors/http.py | 7 ++++++- .../http/src/airflow/providers/http/version_compat.py | 9 --------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/providers/http/src/airflow/providers/http/operators/http.py b/providers/http/src/airflow/providers/http/operators/http.py index 6e6c48ea94a90..ca36ac471c7fd 100644 --- a/providers/http/src/airflow/providers/http/operators/http.py +++ b/providers/http/src/airflow/providers/http/operators/http.py @@ -28,8 +28,8 @@ from airflow.configuration import conf from airflow.exceptions import AirflowException from airflow.hooks.base import BaseHook +from airflow.models import BaseOperator from airflow.providers.http.triggers.http import HttpTrigger, serialize_auth_type -from airflow.providers.http.version_compat import BaseOperator from airflow.utils.helpers import merge_dicts if TYPE_CHECKING: diff --git a/providers/http/src/airflow/providers/http/sensors/http.py b/providers/http/src/airflow/providers/http/sensors/http.py index f395ab2bb8ca3..a9d9274afd109 100644 --- a/providers/http/src/airflow/providers/http/sensors/http.py +++ b/providers/http/src/airflow/providers/http/sensors/http.py @@ -25,7 +25,12 @@ from airflow.exceptions import AirflowException from airflow.providers.http.hooks.http import HttpHook from airflow.providers.http.triggers.http import HttpSensorTrigger -from airflow.providers.http.version_compat import AIRFLOW_V_3_0_PLUS, BaseSensorOperator +from airflow.providers.http.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] if TYPE_CHECKING: try: diff --git a/providers/http/src/airflow/providers/http/version_compat.py b/providers/http/src/airflow/providers/http/version_compat.py index a4c1cfadb6992..48d122b669696 100644 --- a/providers/http/src/airflow/providers/http/version_compat.py +++ b/providers/http/src/airflow/providers/http/version_compat.py @@ -33,12 +33,3 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0) - -if AIRFLOW_V_3_0_PLUS: - from airflow.sdk import BaseOperator - from airflow.sdk import BaseSensorOperator -else: - from airflow.models import BaseOperator - from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef] - -__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator", "BaseSensorOperator"]