fix: evaluate conditions against structured frame context

This commit is contained in:
lda
2026-09-05 00:34:59 +07:00 Verified
parent 0530d1120a
commit 3bfb3f440b
3 changed files with 178 additions and 6 deletions
+26 -6
View File
@@ -21,25 +21,43 @@ def eval_condition(
state: Mapping[str, Any], state: Mapping[str, Any],
workflow_input: Mapping[str, Any], workflow_input: Mapping[str, Any],
context_data: str | None, context_data: str | None,
*,
context: Mapping[str, Any] | None = None,
) -> bool: ) -> bool:
"""Evaluate a condition against state, input, and context.
``context`` is the frame's structured context graph (see
``frame_context_view``); when omitted, evaluation falls back to the
legacy ``{"prior_outcome": context_data}`` stub so direct unit callers
keep working. The graph always carries ``prior_outcome``, so passing it
preserves legacy behavior while also resolving structured paths such as
``context.foreach.<id>.item``.
"""
resolved = context if context is not None else {"prior_outcome": context_data}
if isinstance(condition, ExistsCondition): if isinstance(condition, ExistsCondition):
return path_exists( return path_exists(
condition.path, condition.path,
state=state, state=state,
workflow_input=workflow_input, workflow_input=workflow_input,
context={"prior_outcome": context_data}, context=resolved,
) )
if isinstance(condition, NotCondition): if isinstance(condition, NotCondition):
return not eval_condition(condition.arg, state, workflow_input, context_data) return not eval_condition(
condition.arg, state, workflow_input, context_data, context=resolved
)
if isinstance(condition, VariadicCondition): if isinstance(condition, VariadicCondition):
values = [ values = [
eval_condition(arg, state, workflow_input, context_data) eval_condition(arg, state, workflow_input, context_data, context=resolved)
for arg in condition.args for arg in condition.args
] ]
return all(values) if condition.op == "and" else any(values) return all(values) if condition.op == "and" else any(values)
if isinstance(condition, BinaryCondition): if isinstance(condition, BinaryCondition):
left = resolve_operand(condition.left, state, workflow_input, context_data) left = resolve_operand(
right = resolve_operand(condition.right, state, workflow_input, context_data) condition.left, state, workflow_input, context_data, context=resolved
)
right = resolve_operand(
condition.right, state, workflow_input, context_data, context=resolved
)
if condition.op == "eq": if condition.op == "eq":
return left == right return left == right
if condition.op == "ne": if condition.op == "ne":
@@ -60,6 +78,8 @@ def resolve_operand(
state: Mapping[str, Any], state: Mapping[str, Any],
workflow_input: Mapping[str, Any], workflow_input: Mapping[str, Any],
context_data: str | None, context_data: str | None,
*,
context: Mapping[str, Any] | None = None,
) -> Any: ) -> Any:
if isinstance(operand, LiteralOperand): if isinstance(operand, LiteralOperand):
return operand.value return operand.value
@@ -67,7 +87,7 @@ def resolve_operand(
str(operand.path), str(operand.path),
state=state, state=state,
workflow_input=workflow_input, workflow_input=workflow_input,
context={"prior_outcome": context_data}, context=context if context is not None else {"prior_outcome": context_data},
) )
+3
View File
@@ -29,6 +29,9 @@ def handle_condition_step(
state_view_for_frame(run, frame), state_view_for_frame(run, frame),
scope_input_for_frame(run, frame), scope_input_for_frame(run, frame),
frame.prior_outcome, frame.prior_outcome,
# Structured context must match what validation blesses: conditions
# inside a foreach body can read context.foreach.* / loop aliases.
context=frame_context_view(run, frame).graph,
) )
outcome = "true" if predicate else "false" outcome = "true" if predicate else "false"
return StepExecutionResult( return StepExecutionResult(
@@ -923,3 +923,152 @@ def test_bool_loop_index_metadata_fails_closed() -> None:
) )
with pytest.raises(WorkflowExecutionError, match="malformed foreach loop index"): with pytest.raises(WorkflowExecutionError, match="malformed foreach loop index"):
frame_context_view(run, run.frames["bad"]) frame_context_view(run, run.frames["bad"])
def test_condition_exists_reads_structured_foreach_item() -> None:
from wf_core import END, Edge, ForeachNode, Workflow, execute_workflow
from wf_core.models.schemas import SchemaRef, StateField, StateSchema
from wf_core.models.steps import ConditionNode
pick = ConditionNode.model_validate(
{
"id": "pick",
"type": "condition",
"check": {"op": "exists", "path": "context.foreach.each.item"},
}
)
workflow = Workflow(
name="condition_structured_exists",
input_schema=SchemaRef(type="object", properties={}),
state_schema=StateSchema.from_field_map({"items": StateField(type="array")}),
output_schema=SchemaRef(type="object", properties={}),
node_defs=[],
start="each",
nodes=[
ForeachNode.model_validate(
{
"id": "each",
"type": "foreach",
"over": "state.items",
"as": "item",
"mode": "serial",
}
),
pick,
],
edges=[
Edge.model_validate({"from": "each", "outcome": "loop", "to": "pick"}),
Edge.model_validate({"from": "pick", "outcome": "true", "to": "each"}),
Edge.model_validate({"from": "pick", "outcome": "false", "to": "each"}),
Edge.model_validate({"from": "each", "outcome": "done", "to": END}),
],
)
run = execute_workflow(workflow, {"items": ["a"]}, {})
assert run.status == RunStatus.COMPLETED
# The item exists, so the validated structured path must take true.
assert ("pick", "true") in [(t.node_id, t.outcome) for t in run.trace]
def test_condition_eq_reads_loop_alias_per_item() -> None:
from wf_core import END, Edge, ForeachNode, Workflow, execute_workflow
from wf_core.models.schemas import SchemaRef, StateField, StateSchema
from wf_core.models.steps import ConditionNode
pick = ConditionNode.model_validate(
{
"id": "pick",
"type": "condition",
"check": {
"op": "eq",
"left": {"path": "context.item"},
"right": {"value": "a"},
},
}
)
workflow = Workflow(
name="condition_structured_eq",
input_schema=SchemaRef(type="object", properties={}),
state_schema=StateSchema.from_field_map({"items": StateField(type="array")}),
output_schema=SchemaRef(type="object", properties={}),
node_defs=[],
start="each",
nodes=[
ForeachNode.model_validate(
{
"id": "each",
"type": "foreach",
"over": "state.items",
"as": "item",
"mode": "serial",
}
),
pick,
],
edges=[
Edge.model_validate({"from": "each", "outcome": "loop", "to": "pick"}),
Edge.model_validate({"from": "pick", "outcome": "true", "to": "each"}),
Edge.model_validate({"from": "pick", "outcome": "false", "to": "each"}),
Edge.model_validate({"from": "each", "outcome": "done", "to": END}),
],
)
run = execute_workflow(workflow, {"items": ["a", "b"]}, {})
assert run.status == RunStatus.COMPLETED
pick_outcomes = [t.outcome for t in run.trace if t.node_id == "pick"]
assert pick_outcomes == ["true", "false"]
def test_condition_still_reads_prior_outcome() -> None:
from wf_core import END, Edge, NodeDef, NodeUse, Workflow, execute_workflow
from wf_core.models.schemas import SchemaRef, StateSchema
from wf_core.models.steps import ConditionNode
pick = ConditionNode.model_validate(
{
"id": "pick",
"type": "condition",
"check": {
"op": "eq",
"left": {"path": "context.prior_outcome"},
"right": {"value": "ok"},
},
}
)
workflow = Workflow(
name="condition_prior_outcome",
input_schema=SchemaRef(type="object", properties={}),
state_schema=StateSchema(fields={}),
output_schema=SchemaRef(type="object", properties={}),
node_defs=[
NodeDef(
name="record",
input_schema=SchemaRef(type="object", properties={"value": {}}),
output_schema=SchemaRef(type="object", properties={}),
outcomes=["ok"],
)
],
start="work",
nodes=[
NodeUse.model_validate(
{
"id": "work",
"type": "node",
"node": "record",
"input": [{"target": "value", "value": 1}],
"output": [],
}
),
pick,
],
edges=[
Edge.model_validate({"from": "work", "outcome": "ok", "to": "pick"}),
Edge.model_validate({"from": "pick", "outcome": "true", "to": END}),
Edge.model_validate({"from": "pick", "outcome": "false", "to": END}),
],
)
def record(payload: dict[str, object], ctx: RuntimeContext) -> dict[str, object]:
return {"outcome": "ok", "output": {}}
run = execute_workflow(workflow, {}, {"record": record})
assert run.status == RunStatus.COMPLETED
assert ("pick", "true") in [(t.node_id, t.outcome) for t in run.trace]