mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-24 17:36:47 +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>
135 lines
3.5 KiB
TypeScript
135 lines
3.5 KiB
TypeScript
import {
|
|
Collapsible,
|
|
CollapsibleContent,
|
|
CollapsibleTrigger,
|
|
} from '@/components/ui/collapsible';
|
|
import { cn } from '@/lib/utils';
|
|
import { CollapsibleProps } from '@radix-ui/react-collapsible';
|
|
import {
|
|
ChevronDown,
|
|
ChevronUp,
|
|
ListChevronsDownUp,
|
|
ListChevronsUpDown,
|
|
} from 'lucide-react';
|
|
import * as React from 'react';
|
|
import {
|
|
PropsWithChildren,
|
|
ReactNode,
|
|
useCallback,
|
|
useEffect,
|
|
useState,
|
|
} from 'react';
|
|
|
|
type CollapseProps = Omit<CollapsibleProps, 'title'> & {
|
|
title?: ReactNode;
|
|
rightContent?: ReactNode;
|
|
} & PropsWithChildren;
|
|
|
|
export function Collapse({
|
|
title,
|
|
children,
|
|
rightContent,
|
|
open,
|
|
defaultOpen = false,
|
|
onOpenChange,
|
|
disabled,
|
|
}: CollapseProps) {
|
|
const [currentOpen, setCurrentOpen] = useState(open);
|
|
|
|
useEffect(() => {
|
|
if (typeof open === 'boolean') {
|
|
setCurrentOpen(open);
|
|
} else {
|
|
setCurrentOpen(defaultOpen);
|
|
}
|
|
}, [defaultOpen, open]);
|
|
|
|
const handleOpenChange = useCallback(
|
|
(open: boolean) => {
|
|
setCurrentOpen(open);
|
|
onOpenChange?.(open);
|
|
},
|
|
[onOpenChange],
|
|
);
|
|
|
|
return (
|
|
<Collapsible
|
|
defaultOpen={defaultOpen}
|
|
open={currentOpen}
|
|
onOpenChange={handleOpenChange}
|
|
disabled={disabled}
|
|
>
|
|
<section className="flex justify-between items-center gap-2">
|
|
<CollapsibleTrigger className="flex min-w-0 flex-1 items-center">
|
|
<div className="flex min-w-0 items-center gap-1">
|
|
{currentOpen ? (
|
|
<ListChevronsUpDown className="size-4 shrink-0" />
|
|
) : (
|
|
<ListChevronsDownUp className="size-4 shrink-0 text-text-secondary" />
|
|
)}
|
|
<div
|
|
className={cn('min-w-0 text-text-secondary', {
|
|
'text-text-primary': currentOpen,
|
|
})}
|
|
>
|
|
{title}
|
|
</div>
|
|
</div>
|
|
</CollapsibleTrigger>
|
|
{rightContent ? <div className="shrink-0">{rightContent}</div> : null}
|
|
</section>
|
|
<CollapsibleContent className="pt-5">{children}</CollapsibleContent>
|
|
</Collapsible>
|
|
);
|
|
}
|
|
|
|
export type NodeCollapsibleProps<T extends any[]> = {
|
|
items?: T;
|
|
children: (item: T[0], idx: number) => ReactNode;
|
|
className?: string;
|
|
};
|
|
export function NodeCollapsible<T extends any[]>({
|
|
items = [] as unknown as T,
|
|
children,
|
|
className,
|
|
}: NodeCollapsibleProps<T>) {
|
|
const [isOpen, setIsOpen] = React.useState(false);
|
|
|
|
const nextClassName = cn('space-y-2', className);
|
|
|
|
const nextItems = items.every((x) => Array.isArray(x)) ? items.flat() : items;
|
|
|
|
return (
|
|
<Collapsible
|
|
open={isOpen}
|
|
onOpenChange={setIsOpen}
|
|
className={cn('relative', nextClassName)}
|
|
>
|
|
{nextItems.slice(0, 3).map(children)}
|
|
<CollapsibleContent className={nextClassName}>
|
|
{nextItems.slice(3).map((x, idx) => children(x, idx + 3))}
|
|
</CollapsibleContent>
|
|
{nextItems.length > 3 && (
|
|
<CollapsibleTrigger
|
|
asChild
|
|
onClick={(e) => e.stopPropagation()}
|
|
className="absolute left-1/2 -translate-x-1/2 bottom-0 translate-y-1/2 cursor-pointer"
|
|
>
|
|
<div
|
|
className={cn(
|
|
'size-3 bg-text-secondary rounded-full flex items-center justify-center',
|
|
{ 'bg-text-primary': isOpen },
|
|
)}
|
|
>
|
|
{isOpen ? (
|
|
<ChevronUp className="stroke-bg-component" />
|
|
) : (
|
|
<ChevronDown className="stroke-bg-component" />
|
|
)}
|
|
</div>
|
|
</CollapsibleTrigger>
|
|
)}
|
|
</Collapsible>
|
|
);
|
|
}
|