This is an automated email from the ASF dual-hosted git repository. rahulvats pushed a commit to branch py-client-sync in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 9d57089de1d08415a572d8dac8af3e374f8c4cfc Author: Jeongwoo Do <[email protected]> AuthorDate: Tue Mar 24 17:56:12 2026 +0900 Update edge executor's import conf path to use common compat SDK (#64137) --- providers/edge3/src/airflow/providers/edge3/cli/api_client.py | 2 +- providers/edge3/src/airflow/providers/edge3/cli/definition.py | 2 +- providers/edge3/src/airflow/providers/edge3/cli/edge_command.py | 2 +- providers/edge3/src/airflow/providers/edge3/cli/worker.py | 3 +-- providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py | 3 +-- providers/edge3/src/airflow/providers/edge3/models/db.py | 2 +- .../edge3/src/airflow/providers/edge3/plugins/edge_executor_plugin.py | 3 +-- providers/edge3/src/airflow/providers/edge3/worker_api/auth.py | 2 +- providers/edge3/src/airflow/providers/edge3/worker_api/routes/logs.py | 3 +-- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/providers/edge3/src/airflow/providers/edge3/cli/api_client.py b/providers/edge3/src/airflow/providers/edge3/cli/api_client.py index e1932d90df0..a5124800ba5 100644 --- a/providers/edge3/src/airflow/providers/edge3/cli/api_client.py +++ b/providers/edge3/src/airflow/providers/edge3/cli/api_client.py @@ -30,7 +30,7 @@ from retryhttp import retry, wait_retry_after from tenacity import before_sleep_log, wait_random_exponential from airflow.api_fastapi.auth.tokens import JWTGenerator -from airflow.configuration import conf +from airflow.providers.common.compat.sdk import conf from airflow.providers.edge3.models.edge_worker import ( EdgeWorkerDuplicateException, EdgeWorkerVersionException, diff --git a/providers/edge3/src/airflow/providers/edge3/cli/definition.py b/providers/edge3/src/airflow/providers/edge3/cli/definition.py index a1819e9a9a0..ea8dd30de2e 100644 --- a/providers/edge3/src/airflow/providers/edge3/cli/definition.py +++ b/providers/edge3/src/airflow/providers/edge3/cli/definition.py @@ -19,7 +19,7 @@ from __future__ import annotations from typing import TYPE_CHECKING from airflow.cli.cli_config import ARG_PID, ARG_VERBOSE, ActionCommand, Arg, GroupCommand, lazy_load_command -from airflow.configuration import conf +from airflow.providers.common.compat.sdk import conf if TYPE_CHECKING: import argparse diff --git a/providers/edge3/src/airflow/providers/edge3/cli/edge_command.py b/providers/edge3/src/airflow/providers/edge3/cli/edge_command.py index c18fbdc7f90..07aa8cf5566 100644 --- a/providers/edge3/src/airflow/providers/edge3/cli/edge_command.py +++ b/providers/edge3/src/airflow/providers/edge3/cli/edge_command.py @@ -33,7 +33,7 @@ import psutil from airflow import settings from airflow.cli.commands.daemon_utils import run_command_with_daemon_option from airflow.cli.simple_table import AirflowConsole -from airflow.configuration import conf +from airflow.providers.common.compat.sdk import conf from airflow.providers.edge3.cli.dataclasses import MaintenanceMarker, WorkerStatus from airflow.providers.edge3.cli.signalling import ( EDGE_WORKER_PROCESS_NAME, diff --git a/providers/edge3/src/airflow/providers/edge3/cli/worker.py b/providers/edge3/src/airflow/providers/edge3/cli/worker.py index 34352717350..f0cffa96c05 100644 --- a/providers/edge3/src/airflow/providers/edge3/cli/worker.py +++ b/providers/edge3/src/airflow/providers/edge3/cli/worker.py @@ -35,8 +35,7 @@ from aiohttp import ClientResponseError from lockfile.pidlockfile import remove_existing_pidfile from airflow import __version__ as airflow_version -from airflow.configuration import conf -from airflow.providers.common.compat.sdk import timezone +from airflow.providers.common.compat.sdk import conf, timezone from airflow.providers.edge3 import __version__ as edge_provider_version from airflow.providers.edge3.cli.api_client import ( jobs_fetch, diff --git a/providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py b/providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py index 58f516ee122..bef49278c6a 100644 --- a/providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py +++ b/providers/edge3/src/airflow/providers/edge3/executors/edge_executor.py @@ -24,11 +24,10 @@ from typing import TYPE_CHECKING, Any from sqlalchemy import delete, select -from airflow.configuration import conf from airflow.executors import workloads from airflow.executors.base_executor import BaseExecutor from airflow.models.taskinstance import TaskInstance -from airflow.providers.common.compat.sdk import Stats, timezone +from airflow.providers.common.compat.sdk import Stats, conf, timezone from airflow.providers.edge3.models.db import EdgeDBManager, check_db_manager_config from airflow.providers.edge3.models.edge_job import EdgeJobModel from airflow.providers.edge3.models.edge_logs import EdgeLogsModel diff --git a/providers/edge3/src/airflow/providers/edge3/models/db.py b/providers/edge3/src/airflow/providers/edge3/models/db.py index 5ce0c5c9a01..1637cca2a13 100644 --- a/providers/edge3/src/airflow/providers/edge3/models/db.py +++ b/providers/edge3/src/airflow/providers/edge3/models/db.py @@ -128,7 +128,7 @@ def check_db_manager_config() -> None: Should be called whenever the edge3 provider is active so operators are alerted early if the required database configuration is missing. """ - from airflow.configuration import conf + from airflow.providers.common.compat.sdk import conf from airflow.providers_manager import ProvidersManager fqcn = f"{EdgeDBManager.__module__}.{EdgeDBManager.__name__}" diff --git a/providers/edge3/src/airflow/providers/edge3/plugins/edge_executor_plugin.py b/providers/edge3/src/airflow/providers/edge3/plugins/edge_executor_plugin.py index c73fa5b23c1..8a23cf7231e 100644 --- a/providers/edge3/src/airflow/providers/edge3/plugins/edge_executor_plugin.py +++ b/providers/edge3/src/airflow/providers/edge3/plugins/edge_executor_plugin.py @@ -20,9 +20,8 @@ from __future__ import annotations import sys from typing import TYPE_CHECKING, Any -from airflow.configuration import conf from airflow.exceptions import AirflowConfigException -from airflow.providers.common.compat.sdk import AirflowPlugin +from airflow.providers.common.compat.sdk import AirflowPlugin, conf from airflow.providers.edge3.version_compat import AIRFLOW_V_3_1_PLUS from airflow.utils.session import NEW_SESSION, provide_session diff --git a/providers/edge3/src/airflow/providers/edge3/worker_api/auth.py b/providers/edge3/src/airflow/providers/edge3/worker_api/auth.py index a29fd42b2d1..6e9ba46ba87 100644 --- a/providers/edge3/src/airflow/providers/edge3/worker_api/auth.py +++ b/providers/edge3/src/airflow/providers/edge3/worker_api/auth.py @@ -31,7 +31,7 @@ from jwt import ( ) from airflow.api_fastapi.auth.tokens import JWTValidator -from airflow.configuration import conf +from airflow.providers.common.compat.sdk import conf from airflow.providers.edge3.worker_api.datamodels import JsonRpcRequestBase # noqa: TCH001 log = logging.getLogger(__name__) diff --git a/providers/edge3/src/airflow/providers/edge3/worker_api/routes/logs.py b/providers/edge3/src/airflow/providers/edge3/worker_api/routes/logs.py index e58e6874fd1..33fe9dceee1 100644 --- a/providers/edge3/src/airflow/providers/edge3/worker_api/routes/logs.py +++ b/providers/edge3/src/airflow/providers/edge3/worker_api/routes/logs.py @@ -26,9 +26,8 @@ from fastapi import Body, Depends, status from airflow.api_fastapi.common.db.common import SessionDep # noqa: TC001 from airflow.api_fastapi.common.router import AirflowRouter from airflow.api_fastapi.core_api.openapi.exceptions import create_openapi_http_exception_doc -from airflow.configuration import conf from airflow.models.taskinstance import TaskInstance -from airflow.providers.common.compat.sdk import TaskInstanceKey +from airflow.providers.common.compat.sdk import TaskInstanceKey, conf from airflow.providers.edge3.models.edge_logs import EdgeLogsModel from airflow.providers.edge3.worker_api.auth import jwt_token_authorization_rest from airflow.providers.edge3.worker_api.datamodels import PushLogsBody, WorkerApiDocs
