From c0edb91da6f5af03d9c9fa2af10921a3734914e3 Mon Sep 17 00:00:00 2001 From: Kaxil Naik Date: Mon, 30 Jun 2025 16:55:10 +0530 Subject: [PATCH] Provider Migration: Replace `BaseOperator` to Task SDK for `OpenAI` Part of #52378 --- .../providers/openai/operators/openai.py | 4 +- .../providers/openai/version_compat.py | 42 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 providers/openai/src/airflow/providers/openai/version_compat.py diff --git a/providers/openai/src/airflow/providers/openai/operators/openai.py b/providers/openai/src/airflow/providers/openai/operators/openai.py index 97356ad2f55c2..77bf82b665ef4 100644 --- a/providers/openai/src/airflow/providers/openai/operators/openai.py +++ b/providers/openai/src/airflow/providers/openai/operators/openai.py @@ -23,17 +23,17 @@ from typing import TYPE_CHECKING, Any, Literal from airflow.configuration import conf -from airflow.models import BaseOperator from airflow.providers.openai.exceptions import OpenAIBatchJobException from airflow.providers.openai.hooks.openai import OpenAIHook from airflow.providers.openai.triggers.openai import OpenAIBatchTrigger +from airflow.providers.openai.version_compat import BaseOperator if TYPE_CHECKING: try: from airflow.sdk.definitions.context import Context except ImportError: # TODO: Remove once provider drops support for Airflow 2 - from airflow.utils.context import Context + from airflow.utils.context import Context # type: ignore[no-redef] class OpenAIEmbeddingOperator(BaseOperator): diff --git a/providers/openai/src/airflow/providers/openai/version_compat.py b/providers/openai/src/airflow/providers/openai/version_compat.py new file mode 100644 index 0000000000000..4f8d5e32bca4a --- /dev/null +++ b/providers/openai/src/airflow/providers/openai/version_compat.py @@ -0,0 +1,42 @@ +# 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 # type: ignore[no-redef] + +__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator"]