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/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/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/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,