apache-airflow-providers-fab 3.0.1__py3-none-any.whl → 3.1.0rc1__py3-none-any.whl

airflow/providers/fab/www/api_connexion/parameters.py

@@ -17,21 +17,16 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Callable, Container
+from collections.abc import Callable
 from functools import wraps
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
-from pendulum.parsing import ParserError
-from sqlalchemy import text
-
 from airflow.configuration import conf
 from airflow.providers.fab.www.api_connexion.exceptions import BadRequest
-from airflow.utils import timezone
 
 if TYPE_CHECKING:
     from datetime import datetime
 
-    from sqlalchemy.sql import Select
 
 log = logging.getLogger(__name__)
 
@@ -42,24 +37,6 @@ def validate_istimezone(value: datetime) -> None:
         raise BadRequest("Invalid datetime format", detail="Naive datetime is disallowed")
 
 
-def format_datetime(value: str) -> datetime:
-    """
-    Format datetime objects.
-
-    Datetime format parser for args since connexion doesn't parse datetimes
-    https://github.com/zalando/connexion/issues/476
-
-    This should only be used within connection views because it raises 400
-    """
-    value = value.strip()
-    if value[-1] != "Z":
-        value = value.replace(" ", "+")
-    try:
-        return timezone.parse(value)
-    except (ParserError, TypeError) as err:
-        raise BadRequest("Incorrect datetime argument", detail=str(err))
-
-
 def check_limit(value: int) -> int:
     """
     Check the limit does not exceed configured value.
@@ -107,25 +84,3 @@ def format_parameters(params_formatters: dict[str, Callable[[Any], Any]]) -> Cal
         return cast("T", wrapped_function)
 
     return format_parameters_decorator
-
-
-def apply_sorting(
-    query: Select,
-    order_by: str,
-    to_replace: dict[str, str] | None = None,
-    allowed_attrs: Container[str] | None = None,
-) -> Select:
-    """Apply sorting to query."""
-    lstriped_orderby = order_by.lstrip("-")
-    if allowed_attrs and lstriped_orderby not in allowed_attrs:
-        raise BadRequest(
-            detail=f"Ordering with '{lstriped_orderby}' is disallowed or "
-            f"the attribute does not exist on the model"
-        )
-    if to_replace:
-        lstriped_orderby = to_replace.get(lstriped_orderby, lstriped_orderby)
-    if order_by[0] == "-":
-        order_by = f"{lstriped_orderby} desc"
-    else:
-        order_by = f"{lstriped_orderby} asc"
-    return query.order_by(text(order_by))

airflow/providers/fab/www/app.py

@@ -18,6 +18,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from functools import cache
 from os.path import isabs
 
 from flask import Flask
@@ -30,7 +31,7 @@ from airflow.api_fastapi.app import get_auth_manager
 from airflow.configuration import conf
 from airflow.exceptions import AirflowConfigException
 from airflow.logging_config import configure_logging
-from airflow.providers.fab.www.extensions.init_appbuilder import init_appbuilder
+from airflow.providers.fab.www.extensions.init_appbuilder import AirflowAppBuilder
 from airflow.providers.fab.www.extensions.init_jinja_globals import init_jinja_globals
 from airflow.providers.fab.www.extensions.init_manifest_files import configure_manifest_files
 from airflow.providers.fab.www.extensions.init_security import init_api_auth
@@ -44,8 +45,6 @@ from airflow.providers.fab.www.extensions.init_views import (
 from airflow.providers.fab.www.extensions.init_wsgi_middlewares import init_wsgi_middleware
 from airflow.providers.fab.www.utils import get_session_lifetime_config
 
-app: Flask | None = None
-
 # Initializes at the module level, so plugins can access it.
 # See: /docs/plugins.rst
 csrf = CSRFProtect()
@@ -85,6 +84,8 @@ def create_app(enable_plugins: bool):
     csrf.init_app(flask_app)
 
     db = SQLAlchemy(flask_app)
+    if settings.Session is None:
+        raise RuntimeError("Session not configured. Call configure_orm() first.")
     db.session = settings.Session
 
     configure_logging()
@@ -92,7 +93,12 @@ def create_app(enable_plugins: bool):
     init_api_auth(flask_app)
 
     with flask_app.app_context():
-        init_appbuilder(flask_app, enable_plugins=enable_plugins)
+        AirflowAppBuilder(
+            app=flask_app,
+            session=db.session(),
+            base_template="airflow/main.html",
+            enable_plugins=enable_plugins,
+        )
         init_error_handlers(flask_app)
         # In two scenarios a Flask application can be created:
         # - To support Airflow 2 plugins relying on Flask (``enable_plugins`` is True)
@@ -112,15 +118,12 @@ def create_app(enable_plugins: bool):
     return flask_app
 
 
+@cache
 def cached_app():
     """Return cached instance of Airflow WWW app."""
-    global app
-    if not app:
-        app = create_app()
-    return app
+    return create_app()
 
 
 def purge_cached_app():
     """Remove the cached version of the app in global state."""
-    global app
-    app = None
+    cached_app.cache_clear()

airflow/providers/fab/www/extensions/init_appbuilder.py

@@ -42,7 +42,7 @@ from airflow import settings
 from airflow.api_fastapi.app import create_auth_manager, get_auth_manager
 from airflow.configuration import conf
 from airflow.providers.fab.www.security_manager import AirflowSecurityManagerV2
-from airflow.providers.fab.www.views import FabIndexView
+from airflow.providers.fab.www.views import FabIndexView, redirect
 
 if TYPE_CHECKING:
     from flask import Flask
@@ -216,6 +216,7 @@ class AirflowAppBuilder:
         from airflow.providers.fab.www.views import get_safe_url
 
         fab_sec_views.get_safe_redirect = get_safe_url
+        fab_sec_views.redirect = redirect
 
     def _init_extension(self, app):
         app.appbuilder = self
@@ -473,7 +474,7 @@ class AirflowAppBuilder:
             baseview=baseview,
             cond=cond,
         )
-        if self.app:
+        if current_app:
             self._add_permissions_menu(name)
             if category:
                 self._add_permissions_menu(category)
@@ -592,6 +593,8 @@ class AirflowAppBuilder:
 
 def init_appbuilder(app: Flask, enable_plugins: bool) -> AirflowAppBuilder:
     """Init `Flask App Builder <https://flask-appbuilder.readthedocs.io/en/latest/>`__."""
+    if settings.Session is None:
+        raise RuntimeError("Session not configured. Call configure_orm() first.")
     return AirflowAppBuilder(
         app=app,
         session=settings.Session(),

airflow/providers/fab/www/extensions/init_security.py

@@ -20,7 +20,7 @@ import logging
 from importlib import import_module
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 
 log = logging.getLogger(__name__)