Merge pull request #18788 from nsoranzo/release_24.0_TypeError_discri…

…minator [24.0] Fix ``TypeError`` from Pydantic 2.9.0
galaxyproject · Sep 7, 2024 · 764dbb3 · 764dbb3
2 parents 0c9cc61 + 51e3ec6
commit 764dbb3
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lib/galaxy/schema/workflows.py b/lib/galaxy/schema/workflows.py
@@ -11,6 +11,7 @@
     Field,
     field_validator,
 )
+from typing_extensions import Annotated
 
 from galaxy.schema.schema import (
     AnnotationField,
@@ -189,19 +190,21 @@ class StoredWorkflowDetailed(StoredWorkflowSummary):
     )
     steps: Dict[
         int,
-        Union[
-            InputDataStep,
-            InputDataCollectionStep,
-            InputParameterStep,
-            PauseStep,
-            ToolStep,
-            SubworkflowStep,
+        Annotated[
+            Union[
+                InputDataStep,
+                InputDataCollectionStep,
+                InputParameterStep,
+                PauseStep,
+                ToolStep,
+                SubworkflowStep,
+            ],
+            Field(discriminator="type"),
         ],
     ] = Field(
         {},
         title="Steps",
         description="A dictionary with information about all the steps of the workflow.",
-        discriminator="type",
     )
     importable: Optional[bool] = Field(
         ...,