Skip to content

Provider Migration: Replace BaseOperator to Task SDK for apache/http #52528

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
kaxil merged 1 commit into from
Jun 30, 2025
Merged

Provider Migration: Replace BaseOperator to Task SDK for apache/http #52528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion providers/http/src/airflow/providers/http/operators/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 1 addition & 6 deletions providers/http/src/airflow/providers/http/sensors/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@
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

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.http.version_compat import AIRFLOW_V_3_0_PLUS, BaseSensorOperator

if TYPE_CHECKING:
try:
Expand Down
8 changes: 8 additions & 0 deletions providers/http/src/airflow/providers/http/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ 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, BaseSensorOperator
else:
from airflow.models import BaseOperator # type: ignore[no-redef]
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]

__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator", "BaseSensorOperator"]
15 changes: 4 additions & 11 deletions providers/http/tests/unit/http/sensors/test_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,6 @@ def mount(self, prefix, adapter):


class TestHttpOpSensor:
def setup_method(self):
args = {"owner": "airflow", "start_date": DEFAULT_DATE_ISO}
dag = DAG(TEST_DAG_ID, schedule=None, default_args=args)
self.dag = dag

@mock.patch("airflow.providers.http.hooks.http.Session", FakeSession)
def test_get(self):
op = HttpOperator(
Expand All @@ -299,9 +294,8 @@ def test_get(self):
endpoint="/search",
data={"client": "ubuntu", "q": "airflow"},
headers={},
dag=self.dag,
)
op.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)
op.execute({})

@mock.patch("airflow.providers.http.hooks.http.Session", FakeSession)
def test_get_response_check(self):
Expand All @@ -312,9 +306,8 @@ def test_get_response_check(self):
data={"client": "ubuntu", "q": "airflow"},
response_check=lambda response: ("apache/airflow" in response.text),
headers={},
dag=self.dag,
)
op.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)
op.execute({})

@pytest.mark.skipif(not AIRFLOW_V_3_0_PLUS, reason="Test only for Airflow 3.0+")
@mock.patch("airflow.providers.http.hooks.http.Session", FakeSession)
Expand All @@ -328,13 +321,13 @@ def test_sensor(self, run_task):
response_check=lambda response: f"apache/airflow/{DEFAULT_DATE:%Y-%m-%d}" in response.text,
poke_interval=5,
timeout=15,
dag=self.dag,
)
run_task(sensor)

@pytest.mark.skipif(AIRFLOW_V_3_0_PLUS, reason="Test only for Airflow < 3.0")
@mock.patch("airflow.providers.http.hooks.http.Session", FakeSession)
def test_sensor_af2(self):
dag = DAG(TEST_DAG_ID, schedule=None)
sensor = HttpSensor(
task_id="http_sensor_check",
http_conn_id="http_default",
Expand All @@ -344,7 +337,7 @@ def test_sensor_af2(self):
response_check=lambda response: f"apache/airflow/{DEFAULT_DATE:%Y-%m-%d}" in response.text,
poke_interval=5,
timeout=15,
dag=self.dag,
dag=dag,
)
sensor.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)

Expand Down