From f25c099c9b516902cab1d0810d46a915b7fbab72 Mon Sep 17 00:00:00 2001 From: fweilun Date: Mon, 30 Jun 2025 22:39:30 +0800 Subject: [PATCH 1/3] Replace models.BaseOperator to Task SDK one for Apache Kylin --- .../apache/kylin/operators/kylin_cube.py | 1 + .../providers/apache/kylin/version_compat.py | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py index 01b98995802d4..61dbbfaae42de 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py @@ -27,6 +27,7 @@ from airflow.exceptions import AirflowException from airflow.models import BaseOperator from airflow.providers.apache.kylin.hooks.kylin import KylinHook +from airflow.providers.apache.kylin.version_compat import BaseOperator if TYPE_CHECKING: from airflow.utils.context import Context diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py new file mode 100644 index 0000000000000..7f5a27b934fe3 --- /dev/null +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# NOTE! THIS FILE IS COPIED MANUALLY IN OTHER PROVIDERS DELIBERATELY TO AVOID ADDING UNNECESSARY +# DEPENDENCIES BETWEEN PROVIDERS. IF YOU WANT TO ADD CONDITIONAL CODE IN YOUR PROVIDER THAT DEPENDS +# ON AIRFLOW VERSION, PLEASE COPY THIS FILE TO THE ROOT PACKAGE OF YOUR PROVIDER AND IMPORT +# THOSE CONSTANTS FROM IT RATHER THAN IMPORTING THEM FROM ANOTHER PROVIDER OR TEST CODE +# +from __future__ import annotations + + +def get_base_airflow_version_tuple() -> tuple[int, int, int]: + from packaging.version import Version + + from airflow import __version__ + + airflow_version = Version(__version__) + return airflow_version.major, airflow_version.minor, airflow_version.micro + + +AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0) + +if AIRFLOW_V_3_0_PLUS: + from airflow.sdk import BaseOperator +else: + from airflow.models import BaseOperator + +__all__ = [ + "AIRFLOW_V_3_0_PLUS", + "BaseOperator", +] \ No newline at end of file From 8ee168c1e2bde9f5dc4ce5c92d0f83a22c4a9d60 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Tue, 1 Jul 2025 00:14:19 +0530 Subject: [PATCH 2/3] Apply suggestions from code review --- .../src/airflow/providers/apache/kylin/version_compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py index 7f5a27b934fe3..df1b3e7037841 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/version_compat.py @@ -37,9 +37,9 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]: if AIRFLOW_V_3_0_PLUS: from airflow.sdk import BaseOperator else: - from airflow.models import BaseOperator + from airflow.models import BaseOperator # type: ignore[no-redef] __all__ = [ "AIRFLOW_V_3_0_PLUS", "BaseOperator", -] \ No newline at end of file +] From d5242f3189af4bb700ae4cd76b70684f878209b5 Mon Sep 17 00:00:00 2001 From: fweilun Date: Tue, 1 Jul 2025 11:52:27 +0800 Subject: [PATCH 3/3] remove deprecated import --- .../src/airflow/providers/apache/kylin/operators/kylin_cube.py | 1 - 1 file changed, 1 deletion(-) diff --git a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py index 61dbbfaae42de..7c2b317bffe7a 100644 --- a/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py +++ b/providers/apache/kylin/src/airflow/providers/apache/kylin/operators/kylin_cube.py @@ -25,7 +25,6 @@ from kylinpy import kylinpy from airflow.exceptions import AirflowException -from airflow.models import BaseOperator from airflow.providers.apache.kylin.hooks.kylin import KylinHook from airflow.providers.apache.kylin.version_compat import BaseOperator