Mmigrate to connexion 2.15

Author: potiuk

airflow/migrations/versions/0095_2_2_4_add_session_table_to_db.py

@@ -26,9 +26,6 @@
 
 from __future__ import annotations
 
-import sqlalchemy as sa
-from alembic import op
-
 # revision identifiers, used by Alembic.
 revision = "c381b21cb7e4"
 down_revision = "be2bfac3da23"
@@ -41,17 +38,18 @@
 
 def upgrade():
     """Apply Create a ``session`` table to store web session data."""
-    op.create_table(
-        TABLE_NAME,
-        sa.Column("id", sa.Integer()),
-        sa.Column("session_id", sa.String(255)),
-        sa.Column("data", sa.LargeBinary()),
-        sa.Column("expiry", sa.DateTime()),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("session_id"),
-    )
+    # We do not have to create session any more - it is automatically created by Flask-Session 0.8.0+
+    # op.create_table(
+    #     TABLE_NAME,
+    #     sa.Column("id", sa.Integer()),
+    #     sa.Column("session_id", sa.String(255)),
+    #     sa.Column("data", sa.LargeBinary()),
+    #     sa.Column("expiry", sa.DateTime()),
+    #     sa.PrimaryKeyConstraint("id"),
+    #     sa.UniqueConstraint("session_id"),
+    # )
 
 
 def downgrade():
     """Unapply Create a ``session`` table to store web session data."""
-    op.drop_table(TABLE_NAME)
+    # op.drop_table(TABLE_NAME)

airflow/providers/fab/provider.yaml

@@ -45,7 +45,7 @@ versions:
 
 dependencies:
   - apache-airflow>=2.9.0
-  - flask>=2.2,<2.3
+  - flask>=2.2,<3
   # We are tightly coupled with FAB version as we vendored-in part of FAB code related to security manager
   # This is done as part of preparation to removing FAB as dependency, but we are not ready for it yet
   # Every time we update FAB version here, please make sure that you review the classes and models in

airflow/utils/db.py

@@ -764,7 +764,7 @@ def _get_flask_db(sql_database_uri):
     flask_app.config["SQLALCHEMY_DATABASE_URI"] = sql_database_uri
     flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
     db = SQLAlchemy(flask_app)
-    AirflowDatabaseSessionInterface(app=flask_app, db=db, table="session", key_prefix="")
+    AirflowDatabaseSessionInterface(app=flask_app, client=db, table="session", key_prefix="")
     return db
 
 

airflow/www/extensions/init_session.py

@@ -44,7 +44,7 @@ def make_session_permanent():
     elif selected_backend == "database":
         app.session_interface = AirflowDatabaseSessionInterface(
             app=app,
-            db=None,
+            client=None,
             permanent=permanent_cookie,
             # Typically these would be configurable with Flask-Session,
             # but we will set them explicitly instead as they don't make

airflow/www/session.py

@@ -18,7 +18,7 @@
 
 from flask import request
 from flask.sessions import SecureCookieSessionInterface
-from flask_session.sessions import SqlAlchemySessionInterface
+from flask_session.sqlalchemy import SqlAlchemySessionInterface
 
 
 class SessionExemptMixin:

dev/breeze/tests/test_packages.py

@@ -158,7 +158,7 @@ def test_find_matching_long_package_name_bad_filter():
     "apache-airflow>=2.9.0",
     "flask-appbuilder==4.5.2",
     "flask-login>=0.6.2",
-    "flask>=2.2,<2.3",
+    "flask>=2.2,<3",
     "google-re2>=1.0",
     "jmespath>=0.7.0",
     """,
@@ -171,7 +171,7 @@ def test_find_matching_long_package_name_bad_filter():
     "apache-airflow>=2.9.0.dev0",
     "flask-appbuilder==4.5.2",
     "flask-login>=0.6.2",
-    "flask>=2.2,<2.3",
+    "flask>=2.2,<3",
     "google-re2>=1.0",
     "jmespath>=0.7.0",
     """,
@@ -184,7 +184,7 @@ def test_find_matching_long_package_name_bad_filter():
     "apache-airflow>=2.9.0b0",
     "flask-appbuilder==4.5.2",
     "flask-login>=0.6.2",
-    "flask>=2.2,<2.3",
+    "flask>=2.2,<3",
     "google-re2>=1.0",
     "jmespath>=0.7.0",
     """,

generated/provider_dependencies.json

@@ -553,7 +553,7 @@
       "apache-airflow>=2.9.0",
       "flask-appbuilder==4.5.2",
       "flask-login>=0.6.2",
-      "flask>=2.2,<2.3",
+      "flask>=2.2,<3",
       "google-re2>=1.0",
       "jmespath>=0.7.0"
     ],

hatch_build.py

@@ -266,7 +266,7 @@
         "pytest-rerunfailures>=13.0",
         "pytest-timeouts>=1.2.1",
         "pytest-xdist>=3.5.0",
-        "pytest>=8.2,<9",
+        "pytest>=8.2,<8.3",
         "requests_mock>=1.11.0",
         "time-machine>=2.13.0",
         "wheel>=0.42.0",
@@ -422,7 +422,7 @@
     # The usage was added in #30596, seemingly only to override and improve the default error message.
     # Either revert that change or find another way, preferably without using connexion internals.
     # This limit can be removed after https://github.com/apache/airflow/issues/35234 is fixed
-    "connexion[flask]>=2.14.2,<3.0",
+    "connexion==2.15.0rc2",
     "cron-descriptor>=1.2.24",
     "croniter>=2.0.2",
     "cryptography>=41.0.0",
@@ -433,14 +433,9 @@
     # see https://github.com/pydantic/pydantic/issues/10958
     'eval-type-backport>=0.2.0;python_version<"3.10"',
     "flask-caching>=2.0.0",
-    # Flask-Session 0.6 add new arguments into the SqlAlchemySessionInterface constructor as well as
-    # all parameters now are mandatory which make AirflowDatabaseSessionInterface incompatible with this version.
-    "flask-session>=0.4.0,<0.6",
+    "flask-session>=0.8.0",
     "flask-wtf>=1.1.0",
-    # Flask 2.3 is scheduled to introduce a number of deprecation removals - some of them might be breaking
-    # for our dependencies - notably `_app_ctx_stack` and `_request_ctx_stack` removals.
-    # We should remove the limitation after 2.3 is released and our dependencies are updated to handle it
-    "flask>=2.2.1,<2.3",
+    "flask>=2,<4",
     "fsspec>=2023.10.0",
     'google-re2>=1.0;python_version<"3.12"',
     'google-re2>=1.1;python_version>="3.12"',
@@ -494,9 +489,7 @@
     # Universal Pathlib 0.2.4 adds extra validation for Paths and our integration with local file paths
     # Does not work with it Tracked in https://github.com/fsspec/universal_pathlib/issues/276
     "universal-pathlib>=0.2.2,!=0.2.4",
-    # Werkzug 3 breaks Flask-Login 0.6.2, also connexion needs to be updated to >= 3.0
-    # we should remove this limitation when FAB supports Flask 2.3 and we migrate connexion to 3+
-    "werkzeug>=2.0,<3",
+    "werkzeug>=3,<4",
 ]