Skip to content

Move all BaseHook usages to version_compat in HTTP #52814

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 2 commits into from
Jul 5, 2025
+9 −12
Merged

Move all BaseHook usages to version_compat in HTTP #52814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae77362
Move all BaseHook usages to version_compat in HTTP
sunank200 Jul 3, 2025
dc137c1
Merge branch 'main' into move-basehook-http
amoghrajesh Jul 5, 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/http/src/airflow/providers/http/hooks/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@

from airflow.exceptions import AirflowException
from airflow.providers.http.exceptions import HttpErrorException, HttpMethodException

try:
from airflow.sdk import BaseHook
except ImportError:
from airflow.hooks.base import BaseHook as BaseHook # type: ignore
from airflow.providers.http.version_compat import BaseHook

if TYPE_CHECKING:
from aiohttp.client_reqrep import ClientResponse
Expand Down
7 changes: 1 addition & 6 deletions 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 @@ -27,13 +27,8 @@

from airflow.configuration import conf
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.http.triggers.http import HttpTrigger, serialize_auth_type
from airflow.providers.http.version_compat import BaseOperator
from airflow.providers.http.version_compat import BaseHook, BaseOperator
from airflow.utils.helpers import merge_dicts

if TYPE_CHECKING:
Expand Down
8 changes: 7 additions & 1 deletion 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,11 +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 # type: ignore[no-redef]
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]

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