mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-07 03:48:44 +08:00
## Summary
Aligns the **Go agent runtime/canvas/components/tools** behavior with
the **Python `agent/` implementation** so the same stored canvas DSL
produces the same execution result on either side. Every component,
tool, and runtime primitive in `internal/agent/` is now driven by the
same semantics as its Python counterpart — variable resolution, template
substitution, control flow, error reporting, retry/cancel, and stream
event shapes.
The **retrieval component is the one explicit exception** in this PR. It
is being reworked in a separate change and is excluded from this
alignment pass; the wrapper slot (`universe_a_wrappers.go →
newRetrievalComponent`) is preserved.
## Scope of alignment
### Components (all aligned with `agent/component/`)
`Begin` · `Message` · `LLM` (incl. ChatTemplateKwargs,
MessageHistoryWindowSize, VisualFiles, Cite, OutputStructure,
JSONOutput, TopP, MaxRetries, DelayAfterError, credentials) · `Agent`
(react + tool artifact capture + `Reset()` interface-assert) · `Switch`
(12/12 operators, Python-equivalent semantics) · `Categorize` · `Invoke`
· `Iteration` · `Loop` (macro-expansion through `workflowx.AddLoopNode`)
· `UserFillUp` (Python-equivalent interrupt/resume via eino
`compose.Interrupt`/`ResumeWithData`) · `FillUp` · `DataOperations` ·
`ListOperations` · `StringTransform` · `VariableAggregator` ·
`VariableAssigner` · `Browser` (full stagehand runtime parity) ·
`DocsGenerator` · `ExcelProcessor`.
### Tools (all aligned with `agent/tools/`)
`Retrieval` (wrapper slot only — logic out of scope) · `MCPToolAdapter`
(streamable-HTTP) · `CodeExec` (sandbox bridge with
`code_exec_contract.go` matching Python contract) · `AkShare` · `ArXiv`
· `Crawler` · `DeepL` · `DuckDuckGo` · `Email` · `ExeSQL` · `GitHub` ·
`Google` · `GoogleScholar` · `Jin10` · `PubMed` · `QWeather` · `SearXNG`
· `Tavily` · `Tushare` · `Wencai` · `Wikipedia` · `YahooFinance` —
uniform `eino tool.InvokableTool` interface, SSRF protection, shared
HTTP client.
### Canvas execution engine (`internal/agent/canvas/`)
Aligned with Python's `agent/canvas.py`:
- **Scheduler** (`scheduler.go`): state pre/post handlers, node lambdas,
per-component timeout resolver (4-level: per-class env → per-class table
→ uniform env → 600s fallback), `legacyNoOpNames`.
- **Loop subgraph** (`loop_subgraph.go`): Python-equivalent
`AddLoopNode` macro expansion + condition translation.
- **Multibranch** (`multibranch.go`): `Switch` / `Categorize` routing
via `compose.NewGraphMultiBranch` — same branch selection semantics as
Python.
- **Parallel subgraph** (`parallel_subgraph.go`): matches Python's
parallel fan-out contract.
- **Interrupt/Resume** (`interrupt_resume.go`): `UserFillUpNodeBody` /
`IsInterruptError` / `ExtractInterruptContexts` — replaces the
deprecated Python sentinel chain with eino's native interrupt API,
preserving the same external behavior.
- **Checkpoint** (`checkpoint_store.go`): `RedisCheckPointStore`
Get/Set/Delete, with business metadata (status / canvas_id /
parent_run_id) on a parallel Redis Hash.
- **RunTracker** (`run_tracker.go`): Start / MarkSucceeded / MarkFailed
/ MarkCancelled / AttachCheckpoint — same lifecycle as the Python run
record.
- **Cancel** (`cancel.go`): Redis pub/sub watch.
- **Stream** (`stream.go`): SSE channel with `messages` / `waiting` /
`errors` / `done` events, same shape as Python's `agent.canvas.RunEvent`
payload.
### DSL bridge (`internal/agent/dsl/`)
- `normalize.go`: v1↔v2 collapsed into a single wire format — Python and
Go consume the same stored JSON.
- `reset.go`: per-run state reset matches Python's `Canvas.reset()`
semantics.
- Testdata mirrors Python's `agent_msg.json` / `all.json` / etc.
### Runtime (`internal/agent/runtime/`)
- `CanvasState` / `NewCanvasState` / `GetVar` / `SetVar` / `ReadVars`:
same `{{cpn_id@param}}` resolution model.
- `ResolveTemplate` (regex fast path + gonja fallback) — Python
Jinja-style semantics.
- `selector.go`, `metrics.go`, `component.go`: shared runtime contracts.
## Out of scope (intentionally)
- **`Retrieval` component logic** — wrapped only; full parity lands in a
follow-up PR.
- **Frontend** — only minor dsl-bridge / canvas UX fixes ride along.
- **CLI / admin / model registry** — orthogonal to agent behavior.
## How alignment is verified
`internal/service/agent_run_e2e_test.go` exercises the **full production
chain** against real Python-shaped DSL fixtures:
```
loadCanvasForUser → versionDAO.GetLatest → decodeCanvasFromDSL →
canvas.Compile → cc.Workflow.Invoke → answer extraction
```
using in-memory SQLite + miniredis (no Docker). Covers:
- `TestRunAgent_RealCanvas_BeginMessage` — happy path, `{{sys.query}}`
resolution
- `TestRunAgent_RealCanvas_WaitForUserResume` — two-run resume cycle
(Python-equivalent)
- `TestRunAgent_RealCanvas_CompileFails` — unknown component name →
sanitized error (Python-equivalent)
- `TestRunAgent_RealCanvas_InvokeFails` — unresolvable template ref
(Python-equivalent)
- `TestRunAgent_RunTracker_AttachCheckpoint_CallSequence` —
Start→AttachCheckpoint→MarkSucceeded lifecycle
`internal/handler/agent_test.go` — SSE streaming parity (`Content-Type:
text/event-stream`, `data: {…}\n\n`, trailing `data: [DONE]\n\n`,
OpenAI-compatible non-stream `choices`).
`internal/agent/canvas/fixture_compile_test.go` + per-component tests
pin the Python-equivalent outputs.
```
go test -count=1 -v -run 'TestRunAgent_RealCanvas|TestRunAgent_RunTracker' ./internal/service/
```
## Design reference
`docs/develop/agent-go-port-design.md` (1329 lines, last cross-checked
2026-06-17) — module layout, per-component / per-tool inventory,
corner-case catalogue, and the actionable backlog (Section 14, including
the retrieval alignment follow-up).
---------
Co-authored-by: Claude <noreply@anthropic.com>
225 lines
7.9 KiB
Go
225 lines
7.9 KiB
Go
//
|
|
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
// multibranch.go — runtime branch wiring for Switch / Categorize.
|
|
//
|
|
// Switch and Categorize are control-flow components that produce a
|
|
// `_next` output identifying which downstream child should run at
|
|
// runtime. The static AddInput edges from a parent to every declared
|
|
// child carry the data path; this file adds the eino MultiBranch
|
|
// wiring that gates control so only the chosen child executes:
|
|
//
|
|
// 1. The static AddInput edges stay wired (so the chosen child
|
|
// receives the parent's output as its input data).
|
|
// 2. For every Switch / Categorize parent with >= 2 downstream
|
|
// children, we register
|
|
// wf.AddBranch(parent, NewGraphBranch(cond, endNodes)).
|
|
// 3. The branch's condition reads in["_next"] from the parent's
|
|
// output map and returns the chosen cpn_id (or "" if no match —
|
|
// which eino interprets as "no branch chosen, fall through").
|
|
//
|
|
// Per eino v0.9.5 (compose/workflow.go:413-419), Workflow branches
|
|
// are control-only: the chosen end-node does NOT auto-receive the
|
|
// branch source's output. The static AddInput edges supply the data
|
|
// path; the branch supplies the control gate.
|
|
//
|
|
// Categorize is included for symmetry even though its current
|
|
// outputs["_next"] is an empty slice (the chosen category name lives
|
|
// at outputs["category"] and the downstream-routing glue between
|
|
// "category" and "cpn_id" is tracked at the DSL layer). When the
|
|
// glue lands, the existing branch wiring picks it up with no further
|
|
// change here.
|
|
|
|
package canvas
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/cloudwego/eino/compose"
|
|
)
|
|
|
|
// branchableControlNames is the case-insensitive set of component
|
|
// names that produce a runtime `_next` field and therefore qualify
|
|
// for MultiBranch wiring. Switch emits _next as a single cpn_id
|
|
// string; Categorize emits it as a list (see the package comment
|
|
// above for the current status). The set is small on purpose: adding
|
|
// a new entry requires the component body to emit outputs["_next"]
|
|
// in a shape wireMultiBranches can consume.
|
|
var branchableControlNames = map[string]bool{
|
|
"switch": true,
|
|
"categorize": true,
|
|
}
|
|
|
|
// isBranchableControl reports whether the component name is one of
|
|
// the runtime-control components that should get a MultiBranch edge
|
|
// from BuildWorkflow. The lookup is case-insensitive to match the
|
|
// rest of the package's name handling (see canvas.go:92).
|
|
func isBranchableControl(name string) bool {
|
|
return branchableControlNames[strings.ToLower(name)]
|
|
}
|
|
|
|
// wireMultiBranches registers an eino MultiBranch on every
|
|
// branchable parent that has at least two declared downstream
|
|
// children. Pass-2 already wired AddInput edges from parent to each
|
|
// child; the branch adds the control-only gating so only the
|
|
// chosen child fires at runtime.
|
|
//
|
|
// The function is a no-op for:
|
|
// - parents with < 2 downstreams (a single-child "switch" is
|
|
// degenerate — no branching needed, AddInput is enough)
|
|
// - parents inside loop subgraphs (their children live in the
|
|
// loop's sub-workflow; the outer graph can't see them)
|
|
// - Loop cpns themselves (their children are inside the loop
|
|
// body; same reason)
|
|
//
|
|
// Returns the list of registered (parent cpn_id → end-nodes set)
|
|
// pairs so tests can assert which branches were installed.
|
|
func wireMultiBranches(
|
|
wf *compose.Workflow[map[string]any, map[string]any],
|
|
c *Canvas,
|
|
loopMembers map[string]bool,
|
|
) []branchRegistration {
|
|
if wf == nil || c == nil {
|
|
return nil
|
|
}
|
|
var out []branchRegistration
|
|
for cpnID, comp := range c.Components {
|
|
// Skip loop body members — they live in a sub-workflow
|
|
// whose branches must be wired separately by the loop
|
|
// expansion code, not here.
|
|
if loopMembers[cpnID] {
|
|
continue
|
|
}
|
|
if !isBranchableControl(comp.Obj.ComponentName) {
|
|
continue
|
|
}
|
|
// Filter downstreams: keep only nodes that exist in the
|
|
// outer graph (i.e. not loop members). A Switch whose
|
|
// children are all inside a loop body has no
|
|
// outer-graph routing to install.
|
|
endNodes := make(map[string]bool, len(comp.Downstream))
|
|
for _, child := range comp.Downstream {
|
|
if loopMembers[child] {
|
|
continue
|
|
}
|
|
if _, ok := c.Components[child]; !ok {
|
|
continue
|
|
}
|
|
endNodes[child] = true
|
|
}
|
|
if len(endNodes) < 2 {
|
|
// Either no outer-graph children, or fewer than
|
|
// two — a MultiBranch with < 2 end-nodes is
|
|
// either meaningless (0/1 end-nodes) or
|
|
// equivalent to plain AddInput. Skip it so we
|
|
// don't pay the branch-evaluation cost when the
|
|
// DSL doesn't actually branch.
|
|
continue
|
|
}
|
|
endNodesList := make([]string, 0, len(endNodes))
|
|
for n := range endNodes {
|
|
endNodesList = append(endNodesList, n)
|
|
}
|
|
cond := makeSwitchBranchCondition(endNodes)
|
|
wf.AddBranch(cpnID, compose.NewGraphMultiBranch(cond, endNodes))
|
|
out = append(out, branchRegistration{
|
|
Parent: cpnID,
|
|
EndNodes: endNodesList,
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
// branchRegistration is the public record of a MultiBranch that was
|
|
// installed. Returned by wireMultiBranches for test introspection;
|
|
// the scheduler does not consume it.
|
|
type branchRegistration struct {
|
|
Parent string
|
|
EndNodes []string
|
|
}
|
|
|
|
// makeSwitchBranchCondition returns a GraphMultiBranchCondition that
|
|
// drives eino's MultiBranch from the parent's outputs["_next"]
|
|
// field. The condition:
|
|
//
|
|
// 1. Pulls `_next` out of the parent's output map (which the
|
|
// statePost handler has already written to state.Outputs and
|
|
// the lambda has returned).
|
|
// 2. When `_next` is a []any (list of cpn_ids — Python's Switch
|
|
// can route to multiple targets simultaneously), all entries
|
|
// that are in the endNodes whitelist are returned as the chosen
|
|
// set. This mirrors the Python behavior where Switch's "to"
|
|
// field is a list and every listed cpn_id fires.
|
|
// 3. When `_next` is a string (single target — legacy or default
|
|
// path), it is validated against the whitelist and returned as
|
|
// a single-entry map.
|
|
// 4. Falls back to an empty map when `_next` is absent, empty, or
|
|
// contains no whitelisted entries. eino treats an empty chosen
|
|
// set as "no successor" — the workflow simply doesn't continue
|
|
// past the parent on this path.
|
|
func makeSwitchBranchCondition(endNodes map[string]bool) compose.GraphMultiBranchCondition[map[string]any] {
|
|
return func(_ context.Context, in map[string]any) (map[string]bool, error) {
|
|
raw, ok := in["_next"]
|
|
if !ok {
|
|
return nil, nil
|
|
}
|
|
chosen := make(map[string]bool, 1)
|
|
switch v := raw.(type) {
|
|
case string:
|
|
if v != "" && endNodes[v] {
|
|
chosen[v] = true
|
|
}
|
|
case []string:
|
|
for _, s := range v {
|
|
if s == "" {
|
|
continue
|
|
}
|
|
if endNodes[s] {
|
|
chosen[s] = true
|
|
}
|
|
}
|
|
case []any:
|
|
for _, item := range v {
|
|
s, ok := item.(string)
|
|
if !ok || s == "" {
|
|
continue
|
|
}
|
|
if endNodes[s] {
|
|
chosen[s] = true
|
|
}
|
|
}
|
|
}
|
|
return chosen, nil
|
|
}
|
|
}
|
|
|
|
// fmtBranchRegistrations is a small debug helper kept here so the
|
|
// table of installed branches can be dumped from a test or a future
|
|
// verbose-logging path without pulling in fmt at the call site.
|
|
// Currently unused; lives next to its data type for symmetry.
|
|
func fmtBranchRegistrations(regs []branchRegistration) string {
|
|
if len(regs) == 0 {
|
|
return "no multi-branches installed"
|
|
}
|
|
var b strings.Builder
|
|
for _, r := range regs {
|
|
fmt.Fprintf(&b, "%s -> %v\n", r.Parent, r.EndNodes)
|
|
}
|
|
return b.String()
|
|
}
|