diff --git a/airflow-core/src/airflow/models/dag_favorite.py b/airflow-core/src/airflow/models/dag_favorite.py index f57ce6373a5b0..700cf8575bf00 100644 --- a/airflow-core/src/airflow/models/dag_favorite.py +++ b/airflow-core/src/airflow/models/dag_favorite.py @@ -17,16 +17,12 @@ # under the License. from __future__ import annotations -from typing import TYPE_CHECKING - from sqlalchemy import ForeignKey +from sqlalchemy.orm import Mapped # noqa: TC002 from airflow.models.base import Base, StringID from airflow.utils.sqlalchemy import mapped_column -if TYPE_CHECKING: - from sqlalchemy.orm import Mapped - class DagFavorite(Base): """Association table model linking users to their favorite DAGs.""" diff --git a/airflow-core/src/airflow/models/db_callback_request.py b/airflow-core/src/airflow/models/db_callback_request.py index d5a7c292a888e..0dc2a287ca805 100644 --- a/airflow-core/src/airflow/models/db_callback_request.py +++ b/airflow-core/src/airflow/models/db_callback_request.py @@ -21,14 +21,13 @@ from typing import TYPE_CHECKING from sqlalchemy import Integer, String +from sqlalchemy.orm import Mapped # noqa: TC002 from airflow._shared.timezones import timezone from airflow.models.base import Base from airflow.utils.sqlalchemy import ExtendedJSON, UtcDateTime, mapped_column if TYPE_CHECKING: - from sqlalchemy.orm import Mapped - from airflow.callbacks.callback_requests import CallbackRequest diff --git a/airflow-core/src/airflow/models/errors.py b/airflow-core/src/airflow/models/errors.py index ee8714b8943e7..0dbd8d5de6b76 100644 --- a/airflow-core/src/airflow/models/errors.py +++ b/airflow-core/src/airflow/models/errors.py @@ -17,17 +17,13 @@ # under the License. from __future__ import annotations -from typing import TYPE_CHECKING - from sqlalchemy import Integer, String, Text +from sqlalchemy.orm import Mapped # noqa: TC002 from airflow.dag_processing.bundles.manager import DagBundlesManager from airflow.models.base import Base, StringID from airflow.utils.sqlalchemy import UtcDateTime, mapped_column -if TYPE_CHECKING: - from sqlalchemy.orm import Mapped - class ParseImportError(Base): """Stores all Import Errors which are recorded when parsing DAGs and displayed on the Webserver.""" diff --git a/airflow-core/src/airflow/models/pool.py b/airflow-core/src/airflow/models/pool.py index ef64cfb2de102..058a14f7883b6 100644 --- a/airflow-core/src/airflow/models/pool.py +++ b/airflow-core/src/airflow/models/pool.py @@ -20,6 +20,7 @@ from typing import TYPE_CHECKING, Any, TypedDict from sqlalchemy import Boolean, ForeignKey, Integer, String, Text, func, select +from sqlalchemy.orm import Mapped # noqa: TC002 from sqlalchemy_utils import UUIDType from airflow.exceptions import AirflowException, PoolNotFound @@ -32,7 +33,6 @@ from airflow.utils.state import TaskInstanceState if TYPE_CHECKING: - from sqlalchemy.orm import Mapped from sqlalchemy.orm.session import Session diff --git a/airflow-core/src/airflow/models/tasklog.py b/airflow-core/src/airflow/models/tasklog.py index 43e6cad945400..51ec10db1808b 100644 --- a/airflow-core/src/airflow/models/tasklog.py +++ b/airflow-core/src/airflow/models/tasklog.py @@ -17,17 +17,13 @@ # under the License. from __future__ import annotations -from typing import TYPE_CHECKING - from sqlalchemy import Integer, Text +from sqlalchemy.orm import Mapped # noqa: TC002 from airflow._shared.timezones import timezone from airflow.models.base import Base from airflow.utils.sqlalchemy import UtcDateTime, mapped_column -if TYPE_CHECKING: - from sqlalchemy.orm import Mapped - class LogTemplate(Base): """ diff --git a/airflow-core/src/airflow/models/taskmap.py b/airflow-core/src/airflow/models/taskmap.py index 71ddcc45775a8..8d6500747b727 100644 --- a/airflow-core/src/airflow/models/taskmap.py +++ b/airflow-core/src/airflow/models/taskmap.py @@ -25,6 +25,7 @@ from typing import TYPE_CHECKING, Any from sqlalchemy import CheckConstraint, ForeignKeyConstraint, Integer, String, func, or_, select +from sqlalchemy.orm import Mapped # noqa: TC002 from airflow.models.base import COLLATION_ARGS, ID_LEN, TaskInstanceDependencies from airflow.models.dag_version import DagVersion @@ -33,7 +34,7 @@ from airflow.utils.state import State, TaskInstanceState if TYPE_CHECKING: - from sqlalchemy.orm import Mapped, Session + from sqlalchemy.orm import Session from airflow.models.mappedoperator import MappedOperator from airflow.models.taskinstance import TaskInstance