refactor: migrate models to use mapped_column for SQLAlchemy 2.0 compatibility

Author: josix

providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py

@@ -21,8 +21,6 @@
 # This product contains a modified portion of 'Flask App Builder' developed by Daniel Vaz Gaspar.
 # (https://github.com/dpgaspar/Flask-AppBuilder).
 # Copyright 2013, Daniel Vaz Gaspar
-from typing import TYPE_CHECKING
-
 from flask import current_app, g
 from flask_appbuilder import Model
 from sqlalchemy import (
@@ -45,12 +43,6 @@
 from airflow.api_fastapi.auth.managers.models.base_user import BaseUser
 from airflow.providers.common.compat.sqlalchemy.orm import mapped_column
 
-if TYPE_CHECKING:
-    try:
-        from sqlalchemy import Identity
-    except Exception:
-        Identity = None
-
 """
 Compatibility note: The models in this file are duplicated from Flask AppBuilder.
 """

providers/fab/tests/unit/fab/auth_manager/models/test_user_model.py

@@ -35,7 +35,7 @@ def test_get_id_returns_str(user_id: int | str, expected_id: str) -> None:
     Ensure get_id() always returns a string representation of the id.
     """
     user = User()
-    user.id = user_id
+    user.id = user_id  # type: ignore[assignment] # id can be int or str for this test
     result = user.get_id()
     assert isinstance(result, str), f"Expected str, got {type(result)}"
     assert result == expected_id