flow: add path to flow script as well

windmill-labs · Dec 18, 2024 · e505b6f · e505b6f
1 parent ee28955
commit e505b6f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/backend/windmill-common/src/jobs.rs b/backend/windmill-common/src/jobs.rs
@@ -274,7 +274,8 @@ pub enum JobPayload {
         apply_preprocessor: bool,
     },
     FlowScript {
-        id: FlowNodeId, // flow_node(id).
+        id: FlowNodeId,       // flow_node(id).
+        path: Option<String>, // flow step path.
         language: ScriptLang,
         custom_concurrency_key: Option<String>,
         concurrent_limit: Option<i32>,

diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
@@ -2845,7 +2845,8 @@ pub async fn push<'c, 'd>(
             )
         }
         JobPayload::FlowScript {
-            id, // flow_node(id).
+            id,   // flow_node(id).
+            path, // flow step path.
             language,
             custom_concurrency_key,
             concurrent_limit,
@@ -2854,7 +2855,7 @@ pub async fn push<'c, 'd>(
             dedicated_worker,
         } => (
             Some(id.0),
-            None,
+            path,
             None,
             JobKind::FlowScript,
             None,

diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
@@ -3089,9 +3089,19 @@ async fn compute_next_flow_transform(
             concurrency_time_window_s,
             ..
         } => {
+            let path = if status
+                .preprocessor_module
+                .as_ref()
+                .is_some_and(|x| x.id() == module.id)
+            {
+                format!("{}/preprocessor", flow_job.script_path())
+            } else {
+                format!("{}/step-{}", flow_job.script_path(), status.step)
+            };
             let payload = JobPayloadWithTag {
                 payload: JobPayload::FlowScript {
                     id,
+                    path: Some(path),
                     language,
                     custom_concurrency_key: custom_concurrency_key.clone(),
                     concurrent_limit,
@@ -3693,6 +3703,7 @@ async fn payload_from_simple_module(
         } => JobPayloadWithTag {
             payload: JobPayload::FlowScript {
                 id,
+                path: inner_path,
                 language,
                 custom_concurrency_key,
                 concurrent_limit,