galaxy-web-stack 25.1.2__tar.gz → 26.0.1.dev0__tar.gz

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/HISTORY.rst

@@ -3,6 +3,31 @@ History
 
 .. to_doc
 
+-----------
+26.0.1.dev0
+-----------
+
+
+
+-------------------
+26.0.0 (2026-04-08)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix differentiation between single handler and handler tag by `@natefoo <https://github.com/natefoo>`_ in `#21252 <https://github.com/galaxyproject/galaxy/pull/21252>`_
+
+============
+Enhancements
+============
+
+* Add type annotations to job handling code by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21171 <https://github.com/galaxyproject/galaxy/pull/21171>`_
+* Clean up code with pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21540 <https://github.com/galaxyproject/galaxy/pull/21540>`_
+* Drop support for Python 3.9 by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21583 <https://github.com/galaxyproject/galaxy/pull/21583>`_
+
 -------------------
 25.1.2 (2026-03-09)
 -------------------

galaxy_web_stack-26.0.1.dev0/LICENSE

@@ -0,0 +1,38 @@
+Copyright (c) 2005-2026 Galaxy Contributors (see CONTRIBUTORS.md)
+
+Galaxy is provided from 2026-02-25 onwards entirely under the MIT License.
+
+Some icons found in Galaxy are from the Silk Icons set, available under
+the Creative Commons Attribution 2.5 License, from:
+
+http://www.famfamfam.com/lab/icons/silk/
+
+
+Other images and documentation are licensed under the Creative Commons
+Attribution 3.0 (CC BY 3.0) License. See:
+
+http://creativecommons.org/licenses/by/3.0/
+
+
+--------------------------------------------------------------------------------
+
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{galaxy_web_stack-25.1.2/galaxy_web_stack.egg-info → galaxy_web_stack-26.0.1.dev0}/PKG-INFO

@@ -1,33 +1,20 @@
 Metadata-Version: 2.4
 Name: galaxy-web-stack
-Version: 25.1.2
+Version: 26.0.1.dev0
 Summary: Galaxy web stack abstraction
 Home-page: https://github.com/galaxyproject/galaxy
 Author: Galaxy Project and Community
 Author-email: galaxy-committers@lists.galaxyproject.org
-License: AFL
-Keywords: Galaxy
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Academic Free License (AFL)
-Classifier: Natural Language :: English
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Code Generators
-Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.9
+License: MIT
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: galaxy-data
 Requires-Dist: galaxy-util
 Requires-Dist: SQLAlchemy!=2.0.41,<2.1,>=2.0.37
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: gunicorn; extra == "test"
 Dynamic: license-file
 
 
@@ -49,6 +36,31 @@ History
 
 .. to_doc
 
+-----------
+26.0.1.dev0
+-----------
+
+
+
+-------------------
+26.0.0 (2026-04-08)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix differentiation between single handler and handler tag by `@natefoo <https://github.com/natefoo>`_ in `#21252 <https://github.com/galaxyproject/galaxy/pull/21252>`_
+
+============
+Enhancements
+============
+
+* Add type annotations to job handling code by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21171 <https://github.com/galaxyproject/galaxy/pull/21171>`_
+* Clean up code with pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21540 <https://github.com/galaxyproject/galaxy/pull/21540>`_
+* Drop support for Python 3.9 by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21583 <https://github.com/galaxyproject/galaxy/pull/21583>`_
+
 -------------------
 25.1.2 (2026-03-09)
 -------------------

galaxy_web_stack-26.0.1.dev0/dev-requirements.txt

@@ -0,0 +1,6 @@
+# For dev
+mypy
+
+# For release
+build
+twine==6.2.0

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/galaxy/web_stack/__init__.py

@@ -5,15 +5,19 @@ import multiprocessing
 import os
 import sys
 import threading
+from collections.abc import Callable
 from typing import (
-    Callable,
     Optional,
+    TYPE_CHECKING,
 )
 
 from galaxy.model import database_utils
 from galaxy.util.facts import get_facts
 from .handlers import HANDLER_ASSIGNMENT_METHODS
 
+if TYPE_CHECKING:
+    from .handlers import ConfiguresHandlers
+
 log = logging.getLogger(__name__)
 
 
@@ -76,17 +80,17 @@ class ApplicationStack:
                 self._preferred_handler_assignment_method = HANDLER_ASSIGNMENT_METHODS.DB_TRANSACTION_ISOLATION
         return self._preferred_handler_assignment_method
 
-    def _set_default_job_handler_assignment_methods(self, job_config, base_pool):
+    def _set_default_job_handler_assignment_methods(self, job_config: "ConfiguresHandlers", base_pool: str) -> None:
         """Override in subclasses to set default job handler assignment methods if not explicitly configured by the administrator.
 
         Called once per job_config.
         """
 
