Skip to content

Replace BaseHook to Task SDK for google #52809

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 6, 2025
Merged

Replace BaseHook to Task SDK for google #52809

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
8b1d232
Replace BaseHook to Task SDK for google
fweilun Jul 3, 2025
1d29790
Fix import order in version_compat.py
fweilun Jul 3, 2025
6552e61
Merge branch 'main' into migrate-google
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/google/src/airflow/providers/google/ads/hooks/ads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@

from airflow.exceptions import AirflowException
from airflow.providers.google.common.hooks.base_google import get_field

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

if TYPE_CHECKING:
from google.ads.googleads.v20.services.services.customer_service import CustomerServiceClient
Expand Down
6 changes: 1 addition & 5 deletions providers/google/src/airflow/providers/google/cloud/hooks/cloud_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@
GoogleBaseHook,
get_field,
)

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

if TYPE_CHECKING:
Expand Down
5 changes: 1 addition & 4 deletions providers/google/src/airflow/providers/google/cloud/hooks/dataprep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
from requests import HTTPError
from tenacity import retry, stop_after_attempt, wait_exponential

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


def _get_field(extras: dict, field_name: str) -> str | None:
Expand Down
6 changes: 1 addition & 5 deletions providers/google/src/airflow/providers/google/cloud/hooks/looker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@
from packaging.version import parse as parse_version

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.google.version_compat import BaseHook
from airflow.version import version

if TYPE_CHECKING:
Expand Down
6 changes: 1 addition & 5 deletions providers/google/src/airflow/providers/google/cloud/operators/cloud_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@
from airflow.providers.google.cloud.utils.field_validator import GcpBodyFieldValidator
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID, get_field
from airflow.providers.google.common.links.storage import FileDetailsLink

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

if TYPE_CHECKING:
from airflow.models import Connection
Expand Down
6 changes: 1 addition & 5 deletions providers/google/src/airflow/providers/google/common/hooks/base_google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@
_get_target_principal_and_delegates,
get_credentials_and_project_id,
)

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

if TYPE_CHECKING:
Expand Down
6 changes: 1 addition & 5 deletions providers/google/src/airflow/providers/google/leveldb/hooks/leveldb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
from typing import Any

from airflow.exceptions import AirflowException, AirflowOptionalProviderFeatureException

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

try:
import plyvel
Expand Down
7 changes: 6 additions & 1 deletion providers/google/src/airflow/providers/google/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
# BaseOperator: Use 3.1+ due to xcom_push method missing in SDK BaseOperator 3.0.x
# This is needed for DecoratedOperator compatibility
if AIRFLOW_V_3_1_PLUS:
from airflow.sdk import BaseOperator
from airflow.sdk import (
BaseHook,
BaseOperator,
)
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]
from airflow.models import BaseOperator

# Other SDK components: Available since 3.0+
Expand All @@ -57,6 +61,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
__all__ = [
"AIRFLOW_V_3_0_PLUS",
"AIRFLOW_V_3_1_PLUS",
"BaseHook",
"BaseOperator",
"BaseSensorOperator",
"BaseOperatorLink",
Expand Down