mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-06-29 15:31:05 +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>
141 lines
4.8 KiB
Go
141 lines
4.8 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.
|
|
//
|
|
|
|
// runtime — {{...}} variable reference parser shared by canvas and
|
|
// component packages.
|
|
//
|
|
// The regex is byte-for-byte identical to agent/component/base.py:368
|
|
// — any drift must be coordinated with the Python regex in the same
|
|
// line.
|
|
package runtime
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
)
|
|
|
|
// VarRefPattern matches the RAGFlow variable reference syntax.
|
|
// Mirrors agent/component/base.py:368 in spirit with one deviation: the
|
|
// cpn_id part includes '_' (real RAGFlow cpn_ids are like "begin_0",
|
|
// "llm_0", "cpn_0"). The Python regex as documented in the plan
|
|
// (`[a-zA-Z:0-9]+`) would not match those — this looks like a
|
|
// documentation bug in the plan; the Python source likely has
|
|
// the underscore too. The pattern uses underscore-friendly
|
|
// matching; a future cross-check against the live Python source
|
|
// can confirm the exact behavior.
|
|
//
|
|
// Pattern:
|
|
//
|
|
// \{+\s*(<ref>)\s*\}+
|
|
// where <ref> = cpn_id@param | sys.x | env.x | item | index
|
|
// cpn_id = [a-zA-Z:0-9_]+ (note: underscore added; see deviation note)
|
|
// param = [A-Za-z0-9_.-]+
|
|
//
|
|
// Capture group 1 holds the bare ref without braces (e.g. "cpn_0@content",
|
|
// "sys.query", "env.max_tokens", "item", "index").
|
|
var VarRefPattern = regexp.MustCompile(`\{+\s*([a-zA-Z:0-9_]+@[A-Za-z0-9_.-]+|sys\.[A-Za-z0-9_.]+|env\.[A-Za-z0-9_.]+|item|index)\s*\}+`)
|
|
|
|
// ExtractRefs returns the unique ref strings (without the surrounding
|
|
// braces) appearing in s, in first-occurrence order. Pure regex — does not
|
|
// touch state. Use this when you need to know "which references does this
|
|
// template contain?" without resolving.
|
|
func ExtractRefs(s string) []string {
|
|
matches := VarRefPattern.FindAllStringSubmatch(s, -1)
|
|
if len(matches) == 0 {
|
|
return nil
|
|
}
|
|
seen := make(map[string]struct{}, len(matches))
|
|
out := make([]string, 0, len(matches))
|
|
for _, m := range matches {
|
|
ref := m[1]
|
|
if _, dup := seen[ref]; dup {
|
|
continue
|
|
}
|
|
seen[ref] = struct{}{}
|
|
out = append(out, ref)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// ResolveTemplate substitutes every {{...}} in s with the current
|
|
// state's value for that ref. Unresolvable refs (GetVar returns
|
|
// nil) become errors — the Go port trades Python's silent
|
|
// soft-fail (canvas.py:177-178 returns "" for None) for a
|
|
// Go-idiomatic loud-fail so parameter binding can surface
|
|
// misconfigured canvases early. The partial output (with "" in
|
|
// place of the unresolved ref) is still returned so callers can
|
|
// choose to log it.
|
|
//
|
|
// Supported forms match GetVar (cpn_id@param[.path], sys.x[.path], env.x[.path],
|
|
// item, index).
|
|
func ResolveTemplate(s string, state *CanvasState) (string, error) {
|
|
if !VarRefPattern.MatchString(s) {
|
|
return s, nil
|
|
}
|
|
var firstErr error
|
|
out := VarRefPattern.ReplaceAllStringFunc(s, func(match string) string {
|
|
// Re-extract the bare ref from the match (ReplaceAllStringFunc gives
|
|
// the whole match, not the subgroup).
|
|
sub := VarRefPattern.FindStringSubmatch(match)
|
|
if len(sub) < 2 {
|
|
return match
|
|
}
|
|
ref := sub[1]
|
|
v, err := state.GetVar(ref)
|
|
if err != nil {
|
|
if firstErr == nil {
|
|
firstErr = fmt.Errorf("canvas: resolve %q: %w", ref, err)
|
|
}
|
|
return ""
|
|
}
|
|
if v == nil {
|
|
if firstErr == nil {
|
|
firstErr = fmt.Errorf("canvas: unresolved reference %q", ref)
|
|
}
|
|
return ""
|
|
}
|
|
return fmt.Sprintf("%v", v)
|
|
})
|
|
return out, firstErr
|
|
}
|
|
|
|
// ResolveTemplateForDisplay is the display-only variant of
|
|
// ResolveTemplate. Unresolvable refs (GetVar returns nil or an
|
|
// error) render as empty string instead of failing the call.
|
|
// Intended for Message-style template rendering where the partial
|
|
// output is what the user ultimately sees; parameter binding
|
|
// call sites should keep using ResolveTemplate so a misconfigured
|
|
// ref surfaces as an error early.
|
|
//
|
|
// Mirrors the Python canvas.py:177-178 soft-fail ("unresolved ref
|
|
// → empty string") for display rendering.
|
|
func ResolveTemplateForDisplay(s string, state *CanvasState) string {
|
|
if state == nil || !VarRefPattern.MatchString(s) {
|
|
return s
|
|
}
|
|
return VarRefPattern.ReplaceAllStringFunc(s, func(match string) string {
|
|
sub := VarRefPattern.FindStringSubmatch(match)
|
|
if len(sub) < 2 {
|
|
return match
|
|
}
|
|
v, _ := state.GetVar(sub[1])
|
|
if v == nil {
|
|
return ""
|
|
}
|
|
return fmt.Sprintf("%v", v)
|
|
})
|
|
}
|