From 4ae1ea2010a2dbd7e32159fee7332b71e763e2eb Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 27 Mar 2025 16:59:42 +0100 Subject: [PATCH] Fix toolbox.get_tool return type annotation --- lib/galaxy/tool_util/toolbox/base.py | 5 ++++- lib/galaxy/webapps/galaxy/services/tools.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py index 990736b93f7..f38509c3149 100644 --- a/lib/galaxy/tool_util/toolbox/base.py +++ b/lib/galaxy/tool_util/toolbox/base.py @@ -832,7 +832,10 @@ class AbstractToolBox(ManagesIntegratedToolPanelMixin): self.get_tool(tool_id, tool_version=tool_version, tool_uuid=tool_uuid, exact=exact, user=user) is not None ) - def get_unprivileged_tool(self, user: model.User, tool_uuid: Union[UUID, str]) -> Optional["Tool"]: + def get_unprivileged_tool(self, user: "User", tool_uuid: Union[UUID, str]) -> Optional["Tool"]: + return None + + def get_unprivileged_tool_or_none(self, user: "User", tool_uuid: Union[UUID, str]) -> Optional["Tool"]: return None def is_missing_shed_tool(self, tool_id: str) -> bool: diff --git a/lib/galaxy/webapps/galaxy/services/tools.py b/lib/galaxy/webapps/galaxy/services/tools.py index 10ea0bb03a3..84b0a7d9691 100644 --- a/lib/galaxy/webapps/galaxy/services/tools.py +++ b/lib/galaxy/webapps/galaxy/services/tools.py @@ -123,6 +123,7 @@ class ToolsService(ServiceBase): if tool_id is None and tool_uuid is None: raise exceptions.RequestParameterMissingException("Must specify either a tool_id or a tool_uuid.") + tool: Optional[Tool] = None if tool_uuid: tool = trans.app.toolbox.get_unprivileged_tool(trans.user, tool_uuid=tool_uuid) if not tool: