From 447111939c44789c24923a2e4fec7ab10293e985 Mon Sep 17 00:00:00 2001 From: Jens Scheffler Date: Sun, 1 Dec 2024 09:58:46 +0100 Subject: [PATCH] Remove mypy errors from semantic merge problems due to Internal API removal --- providers/src/airflow/providers/edge/models/edge_logs.py | 1 + .../airflow/providers/edge/worker_api/routes/_v2_routes.py | 6 +++--- .../src/airflow/providers/edge/worker_api/routes/logs.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/providers/src/airflow/providers/edge/models/edge_logs.py b/providers/src/airflow/providers/edge/models/edge_logs.py index 65146cf7edc3b..49a340540b3c8 100644 --- a/providers/src/airflow/providers/edge/models/edge_logs.py +++ b/providers/src/airflow/providers/edge/models/edge_logs.py @@ -144,6 +144,7 @@ def logfile_path(task: TaskInstanceKey) -> Path: ) if TYPE_CHECKING: assert ti + assert isinstance(ti, TaskInstance) base_log_folder = conf.get("logging", "base_log_folder", fallback="NOT AVAILABLE") return Path(base_log_folder, FileTaskHandler(base_log_folder)._render_filename(ti, task.try_number)) diff --git a/providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py b/providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py index 128500f63c621..767aef14b3432 100644 --- a/providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py +++ b/providers/src/airflow/providers/edge/worker_api/routes/_v2_routes.py @@ -49,7 +49,7 @@ def _initialize_method_map() -> dict[str, Callable]: # for compatibility with Airflow 2.10-line. # Methods are potentially not existing more on main branch for Airflow 3. from airflow.api.common.trigger_dag import trigger_dag - from airflow.cli.commands.task_command import _get_ti_db_access + from airflow.cli.commands.task_command import _get_ti_db_access # type: ignore[attr-defined] from airflow.dag_processing.manager import DagFileProcessorManager from airflow.dag_processing.processor import DagFileProcessor @@ -82,7 +82,7 @@ def _initialize_method_map() -> dict[str, Callable]: from airflow.providers.edge.models.edge_worker import EdgeWorker from airflow.secrets.metastore import MetastoreBackend from airflow.sensors.base import _orig_start_date - from airflow.utils.cli_action_loggers import _default_action_log_internal + from airflow.utils.cli_action_loggers import _default_action_log_internal # type: ignore[attr-defined] from airflow.utils.log.file_task_handler import FileTaskHandler functions: list[Callable] = [ @@ -118,7 +118,7 @@ def _initialize_method_map() -> dict[str, Callable]: DagWarning.purge_inactive_dag_warnings, expand_alias_to_datasets, DatasetManager.register_dataset_change, - FileTaskHandler._render_filename_db_access, + FileTaskHandler._render_filename_db_access, # type: ignore[attr-defined] Job._add_to_db, Job._fetch_from_db, Job._kill, diff --git a/providers/src/airflow/providers/edge/worker_api/routes/logs.py b/providers/src/airflow/providers/edge/worker_api/routes/logs.py index 3dc04a6670959..8a1b50ae026fc 100644 --- a/providers/src/airflow/providers/edge/worker_api/routes/logs.py +++ b/providers/src/airflow/providers/edge/worker_api/routes/logs.py @@ -55,6 +55,7 @@ def _logfile_path(task: TaskInstanceKey, session=NEW_SESSION) -> str: ) if TYPE_CHECKING: assert ti + assert isinstance(ti, TaskInstance) return FileTaskHandler(".")._render_filename(ti, task.try_number)