diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml index b301430c38..386479d4b0 100644 --- a/backend/windmill-api/openapi.yaml +++ b/backend/windmill-api/openapi.yaml @@ -17788,7 +17788,9 @@ paths: $ref: "#/components/schemas/ScriptArgs" steps: type: object - description: step id -> override + description: >- + step id -> override. A step inside a subflow is named by the path of step + ids to it, `sub:inner` for step `inner` of the subflow that step `sub` calls. additionalProperties: type: object properties: diff --git a/backend/windmill-api/src/flow_test.rs b/backend/windmill-api/src/flow_test.rs index 46680f9c1f..4f87a6719a 100644 --- a/backend/windmill-api/src/flow_test.rs +++ b/backend/windmill-api/src/flow_test.rs @@ -345,7 +345,7 @@ fn disable_result_cache(value: &mut Value) { } } -/// Nesting limit of `a.b.c` step keys, so a subflow calling itself cannot recurse forever. +/// Nesting limit of `a:b:c` step keys, so a subflow calling itself cannot recurse forever. const MAX_SUBFLOW_DEPTH: usize = 10; /// The deployed path of the subflow step `id` of a flow value. @@ -401,7 +401,7 @@ async fn deployed_flow_value( Ok((stored.0, info.tag)) } -/// Applies `overrides` to `value`. A key `sub.inner` overrides step `inner` of the subflow that +/// Applies `overrides` to `value`. A key `sub:inner` overrides step `inner` of the subflow that /// step `sub` calls: that subflow's deployed value, overridden in turn, goes to `subflows` under /// its path, which the run uses for every call of that subflow. fn resolve_overrides<'a>( @@ -415,7 +415,7 @@ fn resolve_overrides<'a>( let mut local = HashMap::new(); let mut nested: HashMap> = HashMap::new(); for (key, o) in overrides { - match key.split_once('.') { + match key.split_once(':') { Some((step, rest)) => { nested .entry(step.to_string()) diff --git a/cli/src/guidance/skills.gen.ts b/cli/src/guidance/skills.gen.ts index d982136386..a7acf9f164 100644 --- a/cli/src/guidance/skills.gen.ts +++ b/cli/src/guidance/skills.gen.ts @@ -822,7 +822,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, \`"sub.inner"\` for step \`inner\` + * A step inside a subflow is named by the path of step ids to it, \`"sub:inner"\` for step \`inner\` * of the subflow that step \`sub\` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their @@ -1711,7 +1711,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, \`"sub.inner"\` for step \`inner\` + * A step inside a subflow is named by the path of step ids to it, \`"sub:inner"\` for step \`inner\` * of the subflow that step \`sub\` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their @@ -2709,7 +2709,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, \`"sub.inner"\` for step \`inner\` + * A step inside a subflow is named by the path of step ids to it, \`"sub:inner"\` for step \`inner\` * of the subflow that step \`sub\` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py index eedf64043b..3e7bcd695b 100644 --- a/python-client/wmill/wmill/client.py +++ b/python-client/wmill/wmill/client.py @@ -1856,7 +1856,7 @@ def test_flow( - a top-level function of the calling script's own file: the step runs that function instead of its own code, with the step's inputs as keyword arguments. - A step inside a subflow is named by the path of step ids to it, ``"sub.inner"`` for step + A step inside a subflow is named by the path of step ids to it, ``"sub:inner"`` for step ``inner`` of the subflow that step ``sub`` calls. It applies to every call of that subflow made by the tested flow and by the subflows it overrides; a subflow left as is still calls the deployed one. Those subflows, and each one on the way to an override, run as you rather diff --git a/system_prompts/auto-generated/prompts.ts b/system_prompts/auto-generated/prompts.ts index 42c865a52e..83ceedff32 100644 --- a/system_prompts/auto-generated/prompts.ts +++ b/system_prompts/auto-generated/prompts.ts @@ -2208,7 +2208,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, \`"sub.inner"\` for step \`inner\` + * A step inside a subflow is named by the path of step ids to it, \`"sub:inner"\` for step \`inner\` * of the subflow that step \`sub\` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/system_prompts/auto-generated/script.md b/system_prompts/auto-generated/script.md index 357c714764..b768d2645a 100644 --- a/system_prompts/auto-generated/script.md +++ b/system_prompts/auto-generated/script.md @@ -1628,7 +1628,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/system_prompts/auto-generated/sdks/typescript.md b/system_prompts/auto-generated/sdks/typescript.md index d5c8698516..3ab0dc2fbb 100644 --- a/system_prompts/auto-generated/sdks/typescript.md +++ b/system_prompts/auto-generated/sdks/typescript.md @@ -162,7 +162,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/system_prompts/auto-generated/skills/write-script-bun/SKILL.md b/system_prompts/auto-generated/skills/write-script-bun/SKILL.md index 3d71d8d9dd..e1ea9f2fc3 100644 --- a/system_prompts/auto-generated/skills/write-script-bun/SKILL.md +++ b/system_prompts/auto-generated/skills/write-script-bun/SKILL.md @@ -361,7 +361,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md b/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md index 34f2ccf958..94c7fc9afd 100644 --- a/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md +++ b/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md @@ -373,7 +373,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/system_prompts/auto-generated/skills/write-script-deno/SKILL.md b/system_prompts/auto-generated/skills/write-script-deno/SKILL.md index 119f5afce6..f80c572c2c 100644 --- a/system_prompts/auto-generated/skills/write-script-deno/SKILL.md +++ b/system_prompts/auto-generated/skills/write-script-deno/SKILL.md @@ -363,7 +363,7 @@ async runFlowAsync(path: string | null, args: Record | null, schedu * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their diff --git a/typescript-client/client.ts b/typescript-client/client.ts index b159e736b8..6094ce8f13 100644 --- a/typescript-client/client.ts +++ b/typescript-client/client.ts @@ -610,7 +610,7 @@ export async function runFlowAsync( * - a function exported from the calling script's own file: the step runs that function * instead of its own code, with the step's inputs as arguments (matched by name). * - * A step inside a subflow is named by the path of step ids to it, `"sub.inner"` for step `inner` + * A step inside a subflow is named by the path of step ids to it, `"sub:inner"` for step `inner` * of the subflow that step `sub` calls. It applies to every call of that subflow made by the * tested flow and by the subflows it overrides; a subflow left as is still calls the deployed * one. Those subflows, and each one on the way to an override, run as you rather than as their