[cjmayo]

flask-sqlalchemy-lite without flask-sqlalchemy is not being tested, causing a bug to be missed: #2958

HAS_FLASK_SQLALCHEMY was a way to get this test working. Maybe that needs some more thought.

[hasansezertasan]

Thanks @cjmayo for the test job 🤓

I ran py314-flask-sqlalchemy-lite locally and the CI failure is exactly #2958 (ImportError: cannot import name 'T_SESSION'), so the job does what it should. The fix is a one-liner, so could you include it in this PR? That way the job is green here and the test and the fix land together:

# flask_admin/contrib/sqla/_types.py
except ImportError:
    T_SQLALCHEMY: t.Any | None = None  # type: ignore[no-redef]
    T_SESSION: t.Any | None = None  # type: ignore[no-redef]

Once that is in, the job hits one more thing in conftest.py:

NameError: name 'sqla_db_exts' is not defined

sqla_db_exts is only defined inside if HAS_FLASK_SQLALCHEMY:, but the SQLALiteProvider block appends to it. SQLAProvider only imports flask_sqlalchemy in __init__, so it can stay unconditional and only the registration needs the guard:

sqla_db_exts: list[type[T_ANY_SQLA_PROVIDER]] = []
if HAS_FLASK_SQLALCHEMY:
    sqla_db_exts.append(SQLAProvider)

With both, collection works and the tests that don't need services pass locally (220 passed; Postgres/Azure need the CI services). The branch is also behind master, so it needs a rebase. We can then close #2964 as superseded.

WDYT?

[ElLorans]

T_SESSION should import from flask_sqlalchemy_lite though, not be None

[hasansezertasan]

T_SESSION should import from flask_sqlalchemy_lite though, not be None

flask_sqlalchemy_lite only exports SQLAlchemy and has no session class: get_session() returns a plain sqlalchemy.orm.Session. So the lite equivalent would be:

except ImportError:
    T_SQLALCHEMY: t.Any | None = None  # type: ignore[no-redef]
    from sqlalchemy.orm import Session as T_SESSION  # type: ignore[assignment]

I tried it: with lite only, from flask_admin.contrib.sqla import ModelView imports, and the repo's mypy config passes (run with both libraries installed). WDYT?

[cjmayo]

I've rebased, added the fix and updated to be py315-flask-sqlalchemy-lite.

Seems there is more to do:

flask_admin/tests/bootstrap4/test_renders.py:6: in <module>
    from flask_admin.tests.conftest import T_ANY_SQLA_PROVIDER
E   ImportError: cannot import name 'T_ANY_SQLA_PROVIDER' from 'flask_admin.tests.conftest' (/home/runner/work/flask-admin/flask-admin/flask_admin/tests/conftest.py)

[ElLorans]

I can take it from here, if you want.

[cjmayo]

I can take it from here, if you want.

Yes please!