From 8981856d368c6811ff9e913ee99a7a63dc46ac21 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 7 Mar 2026 19:25:38 -0500
Subject: [PATCH] Fix ToolExpressionOutput.to_model() for boolean type.

to_model() checked "bool" but production expression tools (pick_value,
param_value_from_file) declare type="boolean". Fix to_model() to match
canonical "boolean" and fix lone test tool using non-canonical "bool".

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 lib/galaxy/tool_util/parser/output_objects.py              | 3 +--
 test/functional/tools/expression_null_handling_boolean.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/tool_util/parser/output_objects.py b/lib/galaxy/tool_util/parser/output_objects.py
index dba18ea03f6..77ea4977641 100644
--- a/lib/galaxy/tool_util/parser/output_objects.py
+++ b/lib/galaxy/tool_util/parser/output_objects.py
@@ -244,9 +244,8 @@ class ToolExpressionOutput(ToolOutputBase):
             model_class = ToolOutputIntegerModel
         elif self.output_type == "float":
             model_class = ToolOutputFloatModel
-        elif self.output_type == "bool":
+        elif self.output_type == "boolean":
             model_class = ToolOutputBooleanModel
-            model_type = "boolean"
         elif self.output_type == "text":
             model_class = ToolOutputTextModel
         assert model_class
diff --git a/test/functional/tools/expression_null_handling_boolean.xml b/test/functional/tools/expression_null_handling_boolean.xml
index 51eb7d2cfd1..d3f788c13f1 100644
--- a/test/functional/tools/expression_null_handling_boolean.xml
+++ b/test/functional/tools/expression_null_handling_boolean.xml
@@ -7,7 +7,7 @@
         <param type="boolean" label="Booelan input." name="bool_input" optional="true" />
     </inputs>
     <outputs>
-        <output type="bool" name="bool_out" from="bool_out" />
+        <output type="boolean" name="bool_out" from="bool_out" />
     </outputs>
     <tests>
         <test>