From 85551307f131b3c0996e0ddeb7497c76e3e247e4 Mon Sep 17 00:00:00 2001 From: Yuseok Jo Date: Tue, 24 Mar 2026 20:24:09 +0900 Subject: [PATCH 1/2] Compat sdk conf follow-up for multiple providers --- providers/amazon/pyproject.toml | 2 +- .../amazon/aws/executors/batch/test_batch_executor.py | 3 +-- providers/common/ai/pyproject.toml | 2 +- .../ai/src/airflow/providers/common/ai/operators/agent.py | 3 +-- .../airflow/providers/common/ai/plugins/hitl_review.py | 2 +- providers/keycloak/pyproject.toml | 2 +- .../keycloak/auth_manager/keycloak_auth_manager.py | 7 +------ providers/microsoft/azure/pyproject.toml | 2 +- .../providers/microsoft/azure/operators/powerbi.py | 8 ++++++-- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/providers/amazon/pyproject.toml b/providers/amazon/pyproject.toml index dfad518ecbbe1..214b80ebab8af 100644 --- a/providers/amazon/pyproject.toml +++ b/providers/amazon/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.13.0", + "apache-airflow-providers-common-compat>=1.13.0", # use next version "apache-airflow-providers-common-sql>=1.32.0", "apache-airflow-providers-http", # We should update minimum version of boto3 and here regularly to avoid `pip` backtracking with the number diff --git a/providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py b/providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py index ed767fea187dd..0e7238945973f 100644 --- a/providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py +++ b/providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py @@ -28,7 +28,6 @@ from botocore.exceptions import ClientError, NoCredentialsError from semver import VersionInfo -from airflow.configuration import conf from airflow.executors.base_executor import BaseExecutor from airflow.models import TaskInstance from airflow.models.taskinstancekey import TaskInstanceKey @@ -43,7 +42,7 @@ CONFIG_GROUP_NAME, AllBatchConfigKeys, ) -from airflow.providers.common.compat.sdk import AirflowException +from airflow.providers.common.compat.sdk import AirflowException, conf from airflow.utils.helpers import convert_camel_to_snake from airflow.utils.state import State from airflow.version import version as airflow_version_str diff --git a/providers/common/ai/pyproject.toml b/providers/common/ai/pyproject.toml index 203497e401dd3..f984da1c5a28c 100644 --- a/providers/common/ai/pyproject.toml +++ b/providers/common/ai/pyproject.toml @@ -67,7 +67,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=3.0.0", - "apache-airflow-providers-common-compat>=1.14.1", + "apache-airflow-providers-common-compat>=1.14.1", # use next version "apache-airflow-providers-standard>=1.12.1", "pydantic-ai-slim>=1.14.0", ] diff --git a/providers/common/ai/src/airflow/providers/common/ai/operators/agent.py b/providers/common/ai/src/airflow/providers/common/ai/operators/agent.py index da8ecafc1c562..4278e02fbe14b 100644 --- a/providers/common/ai/src/airflow/providers/common/ai/operators/agent.py +++ b/providers/common/ai/src/airflow/providers/common/ai/operators/agent.py @@ -33,6 +33,7 @@ AirflowOptionalProviderFeatureException, BaseOperator, BaseOperatorLink, + conf, ) from airflow.providers.common.compat.version_compat import AIRFLOW_V_3_1_PLUS @@ -65,8 +66,6 @@ def get_link( return "" from urllib.parse import urlparse - from airflow.configuration import conf - base_url = conf.get("api", "base_url", fallback="/") if base_url.startswith(("http://", "https://")): base_path = urlparse(base_url).path.rstrip("/") diff --git a/providers/common/ai/src/airflow/providers/common/ai/plugins/hitl_review.py b/providers/common/ai/src/airflow/providers/common/ai/plugins/hitl_review.py index 773dcd2c86d2d..02d43c511f9d7 100644 --- a/providers/common/ai/src/airflow/providers/common/ai/plugins/hitl_review.py +++ b/providers/common/ai/src/airflow/providers/common/ai/plugins/hitl_review.py @@ -31,7 +31,6 @@ from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity from airflow.api_fastapi.core_api.security import requires_access_dag -from airflow.configuration import conf from airflow.models.taskinstance import TaskInstance as TI from airflow.models.xcom import XComModel from airflow.plugins_manager import AirflowPlugin @@ -46,6 +45,7 @@ HumanFeedbackRequest, SessionStatus, ) +from airflow.providers.common.compat.sdk import conf from airflow.utils.session import create_session from airflow.utils.state import TaskInstanceState diff --git a/providers/keycloak/pyproject.toml b/providers/keycloak/pyproject.toml index 56a709bf6addf..9e67a833d507d 100644 --- a/providers/keycloak/pyproject.toml +++ b/providers/keycloak/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=3.0.0", - "apache-airflow-providers-common-compat>=1.12.0", + "apache-airflow-providers-common-compat>=1.12.0", # use next version "python-keycloak>=5.0.0", ] diff --git a/providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py b/providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py index 9844873c031a6..a8cd683ef46ba 100644 --- a/providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py +++ b/providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py @@ -43,12 +43,7 @@ from airflow.api_fastapi.common.types import MenuItem from airflow.cli.cli_config import CLICommand - -try: - from airflow.providers.common.compat.sdk import AirflowException, conf -except ModuleNotFoundError: - from airflow.configuration import conf - from airflow.exceptions import AirflowException +from airflow.providers.common.compat.sdk import AirflowException, conf from airflow.providers.keycloak.auth_manager.cache import single_flight from airflow.providers.keycloak.auth_manager.constants import ( CONF_CLIENT_ID_KEY, diff --git a/providers/microsoft/azure/pyproject.toml b/providers/microsoft/azure/pyproject.toml index c98b5e4ed5d00..07e9b43fe37ca 100644 --- a/providers/microsoft/azure/pyproject.toml +++ b/providers/microsoft/azure/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.13.0", + "apache-airflow-providers-common-compat>=1.13.0", # use next version "adlfs>=2023.10.0", "azure-batch>=8.0.0", "azure-cosmos>=4.6.0", diff --git a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py index e48278de56c7c..a3f9792d45664 100644 --- a/providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py +++ b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py @@ -20,8 +20,12 @@ from collections.abc import Sequence from typing import TYPE_CHECKING, Any -from airflow.configuration import conf -from airflow.providers.common.compat.sdk import AirflowException, BaseOperator, BaseOperatorLink +from airflow.providers.common.compat.sdk import ( + AirflowException, + BaseOperator, + BaseOperatorLink, + conf, +) from airflow.providers.microsoft.azure.hooks.powerbi import PowerBIHook from airflow.providers.microsoft.azure.triggers.powerbi import ( PowerBIDatasetListTrigger, From c1ee3a0f4f0bed1b2750a78f3de849196b58277e Mon Sep 17 00:00:00 2001 From: Yuseok Jo Date: Wed, 25 Mar 2026 22:10:41 +0900 Subject: [PATCH 2/2] Remove common-compat "use next version" comments --- providers/amazon/pyproject.toml | 2 +- providers/common/ai/pyproject.toml | 2 +- providers/keycloak/pyproject.toml | 2 +- providers/microsoft/azure/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/amazon/pyproject.toml b/providers/amazon/pyproject.toml index 4156ea5cedee5..8ab8b4a0feedb 100644 --- a/providers/amazon/pyproject.toml +++ b/providers/amazon/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.13.0", # use next version + "apache-airflow-providers-common-compat>=1.13.0", "apache-airflow-providers-common-sql>=1.32.0", "apache-airflow-providers-http", # We should update minimum version of boto3 and here regularly to avoid `pip` backtracking with the number diff --git a/providers/common/ai/pyproject.toml b/providers/common/ai/pyproject.toml index f984da1c5a28c..203497e401dd3 100644 --- a/providers/common/ai/pyproject.toml +++ b/providers/common/ai/pyproject.toml @@ -67,7 +67,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=3.0.0", - "apache-airflow-providers-common-compat>=1.14.1", # use next version + "apache-airflow-providers-common-compat>=1.14.1", "apache-airflow-providers-standard>=1.12.1", "pydantic-ai-slim>=1.14.0", ] diff --git a/providers/keycloak/pyproject.toml b/providers/keycloak/pyproject.toml index 303a13abf5ea7..f03fa0ef164da 100644 --- a/providers/keycloak/pyproject.toml +++ b/providers/keycloak/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=3.0.0", - "apache-airflow-providers-common-compat>=1.12.0", # use next version + "apache-airflow-providers-common-compat>=1.12.0", "python-keycloak>=5.0.0", ] diff --git a/providers/microsoft/azure/pyproject.toml b/providers/microsoft/azure/pyproject.toml index 7a5d104cf8be5..2fb8043b6b1e8 100644 --- a/providers/microsoft/azure/pyproject.toml +++ b/providers/microsoft/azure/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.13.0", # use next version + "apache-airflow-providers-common-compat>=1.13.0", "adlfs>=2023.10.0", "azure-batch>=8.0.0", "azure-cosmos>=4.6.0",