mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-05 00:03:08 +00:00
add flow_input to context of branch predicates and stop early
This commit is contained in:
@@ -288,6 +288,27 @@
|
||||
},
|
||||
"query": "SELECT label, concat(substring(token for 10)) as token_prefix, expiration, created_at, last_used_at FROM token WHERE email = $1"
|
||||
},
|
||||
"10e28457d488df43e81eed6960f16f76413121caf205ed7ceee506bd0fb168ab": {
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"name": "args",
|
||||
"ordinal": 0,
|
||||
"type_info": "Jsonb"
|
||||
}
|
||||
],
|
||||
"nullable": [
|
||||
true
|
||||
],
|
||||
"parameters": {
|
||||
"Left": [
|
||||
"Uuid",
|
||||
"Text"
|
||||
]
|
||||
}
|
||||
},
|
||||
"query": "SELECT args FROM queue WHERE id = $1 AND workspace_id = $2"
|
||||
},
|
||||
"11b1586acdfc180c5a077861ee1f7201fcbcec9d0ebada464f9d952c9c3e400d": {
|
||||
"describe": {
|
||||
"columns": [],
|
||||
|
||||
@@ -211,15 +211,25 @@ pub async fn update_flow_status_after_job_completion(
|
||||
.await
|
||||
.map_err(|e| Error::InternalErr(format!("retrieval of stop_early_expr from state: {e}")))?;
|
||||
|
||||
(
|
||||
success
|
||||
&& if let Some(expr) = stop_early_expr.clone() {
|
||||
compute_bool_from_expr(expr, result.clone(), base_internal_url).await?
|
||||
} else {
|
||||
false
|
||||
},
|
||||
skip_if_stop_early.unwrap_or(false),
|
||||
let flow_args = sqlx::query_scalar!(
|
||||
"SELECT args FROM queue WHERE id = $1 AND workspace_id = $2",
|
||||
flow,
|
||||
w_id
|
||||
)
|
||||
.fetch_one(&mut tx)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
Error::InternalErr(format!(
|
||||
"fetching flow status {flow} while reporting {success} {result:?}: {e}"
|
||||
))
|
||||
})?;
|
||||
let stop_early = success
|
||||
&& if let Some(expr) = stop_early_expr.clone() {
|
||||
compute_bool_from_expr(expr, &flow_args, result.clone(), base_internal_url).await?
|
||||
} else {
|
||||
false
|
||||
};
|
||||
(stop_early, skip_if_stop_early.unwrap_or(false))
|
||||
};
|
||||
|
||||
let result = match &new_status {
|
||||
@@ -464,12 +474,15 @@ fn next_retry(retry: &Retry, status: &RetryStatus) -> Option<(u16, Duration)> {
|
||||
|
||||
async fn compute_bool_from_expr(
|
||||
expr: String,
|
||||
flow_args: &Option<serde_json::Value>,
|
||||
result: serde_json::Value,
|
||||
base_internal_url: &str,
|
||||
) -> error::Result<bool> {
|
||||
let flow_input = flow_args.clone().unwrap_or_else(|| json!({}));
|
||||
match eval_timeout(
|
||||
expr,
|
||||
[
|
||||
("flow_input".to_string(), flow_input),
|
||||
("result".to_string(), result.clone()),
|
||||
("previous_result".to_string(), result),
|
||||
]
|
||||
@@ -1424,6 +1437,7 @@ async fn compute_next_flow_transform<'c>(
|
||||
for (i, b) in branches.iter().enumerate() {
|
||||
let pred = compute_bool_from_expr(
|
||||
b.expr.to_string(),
|
||||
&flow_job.args,
|
||||
last_result.clone(),
|
||||
base_internal_url,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user