-    def _init_job_handler_assignment_methods(self, job_config, base_pool):
+    def _init_job_handler_assignment_methods(self, job_config: "ConfiguresHandlers", base_pool: str) -> None:
         if not job_config.handler_assignment_methods_configured:
             self._set_default_job_handler_assignment_methods(job_config, base_pool)
 
-    def _init_job_handler_subpools(self, job_config, base_pool):
+    def _init_job_handler_subpools(self, job_config: "ConfiguresHandlers", base_pool: str) -> None:
         """Set up members of "subpools" ("base_pool.*") as handlers (including the base pool itself, if it exists)."""
         for pool_name in self.configured_pools:
             if pool_name == base_pool:
@@ -105,7 +109,7 @@ class ApplicationStack:
                     job_config.add_handler(handler, [tag])
                 job_config.pool_for_tag[tag] = pool_name
 
-    def init_job_handling(self, job_config):
+    def init_job_handling(self, job_config: "ConfiguresHandlers") -> None:
         """Automatically add pools as handlers if they are named per predefined names and there is not an explicit
         job handler assignment configuration.
 
@@ -147,17 +151,17 @@ class ApplicationStack:
     def configured_pools(self):
         return {}
 
-    def has_base_pool(self, pool_name):
+    def has_base_pool(self, pool_name: str) -> bool:
         return self.has_pool(pool_name) or any(pool.startswith(f"{pool_name}.") for pool in self.configured_pools)
 
-    def has_pool(self, pool_name):
+    def has_pool(self, pool_name: str) -> bool:
         return pool_name in self.configured_pools
 
-    def in_pool(self, pool_name):
+    def in_pool(self, pool_name: str) -> bool:
         return False
 
-    def pool_members(self, pool_name):
-        return None
+    def pool_members(self, pool_name: str) -> tuple[str, ...]:
+        return ()
 
     @property
     def facts(self):
@@ -224,7 +228,7 @@ class GunicornApplicationStack(ApplicationStack):
 class WeblessApplicationStack(ApplicationStack):
     name = "Webless"
 
-    def _set_default_job_handler_assignment_methods(self, job_config, base_pool):
+    def _set_default_job_handler_assignment_methods(self, job_config: "ConfiguresHandlers", base_pool: str) -> None:
         # We will only get here if --attach-to-pool has been set so it is safe to assume that this handler is dynamic
         # and that we want to use one of the DB serialization methods.
         #
@@ -267,11 +271,11 @@ class WeblessApplicationStack(ApplicationStack):
     def configured_pools(self):
         return dict.fromkeys(self.config.attach_to_pools, self.config.server_name)
 
-    def in_pool(self, pool_name):
+    def in_pool(self, pool_name: str) -> bool:
         return pool_name in self.config.attach_to_pools
 
-    def pool_members(self, pool_name):
-        return (self.config.server_name,) if self.in_pool(pool_name) else None
+    def pool_members(self, pool_name: str) -> tuple[str, ...]:
+        return (self.config.server_name,) if self.in_pool(pool_name) else ()
 
 
 def application_stack_class() -> type[ApplicationStack]:
@@ -294,13 +298,9 @@ def application_stack_log_filter():
     return application_stack_class().log_filter_class()
 
 
-def application_stack_log_formatter():
+def application_stack_log_formatter() -> logging.Formatter:
     return logging.Formatter(fmt=application_stack_class().log_format)
 
 
-def register_postfork_function(f, *args, post_fork_only=False, **kwargs):
-    application_stack_class().register_postfork_function(f, *args, post_fork_only=post_fork_only**kwargs)
-
-
 def get_app_kwds(config_section, app_name=None):
     return application_stack_class().get_app_kwds(config_section, app_name=app_name)

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/galaxy/web_stack/handlers.py

@@ -7,7 +7,21 @@ for some activity such as queuing up jobs or scheduling workflows.
 import logging
 import os
 import random
+from collections.abc import (
+    Callable,
+    Iterable,
+    Sequence,
+)
 from enum import Enum
+from typing import (
+    Any,
+    Concatenate,
+    Literal,
+    Protocol,
+    TYPE_CHECKING,
+    TypeVar,
+    Union,
+)
 
 from sqlalchemy.orm import object_session
 
@@ -15,8 +29,13 @@ from galaxy.exceptions import HandlerAssignmentError
 from galaxy.util import (
     ExecutionTimer,
     listify,
+    unicodify,
 )
 
+if TYPE_CHECKING:
+    from galaxy.structured_app import MinimalManagerApp
+    from galaxy.util import Element
+
 log = logging.getLogger(__name__)
 
 
@@ -36,13 +55,29 @@ class HandlerAssignmentSkip(Exception):
     """Exception for handler assignment methods to raise if the next method should be tried."""
 
 
+class ModelWithHandler(Protocol):
+    def log_str(self) -> str: ...
+
+    def set_handler(self, handler: str) -> None: ...
+
+
+T = TypeVar("T")
+
+
 class ConfiguresHandlers:
     DEFAULT_HANDLER_TAG = "_default_"
     DEFAULT_BASE_HANDLER_POOLS: tuple[str, ...] = ()
 
-    def add_handler(self, handler_id, tags):
+    def __init__(self, app: "MinimalManagerApp") -> None:
+        self.app = app
+        self.handler_assignment_methods: list[HANDLER_ASSIGNMENT_METHODS] = []
+        self.handler_assignment_methods_configured = False
+        self.handler_max_grab: Union[int, None] = None
+        self.handlers: dict[str, list[str]] = {}
+
+    def add_handler(self, handler_id: str, tags: list[str]) -> None:
         if handler_id not in self.handlers:
-            self.handlers[handler_id] = (handler_id,)
+            self.handlers[handler_id] = [handler_id]
         for tag in tags:
             if tag in self.handlers and handler_id not in self.handlers[tag]:
                 self.handlers[tag].append(handler_id)
@@ -50,23 +85,24 @@ class ConfiguresHandlers:
                 self.handlers[tag] = [handler_id]
 
     @staticmethod
-    def xml_to_dict(config, config_element):
-        handling_config_dict = {}
-
-        processes = {}
-        handling_config_dict["processes"] = processes
+    def xml_to_dict(config, config_element: Union["Element", None]) -> dict[str, Any]:
+        processes: dict[str, dict[str, list[str]]] = {}
+        handling_config_dict: dict[str, Any] = {"processes": processes}
 
         # Parse handlers
         if config_element is not None:
             for handler in ConfiguresHandlers._findall_with_required(config_element, "handler"):
                 handler_id = handler.get("id")
+                assert handler_id is not None  # guaranteed by _findall_with_required()
                 if handler_id in processes:
                     log.error("Handler '%s' overlaps handler with the same name, ignoring", handler_id)
                 else:
                     log.debug("Read definition for handler '%s'", handler_id)
                     plugins = []
                     for plugin in ConfiguresHandlers._findall_with_required(handler, "plugin", ["id"]):
-                        plugins.append(plugin.get("id"))
+                        plugin_id = plugin.get("id")
+                        assert plugin_id is not None  # guaranteed by _findall_with_required()
+                        plugins.append(plugin_id)
                     tags = [x.strip() for x in handler.get("tags", ConfiguresHandlers.DEFAULT_HANDLER_TAG).split(",")]
                     handler_def = {"tags": tags}
                     if plugins:
@@ -88,7 +124,7 @@ class ConfiguresHandlers:
 
         return handling_config_dict
 
-    def _init_handlers(self, handling_config_dict=None):
+    def _init_handlers(self, handling_config_dict: Union[dict, None]) -> None:
         handling_config_dict = handling_config_dict or {}
         for handler_id, process in handling_config_dict.get("processes", {}).items():
             process = process or {}
@@ -103,13 +139,16 @@ class ConfiguresHandlers:
             handling_config_dict.get("default"), list(self.handlers.keys()), required=False
         )
 
-    def _init_handler_assignment_methods(self, handling_config_dict=None):
+    def _init_handler_assignment_methods(self, handling_config_dict: Union[dict, None] = None) -> None:
         handling_config_dict = handling_config_dict or {}
 
-        self.__is_handler = None
+        self.__is_handler: Union[bool, None] = None
         # This is set by the stack job handler init code
-        self.pool_for_tag = {}
-        self._handler_assignment_method_methods = {
+        self.pool_for_tag: dict[str, str] = {}
+        self._handler_assignment_method_methods: dict[
+            HANDLER_ASSIGNMENT_METHODS,
+            Callable[Concatenate[ModelWithHandler, HANDLER_ASSIGNMENT_METHODS, Union[str, None], bool, ...], str],
+        ] = {
             HANDLER_ASSIGNMENT_METHODS.MEM_SELF: self._assign_mem_self_handler,
             HANDLER_ASSIGNMENT_METHODS.DB_SELF: self._assign_db_self_handler,
             HANDLER_ASSIGNMENT_METHODS.DB_PREASSIGN: self._assign_db_preassign_handler,
@@ -124,18 +163,14 @@ class ConfiguresHandlers:
                 ), "Invalid job handler assignment method '{}', must be one of: {}".format(
                     method, ", ".join(h.value for h in HANDLER_ASSIGNMENT_METHODS)
                 )
-                try:
-                    self.handler_assignment_methods.append(method)
-                except AttributeError:
-                    self.handler_assignment_methods_configured = True
-                    self.handler_assignment_methods = [method]
+                self.handler_assignment_methods.append(method)
+                self.handler_assignment_methods_configured = True
             if self.handler_assignment_methods == [HANDLER_ASSIGNMENT_METHODS.MEM_SELF]:
                 self.app.config.track_jobs_in_database = False
-            self.handler_max_grab = handling_config_dict.get("max_grab", self.handler_max_grab)
-            if self.handler_max_grab is not None:
-                self.handler_max_grab = int(self.handler_max_grab)
+            if (max_grab := handling_config_dict.get("max_grab")) is not None:
+                self.handler_max_grab = int(max_grab)
 
-    def _set_default_handler_assignment_methods(self):
+    def _set_default_handler_assignment_methods(self) -> None:
         if not self.handler_assignment_methods_configured:
             if not self.app.config.track_jobs_in_database:
                 # DEPRECATED: You should just set mem_self as the only method if you want this
@@ -160,17 +195,19 @@ class ConfiguresHandlers:
         pass
 
     @staticmethod
-    def get_xml_default(config, parent):
+    def get_xml_default(config, parent: "Element"):
         rval = parent.get("default")
         if "default_from_environ" in parent.attrib:
-            environ_var = parent.attrib["default_from_environ"]
+            environ_var = unicodify(parent.attrib["default_from_environ"])
             rval = os.environ.get(environ_var, rval)
         elif "default_from_config" in parent.attrib:
-            config_val = parent.attrib["default_from_config"]
+            config_val = unicodify(parent.attrib["default_from_config"])
             rval = config.config_dict.get(config_val, rval)
         return rval
 
-    def _get_default(self, config, parent, names, auto=False, required=True):
+    def _get_default(
+        self, config, parent: "Element", names: list[str], auto: bool = False, required: bool = True
+    ) -> Union[str, None]:
         """
         Returns the default attribute set in a parent tag like <handlers> or
         <destinations>, or return the ID of the child, if there is no explicit
