mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-17 05:07:23 +08:00
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>
This commit is contained in:
@@ -59,25 +59,25 @@ export function Collapse({
|
||||
onOpenChange={handleOpenChange}
|
||||
disabled={disabled}
|
||||
>
|
||||
<CollapsibleTrigger className={'w-full'}>
|
||||
<section className="flex justify-between items-center">
|
||||
<div className="flex items-center gap-1">
|
||||
<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" />
|
||||
<ListChevronsUpDown className="size-4 shrink-0" />
|
||||
) : (
|
||||
<ListChevronsDownUp className="size-4 text-text-secondary" />
|
||||
<ListChevronsDownUp className="size-4 shrink-0 text-text-secondary" />
|
||||
)}
|
||||
<div
|
||||
className={cn('text-text-secondary', {
|
||||
'text-text-primary': open,
|
||||
className={cn('min-w-0 text-text-secondary', {
|
||||
'text-text-primary': currentOpen,
|
||||
})}
|
||||
>
|
||||
{title}
|
||||
</div>
|
||||
</div>
|
||||
<div>{rightContent}</div>
|
||||
</section>
|
||||
</CollapsibleTrigger>
|
||||
</CollapsibleTrigger>
|
||||
{rightContent ? <div className="shrink-0">{rightContent}</div> : null}
|
||||
</section>
|
||||
<CollapsibleContent className="pt-5">{children}</CollapsibleContent>
|
||||
</Collapsible>
|
||||
);
|
||||
|
||||
@@ -9,8 +9,9 @@ import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
|
||||
const CopyToClipboard = ({
|
||||
text,
|
||||
className,
|
||||
avoidButtonWrapper = false,
|
||||
...buttonProps
|
||||
}: { text: string } & ButtonProps) => {
|
||||
}: { text: string; avoidButtonWrapper?: boolean } & ButtonProps) => {
|
||||
const [copied, setCopied] = useState(false);
|
||||
const { t } = useTranslate('common');
|
||||
|
||||
@@ -21,19 +22,32 @@ const CopyToClipboard = ({
|
||||
}, 2000);
|
||||
};
|
||||
|
||||
const icon = copied ? <LucideCheck /> : <LucideCopy />;
|
||||
const trigger = avoidButtonWrapper ? (
|
||||
<Button
|
||||
asChild
|
||||
variant="transparent"
|
||||
size="icon-sm"
|
||||
{...buttonProps}
|
||||
className={cn(className, copied && '!text-state-success')}
|
||||
>
|
||||
<span aria-label={copied ? t('copied') : t('copy')}>{icon}</span>
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
variant="transparent"
|
||||
size="icon-sm"
|
||||
{...buttonProps}
|
||||
className={cn(className, copied && '!text-state-success')}
|
||||
>
|
||||
{icon}
|
||||
</Button>
|
||||
);
|
||||
|
||||
return (
|
||||
<Tooltip open={copied ? true : undefined}>
|
||||
<Clipboard text={text} onCopy={handleCopy}>
|
||||
<TooltipTrigger asChild>
|
||||
<Button
|
||||
variant="transparent"
|
||||
size="icon-sm"
|
||||
{...buttonProps}
|
||||
className={cn(className, copied && '!text-state-success')}
|
||||
>
|
||||
{copied ? <LucideCheck /> : <LucideCopy />}
|
||||
</Button>
|
||||
</TooltipTrigger>
|
||||
<TooltipTrigger asChild>{trigger}</TooltipTrigger>
|
||||
</Clipboard>
|
||||
<TooltipContent>{copied ? t('copied') : t('copy')}</TooltipContent>
|
||||
</Tooltip>
|
||||
|
||||
@@ -60,7 +60,12 @@ export const AssistantGroupButton = ({
|
||||
className="flex gap-1 opacity-0 transition-opacity group-hover:opacity-100"
|
||||
role="toolbar"
|
||||
>
|
||||
<CopyToClipboard text={content} className="border-0" size="icon-xs" />
|
||||
<CopyToClipboard
|
||||
text={content}
|
||||
className="border-0"
|
||||
size="icon-xs"
|
||||
avoidButtonWrapper
|
||||
/>
|
||||
|
||||
{showLoudspeaker && (
|
||||
<>
|
||||
@@ -156,7 +161,12 @@ export const UserGroupButton = ({
|
||||
|
||||
return (
|
||||
<div className="flex gap-1 opacity-0 transition-opacity group-hover:opacity-100">
|
||||
<CopyToClipboard text={content} className="border-0" size="icon-xs" />
|
||||
<CopyToClipboard
|
||||
text={content}
|
||||
className="border-0"
|
||||
size="icon-xs"
|
||||
avoidButtonWrapper
|
||||
/>
|
||||
|
||||
{regenerateMessage && (
|
||||
<Tooltip>
|
||||
|
||||
@@ -85,6 +85,7 @@ export const AssistantGroupButton = ({
|
||||
<CopyToClipboard
|
||||
text={content}
|
||||
className="border-none hover:!bg-transparent"
|
||||
avoidButtonWrapper
|
||||
></CopyToClipboard>
|
||||
</ToggleGroupItem>
|
||||
{showLoudspeaker && (
|
||||
@@ -189,7 +190,7 @@ export const UserGroupButton = ({
|
||||
className="space-x-1"
|
||||
>
|
||||
<ToggleGroupItem value="a">
|
||||
<CopyToClipboard text={content}></CopyToClipboard>
|
||||
<CopyToClipboard text={content} avoidButtonWrapper></CopyToClipboard>
|
||||
</ToggleGroupItem>
|
||||
{regenerateMessage && (
|
||||
<ToggleGroupItem
|
||||
|
||||
@@ -113,22 +113,29 @@ const SingleSelectDisplay: React.FC<{
|
||||
};
|
||||
|
||||
const InputSelect = React.forwardRef<HTMLInputElement, InputSelectProps>(
|
||||
({
|
||||
options = [],
|
||||
value = [],
|
||||
onChange,
|
||||
placeholder = 'Select tags...',
|
||||
className,
|
||||
style,
|
||||
multi = false,
|
||||
type = 'text',
|
||||
}) => {
|
||||
(
|
||||
{
|
||||
options = [],
|
||||
value = [],
|
||||
onChange,
|
||||
placeholder = 'Select tags...',
|
||||
className,
|
||||
style,
|
||||
multi = false,
|
||||
type = 'text',
|
||||
},
|
||||
ref,
|
||||
) => {
|
||||
const [inputValue, setInputValue] = React.useState('');
|
||||
const [open, setOpen] = React.useState(false);
|
||||
const [isFocused, setIsFocused] = React.useState(false);
|
||||
const inputRef = React.useRef<HTMLInputElement>(null);
|
||||
const { t } = useTranslation();
|
||||
|
||||
React.useImperativeHandle(ref, () => inputRef.current as HTMLInputElement, [
|
||||
inputRef,
|
||||
]);
|
||||
|
||||
// Normalize value to array for consistent handling based on type
|
||||
const normalizedValue = React.useMemo(() => {
|
||||
if (Array.isArray(value)) {
|
||||
@@ -299,7 +306,13 @@ const InputSelect = React.forwardRef<HTMLInputElement, InputSelectProps>(
|
||||
// Return single value if not multi-select, otherwise return array
|
||||
let result: string | number | Date | string[] | number[] | Date[];
|
||||
if (multi) {
|
||||
result = newValue;
|
||||
if (type === 'number') {
|
||||
result = newValue as number[];
|
||||
} else if (type === 'date' || type === 'datetime') {
|
||||
result = newValue as Date[];
|
||||
} else {
|
||||
result = newValue as string[];
|
||||
}
|
||||
} else {
|
||||
if (type === 'number') {
|
||||
result = newValue[0] || 0;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { cn } from '@/lib/utils';
|
||||
import * as DialogPrimitive from '@radix-ui/react-dialog';
|
||||
import { AlertCircle, CheckCircle, Info, Loader, X } from 'lucide-react';
|
||||
import { FC, ReactNode, useCallback, useEffect, useMemo } from 'react';
|
||||
import React, { FC, ReactNode, useCallback, useEffect, useMemo } from 'react';
|
||||
import { createRoot } from 'react-dom/client';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { DialogDescription } from '../dialog';
|
||||
|
||||
@@ -35,14 +35,16 @@ export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };
|
||||
export const FormTooltip = ({ tooltip }: { tooltip: React.ReactNode }) => {
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger
|
||||
tabIndex={-1}
|
||||
className="align-text-top"
|
||||
onClick={(e) => {
|
||||
e.preventDefault(); // Prevent clicking the tooltip from triggering form save
|
||||
}}
|
||||
>
|
||||
<CircleQuestionMark className="size-[.85em] ml-[.25em]" />
|
||||
<TooltipTrigger asChild>
|
||||
<span
|
||||
tabIndex={-1}
|
||||
className="inline-flex align-text-top"
|
||||
onClick={(e) => {
|
||||
e.preventDefault(); // Prevent clicking the tooltip from triggering form save
|
||||
}}
|
||||
>
|
||||
<CircleQuestionMark className="size-[.85em] ml-[.25em]" />
|
||||
</span>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>{tooltip}</TooltipContent>
|
||||
</Tooltip>
|
||||
|
||||
Reference in New Issue
Block a user