This is an automated email from the ASF dual-hosted git repository.
jasonliu 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 89c82681011 Compat sdk conf follow-up for multiple providers (#64161)
89c82681011 is described below
commit 89c8268101192277dc741d6d3cebcbe7f3e065fc
Author: Yuseok Jo <[email protected]>
AuthorDate: Thu Mar 26 11:41:31 2026 +0900
Compat sdk conf follow-up for multiple providers (#64161)
* Compat sdk conf follow-up for multiple providers
* Remove common-compat "use next version" comments
---
.../tests/unit/amazon/aws/executors/batch/test_batch_executor.py | 3 +--
.../common/ai/src/airflow/providers/common/ai/operators/agent.py | 3 +--
.../ai/src/airflow/providers/common/ai/plugins/hitl_review.py | 2 +-
.../providers/keycloak/auth_manager/keycloak_auth_manager.py | 7 +------
.../src/airflow/providers/microsoft/azure/operators/powerbi.py | 8 ++++++--
5 files changed, 10 insertions(+), 13 deletions(-)
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 ed767fea187..0e723894597 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 @@ import yaml
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 @@ from airflow.providers.amazon.aws.executors.batch.utils
import (
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/src/airflow/providers/common/ai/operators/agent.py
b/providers/common/ai/src/airflow/providers/common/ai/operators/agent.py
index d4d42c718f9..68da378a994 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 @@ from airflow.providers.common.compat.sdk import (
AirflowOptionalProviderFeatureException,
BaseOperator,
BaseOperatorLink,
+ conf,
)
from airflow.providers.common.compat.version_compat import AIRFLOW_V_3_1_PLUS
@@ -67,8 +68,6 @@ class HITLReviewLink(BaseOperatorLink):
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 773dcd2c86d..02d43c511f9 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 sqlalchemy.orm import Session
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 @@ from airflow.providers.common.ai.utils.hitl_review import (
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/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py
b/providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py
index 9844873c031..a8cd683ef46 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 @@ except ImportError:
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/src/airflow/providers/microsoft/azure/operators/powerbi.py
b/providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py
index e48278de56c..a3f9792d456 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 __future__ import annotations
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,