@@ -190,7 +227,9 @@ class ConfiguresHandlers:
         rval = ConfiguresHandlers.get_xml_default(config, parent)
         return self._ensure_default_set(rval, names, auto=auto, required=required)
 
-    def _ensure_default_set(self, rval, names, auto=False, required=True):
+    def _ensure_default_set(
+        self, rval: Union[str, None], names: list[str], auto: bool = False, required: bool = True
+    ) -> Union[str, None]:
         if rval is not None:
             # If the parent element has a 'default' attribute, use the id or tag in that attribute
             if required and rval not in names:
@@ -204,7 +243,9 @@ class ConfiguresHandlers:
         return rval
 
     @staticmethod
-    def _findall_with_required(parent, match, attribs=None):
+    def _findall_with_required(
+        parent: "Element", match: str, attribs: Union[Iterable[str], None] = None
+    ) -> list["Element"]:
         """Like ``lxml.etree.Element.findall()``, except only returns children that have the specified attribs.
 
         :param parent: Parent element in which to find.
@@ -216,7 +257,7 @@ class ConfiguresHandlers:
 
         :returns: list of ``lxml.etree._Element``
         """
-        rval = []
+        rval: list[Element] = []
         if attribs is None:
             attribs = ("id",)
         for elem in parent.findall(match):
