Fix type hints

Author: mr-c

lib/galaxy/tools/wrappers.py

@@ -7,6 +7,7 @@
     Any,
     cast,
     Dict,
+    ItemsView,
     Iterable,
     Iterator,
     KeysView,
@@ -56,7 +57,7 @@ class ToolParameterValueWrapper:
     Base class for object that Wraps a Tool Parameter and Value.
     """
 
-    value: Union[str, List[str]]
+    value: Union[None, str, List[str], Dict[str, str]]
     input: "ToolParameter"
 
     def __bool__(self) -> bool:
@@ -103,10 +104,12 @@ class InputValueWrapper(ToolParameterValueWrapper):
     Wraps an input so that __str__ gives the "param_dict" representation.
     """
 
+    value: Optional[Dict[str, str]]
+
     def __init__(
         self,
         input: "ToolParameter",
-        value: str,
+        value: Dict[str, str],
         other_values: Optional[Dict[str, str]] = None,
     ) -> None:
         self.input = input
@@ -172,6 +175,7 @@ class SelectToolParameterWrapper(ToolParameterValueWrapper):
     """
 
     input: "SelectToolParameter"
+    value: Union[str, List[str]]
 
     class SelectToolParameterFieldWrapper:
         """
@@ -625,9 +629,13 @@ def __init__(
         self.collection = collection
 
         elements = collection.elements
-        element_instances = {}
+        element_instances: Dict[
+            str, Union[DatasetCollectionWrapper, DatasetFilenameWrapper]
+        ] = {}
 
-        element_instance_list = []
+        element_instance_list: List[
+            Union[DatasetCollectionWrapper, DatasetFilenameWrapper]
+        ] = []
         for dataset_collection_element in elements:
             element_object = dataset_collection_element.element_object
             element_identifier = dataset_collection_element.element_identifier
@@ -662,7 +670,9 @@ def keys(self) -> Union[List[str], KeysView[Any]]:
             return []
         return self.__element_instances.keys()
 
-    def items(self):
+    def items(
+        self,
+    ) -> ItemsView[str, Union["DatasetCollectionWrapper", DatasetFilenameWrapper]]:
         return self.__element_instances.items()
 
     @property

lib/galaxy/workflow/modules.py

@@ -879,7 +879,7 @@ def get_inputs(self):
         cases = []
 
         for param_type in ["text", "integer", "float", "boolean", "color", "field"]:
-            default_source: Dict[str, Union[int, float, bool, str]] = dict(
+            default_source: Dict[str, Union[None, int, float, bool, str]] = dict(
                 name="default", label="Default Value", type=param_type
             )
             if param_type == "text":
@@ -891,6 +891,7 @@ def get_inputs(self):
                 input_default_value: Union[
                     TextToolParameter,
                     IntegerToolParameter,
+                    FieldTypeToolParameter,
                     FloatToolParameter,
                     BooleanToolParameter,
                     ColorToolParameter,
@@ -1728,7 +1729,7 @@ def decode_runtime_state(self, runtime_state):
 
     def evaluate_value_from_expressions(self, progress, step, execution_state, extra_step_state):
         value_from_expressions = {}
-        replacements = {}
+        replacements: Dict[str, str] = {}
 
         for key in execution_state.inputs.keys():
             step_input = step.inputs_by_name.get(key)
@@ -1882,8 +1883,17 @@ def callback(input, prefixed_name, **kwargs):
                                 replacement = json.load(f)
                     found_replacement_keys.add(prefixed_name)
 
-                is_data = isinstance(input, DataToolParameter) or isinstance(input, DataCollectionToolParameter) or isinstance(input, FieldTypeToolParameter)
-                if not is_data and getattr(replacement, "history_content_type", None) == "dataset" and getattr(replacement, "ext", None) == "expression.json":
+                is_data = (
+                    isinstance(input, DataToolParameter)
+                    or isinstance(input, DataCollectionToolParameter)
+                    or isinstance(input, FieldTypeToolParameter)
+                )
+                if (
+                    not is_data
+                    and not isinstance(replacement, NoReplacement)
+                    and getattr(replacement, "history_content_type", None) == "dataset"
+                    and getattr(replacement, "ext", None) == "expression.json"
+                ):
                     if isinstance(replacement, model.HistoryDatasetAssociation):
                         if not replacement.dataset.in_ready_state():
                             why = "dataset [%s] is needed for non-data connection and is non-ready" % replacement.id
@@ -1897,11 +1907,11 @@ def callback(input, prefixed_name, **kwargs):
 
                 if isinstance(input, FieldTypeToolParameter):
                     if isinstance(replacement, model.HistoryDatasetAssociation):
-                        replacement = {"src": "hda", "value": replacement}
+                        return {"src": "hda", "value": replacement}
                     elif isinstance(replacement, model.HistoryDatasetCollectionAssociation):
-                        replacement = {"src": "hdca", "value": replacement}
+                        return {"src": "hdca", "value": replacement}
                     elif replacement is not NO_REPLACEMENT:
-                        replacement = {"src": "json", "value": replacement}
+                        return {"src": "json", "value": replacement}
 
                 return replacement
 
@@ -1944,9 +1954,9 @@ def expression_callback(input, prefixed_name, **kwargs):
                 if prefixed_name in expression_replacements:
                     expression_replacement = expression_replacements[prefixed_name]
                     if isinstance(input, FieldTypeToolParameter):
-                        replacement = {"src": "json", "value": expression_replacement}
+                        return {"src": "json", "value": expression_replacement}
                     else:
-                        replacement = expression_replacement
+                        return expression_replacement
 
                 return replacement
 

lib/galaxy/workflow/run.py

@@ -367,11 +367,10 @@ def replacement_for_input_connections(self, step, input_dict, connections):
             else:
                 raise NotImplementedError()
 
-            ephemeral_collection = modules.EphemeralCollection(
+            return modules.EphemeralCollection(
                 collection=collection,
                 history=self.workflow_invocation.history,
             )
-            replacement = ephemeral_collection
 
         return replacement
 

lib/galaxy_test/api/test_tools_cwl.py

@@ -327,7 +327,7 @@ def test_any1_file(self):
             test_data_directory="test/functional/tools/cwl_tools/v1.0/v1.0/",
         )
         output1_content = self.dataset_populator.get_history_dataset_content(run_object.history_id)
-        self.dataset_populator._summarize_history_errors(run_object.history_id)
+        self.dataset_populator._summarize_history(run_object.history_id)
         assert output1_content == '"File"', "[%s]" % output1_content
 
     @skip_without_tool("any1.cwl")

lib/galaxy_test/api/test_workflows_cwl.py

@@ -11,6 +11,7 @@
 
 
 class BaseCwlWorklfowTestCase(BaseWorkflowsApiTestCase):
+    history_id: str
     allow_path_paste = True
     require_admin_user = True
 

lib/galaxy_test/base/populators.py

@@ -473,7 +473,7 @@ def run_conformance_test(self, version, doc):
             directory = os.path.join(CWL_TOOL_DIRECTORY, version)
         tool = os.path.join(directory, test["tool"])
         job_path = test.get("job")
-        job = None
+        job: Optional[Dict[str, str]] = None
         if job_path is not None:
             job_path = os.path.join(directory, job_path)
         else: