Skip to content

Fix loop export reference inference and Jinja template resolution for loop contexts #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhongkaifu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix loop export reference inference and Jinja template resolution for loop contexts #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions velvetflow/bindings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,6 @@ def _validate_result_reference(self, src_path: str) -> None:
if not loop_schema:
raise ValueError(f"__from__ 引用的 loop 节点 '{node_id}' 未定义 exports")
field_path = parts[2:]
if field_path and field_path[0] == "exports":
field_path = field_path[1:]
if (
field_path
and field_path[-1] == "count"
Expand Down Expand Up @@ -711,7 +709,14 @@ def _append_token(token: Any) -> None:
resolved_parts.extend(["result_of", str(first_key)])
rest = parts[2:]
node = self._nodes.get(first_key)
if node and node.type == "loop" and rest and rest[0] == "exports":
if (
node
and node.type == "loop"
and rest
and rest[0] == "exports"
and isinstance(cur, dict)
and "exports" not in cur
):
rest = rest[1:]
else:
context = {f"result_of.{nid}": value for nid, value in self.results.items()}
Expand Down Expand Up @@ -981,10 +986,26 @@ def _resolve(value: Any, path: str = "") -> Any:
stripped_template = normalized_templates.strip()
if stripped_template.startswith("{{") and stripped_template.endswith("}}"):
inner = stripped_template[2:-2].strip()
normalized_inner = normalize_reference_path(inner)
qualified_inner = ctx._qualify_context_path(normalized_inner)
head = qualified_inner.split(".", 1)[0]
if re.match(r"^[A-Za-z_][\w.\[\]*]*$", normalized_inner) and (
head in ctx.loop_ctx
or head == ctx.loop_id
or qualified_inner.startswith("loop.")
or qualified_inner.startswith("result_of.")
):
try:
return ctx.get_value(qualified_inner)
except Exception:
pass
try:
rendered = eval_jinja_expression(inner, ctx.build_jinja_context())
if isinstance(rendered, Undefined):
return None
try:
return ctx.get_value(qualified_inner)
except Exception:
return None
return rendered
except Exception:
pass
Expand Down
42 changes: 23 additions & 19 deletions velvetflow/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,27 +752,31 @@ def validate_loop_body_subgraphs(self) -> "Workflow":
normalize_reference_path(source) if isinstance(source, str) else None
)
if isinstance(normalized_source, str):
from velvetflow.verification.binding_checks import (
_get_output_schema_at_path,
)
if not (
normalized_source == "loop"
or normalized_source.startswith(("loop.", "loop_ctx."))
):
from velvetflow.verification.binding_checks import (
_get_output_schema_at_path,
)

schema = _get_output_schema_at_path(
normalized_source,
nodes_by_id,
actions_by_id,
loop_body_parents,
)
actual_type = schema.get("type") if isinstance(schema, Mapping) else None
if actual_type not in {"array"}:
errors.append(
{
"loc": ("nodes", idx, "params", "source"),
"msg": (
"loop 节点的 source 应该引用数组/序列"
f"，但解析到的类型为 {actual_type or '未知'}，路径: {normalized_source}"
),
}
schema = _get_output_schema_at_path(
normalized_source,
nodes_by_id,
actions_by_id,
loop_body_parents,
)
actual_type = schema.get("type") if isinstance(schema, Mapping) else None
if actual_type not in {"array"}:
errors.append(
{
"loc": ("nodes", idx, "params", "source"),
"msg": (
"loop 节点的 source 应该引用数组/序列"
f"，但解析到的类型为 {actual_type or '未知'}，路径: {normalized_source}"
),
}
)

try:
Workflow.model_validate(
Expand Down