add implicit_collection_jobs_id to invocation step summary

Also, return a correctly encoded database id field in `step_jobs_summary` api.
galaxyproject · Apr 11, 2024 · ffe6d81 · ffe6d81
1 parent 28e9fd0
commit ffe6d81
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
@@ -7465,6 +7465,11 @@ export interface components {
              * @example 0123456789ABCDEF
              */
             id: string;
+            /**
+             * Implicit Collection Jobs ID
+             * @description The implicit collection job ID associated with the workflow invocation step.
+             */
+            implicit_collection_jobs_id?: string | null;
             /** Job Id */
             job_id: string | null;
             /**
@@ -7549,7 +7554,7 @@ export interface components {
         InvocationStepJobsResponseCollectionJobsModel: {
             /**
              * ID
-             * @description The encoded ID of the workflow invocation.
+             * @description The encoded ID of the job.
              * @example 0123456789ABCDEF
              */
             id: string;
@@ -7575,7 +7580,7 @@ export interface components {
         InvocationStepJobsResponseJobModel: {
             /**
              * ID
-             * @description The encoded ID of the workflow invocation.
+             * @description The encoded ID of the job.
              * @example 0123456789ABCDEF
              */
             id: string;

diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -8669,6 +8669,7 @@ def to_dict(self, view="collection", value_mapper=None, step_details=False, lega
                         v["state"] = None
                         steps.append(v)
                 else:
+                    v["implicit_collection_jobs_id"] = step.implicit_collection_jobs_id
                     steps.append(v)
             rval["steps"] = steps
 

diff --git a/lib/galaxy/schema/invocation.py b/lib/galaxy/schema/invocation.py
@@ -407,6 +407,11 @@ class InvocationStep(Model, WithModelClass):
         title="Jobs",
         description="Jobs associated with the workflow invocation step.",
     )
+    implicit_collection_jobs_id: Optional[EncodedDatabaseIdField] = Field(
+        None,
+        title="Implicit Collection Jobs ID",
+        description="The implicit collection job ID associated with the workflow invocation step.",
+    )
 
 
 class InvocationReport(Model, WithModelClass):
@@ -609,9 +614,14 @@ class InvocationStepJobsResponseStepModel(InvocationJobsSummaryBaseModel):
 
 class InvocationStepJobsResponseJobModel(InvocationJobsSummaryBaseModel):
     model: JOB_MODEL_CLASS
+    id: EncodedDatabaseIdField = Field(
+        default=...,
+        title="ID",
+        description="The encoded ID of the job.",
+    )
 
 
-class InvocationStepJobsResponseCollectionJobsModel(InvocationJobsSummaryBaseModel):
+class InvocationStepJobsResponseCollectionJobsModel(InvocationStepJobsResponseJobModel):
     model: IMPLICIT_COLLECTION_JOBS_MODEL_CLASS