Merge branch 'release_24.1' into dev

client/src/api/schema/schema.ts

@@ -6155,6 +6155,8 @@ export interface components {
              * @enum {string}
              */
             model_class: "HistoryDatasetAssociation";
+            /** Purged */
+            purged: boolean;
             /**
              * State
              * @description The current state of this dataset.

client/src/stores/collectionElementsStore.test.ts

@@ -151,6 +151,7 @@ function mockElement(collectionId: string, i: number): DCESummary {
             history_id: "1",
             tags: [],
             accessible: true,
+            purged: false,
         },
     };
 }

lib/galaxy/managers/collections_util.py

@@ -186,6 +186,7 @@ def dictify_element_reference(
         else:
             object_details["state"] = element_object.state
             object_details["hda_ldda"] = "hda"
+            object_details["purged"] = element_object.purged
             if isinstance(element_object, model.HistoryDatasetAssociation):
                 object_details["history_id"] = element_object.history_id
                 object_details["tags"] = element_object.make_tag_string_list()

lib/galaxy/managers/jobs.py

@@ -8,6 +8,7 @@
     cast,
     Dict,
     List,
+    Optional,
 )
 
 import sqlalchemy
@@ -26,6 +27,7 @@
 )
 from sqlalchemy.orm import aliased
 from sqlalchemy.sql import select
+from typing_extensions import TypedDict
 
 from galaxy import model
 from galaxy.exceptions import (
@@ -824,7 +826,14 @@ def merge_states(component_states):
     return rval
 
 
-def summarize_jobs_to_dict(sa_session, jobs_source):
+class JobsSummary(TypedDict):
+    populated_state: str
+    states: Dict[str, int]
+    model: str
+    id: int
+
+
+def summarize_jobs_to_dict(sa_session, jobs_source) -> Optional[JobsSummary]:
     """Produce a summary of jobs for job summary endpoints.
 
     :type   jobs_source: a Job or ImplicitCollectionJobs or None
@@ -833,7 +842,7 @@ def summarize_jobs_to_dict(sa_session, jobs_source):
     :rtype:     dict
     :returns:   dictionary containing job summary information
     """
-    rval = None
+    rval: Optional[JobsSummary] = None
     if jobs_source is None:
         pass
     elif isinstance(jobs_source, model.Job):

lib/galaxy/schema/schema.py

@@ -950,6 +950,7 @@ class HDAObject(Model, WithModelClass):
     tags: List[str]
     copied_from_ldda_id: Optional[EncodedDatabaseIdField] = None
     accessible: Optional[bool] = None
+    purged: bool
     model_config = ConfigDict(extra="allow")
 
 

lib/galaxy/tools/parameters/validation.py

@@ -165,7 +165,7 @@ def __init__(self, message, range_min, range_max, exclude_min=False, exclude_max
             op1 = "<"
         if self.exclude_max:
             op2 = "<"
-        expression = f"float('{self.min}') {op1} value {op2} float('{self.max}')"
+        expression = f"float('{self.min}') {op1} float(value) {op2} float('{self.max}')"
         if message is None:
             message = f"Value ('%s') must {'not ' if negate == 'true' else ''}fulfill {expression}"
         super().__init__(message, expression, negate)

test/unit/app/tools/test_parameter_validation.py

@@ -219,11 +219,11 @@ def test_InRangeValidator(self):
         )
         p.validate(10)
         with self.assertRaisesRegex(
-            ValueError, r"Parameter blah: Value \('15'\) must not fulfill float\('10'\) < value <= float\('20'\)"
+            ValueError, r"Parameter blah: Value \('15'\) must not fulfill float\('10'\) < float\(value\) <= float\('20'\)"
         ):
             p.validate(15)
         with self.assertRaisesRegex(
-            ValueError, r"Parameter blah: Value \('20'\) must not fulfill float\('10'\) < value <= float\('20'\)"
+            ValueError, r"Parameter blah: Value \('20'\) must not fulfill float\('10'\) < float\(value\) <= float\('20'\)"
         ):
             p.validate(20)
         p.validate(21)