mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-06-29 23:41:12 +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>
116 lines
4.1 KiB
Go
116 lines
4.1 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.
|
|
//
|
|
|
|
// CodeExec sandbox client. The Python sandbox service is kept
|
|
// as-is (we do NOT rewrite the sandbox). The Go side has a
|
|
// client that talks to the Python sandbox subsystem via the
|
|
// internal/agent/sandbox providers.
|
|
//
|
|
// The Python agent's code_exec delegates to a
|
|
// `SandboxProvider` subsystem (agent/sandbox/providers/) with
|
|
// three backends: self-managed (Docker + gVisor via local
|
|
// executor_manager HTTP), Aliyun Code Interpreter (cloud), and
|
|
// e2b (cloud SaaS). A `ProviderManager` selects one at
|
|
// startup. The Go side's decision is recorded in
|
|
// code_exec_sandbox_design.md:
|
|
//
|
|
// 1. shell out = spawn a Python subprocess that uses
|
|
// ProviderManager to dispatch to whichever provider the
|
|
// operator has configured. Reuses all three providers.
|
|
// 2. in-process = reimplement all three provider clients in
|
|
// Go. No Python dep, but three SDK surfaces to maintain.
|
|
//
|
|
// Decision: shell out (option A). The interface here is stable —
|
|
// when the implementation lands, callers see no change.
|
|
//
|
|
// Until the proto lands, CodeExecTool.InvokableRun surfaces
|
|
// ErrCodeExecSandboxMissing (defined in code_exec.go) so callers
|
|
// can detect the no-sandbox state.
|
|
package tool
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
)
|
|
|
|
// SandboxClient is the abstract interface for the CodeExec gRPC
|
|
// client. Production code calls SetSandboxClient at boot to install
|
|
// a real client; the default is a stub returning
|
|
// ErrSandboxNotWired.
|
|
type SandboxClient interface {
|
|
ExecuteCode(ctx context.Context, req SandboxRequest) (*SandboxResponse, error)
|
|
}
|
|
|
|
// SandboxRequest is the wire shape between the CodeExec tool and
|
|
// the sandbox subsystem. Mirrors `agent.sandbox.client.execute_code`'s
|
|
// input surface. Arguments and Timeout are optional — the bridge
|
|
// applies defaults (no args, 30s timeout) when zero-valued.
|
|
type SandboxRequest struct {
|
|
Lang string // "python" | "javascript"
|
|
Script string // the user's code
|
|
Arguments map[string]any // optional, passed to main(**args)
|
|
Timeout int // seconds, 0 = use provider default (30s)
|
|
}
|
|
|
|
// SandboxResponse is what the sandbox returns. Stdout / Stderr are
|
|
// captured streams; Returned is the legacy alias for the
|
|
// structured main() return value; StructuredResult carries the
|
|
// full extracted payload; Metadata holds provider-specific extras.
|
|
type SandboxResponse struct {
|
|
Stdout string
|
|
Stderr string
|
|
Returned string
|
|
ExitCode int
|
|
StructuredResult map[string]any
|
|
Metadata map[string]any
|
|
}
|
|
|
|
// ErrSandboxNotWired is the sentinel returned by the default stub
|
|
// client. Kept as an alias of ErrCodeExecSandboxMissing for backward
|
|
// compatibility with existing code_exec_test.go callers — the tool's
|
|
// public error surface is ErrCodeExecSandboxMissing; the client
|
|
// surface here is the same condition, named for code-path clarity.
|
|
var ErrSandboxNotWired = ErrCodeExecSandboxMissing
|
|
|
|
var (
|
|
sandboxClientMu sync.RWMutex
|
|
sandboxClientImpl SandboxClient = stubSandboxClient{}
|
|
)
|
|
|
|
func SetSandboxClient(c SandboxClient) {
|
|
sandboxClientMu.Lock()
|
|
defer sandboxClientMu.Unlock()
|
|
if c == nil {
|
|
sandboxClientImpl = stubSandboxClient{}
|
|
return
|
|
}
|
|
sandboxClientImpl = c
|
|
}
|
|
|
|
func GetSandboxClient() SandboxClient {
|
|
sandboxClientMu.RLock()
|
|
defer sandboxClientMu.RUnlock()
|
|
return sandboxClientImpl
|
|
}
|
|
|
|
type stubSandboxClient struct{}
|
|
|
|
func (stubSandboxClient) ExecuteCode(_ context.Context, _ SandboxRequest) (*SandboxResponse, error) {
|
|
return nil, ErrSandboxNotWired
|
|
}
|
|
|
|
func (stubSandboxClient) IsStubSandboxClient() bool { return true }
|