@@ -234,7 +275,7 @@ class ConfiguresHandlers:
             filter(lambda x: x == HANDLER_ASSIGNMENT_METHODS.DB_PREASSIGN), self.handler_assignment_methods
         )
 
-    def _get_is_handler(self):
+    def _get_is_handler(self) -> bool:
         """Indicate whether the current server is configured as a handler.
 
         :return: bool
@@ -260,12 +301,12 @@ class ConfiguresHandlers:
             return True
         return False
 
-    def _set_is_handler(self, value):
+    def _set_is_handler(self, value: bool) -> None:
         self.__is_handler = value
 
     is_handler = property(_get_is_handler, _set_is_handler)
 
-    def _get_single_item(self, collection, index=None):
+    def _get_single_item(self, collection: Sequence[T], index: Union[int, None] = None) -> T:
         """Given a collection of handlers or destinations, return one item from the collection at random."""
         # Done like this to avoid random under the assumption it's faster to avoid it
         if len(collection) == 1:
@@ -278,7 +319,7 @@ class ConfiguresHandlers:
     @property
     def handler_tags(self):
         """Get an iterable of all configured handler tags."""
-        return filter(lambda k: isinstance(self.handlers[k], list), self.handlers.keys())
+        return filter(lambda k: self.handlers[k] != [k], self.handlers.keys())
 
     @property
     def self_handler_tags(self):
@@ -289,7 +330,9 @@ class ConfiguresHandlers:
 
     # If these get to be any more complex we should probably modularize them, or at least move to a separate class
 
-    def _assign_handler_direct(self, obj, configured, flush=True):
+    def _assign_handler_direct(
+        self, obj: ModelWithHandler, configured: Union[str, None], flush: bool = True
+    ) -> Union[str, Literal[False]]:
         """Directly assign a handler if the object has been preconfigured to a known single static handler.
 
         :param obj:             Same as :method:`ConfiguresHandlers.assign_handler()`.
