Merge branch 'release_24.1' into dev

ahmedhamidawan · Sep 7, 2024 · 8d9fc6b · 8d9fc6b
2 parents 0e4e03a + 5b4d8a1
commit 8d9fc6b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
@@ -11170,8 +11170,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "data_collection_input";
@@ -11213,8 +11212,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "data_input";
@@ -11256,8 +11254,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "parameter_input";
@@ -14135,8 +14132,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "pause";
@@ -15581,8 +15577,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "subworkflow";
@@ -15859,8 +15854,7 @@ export interface components {
              */
             tool_version?: string | null;
             /**
-             * Type
-             * @constant
+             * @description discriminator enum property added by openapi-typescript
              * @enum {string}
              */
             type: "tool";

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,
@@ -194,19 +195,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(
         ...,