Files
ragflow/internal/agent/sandbox/manager_client_test.go

100 lines
3.4 KiB
Go
Raw Normal View History

feat(agent): align Go agent behavior with Python (except retrieval component) (#16225) ## 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>
2026-06-22 11:58:29 +08:00
package sandbox
import (
"context"
"testing"
agenttool "ragflow/internal/agent/tool"
)
type managerClientStubProvider struct{}
func (managerClientStubProvider) Initialize(context.Context) error { return nil }
func (managerClientStubProvider) ProviderType() ProviderType { return ProviderLocal }
func (managerClientStubProvider) CreateInstance(context.Context, string) (*SandboxInstance, error) {
return &SandboxInstance{InstanceID: "inst-1", Provider: ProviderLocal, Status: "running"}, nil
}
func (managerClientStubProvider) ExecuteCode(context.Context, *SandboxInstance, string, string, int, map[string]any) (*ExecutionResult, error) {
return &ExecutionResult{
Stdout: "",
Stderr: "",
ExitCode: 0,
Metadata: map[string]any{
"structured_result": map[string]any{
"present": true,
"value": 16,
"actual_type": "int",
},
},
}, nil
}
func (managerClientStubProvider) DestroyInstance(context.Context, *SandboxInstance) error { return nil }
func (managerClientStubProvider) HealthCheck(context.Context) error { return nil }
func (managerClientStubProvider) SupportedLanguages() []string { return []string{"python"} }
func TestManagerClient_MapsStructuredResultToSandboxResponse(t *testing.T) {
mgr := &ProviderManager{}
mgr.SetProvider(managerClientStubProvider{})
client := &ManagerClient{manager: mgr}
resp, err := client.ExecuteCode(context.Background(), agenttool.SandboxRequest{
Lang: "python",
Script: "def main(): return 16",
})
if err != nil {
t.Fatalf("ExecuteCode: %v", err)
}
if resp.Returned != "16" {
t.Fatalf("Returned=%q, want %q", resp.Returned, "16")
}
if got := resp.StructuredResult["actual_type"]; got != "int" {
t.Fatalf("StructuredResult.actual_type=%v, want int", got)
}
}
func TestManagerClient_MapsLegacyResultKeyToSandboxResponse(t *testing.T) {
mgr := &ProviderManager{}
mgr.SetProvider(managerClientResultKeyProvider{})
client := &ManagerClient{manager: mgr}
resp, err := client.ExecuteCode(context.Background(), agenttool.SandboxRequest{
Lang: "python",
Script: "def main(): return 16",
})
if err != nil {
t.Fatalf("ExecuteCode: %v", err)
}
if resp.Returned != "16" {
t.Fatalf("Returned=%q, want %q", resp.Returned, "16")
}
if got := resp.StructuredResult["value"]; got != 16 {
t.Fatalf("StructuredResult.value=%v, want 16", got)
}
}
type managerClientResultKeyProvider struct{}
func (managerClientResultKeyProvider) Initialize(context.Context) error { return nil }
func (managerClientResultKeyProvider) ProviderType() ProviderType { return ProviderLocal }
func (managerClientResultKeyProvider) CreateInstance(context.Context, string) (*SandboxInstance, error) {
return &SandboxInstance{InstanceID: "inst-2", Provider: ProviderLocal, Status: "running"}, nil
}
func (managerClientResultKeyProvider) ExecuteCode(context.Context, *SandboxInstance, string, string, int, map[string]any) (*ExecutionResult, error) {
return &ExecutionResult{
Stdout: "",
Stderr: "",
ExitCode: 0,
Metadata: map[string]any{
"result": map[string]any{
"present": true,
"value": 16,
},
},
}, nil
}
func (managerClientResultKeyProvider) DestroyInstance(context.Context, *SandboxInstance) error {
return nil
}
func (managerClientResultKeyProvider) HealthCheck(context.Context) error { return nil }
func (managerClientResultKeyProvider) SupportedLanguages() []string { return []string{"python"} }