@@ -302,14 +345,22 @@ class ConfiguresHandlers:
                 handlers = self.handlers[configured]
             except KeyError:
                 handlers = None
-            if handlers == (configured,):
+            if handlers == [configured]:
                 obj.set_handler(configured)
                 if flush:
                     _timed_flush_obj(obj)
                 return configured
         return False
 
-    def _assign_mem_self_handler(self, obj, method, configured, queue_callback=None, flush=True, **kwargs):
+    def _assign_mem_self_handler(
+        self,
+        obj: ModelWithHandler,
+        method: HANDLER_ASSIGNMENT_METHODS,
+        configured: Union[str, None],
+        flush: bool,
+        queue_callback=None,
+        **kwargs,
+    ) -> str:
         """Assign object to this handler using this process's in-memory queue.
 
         This method ignores all handler configuration.
@@ -339,7 +390,14 @@ class ConfiguresHandlers:
         queue_callback()
         return self.app.config.server_name
 
-    def _assign_db_self_handler(self, obj, method, configured, flush=True, **kwargs):
+    def _assign_db_self_handler(
+        self,
+        obj: ModelWithHandler,
+        method: HANDLER_ASSIGNMENT_METHODS,
+        configured: Union[str, None],
+        flush: bool,
+        **kwargs,
+    ) -> str:
         """Assign object to this process by setting its ``handler`` column in the database to this process.
 
         This only occurs if there is not an explicitly configured handler assignment for the object. Otherwise, it is
@@ -353,14 +411,22 @@ class ConfiguresHandlers:
         """
         if configured:
             return self._handler_assignment_method_methods[HANDLER_ASSIGNMENT_METHODS.DB_PREASSIGN](
-                obj, method, configured, **kwargs
+                obj, method, configured, flush, **kwargs
             )
         obj.set_handler(self.app.config.server_name)
         if flush:
             _timed_flush_obj(obj)
         return self.app.config.server_name
 
-    def _assign_db_preassign_handler(self, obj, method, configured, index=None, flush=True, **kwargs):
+    def _assign_db_preassign_handler(
+        self,
+        obj: ModelWithHandler,
+        method: HANDLER_ASSIGNMENT_METHODS,
+        configured: Union[str, None],
+        flush: bool,
+        index: Union[int, None] = None,
+        **kwargs,
+    ) -> str:
         """Assign object to a handler by setting its ``handler`` column in the database to a handler selected at random
         from the known handlers in the appropriate tag.
 
@@ -394,7 +460,14 @@ class ConfiguresHandlers:
             _timed_flush_obj(obj)
         return handler_id
 
-    def _assign_db_tag(self, obj, method, configured, flush=True, **kwargs):
+    def _assign_db_tag(
+        self,
+        obj: ModelWithHandler,
+        method: HANDLER_ASSIGNMENT_METHODS,
+        configured: Union[str, None],
+        flush: bool,
+        **kwargs,
+    ) -> str:
         """Assign object to a handler by setting its ``handler`` column in the database to either the configured handler
         ID or tag, or to the default tag (or ``_default_``)
 
@@ -412,34 +485,33 @@ class ConfiguresHandlers:
             _timed_flush_obj(obj)
         return handler
 
-    def assign_handler(self, obj, configured=None, **kwargs):
+    def assign_handler(self, obj: ModelWithHandler, configured: Union[str, None] = None, flush: bool = True, **kwargs):
         """Set a job handler, flush obj
 
         Called assignment methods should raise py:class:`HandlerAssignmentSkip` to indicate that the next method
         should be tried.
 
-        :param obj:         Object to assign a handler to (must be a model object with ``handler`` attribute and
-                            ``log_str`` callable).
-        :type obj:          instance of :class:`galaxy.model.Job` or other model object with a ``set_handler()`` method.
+        :param obj:         Model object to assign a handler to.
+        :type obj:          model object with ``set_handler()`` and ``log_str()`` methods.
         :param configured:  Preconfigured handler (ID, tag, or None) for the given object.
         :type configured:   str or None.
 
