From 616f83b111f284468dec09e66f8c40e58cb75f4a Mon Sep 17 00:00:00 2001 From: Dev-iL <6509619+Dev-iL@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:46:13 +0300 Subject: [PATCH] FAB: reuse ORM type hints from common-compat --- providers/fab/pyproject.toml | 2 +- .../providers/fab/auth_manager/models/__init__.py | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/providers/fab/pyproject.toml b/providers/fab/pyproject.toml index 4b9928daf0d7b..053328bb3d945 100644 --- a/providers/fab/pyproject.toml +++ b/providers/fab/pyproject.toml @@ -57,7 +57,7 @@ license-files = ["NOTICE", "*/LICENSE*"] # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=3.0.2", - "apache-airflow-providers-common-compat>=1.2.1", + "apache-airflow-providers-common-compat>=1.7.4", # + TODO: bump to next version # Blinker use for signals in Flask, this is an optional dependency in Flask 2.2 and lower. # In Flask 2.3 it becomes a mandatory dependency, and flask signals are always available. "blinker>=1.6.2; python_version < '3.13'", diff --git a/providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py b/providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py index 86919ce55841c..62789c02f7d39 100644 --- a/providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py +++ b/providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py @@ -43,16 +43,7 @@ from sqlalchemy.orm import Mapped, backref, declared_attr, relationship from airflow.api_fastapi.auth.managers.models.base_user import BaseUser - -try: - from sqlalchemy.orm import mapped_column -except ImportError: - # fallback for SQLAlchemy < 2.0 - def mapped_column(*args, **kwargs): - from sqlalchemy import Column - - return Column(*args, **kwargs) - +from airflow.providers.common.compat.sqlalchemy.orm import mapped_column if TYPE_CHECKING: try: