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>
206 lines
5.2 KiB
TypeScript
206 lines
5.2 KiB
TypeScript
import { PromptIcon } from '@/assets/icon/next-icon';
|
|
import CopyToClipboard from '@/components/copy-to-clipboard';
|
|
import {
|
|
Tooltip,
|
|
TooltipContent,
|
|
TooltipTrigger,
|
|
} from '@/components/ui/tooltip';
|
|
import { useSetModalState } from '@/hooks/common-hooks';
|
|
import { IRemoveMessageById } from '@/hooks/logic-hooks';
|
|
import { cn } from '@/lib/utils';
|
|
import {
|
|
LucidePauseCircle,
|
|
LucideRefreshCw,
|
|
LucideThumbsDown,
|
|
LucideThumbsUp,
|
|
LucideTrash2,
|
|
LucideVolume2,
|
|
} from 'lucide-react';
|
|
import { useCallback } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import FeedbackDialog from '../feedback-dialog';
|
|
import { PromptDialog } from '../prompt-dialog';
|
|
import { Button } from '../ui/button';
|
|
import { useRemoveMessage, useSendFeedback, useSpeech } from './hooks';
|
|
|
|
interface IProps {
|
|
messageId: string;
|
|
content: string;
|
|
prompt?: string;
|
|
showLikeButton: boolean;
|
|
audioBinary?: string;
|
|
showLoudspeaker?: boolean;
|
|
}
|
|
|
|
export const AssistantGroupButton = ({
|
|
messageId,
|
|
content,
|
|
prompt,
|
|
audioBinary,
|
|
showLikeButton,
|
|
showLoudspeaker = true,
|
|
}: IProps) => {
|
|
const { visible, hideModal, showModal, onFeedbackOk, loading } =
|
|
useSendFeedback(messageId);
|
|
const {
|
|
visible: promptVisible,
|
|
hideModal: hidePromptModal,
|
|
showModal: showPromptModal,
|
|
} = useSetModalState();
|
|
const { t } = useTranslation();
|
|
const { handleRead, ref, isPlaying } = useSpeech(content, audioBinary);
|
|
|
|
const handleLike = useCallback(() => {
|
|
onFeedbackOk({ thumbup: true });
|
|
}, [onFeedbackOk]);
|
|
|
|
return (
|
|
<>
|
|
<div
|
|
className="flex gap-1 opacity-0 transition-opacity group-hover:opacity-100"
|
|
role="toolbar"
|
|
>
|
|
<CopyToClipboard
|
|
text={content}
|
|
className="border-0"
|
|
size="icon-xs"
|
|
avoidButtonWrapper
|
|
/>
|
|
|
|
{showLoudspeaker && (
|
|
<>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
onClick={handleRead}
|
|
>
|
|
<span>
|
|
{isPlaying ? <LucidePauseCircle /> : <LucideVolume2 />}
|
|
</span>
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('chat.read')}</TooltipContent>
|
|
</Tooltip>
|
|
|
|
<audio src="" ref={ref}></audio>
|
|
</>
|
|
)}
|
|
{showLikeButton && (
|
|
<>
|
|
<Button
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
onClick={handleLike}
|
|
>
|
|
<LucideThumbsUp />
|
|
</Button>
|
|
|
|
<Button
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
onClick={showModal}
|
|
>
|
|
<LucideThumbsDown />
|
|
</Button>
|
|
</>
|
|
)}
|
|
{prompt && (
|
|
<Button
|
|
onClick={showPromptModal}
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
>
|
|
<PromptIcon style={{ fontSize: '16px' }} />
|
|
</Button>
|
|
)}
|
|
</div>
|
|
{visible && (
|
|
<FeedbackDialog
|
|
visible={visible}
|
|
hideModal={hideModal}
|
|
onOk={onFeedbackOk}
|
|
loading={loading}
|
|
></FeedbackDialog>
|
|
)}
|
|
{promptVisible && (
|
|
<PromptDialog
|
|
visible={promptVisible}
|
|
hideModal={hidePromptModal}
|
|
prompt={prompt}
|
|
></PromptDialog>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
interface UserGroupButtonProps extends Partial<IRemoveMessageById> {
|
|
messageId: string;
|
|
content: string;
|
|
regenerateMessage?: () => void;
|
|
sendLoading: boolean;
|
|
}
|
|
|
|
export const UserGroupButton = ({
|
|
content,
|
|
messageId,
|
|
sendLoading,
|
|
removeMessageById,
|
|
regenerateMessage,
|
|
}: UserGroupButtonProps) => {
|
|
const { onRemoveMessage, loading } = useRemoveMessage(
|
|
messageId,
|
|
removeMessageById,
|
|
);
|
|
const { t } = useTranslation();
|
|
|
|
return (
|
|
<div className="flex gap-1 opacity-0 transition-opacity group-hover:opacity-100">
|
|
<CopyToClipboard
|
|
text={content}
|
|
className="border-0"
|
|
size="icon-xs"
|
|
avoidButtonWrapper
|
|
/>
|
|
|
|
{regenerateMessage && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
onClick={regenerateMessage}
|
|
disabled={sendLoading}
|
|
>
|
|
<LucideRefreshCw className={cn(sendLoading && 'animate-spin')} />
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('chat.regenerate')}</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
{removeMessageById && (
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<Button
|
|
variant="transparent"
|
|
size="icon-xs"
|
|
className="border-0"
|
|
onClick={onRemoveMessage}
|
|
disabled={loading}
|
|
>
|
|
<LucideTrash2 />
|
|
</Button>
|
|
</TooltipTrigger>
|
|
<TooltipContent>{t('common.delete')}</TooltipContent>
|
|
</Tooltip>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|