-        :returns: bool -- True on successful assignment, False otherwise.
+        :returns: str -- The assigned handler ID or tag.
         """
         # It's a bit awkward that the method that actually hands off job execution is in the JobConfiguration, but
         # that's currently the best place for it. It's worth noting that this method is also part of the
         # WorkflowSchedulingManager, which acts like a combined JobConfiguration and JobManager. Combining those two
         # classes would probably be reasonable (and would remove the need for the queue callback).
-        if self._assign_handler_direct(obj, configured, flush=kwargs.get("flush", True)):
+        if handler := self._assign_handler_direct(obj, configured, flush=flush):
             log.info(
                 "(%s) Skipped handler assignment logic due to explicit configuration` to a single handler: %s",
                 obj.log_str(),
                 configured,
             )
-            return True
+            return handler
         for method in self.handler_assignment_methods:
             try:
-                handler = self._handler_assignment_method_methods[method](obj, method, configured=configured, **kwargs)
+                handler = self._handler_assignment_method_methods[method](obj, method, configured, flush, **kwargs)
                 log.info("(%s) Handler '%s' assigned using '%s' assignment method", obj.log_str(), handler, method)
                 return handler
             except HandlerAssignmentSkip:

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0/galaxy_web_stack.egg-info}/PKG-INFO

@@ -1,33 +1,20 @@
 Metadata-Version: 2.4
 Name: galaxy-web-stack
-Version: 25.1.2
+Version: 26.0.1.dev0
 Summary: Galaxy web stack abstraction
 Home-page: https://github.com/galaxyproject/galaxy
 Author: Galaxy Project and Community
 Author-email: galaxy-committers@lists.galaxyproject.org
-License: AFL
-Keywords: Galaxy
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Academic Free License (AFL)
-Classifier: Natural Language :: English
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Code Generators
-Classifier: Topic :: Software Development :: Testing
-Requires-Python: >=3.9
+License: MIT
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: galaxy-data
 Requires-Dist: galaxy-util
 Requires-Dist: SQLAlchemy!=2.0.41,<2.1,>=2.0.37
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: gunicorn; extra == "test"
 Dynamic: license-file
 
 
@@ -49,6 +36,31 @@ History
 
 .. to_doc
 
+-----------
+26.0.1.dev0
+-----------
+
+
+
+-------------------
+26.0.0 (2026-04-08)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix differentiation between single handler and handler tag by `@natefoo <https://github.com/natefoo>`_ in `#21252 <https://github.com/galaxyproject/galaxy/pull/21252>`_
+
+============
+Enhancements
+============
+
+* Add type annotations to job handling code by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21171 <https://github.com/galaxyproject/galaxy/pull/21171>`_
+* Clean up code with pyupgrade by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21540 <https://github.com/galaxyproject/galaxy/pull/21540>`_
+* Drop support for Python 3.9 by `@nsoranzo <https://github.com/nsoranzo>`_ in `#21583 <https://github.com/galaxyproject/galaxy/pull/21583>`_
+
 -------------------
 25.1.2 (2026-03-09)
 -------------------

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/galaxy_web_stack.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ README.rst
 dev-requirements.txt
 pyproject.toml
 setup.cfg
-test-requirements.txt
 galaxy/__init__.py
 galaxy/py.typed
 galaxy/web_stack/__init__.py

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/galaxy_web_stack.egg-info/requires.txt

@@ -1,3 +1,7 @@
 galaxy-data
 galaxy-util
 SQLAlchemy!=2.0.41,<2.1,>=2.0.37
+
+[test]
+pytest
+gunicorn

galaxy_web_stack-26.0.1.dev0/pyproject.toml

@@ -0,0 +1,16 @@
+[build-system]
+build-backend = "setuptools.build_meta"
+requires = ["setuptools"]
+
+[project]
+dynamic = [
+    "authors",
+    "dependencies",
+    "description",
+    "license",
+    "optional-dependencies",
+    "readme",
+    "requires-python",
+    "version",
+]
+name = "galaxy-web-stack"

{galaxy_web_stack-25.1.2 → galaxy_web_stack-26.0.1.dev0}/setup.cfg

@@ -5,29 +5,28 @@ classifiers =
 	Development Status :: 5 - Production/Stable
 	Environment :: Console
 	Intended Audience :: Developers
-	License :: OSI Approved :: Academic Free License (AFL)
 	Natural Language :: English
 	Operating System :: POSIX
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
 	Programming Language :: Python :: 3.13
+	Programming Language :: Python :: 3.14
 	Topic :: Software Development
 	Topic :: Software Development :: Code Generators
 	Topic :: Software Development :: Testing
 description = Galaxy web stack abstraction
 keywords = 
 	Galaxy
-license = AFL
+license = MIT
 license_files = 
 	LICENSE
 long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 name = galaxy-web-stack
 url = https://github.com/galaxyproject/galaxy
-version = 25.1.2
+version = 26.0.1.dev0
 
 [options]
 include_package_data = True
@@ -36,7 +35,12 @@ install_requires =
 	galaxy-util
 	SQLAlchemy>=2.0.37,<2.1,!=2.0.41
 packages = find:
-python_requires = >=3.9
+python_requires = >=3.10
+
+[options.extras_require]
+test = 
+	pytest
+	gunicorn
 
 [options.packages.find]
 exclude = 

galaxy_web_stack-25.1.2/LICENSE

@@ -1,228 +0,0 @@
-Copyright (c) 2005-2022 Galaxy Contributors (see CONTRIBUTORS.md)
-
-Work contributed from 2021-04-07 onwards is licensed under the MIT License.
-Work contributed before this date is licensed under the Academic Free License
-version 3.0.
-See https://github.com/galaxyproject/galaxy/ for the contribution history.
-See below for the full text of both licenses.
-
-
-Some icons found in Galaxy are from the Silk Icons set, available under
-the Creative Commons Attribution 2.5 License, from:
-
-http://www.famfamfam.com/lab/icons/silk/
-
-
-Other images and documentation are licensed under the Creative Commons
-Attribution 3.0 (CC BY 3.0) License. See:
-
-http://creativecommons.org/licenses/by/3.0/
-
-
---------------------------------------------------------------------------------
-
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
---------------------------------------------------------------------------------
-
-
-Academic Free License ("AFL") v. 3.0
-
-This Academic Free License (the "License") applies to any original work of
-authorship (the "Original Work") whose owner (the "Licensor") has placed the
-following licensing notice adjacent to the copyright notice for the Original
-Work:
-
-Licensed under the Academic Free License version 3.0
-
- 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, 
-    non-exclusive, sublicensable license, for the duration of the copyright, to 
-    do the following:
-
-    a) to reproduce the Original Work in copies, either alone or as part of a 
-       collective work;
-
-    b) to translate, adapt, alter, transform, modify, or arrange the Original 
-       Work, thereby creating derivative works ("Derivative Works") based upon 
-       the Original Work;
-
-    c) to distribute or communicate copies of the Original Work and Derivative 
-       Works to the public, under any license of your choice that does not 
-       contradict the terms and conditions, including Licensor's reserved 
-       rights and remedies, in this Academic Free License;
-
-    d) to perform the Original Work publicly; and
-
-    e) to display the Original Work publicly.
-
- 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, 
-    non-exclusive, sublicensable license, under patent claims owned or 
-    controlled by the Licensor that are embodied in the Original Work as 
-    furnished by the Licensor, for the duration of the patents, to make, use, 
-    sell, offer for sale, have made, and import the Original Work and 
-    Derivative Works.
-
- 3) Grant of Source Code License. The term "Source Code" means the preferred 
-    form of the Original Work for making modifications to it and all available 
-    documentation describing how to modify the Original Work. Licensor agrees 
-    to provide a machine-readable copy of the Source Code of the Original Work 
-    along with each copy of the Original Work that Licensor distributes. 
-    Licensor reserves the right to satisfy this obligation by placing a 
-    machine-readable copy of the Source Code in an information repository 
-    reasonably calculated to permit inexpensive and convenient access by You 
-    for as long as Licensor continues to distribute the Original Work.
-
- 4) Exclusions From License Grant. Neither the names of Licensor, nor the 
-    names of any contributors to the Original Work, nor any of their 
-    trademarks or service marks, may be used to endorse or promote products 
-    derived from this Original Work without express prior permission of the 
-    Licensor. Except as expressly stated herein, nothing in this License 
-    grants any license to Licensor's trademarks, copyrights, patents, trade 
-    secrets or any other intellectual property. No patent license is granted 
-    to make, use, sell, offer for sale, have made, or import embodiments of 
-    any patent claims other than the licensed claims defined in Section 2. 
-    No license is granted to the trademarks of Licensor even if such marks 
-    are included in the Original Work. Nothing in this License shall be 
-    interpreted to prohibit Licensor from licensing under terms different 
-    from this License any Original Work that Licensor otherwise would have a 
-    right to license.
-
- 5) External Deployment. The term "External Deployment" means the use, 
-    distribution, or communication of the Original Work or Derivative Works 
-    in any way such that the Original Work or Derivative Works may be used by 
-    anyone other than You, whether those works are distributed or 
-    communicated to those persons or made available as an application 
-    intended for use over a network. As an express condition for the grants 
-    of license hereunder, You must treat any External Deployment by You of 
-    the Original Work or a Derivative Work as a distribution under 
-    section 1(c).
-
- 6) Attribution Rights. You must retain, in the Source Code of any Derivative 
-    Works that You create, all copyright, patent, or trademark notices from 
-    the Source Code of the Original Work, as well as any notices of licensing 
-    and any descriptive text identified therein as an "Attribution Notice." 
-    You must cause the Source Code for any Derivative Works that You create 
-    to carry a prominent Attribution Notice reasonably calculated to inform 
-    recipients that You have modified the Original Work.
-
- 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that 
-    the copyright in and to the Original Work and the patent rights granted 
-    herein by Licensor are owned by the Licensor or are sublicensed to You 
-    under the terms of this License with the permission of the contributor(s) 
-    of those copyrights and patent rights. Except as expressly stated in the 
-    immediately preceding sentence, the Original Work is provided under this 
-    License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or 
-    implied, including, without limitation, the warranties of 
-    non-infringement, merchantability or fitness for a particular purpose. 
-    THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This 
-    DISCLAIMER OF WARRANTY constitutes an essential part of this License. 
-    No license to the Original Work is granted by this License except under 
-    this disclaimer.
-
- 8) Limitation of Liability. Under no circumstances and under no legal 
-    theory, whether in tort (including negligence), contract, or otherwise, 
-    shall the Licensor be liable to anyone for any indirect, special, 
-    incidental, or consequential damages of any character arising as a result 
-    of this License or the use of the Original Work including, without 
-    limitation, damages for loss of goodwill, work stoppage, computer failure 
-    or malfunction, or any and all other commercial damages or losses. This 
-    limitation of liability shall not apply to the extent applicable law 
-    prohibits such limitation.
-
- 9) Acceptance and Termination. If, at any time, You expressly assented to 
-    this License, that assent indicates your clear and irrevocable acceptance 
-    of this License and all of its terms and conditions. If You distribute or 
-    communicate copies of the Original Work or a Derivative Work, You must 
-    make a reasonable effort under the circumstances to obtain the express 
-    assent of recipients to the terms of this License. This License 
-    conditions your rights to undertake the activities listed in Section 1, 
-    including your right to create Derivative Works based upon the Original 
-    Work, and doing so without honoring these terms and conditions is 
-    prohibited by copyright law and international treaty. Nothing in this 
-    License is intended to affect copyright exceptions and limitations 
-    (including "fair use" or "fair dealing"). This License shall terminate 
-    immediately and You may no longer exercise any of the rights granted to 
-    You by this License upon your failure to honor the conditions in 
-    Section 1(c).
-
-10) Termination for Patent Action. This License shall terminate 
-    automatically and You may no longer exercise any of the rights granted 
-    to You by this License as of the date You commence an action, including 
-    a cross-claim or counterclaim, against Licensor or any licensee alleging 
-    that the Original Work infringes a patent. This termination provision 
-    shall not apply for an action alleging patent infringement by 
-    combinations of the Original Work with other software or hardware.
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating to 
-    this License may be brought only in the courts of a jurisdiction wherein 
-    the Licensor resides or in which Licensor conducts its primary business, 
-    and under the laws of that jurisdiction excluding its conflict-of-law 
-    provisions. The application of the United Nations Convention on 
-    Contracts for the International Sale of Goods is expressly excluded. Any 
-    use of the Original Work outside the scope of this License or after its 
-    termination shall be subject to the requirements and penalties of 
-    copyright or patent law in the appropriate jurisdiction. This section 
-    shall survive the termination of this License.
-
-12) Attorneys' Fees. In any action to enforce the terms of this License or 
-    seeking damages relating thereto, the prevailing party shall be entitled 
-    to recover its costs and expenses, including, without limitation, 
-    reasonable attorneys' fees and costs incurred in connection with such 
-    action, including any appeal of such action. This section shall survive 
-    the termination of this License.
-
-13) Miscellaneous. If any provision of this License is held to be 
-    unenforceable, such provision shall be reformed only to the extent 
-    necessary to make it enforceable.
-
-14) Definition of "You" in This License. "You" throughout this License, 
-    whether in upper or lower case, means an individual or a legal entity 
-    exercising rights under, and complying with all of the terms of, this 
-    License. For legal entities, "You" includes any entity that controls, is 
-    controlled by, or is under common control with you. For purposes of this 
-    definition, "control" means (i) the power, direct or indirect, to cause 
-    the direction or management of such entity, whether by contract or 
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the 
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-15) Right to Use. You may use the Original Work in all ways not otherwise 
-    restricted or conditioned by this License or by law, and Licensor 
-    promises not to interfere with or be responsible for such uses by You.
-
-16) Modification of This License. This License is Copyright © 2005 Lawrence 
-    Rosen. Permission is granted to copy, distribute, or communicate this 
-    License without modification. Nothing in this License permits You to 
-    modify this License as applied to the Original Work or to Derivative 
-    Works. However, You may modify the text of this License and copy, 
-    distribute or communicate your modified version (the "Modified 
-    License") and apply it to other original works of authorship subject to 
-    the following conditions: (i) You may not indicate in any way that your 
-    Modified License is the "Academic Free License" or "AFL" and you may not 
-    use those names in the name of your Modified License; (ii) You must 
-    replace the notice specified in the first paragraph above with the 
-    notice "Licensed under <insert your license name here>" or with a notice 
-    of your own that is not confusingly similar to the notice in this 
-    License; and (iii) You may not claim that your original works are open 
-    source software unless your Modified License has been approved by Open 
-    Source Initiative (OSI) and You comply with its license review and 
-    certification process.

galaxy_web_stack-25.1.2/dev-requirements.txt

@@ -1,10 +0,0 @@
-# For testing
--r test-requirements.txt
-
-# For dev
-sphinx
-mypy
-
-# For release
-build
-twine

galaxy_web_stack-25.1.2/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"

galaxy_web_stack-25.1.2/test-requirements.txt

@@ -1,2 +0,0 @@
-gunicorn
-pytest