Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: Some files in the `agent` directory are triggering `tsc` errors. (#21212)

balibabubcc77dc6c40a
diff --git a/web/src/constants/agent.tsx b/web/src/constants/agent.tsx
index 5d0c55fe5f..066b984da0 100644
--- a/web/src/constants/agent.tsx
+++ b/web/src/constants/agent.tsx
@@ -86,7 +86,6 @@ export enum Operator {
Retrieval = 'Retrieval',
Categorize = 'Categorize',
Message = 'Message',
- RewriteQuestion = 'RewriteQuestion',
DuckDuckGo = 'DuckDuckGo',
Wikipedia = 'Wikipedia',
PubMed = 'PubMed',
diff --git a/web/src/interfaces/database/agent.ts b/web/src/interfaces/database/agent.ts
index 9f778287e3..8012af63c6 100644
--- a/web/src/interfaces/database/agent.ts
+++ b/web/src/interfaces/database/agent.ts
@@ -242,7 +242,6 @@ export type IRelevantNode = BaseNode;
export type ILogicNode = BaseNode;
export type INoteNode = BaseNode;
export type IMessageNode = BaseNode;
-export type IRewriteNode = BaseNode;
export type IInvokeNode = BaseNode;
export type ITemplateNode = BaseNode;
export type IEmailNode = BaseNode;
@@ -264,7 +263,6 @@ export type RAGFlowNodeType =
| ILogicNode
| INoteNode
| IMessageNode
- | IRewriteNode
| IInvokeNode
| ITemplateNode
| IEmailNode
@@ -298,6 +296,7 @@ export interface IAgentLogResponse {
reference: IReference[];
name: string;
version_title: string;
+ is_new?: boolean;
}
export interface IAgentLogsResponse {
total: number;
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index d0e9e6cd71..8e154f1a1a 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -2894,7 +2894,6 @@ Best for: Documents with flowing, contextually connected content — such as boo
generateDescription: `A component that prompts the LLM to generate responses. Ensure the prompt is set correctly.`,
categorizeDescription: `A component that uses the LLM to classify user inputs into predefined categories. Ensure you specify the name, description, and examples for each category, along with the corresponding next component.`,
relevantDescription: `A component that uses the LLM to assess whether the upstream output is relevant to the user's latest query. Ensure you specify the next component for each judge result.`,
- rewriteQuestionDescription: `A component that rewrites a user query from the Interact component, based on the context of previous dialogues.`,
messageDescription:
'This component returns the final data output of the workflow along with predefined message content. ',
keywordDescription: `A component that retrieves top N search results from user's input. Ensure the TopN value is set properly before use.`,
@@ -2909,8 +2908,6 @@ Best for: Documents with flowing, contextually connected content — such as boo
generate: 'Generate',
answer: 'Interact',
categorize: 'Categorize',
- rewriteQuestion: 'Rewrite',
- rewrite: 'Rewrite',
begin: 'Begin',
message: 'Message',
blank: 'Blank',
diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts
index f03c4f6b84..8071789be5 100644
--- a/web/src/locales/zh.ts
+++ b/web/src/locales/zh.ts
@@ -2488,7 +2488,6 @@ NER:使用 spaCy NER 和基于规则的关键词提取来抽取 Entities 和 R
generateDescription: `此组件用于调用 LLM 生成文本,请注意提示的设置。`,
categorizeDescription: `此组件用于对文本进行分类。请指定类别的名称、描述和示例。每个类别都指向不同的下游组件。`,
relevantDescription: `该组件用来判断upstream的输出是否与用户最新的问题相关,‘是’代表相关,‘否’代表不相关。`,
- rewriteQuestionDescription: `此组件用于细化用户的提问。通常,当用户的原始提问无法从知识库中检索到相关信息时,此组件可帮助您将问题更改为更符合知识库表达方式的适当问题。`,
messageDescription:
'该组件用来返回工作流最后产生的数据内容和原先设置的文本内容。',
keywordDescription: `该组件用于从用户的问题中提取关键词。Top N 指定需要提取的关键词数量。`,
@@ -2504,7 +2503,6 @@ NER:使用 spaCy NER 和基于规则的关键词提取来抽取 Entities 和 R
answer: '对话',
categorize: '问题分类',
relevant: '是否相关',
- rewriteQuestion: '问题优化',
begin: '开始',
message: '回复消息',
blank: '空',
diff --git a/web/src/pages/agent/canvas/context-menu/index.tsx b/web/src/pages/agent/canvas/context-menu/index.tsx
index ad1413643d..317de85397 100644
--- a/web/src/pages/agent/canvas/context-menu/index.tsx
+++ b/web/src/pages/agent/canvas/context-menu/index.tsx
@@ -29,6 +29,8 @@ export function NodeContextMenu({
y: node?.position?.y || 0 + 50,
};
+ if (!node) return;
+
addNodes({
...(node || {}),
data: node?.data,
diff --git a/web/src/pages/agent/canvas/index.tsx b/web/src/pages/agent/canvas/index.tsx
index b8f1f97207..80a6e92512 100644
--- a/web/src/pages/agent/canvas/index.tsx
+++ b/web/src/pages/agent/canvas/index.tsx
@@ -77,7 +77,6 @@ import NoteNode from './node/note-node';
import ParserNode from './node/parser-node';
import { PlaceholderNode } from './node/placeholder-node';
import { RetrievalNode } from './node/retrieval-node';
-import { RewriteNode } from './node/rewrite-node';
import { SwitchNode } from './node/switch-node';
import TokenizerNode from './node/tokenizer-node';
import { ToolNode } from './node/tool-node';
@@ -93,7 +92,6 @@ export const nodeTypes: NodeTypes = {
switchNode: SwitchNode,
retrievalNode: RetrievalNode,
messageNode: MessageNode,
- rewriteNode: RewriteNode,
keywordNode: KeywordNode,
// emailNode: EmailNode,
iterationNode: IterationNode,
diff --git a/web/src/pages/agent/canvas/node/rewrite-node.tsx b/web/src/pages/agent/canvas/node/rewrite-node.tsx
deleted file mode 100644
index 9a73728995..0000000000
--- a/web/src/pages/agent/canvas/node/rewrite-node.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useTheme } from '@/components/theme-provider';
-import { IRewriteNode } from '@/interfaces/database/agent';
-import { Handle, NodeProps, Position } from '@xyflow/react';
-import classNames from 'classnames';
-import { get } from 'lodash';
-import { memo } from 'react';
-import { LLMLabelCard } from './card';
-import { LeftHandleStyle, RightHandleStyle } from './handle-icon';
-import styles from './index.module.less';
-import NodeHeader from './node-header';
-
-function InnerRewriteNode({
- id,
- data,
- isConnectable = true,
- selected,
-}: NodeProps<IRewriteNode>) {
- const { theme } = useTheme();
- return (
- <section
- className={classNames(
- styles.logicNode,
- theme === 'dark' ? styles.dark : '',
- {
- [styles.selectedNode]: selected,
- },
- )}
- >
- <Handle
- id="c"
- type="source"
- position={Position.Left}
- isConnectable={isConnectable}
- className={styles.handle}
- style={LeftHandleStyle}
- ></Handle>
- <Handle
- type="source"
- position={Position.Right}
- isConnectable={isConnectable}
- className={styles.handle}
- style={RightHandleStyle}
- id="b"
- ></Handle>
-
- <NodeHeader
- id={id}
- name={data.name}
- label={data.label}
- className={styles.nodeHeader}
- ></NodeHeader>
-
- <LLMLabelCard llmId={get(data, 'form.llm_id')}></LLMLabelCard>
- </section>
- );
-}
-
-export const RewriteNode = memo(InnerRewriteNode);
diff --git a/web/src/pages/agent/chat/use-send-agent-message.ts b/web/src/pages/agent/chat/use-send-agent-message.ts
index 90477ed7a6..09b77d4396 100644
--- a/web/src/pages/agent/chat/use-send-agent-message.ts
+++ b/web/src/pages/agent/chat/use-send-agent-message.ts
@@ -392,8 +392,9 @@ export const useSendAgentMessage = ({
// useSendMessageBySSE already reports application errors from
// streamed code != 0 frames. Only HTTP failures need a second
// layer's notification because the SSE hook cannot parse them.
- if (res?.response?.status !== 200) {
- sonnerMessage.error(res?.data?.message);
+ const msg = res?.data?.message;
+ if (res?.response?.status !== 200 && msg) {
+ sonnerMessage.error(msg);
}
// cancel loading
diff --git a/web/src/pages/agent/constant/index.tsx b/web/src/pages/agent/constant/index.tsx
index cca80edc8d..11fcf93e4e 100644
--- a/web/src/pages/agent/constant/index.tsx
+++ b/web/src/pages/agent/constant/index.tsx
@@ -63,7 +63,6 @@ export const AgentOperatorList = [
Operator.Retrieval,
Operator.Categorize,
Operator.Message,
- Operator.RewriteQuestion,
Operator.Switch,
Operator.Iteration,
Operator.WaitingDialogue,
@@ -112,12 +111,6 @@ export const initialRetrievalValues = {
},
};
-export const initialRewriteQuestionValues = {
- ...initialLlmBaseValues,
- language: '',
- message_history_window_size: 6,
-};
-
export const initialRelevantValues = {
...initialLlmBaseValues,
};
@@ -846,17 +839,7 @@ export const RestrictedUpstreamMap = {
[Operator.Begin]: [Operator.Begin],
[Operator.Categorize]: [Operator.Begin],
[Operator.Retrieval]: [Operator.Begin, Operator.Retrieval],
- [Operator.Message]: [
- Operator.Begin,
- Operator.Message,
- Operator.RewriteQuestion,
- Operator.Categorize,
- ],
- [Operator.RewriteQuestion]: [
- Operator.Begin,
- Operator.Message,
- Operator.RewriteQuestion,
- ],
+ [Operator.Message]: [Operator.Begin, Operator.Message, Operator.Categorize],
[Operator.DuckDuckGo]: [Operator.Begin, Operator.Retrieval],
[Operator.Wikipedia]: [Operator.Begin, Operator.Retrieval],
[Operator.PubMed]: [Operator.Begin, Operator.Retrieval],
@@ -917,7 +900,6 @@ export const NodeMap = {
[Operator.Categorize]: 'categorizeNode',
[Operator.Retrieval]: 'retrievalNode',
[Operator.Message]: 'messageNode',
- [Operator.RewriteQuestion]: 'rewriteNode',
[Operator.DuckDuckGo]: 'ragNode',
[Operator.Wikipedia]: 'ragNode',
[Operator.PubMed]: 'ragNode',
@@ -998,7 +980,6 @@ export const BeginQueryTypeIconMap = {
export const NoDebugOperatorsList = [
Operator.Begin,
Operator.Message,
- Operator.RewriteQuestion,
Operator.Switch,
Operator.Iteration,
Operator.UserFillUp,
diff --git a/web/src/pages/agent/explore/hooks/use-select-derived-session-list.ts b/web/src/pages/agent/explore/hooks/use-select-derived-session-list.ts
index 47bdc0b6c4..6125249866 100644
--- a/web/src/pages/agent/explore/hooks/use-select-derived-session-list.ts
+++ b/web/src/pages/agent/explore/hooks/use-select-derived-session-list.ts
@@ -28,8 +28,10 @@ export const useSelectDerivedSessionList = () => {
source: '',
user_id: '',
dsl: '',
- reference: {},
+ reference: [],
is_new: true,
+ name: '',
+ version_title: '',
};
setList([tempSession, ...sessions]);
diff --git a/web/src/pages/agent/form-hooks.ts b/web/src/pages/agent/form-hooks.ts
index fef7d37b97..d66a82ca85 100644
--- a/web/src/pages/agent/form-hooks.ts
+++ b/web/src/pages/agent/form-hooks.ts
@@ -1,34 +1,5 @@
import { useTranslate } from '@/hooks/common-hooks';
-import { useCallback, useMemo } from 'react';
-import { Operator, RestrictedUpstreamMap } from './constant';
-import useGraphStore from './store';
-
-export const useBuildFormSelectOptions = (
- operatorName: Operator,
- selfId?: string, // exclude the current node
-) => {
- const nodes = useGraphStore((state) => state.nodes);
-
- const buildCategorizeToOptions = useCallback(
- (toList: string[]) => {
- const excludedNodes: Operator[] = [
- Operator.Note,
- ...(RestrictedUpstreamMap[operatorName] ?? []),
- ];
- return nodes
- .filter(
- (x) =>
- excludedNodes.every((y) => y !== x.data.label) &&
- x.id !== selfId &&
- !toList.some((y) => y === x.id), // filter out selected values ​​in other to fields from the current drop-down box options
- )
- .map((x) => ({ label: x.data.name, value: x.id }));
- },
- [nodes, operatorName, selfId],
- );
-
- return buildCategorizeToOptions;
-};
+import { useMemo } from 'react';
export const useBuildSortOptions = () => {
const { t } = useTranslate('flow');
diff --git a/web/src/pages/agent/form-sheet/form-config-map.tsx b/web/src/pages/agent/form-sheet/form-config-map.tsx
index b20e721436..1572518eac 100644
--- a/web/src/pages/agent/form-sheet/form-config-map.tsx
+++ b/web/src/pages/agent/form-sheet/form-config-map.tsx
@@ -1,3 +1,4 @@
+import type { ComponentType } from 'react';
import { Operator } from '../constant';
import AgentForm from '../form/agent-form';
import ArXivForm from '../form/arxiv-form';
@@ -34,7 +35,6 @@ import QueritContentsForm from '../form/querit-contents-form';
import QueritForm from '../form/querit-form';
import BGPTForm from '../form/bgpt-form';
import RetrievalForm from '../form/retrieval-form/next';
-import RewriteQuestionForm from '../form/rewrite-question-form';
import SearXNGForm from '../form/searxng-form';
import StringTransformForm from '../form/string-transform-form';
import SwitchForm from '../form/switch-form';
@@ -52,7 +52,13 @@ import WikipediaForm from '../form/wikipedia-form';
import YahooFinanceForm from '../form/yahoo-finance-form';
import type { INextOperatorForm } from '../interface';
-export const FormConfigMap = {
+type OperatorFormConfig = {
+ component: ComponentType<INextOperatorForm>;
+};
+
+// Not every operator has a config form (e.g. TableChunker/QAChunker/
+// OneChunker/PageChunker); consumers fall back to empty content.
+export const FormConfigMap: Partial<Record<Operator, OperatorFormConfig>> = {
[Operator.Begin]: {
component: BeginForm,
},
@@ -65,9 +71,6 @@ export const FormConfigMap = {
[Operator.Message]: {
component: MessageForm,
},
- [Operator.RewriteQuestion]: {
- component: RewriteQuestionForm,
- },
[Operator.Code]: {
component: CodeForm,
},
diff --git a/web/src/pages/agent/form/agent-form/tool-popover/tool-command.tsx b/web/src/pages/agent/form/agent-form/tool-popover/tool-command.tsx
index 104965e752..d33128e452 100644
--- a/web/src/pages/agent/form/agent-form/tool-popover/tool-command.tsx
+++ b/web/src/pages/agent/form/agent-form/tool-popover/tool-command.tsx
@@ -109,7 +109,7 @@ function useHandleSelectChange({ onChange, value }: ToolCommandProps) {
}
// oxlint-disable-next-line
-export function ToolCommand({ value, onChange }: ToolCommandProps) {
+export function ToolCommand() {
const { t } = useTranslation();
const currentValue = useGetNodeTools();
diff --git a/web/src/pages/agent/form/begin-form/use-edit-query.ts b/web/src/pages/agent/form/begin-form/use-edit-query.ts
index 6942ba88be..cd5c5c8587 100644
--- a/web/src/pages/agent/form/begin-form/use-edit-query.ts
+++ b/web/src/pages/agent/form/begin-form/use-edit-query.ts
@@ -24,7 +24,9 @@ export const useEditQueryRecord = ({
const inputs: BeginQuery[] = form?.getValues('inputs') || [];
const nextQuery: BeginQuery[] =
- index > -1 ? inputs.toSpliced(index, 1, record) : [...inputs, record];
+ index > -1
+ ? inputs.map((item, idx) => (idx === index ? record : item))
+ : [...inputs, record];
form.setValue('inputs', nextQuery);
diff --git a/web/src/pages/agent/form/categorize-form/use-form-schema.ts b/web/src/pages/agent/form/categorize-form/use-form-schema.ts
index 6ff507ee89..b1ae8025dc 100644
--- a/web/src/pages/agent/form/categorize-form/use-form-schema.ts
+++ b/web/src/pages/agent/form/categorize-form/use-form-schema.ts
@@ -7,7 +7,6 @@ export function useCreateCategorizeFormSchema() {
const FormSchema = z.object({
query: z.string().optional(),
- parameter: z.string().optional(),
...LlmSettingSchema,
message_history_window_size: z.coerce.number(),
items: z.array(
diff --git a/web/src/pages/agent/form/invoke-form/index.tsx b/web/src/pages/agent/form/invoke-form/index.tsx
index cd92b82d1d..b300315683 100644
--- a/web/src/pages/agent/form/invoke-form/index.tsx
+++ b/web/src/pages/agent/form/invoke-form/index.tsx
@@ -2,22 +2,16 @@ import { Collapse } from '@/components/collapse';
import { FormContainer } from '@/components/form-container';
import NumberInput from '@/components/originui/number-input';
import { SelectWithSearch } from '@/components/originui/select-with-search';
+import { RAGFlowFormItem } from '@/components/ragflow-form';
+import { SwitchFormField } from '@/components/switch-form-field';
import { useIsDarkTheme } from '@/components/theme-provider';
import { Button } from '@/components/ui/button';
-import {
- Form,
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from '@/components/ui/form';
+import { Form, FormField } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
-import { Switch } from '@/components/ui/switch';
import { zodResolver } from '@hookform/resolvers/zod';
import Editor, { loader } from '@monaco-editor/react';
import { Plus } from 'lucide-react';
-import { memo } from 'react';
+import { memo, useCallback } from 'react';
import { useForm, useWatch } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { initialInvokeValues } from '../../constant';
@@ -85,6 +79,10 @@ function InvokeForm({ node }: INextOperatorForm) {
node,
});
+ const handleAddVariable = useCallback(() => {
+ showModal();
+ }, [showModal]);
+
const variables = useWatch({ control: form.control, name: 'variables' });
const isDarkTheme = useIsDarkTheme();
@@ -95,99 +93,39 @@ function InvokeForm({ node }: INextOperatorForm) {
<Form {...form}>
<FormWrapper>
<FormContainer>
- <FormField
- control={form.control}
- name="url"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('flow.url')}</FormLabel>
- <FormControl>
- <PromptEditor
- value={field.value}
- onChange={field.onChange}
- placeholder="http://"
- showToolbar={false}
- multiLine={false}
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="method"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('flow.method')}</FormLabel>
- <FormControl>
- <SelectWithSearch {...field} options={MethodOptions} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="timeout"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('flow.timeout')}</FormLabel>
- <FormControl>
- <TimeoutInput {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
+ <RAGFlowFormItem name="url" label={t('flow.url')}>
+ <PromptEditor
+ placeholder="http://"
+ showToolbar={false}
+ multiLine={false}
+ />
+ </RAGFlowFormItem>
+ <RAGFlowFormItem name="method" label={t('flow.method')}>
+ <SelectWithSearch options={MethodOptions} />
+ </RAGFlowFormItem>
+ <RAGFlowFormItem name="timeout" label={t('flow.timeout')}>
+ {(field) => (
+ <TimeoutInput value={field.value} onChange={field.onChange} />
)}
- />
- <FormField
- control={form.control}
- name="headers"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('flow.headers')}</FormLabel>
- <FormControl>
- <Editor
- height={200}
- defaultLanguage="json"
- theme={isDarkTheme ? 'vs-dark' : undefined}
- {...field}
- />
- </FormControl>
- <FormMessage />
- </FormItem>
+ </RAGFlowFormItem>
+ <RAGFlowFormItem name="headers" label={t('flow.headers')}>
+ {(field) => (
+ <Editor
+ height={200}
+ defaultLanguage="json"
+ theme={isDarkTheme ? 'vs-dark' : undefined}
+ value={field.value}
+ onChange={field.onChange}
+ />
)}
- />
- <FormField
- control={form.control}
- name="proxy"
- render={({ field }) => (
- <FormItem>
- <FormLabel>{t('flow.proxy')}</FormLabel>
- <FormControl>
- <Input {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
+ </RAGFlowFormItem>
+ <RAGFlowFormItem name="proxy" label={t('flow.proxy')}>
+ <Input />
+ </RAGFlowFormItem>
+ <SwitchFormField
name="clean_html"
- render={({ field }) => (
- <FormItem>
- <FormLabel tooltip={t('flow.cleanHtmlTip')}>
- {t('flow.cleanHtml')}
- </FormLabel>
- <FormControl>
- <Switch
- onCheckedChange={field.onChange}
- checked={field.value}
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
+ label={t('flow.cleanHtml')}
+ tooltip={t('flow.cleanHtmlTip')}
/>
{/* Create a hidden field to make Form instance record this */}
<FormField
@@ -199,13 +137,7 @@ function InvokeForm({ node }: INextOperatorForm) {
<Collapse
title={<div>{t('flow.parameter')}</div>}
rightContent={
- <Button
- variant={'ghost'}
- onClick={(e) => {
- e.preventDefault();
- showModal();
- }}
- >
+ <Button variant={'ghost'} type="button" onClick={handleAddVariable}>
<Plus />
</Button>
}
diff --git a/web/src/pages/agent/form/invoke-form/use-edit-variable.ts b/web/src/pages/agent/form/invoke-form/use-edit-variable.ts
index 40b371894f..9b9f9ae95e 100644
--- a/web/src/pages/agent/form/invoke-form/use-edit-variable.ts
+++ b/web/src/pages/agent/form/invoke-form/use-edit-variable.ts
@@ -19,17 +19,19 @@ export const useEditVariableRecord = ({
});
const otherThanCurrentQuery = useMemo(() => {
- return variables.filter((item, idx) => idx !== index);
+ return variables.filter((_, idx) => idx !== index);
}, [index, variables]);
const handleEditRecord = useCallback(
(record: VariableFormSchemaType) => {
const variables = form?.getValues('variables') || [];
- const nextVaribales =
- index > -1
- ? variables.toSpliced(index, 1, record)
- : [...variables, record];
+ const nextVaribales = [...variables];
+ if (index > -1) {
+ nextVaribales.splice(index, 1, record);
+ } else {
+ nextVaribales.push(record);
+ }
form.setValue('variables', nextVaribales);
@@ -50,7 +52,7 @@ export const useEditVariableRecord = ({
const handleDeleteRecord = useCallback(
(idx: number) => {
const variables = form?.getValues('variables') || [];
- const nextVariables = variables.filter((item, index) => index !== idx);
+ const nextVariables = variables.filter((_, index) => index !== idx);
form.setValue('variables', nextVariables);
},
diff --git a/web/src/pages/agent/form/rewrite-question-form/index.tsx b/web/src/pages/agent/form/rewrite-question-form/index.tsx
deleted file mode 100644
index da543d79d5..0000000000
--- a/web/src/pages/agent/form/rewrite-question-form/index.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { MessageHistoryWindowSizeFormField } from '@/components/message-history-window-size-item';
-import { ModelTreeSelectFormField } from '@/components/model-tree-select';
-import {
- Form,
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from '@/components/ui/form';
-import { SelectWithSearch } from '@/components/originui/select-with-search';
-import { useTranslation } from 'react-i18next';
-import { INextOperatorForm } from '../../interface';
-import { useOwnerTenantId } from '../../context';
-import { GoogleLanguageOptions } from '../../options';
-
-const RewriteQuestionForm = ({ form }: INextOperatorForm) => {
- const { t } = useTranslation();
- const ownerTenantId = useOwnerTenantId();
-
- return (
- <Form {...form}>
- <form
- className="space-y-6"
- onSubmit={(e) => {
- e.preventDefault();
- }}
- >
- <ModelTreeSelectFormField
- name="llm_id"
- label={t('chat.model')}
- tooltip={t('chat.modelTip')}
- ownerTenantId={ownerTenantId}
- />
- <FormField
- control={form.control}
- name="language"
- render={({ field }) => (
- <FormItem>
- <FormLabel tooltip={t('chat.languageTip')}>
- {t('chat.language')}
- </FormLabel>
- <FormControl>
- <SelectWithSearch
- options={GoogleLanguageOptions}
- allowClear={true}
- {...field}
- ></SelectWithSearch>
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <MessageHistoryWindowSizeFormField></MessageHistoryWindowSizeFormField>
- </form>
- </Form>
- );
-};
-
-export default RewriteQuestionForm;
diff --git a/web/src/pages/agent/form/searxng-form/index.tsx b/web/src/pages/agent/form/searxng-form/index.tsx
index 193e5d84e7..7044d09359 100644
--- a/web/src/pages/agent/form/searxng-form/index.tsx
+++ b/web/src/pages/agent/form/searxng-form/index.tsx
@@ -1,15 +1,8 @@
import { FormContainer } from '@/components/form-container';
+import { RAGFlowFormItem } from '@/components/ragflow-form';
import { TopNFormField } from '@/components/top-n-item';
-import {
- Form,
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from '@/components/ui/form';
+import { Form } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
-import { useTranslate } from '@/hooks/common-hooks';
import { zodResolver } from '@hookform/resolvers/zod';
import { memo } from 'react';
import { useForm } from 'react-hook-form';
@@ -32,7 +25,6 @@ const FormSchema = z.object({
const outputList = buildOutputList(initialSearXNGValues.outputs);
function SearXNGForm({ node }: INextOperatorForm) {
- const { t } = useTranslate('flow');
const defaultValues = useFormValues(initialSearXNGValues, node);
const form = useForm<z.infer<typeof FormSchema>>({
@@ -48,19 +40,9 @@ function SearXNGForm({ node }: INextOperatorForm) {
<FormContainer>
<QueryVariable></QueryVariable>
<TopNFormField></TopNFormField>
- <FormField
- control={form.control}
- name="searxng_url"
- render={({ field }) => (
- <FormItem>
- <FormLabel>SearXNG URL</FormLabel>
- <FormControl>
- <Input {...field} placeholder="http://localhost:4000" />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ <RAGFlowFormItem name="searxng_url" label="SearXNG URL">
+ <Input placeholder="http://localhost:4000" />
+ </RAGFlowFormItem>
</FormContainer>
</FormWrapper>
<div className="p-5">
diff --git a/web/src/pages/agent/form/switch-form/index.tsx b/web/src/pages/agent/form/switch-form/index.tsx
index 48b46f0572..137aed291b 100644
--- a/web/src/pages/agent/form/switch-form/index.tsx
+++ b/web/src/pages/agent/form/switch-form/index.tsx
@@ -1,13 +1,8 @@
import { SelectWithSearch } from '@/components/originui/select-with-search';
+import { RAGFlowFormItem } from '@/components/ragflow-form';
import { BlockButton, Button } from '@/components/ui/button';
import { Card, CardContent } from '@/components/ui/card';
-import {
- Form,
- FormControl,
- FormField,
- FormItem,
- FormMessage,
-} from '@/components/ui/form';
+import { Form } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
import { Separator } from '@/components/ui/separator';
import { Textarea } from '@/components/ui/textarea';
@@ -179,52 +174,27 @@ function ConditionCards({
)}
>
<section className="p-2 bg-bg-card flex justify-between items-center gap-2">
- <FormField
- control={form.control}
+ <RAGFlowFormItem
name={`${name}.${index}.cpn_id`}
- render={() => (
- <FormItem className="flex-1 min-w-0">
- <FormControl>
- <VariableWithPath name={`${name}.${index}.cpn_id`} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ className="flex-1 min-w-0"
+ >
+ {() => <VariableWithPath name={`${name}.${index}.cpn_id`} />}
+ </RAGFlowFormItem>
<div className="flex items-center">
<Separator orientation="vertical" className="h-2.5" />
- <FormField
- control={form.control}
- name={`${name}.${index}.operator`}
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <SelectWithSearch
- {...field}
- options={switchOperatorOptions}
- onlyShowSelectedIcon
- triggerClassName="w-30 bg-transparent border-none"
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ <RAGFlowFormItem name={`${name}.${index}.operator`}>
+ <SelectWithSearch
+ options={switchOperatorOptions}
+ onlyShowSelectedIcon
+ triggerClassName="w-30 bg-transparent border-none"
+ />
+ </RAGFlowFormItem>
</div>
</section>
<CardContent className="p-4 ">
- <FormField
- control={form.control}
- name={`${name}.${index}.value`}
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <Textarea {...field} className="bg-transparent" />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ <RAGFlowFormItem name={`${name}.${index}.value`}>
+ <Textarea className="bg-transparent" />
+ </RAGFlowFormItem>
</CardContent>
</Card>
<Button variant={'ghost'} onClick={handleRemove(index)}>
@@ -314,21 +284,11 @@ function SwitchForm({ node }: IOperatorForm) {
{conditionLength > 1 && (
<section className="flex flex-col w-[72px]">
<div className="relative w-1 flex-1 before:absolute before:w-[1px] before:bg-input-border before:top-20 before:bottom-0 before:left-10"></div>
- <FormField
- control={form.control}
+ <RAGFlowFormItem
name={`${ConditionKey}.${index}.logical_operator`}
- render={({ field }) => (
- <FormItem>
- <FormControl>
- <SelectWithSearch
- {...field}
- options={switchLogicOperatorOptions}
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ >
+ <SelectWithSearch options={switchLogicOperatorOptions} />
+ </RAGFlowFormItem>
<div className="relative w-1 flex-1 before:absolute before:w-[1px] before:bg-input-border before:top-0 before:bottom-36 before:left-10"></div>
</section>
)}
diff --git a/web/src/pages/agent/form/user-fill-up-form/index.tsx b/web/src/pages/agent/form/user-fill-up-form/index.tsx
index 384c268980..d25e05b99c 100644
--- a/web/src/pages/agent/form/user-fill-up-form/index.tsx
+++ b/web/src/pages/agent/form/user-fill-up-form/index.tsx
@@ -22,30 +22,30 @@ import { PromptEditor } from '../components/prompt-editor';
import { useValues } from './use-values';
import { useWatchFormChange } from './use-watch-change';
+const FormSchema = z.object({
+ enable_tips: z.boolean().optional(),
+ tips: z.string().trim().optional(),
+ layout_recognize: z.string().optional(),
+ inputs: z
+ .array(
+ z.object({
+ key: z.string(),
+ type: z.string(),
+ value: z.string(),
+ optional: z.boolean(),
+ name: z.string(),
+ options: z.array(z.union([z.number(), z.string(), z.boolean()])),
+ }),
+ )
+ .optional(),
+});
+
function UserFillUpForm({ node }: INextOperatorForm) {
const { t } = useTranslation();
const ownerTenantId = useOwnerTenantId();
const values = useValues(node);
- const FormSchema = z.object({
- enable_tips: z.boolean().optional(),
- tips: z.string().trim().optional(),
- layout_recognize: z.string().optional(),
- inputs: z
- .array(
- z.object({
- key: z.string(),
- type: z.string(),
- value: z.string(),
- optional: z.boolean(),
- name: z.string(),
- options: z.array(z.union([z.number(), z.string(), z.boolean()])),
- }),
- )
- .optional(),
- });
-
const form = useForm({
defaultValues: values,
resolver: zodResolver(FormSchema),
@@ -63,10 +63,14 @@ function UserFillUpForm({ node }: INextOperatorForm) {
[inputs],
);
- const outputList = inputs?.map((item) => ({
- title: item.name,
- type: item.type,
- }));
+ const outputList = useMemo(
+ () =>
+ inputs?.map((item) => ({
+ title: item.name,
+ type: item.type,
+ })),
+ [inputs],
+ );
const {
ok,
diff --git a/web/src/pages/agent/hooks/use-add-node.ts b/web/src/pages/agent/hooks/use-add-node.ts
index 16044ca2fd..387146f57e 100644
--- a/web/src/pages/agent/hooks/use-add-node.ts
+++ b/web/src/pages/agent/hooks/use-add-node.ts
@@ -44,7 +44,6 @@ import {
initialQueritContentsValues,
initialQueritValues,
initialRetrievalValues,
- initialRewriteQuestionValues,
initialSearXNGValues,
initialStringTransformValues,
initialSwitchValues,
@@ -163,10 +162,6 @@ export const useInitializeOperatorParams = () => {
...initialCategorizeValues,
llm_id: llmId,
},
- [Operator.RewriteQuestion]: {
- ...initialRewriteQuestionValues,
- llm_id: llmId,
- },
[Operator.Message]: initialMessageValues,
[Operator.DuckDuckGo]: initialDuckValues,
[Operator.Wikipedia]: initialWikipediaValues,
@@ -213,6 +208,12 @@ export const useInitializeOperatorParams = () => {
// The manual chunker shares the title chunker's form (TitleChunkerForm
// with pinMethodGroup) and initial values, like normalizeOperatorForm.
[Operator.ManualChunker]: initialTitleChunkerValues,
+ // Parser-internal chunkers are never added through the canvas; these
+ // entries only keep the map exhaustive over Operator.
+ [Operator.TableChunker]: {},
+ [Operator.QAChunker]: {},
+ [Operator.OneChunker]: {},
+ [Operator.PageChunker]: {},
[Operator.Extractor]: {
...getInitialExtractorValues(),
llm_id: llmId,
@@ -228,15 +229,12 @@ export const useInitializeOperatorParams = () => {
[Operator.DocGenerator]: initialDocGeneratorValues,
[Operator.Browser]: { ...initialBrowserValues, llm_id: llmId },
[Operator.ExcelProcessor]: {},
- };
+ } satisfies Record<Operator, unknown>;
}, [defaultModelDictionary, llmId]);
const initializeOperatorParams = useCallback(
(operatorName: Operator, position: Position) => {
- // The map only covers canvas operators; parser-internal chunkers
- // (Table/QA/One/Page) are never added through this path.
- const initialValues =
- initialFormValuesMap[operatorName as keyof typeof initialFormValuesMap];
+ const initialValues = initialFormValuesMap[operatorName];
if (isBottomSubAgent(operatorName, position)) {
return {
...initialValues,