This is an automated email from the ASF dual-hosted git repository.
amoghdesai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new f78f82956d5 Move all BaseHook usages to version_compat in gRPC (#52811)
f78f82956d5 is described below
commit f78f82956d59743e63f5c2f90025cc77e0e68b73
Author: Ankit Chaurasia <[email protected]>
AuthorDate: Fri Jul 4 15:29:40 2025 +0545
Move all BaseHook usages to version_compat in gRPC (#52811)
Part of https://github.com/apache/airflow/issues/52676
---
providers/grpc/src/airflow/providers/grpc/hooks/grpc.py | 6 +-----
providers/grpc/src/airflow/providers/grpc/version_compat.py | 8 +++++++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/providers/grpc/src/airflow/providers/grpc/hooks/grpc.py
b/providers/grpc/src/airflow/providers/grpc/hooks/grpc.py
index 7395fcd2a42..2cb1fc93b62 100644
--- a/providers/grpc/src/airflow/providers/grpc/hooks/grpc.py
+++ b/providers/grpc/src/airflow/providers/grpc/hooks/grpc.py
@@ -30,11 +30,7 @@ from google.auth.transport import (
)
from airflow.exceptions import AirflowConfigException
-
-try:
- from airflow.sdk import BaseHook
-except ImportError:
- from airflow.hooks.base import BaseHook # type:
ignore[attr-defined,no-redef]
+from airflow.providers.grpc.version_compat import BaseHook
class GrpcHook(BaseHook):
diff --git a/providers/grpc/src/airflow/providers/grpc/version_compat.py
b/providers/grpc/src/airflow/providers/grpc/version_compat.py
index ab721554141..c98ecb412aa 100644
--- a/providers/grpc/src/airflow/providers/grpc/version_compat.py
+++ b/providers/grpc/src/airflow/providers/grpc/version_compat.py
@@ -28,10 +28,16 @@ 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
else:
from airflow.models import BaseOperator # type: ignore[no-redef]
-__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook",
"BaseOperator"]
