Unverified Commit 20cedf7b authored by mvdbeek's avatar mvdbeek
Browse files

Clean up factory handling

parent d83b56b4

lib/galaxy/web/framework/base.py

+5 −6
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ class WebApplication: 
        self.transaction_factory = DefaultWebTransaction

        # Set if trace logging is enabled

        self.trace_logger = None

        self.session_factories = []



    def add_ui_controller(self, controller_name, controller):

        """
@@ -170,14 +171,12 @@ class WebApplication: 
        path_info = environ.get("PATH_INFO", "")



        try:

            self._model.set_request_id(request_id)  # Start SQLAlchemy session scope

            if self._install_model:

                self._install_model.set_request_id(request_id)

            for session_factory in self.session_factories:

                session_factory.set_request_id(request_id)  # Start SQLAlchemy session scope

            return self.handle_request(request_id, path_info, environ, start_response)

        finally:

            self._model.unset_request_id(request_id)  # End SQLAlchemy session scope

            if self._install_model:

                self._install_model.unset_request_id(request_id)

            for session_factory in self.session_factories:

                session_factory.unset_request_id(request_id)  # End SQLAlchemy session scope

            self.trace(message="Handle request finished")

            if self.trace_logger:

                self.trace_logger.context_remove("request_id")

lib/galaxy/webapps/base/webapp.py

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ class WebApplication(base.WebApplication): 


        # We need this to set the REQUEST_ID contextvar in model.base *BEFORE* a GalaxyWebTransaction is created.

        # This will ensure a SQLAlchemy session is request-scoped for legacy (non-fastapi) endpoints.

        self._model = galaxy_app.model

        self._install_model = getattr(galaxy_app, "install_model", None)

        self.session_factories.append(galaxy_app.model)



    def build_apispec(self):

        """

lib/galaxy/webapps/galaxy/buildapp.py

+9 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import logging 
import sys

import threading

import traceback

from typing import Optional

from urllib.parse import urljoin



from paste import httpexceptions
@@ -20,6 +21,7 @@ import galaxy.web.framework 
import galaxy.webapps.base.webapp

from galaxy import util

from galaxy.security.validate_user_input import VALID_PUBLICNAME_RE

from galaxy.structured_app import MinimalApp

from galaxy.util import asbool

from galaxy.util.properties import load_app_properties

from galaxy.web.framework.middleware.error import ErrorMiddleware
@@ -34,6 +36,13 @@ log = logging.getLogger(__name__) 
class GalaxyWebApplication(galaxy.webapps.base.webapp.WebApplication):

    injection_aware = True



    def __init__(

        self, galaxy_app: MinimalApp, session_cookie: str = "galaxysession", name: Optional[str] = None

    ) -> None:

        super().__init__(galaxy_app, session_cookie, name)

        self.session_factories.append(galaxy_app.install_model)





def app_factory(*args, **kwargs):

    """

    Return a wsgi application serving the root object