Skip to content

Commit 89c8268

Browse files
authored
Compat sdk conf follow-up for multiple providers (#64161)
* Compat sdk conf follow-up for multiple providers * Remove common-compat "use next version" comments
1 parent a3584d7 commit 89c8268

5 files changed

Lines changed: 10 additions & 13 deletions

File tree

providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from botocore.exceptions import ClientError, NoCredentialsError
2929
from semver import VersionInfo
3030

31-
from airflow.configuration import conf
3231
from airflow.executors.base_executor import BaseExecutor
3332
from airflow.models import TaskInstance
3433
from airflow.models.taskinstancekey import TaskInstanceKey
@@ -43,7 +42,7 @@
4342
CONFIG_GROUP_NAME,
4443
AllBatchConfigKeys,
4544
)
46-
from airflow.providers.common.compat.sdk import AirflowException
45+
from airflow.providers.common.compat.sdk import AirflowException, conf
4746
from airflow.utils.helpers import convert_camel_to_snake
4847
from airflow.utils.state import State
4948
from airflow.version import version as airflow_version_str

providers/common/ai/src/airflow/providers/common/ai/operators/agent.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
AirflowOptionalProviderFeatureException,
3434
BaseOperator,
3535
BaseOperatorLink,
36+
conf,
3637
)
3738
from airflow.providers.common.compat.version_compat import AIRFLOW_V_3_1_PLUS
3839

@@ -67,8 +68,6 @@ def get_link(
6768
return ""
6869
from urllib.parse import urlparse
6970

70-
from airflow.configuration import conf
71-
7271
base_url = conf.get("api", "base_url", fallback="/")
7372
if base_url.startswith(("http://", "https://")):
7473
base_path = urlparse(base_url).path.rstrip("/")

providers/common/ai/src/airflow/providers/common/ai/plugins/hitl_review.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity
3333
from airflow.api_fastapi.core_api.security import requires_access_dag
34-
from airflow.configuration import conf
3534
from airflow.models.taskinstance import TaskInstance as TI
3635
from airflow.models.xcom import XComModel
3736
from airflow.plugins_manager import AirflowPlugin
@@ -46,6 +45,7 @@
4645
HumanFeedbackRequest,
4746
SessionStatus,
4847
)
48+
from airflow.providers.common.compat.sdk import conf
4949
from airflow.utils.session import create_session
5050
from airflow.utils.state import TaskInstanceState
5151

providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@
4343

4444
from airflow.api_fastapi.common.types import MenuItem
4545
from airflow.cli.cli_config import CLICommand
46-
47-
try:
48-
from airflow.providers.common.compat.sdk import AirflowException, conf
49-
except ModuleNotFoundError:
50-
from airflow.configuration import conf
51-
from airflow.exceptions import AirflowException
46+
from airflow.providers.common.compat.sdk import AirflowException, conf
5247
from airflow.providers.keycloak.auth_manager.cache import single_flight
5348
from airflow.providers.keycloak.auth_manager.constants import (
5449
CONF_CLIENT_ID_KEY,

providers/microsoft/azure/src/airflow/providers/microsoft/azure/operators/powerbi.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020
from collections.abc import Sequence
2121
from typing import TYPE_CHECKING, Any
2222

23-
from airflow.configuration import conf
24-
from airflow.providers.common.compat.sdk import AirflowException, BaseOperator, BaseOperatorLink
23+
from airflow.providers.common.compat.sdk import (
24+
AirflowException,
25+
BaseOperator,
26+
BaseOperatorLink,
27+
conf,
28+
)
2529
from airflow.providers.microsoft.azure.hooks.powerbi import PowerBIHook
2630
from airflow.providers.microsoft.azure.triggers.powerbi import (
2731
PowerBIDatasetListTrigger,

0 commit comments

Comments
 (0)