diff --git a/web/src/app.tsx b/web/src/app.tsx index b5c0a0d374..1a7973db9c 100644 --- a/web/src/app.tsx +++ b/web/src/app.tsx @@ -13,14 +13,14 @@ import vi_VN from 'antd/locale/vi_VN'; import zhCN from 'antd/locale/zh_CN'; import zh_HK from 'antd/locale/zh_HK'; import dayjs from 'dayjs'; +import 'dayjs/locale/ar'; +import 'dayjs/locale/zh-cn'; import advancedFormat from 'dayjs/plugin/advancedFormat'; import customParseFormat from 'dayjs/plugin/customParseFormat'; import localeData from 'dayjs/plugin/localeData'; import weekOfYear from 'dayjs/plugin/weekOfYear'; import weekYear from 'dayjs/plugin/weekYear'; import weekday from 'dayjs/plugin/weekday'; -import 'dayjs/locale/ar'; -import 'dayjs/locale/zh-cn'; import React, { useEffect, useState } from 'react'; import { RouterProvider } from 'react-router'; import { ThemeProvider, useTheme } from './components/theme-provider'; diff --git a/web/src/interfaces/database/flow.ts b/web/src/interfaces/database/flow.ts deleted file mode 100644 index aa26661508..0000000000 --- a/web/src/interfaces/database/flow.ts +++ /dev/null @@ -1,191 +0,0 @@ -import { Edge, Node } from '@xyflow/react'; -import { IReference, Message } from './chat'; - -export type DSLComponents = Record; - -export interface DSL { - components: DSLComponents; - history: any[]; - path?: string[][]; - answer?: any[]; - graph?: IGraph; - messages: Message[]; - reference: IReference[]; - globals: Record; - retrieval: IReference[]; -} - -export interface IOperator { - obj: IOperatorNode; - downstream: string[]; - upstream: string[]; - parent_id?: string; -} - -export interface IOperatorNode { - component_name: string; - params: Record; -} - -export declare interface IFlow { - avatar?: string; - canvas_type: null; - create_date: string; - create_time: number; - description: string; - dsl: DSL; - id: string; - title: string; - update_date: string; - update_time: number; - user_id: string; - permission: string; - nickname: string; - release?: boolean; -} - -export interface IFlowTemplate { - avatar: string; - canvas_type: string; - canvas_category?: string; - create_date: string; - create_time: number; - description: { - en: string; - zh: string; - de: string; - }; - dsl: DSL; - id: string; - title: { - en: string; - zh: string; - de: string; - }; - update_date: string; - update_time: number; -} - -export type ICategorizeItemResult = Record< - string, - Omit ->; - -export interface IGenerateForm { - max_tokens?: number; - temperature?: number; - top_p?: number; - presence_penalty?: number; - frequency_penalty?: number; - cite?: boolean; - prompt: number; - llm_id: string; - parameters: { key: string; component_id: string }; -} -export interface ICategorizeItem { - name: string; - description?: string; - examples?: string; - to?: string; - index: number; -} - -export interface ICategorizeForm extends IGenerateForm { - category_description: ICategorizeItemResult; -} - -export interface IRelevantForm extends IGenerateForm { - yes: string; - no: string; -} - -export interface ISwitchCondition { - items: ISwitchItem[]; - logical_operator: string; - to: string[] | string; -} - -export interface ISwitchItem { - cpn_id: string; - operator: string; - value: string; -} - -export interface ISwitchForm { - conditions: ISwitchCondition[]; - end_cpn_id: string; - no: string; -} - -export interface IBeginForm { - prologue?: string; -} - -export interface IRetrievalForm { - similarity_threshold?: number; - keywords_similarity_weight?: number; - top_n?: number; - top_k?: number; - rerank_id?: string; - empty_response?: string; - kb_ids: string[]; -} - -export interface ICodeForm { - inputs?: Array<{ name?: string; component_id?: string }>; - lang: string; - script?: string; -} - -export type BaseNodeData = { - label: string; // operator type - name: string; // operator name - color?: string; - form?: TForm; -}; - -export type BaseNode = Node>; - -export type IBeginNode = BaseNode; -export type IRetrievalNode = BaseNode; -export type IGenerateNode = BaseNode; -export type ICategorizeNode = BaseNode; -export type ISwitchNode = BaseNode; -export type IRagNode = BaseNode; -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; -export type IIterationNode = BaseNode; -export type IIterationStartNode = BaseNode; -export type IKeywordNode = BaseNode; -export type ICodeNode = BaseNode; -export type IAgentNode = BaseNode; - -export type RAGFlowNodeType = - | IBeginNode - | IRetrievalNode - | IGenerateNode - | ICategorizeNode - | ISwitchNode - | IRagNode - | IRelevantNode - | ILogicNode - | INoteNode - | IMessageNode - | IRewriteNode - | IInvokeNode - | ITemplateNode - | IEmailNode - | IIterationNode - | IIterationStartNode - | IKeywordNode; - -export interface IGraph { - nodes: RAGFlowNodeType[]; - edges: Edge[]; -} diff --git a/web/src/pages/agent/canvas/node/agent-node.tsx b/web/src/pages/agent/canvas/node/agent-node.tsx index a95d4906dd..d5d5d5689f 100644 --- a/web/src/pages/agent/canvas/node/agent-node.tsx +++ b/web/src/pages/agent/canvas/node/agent-node.tsx @@ -1,4 +1,4 @@ -import { IAgentNode } from '@/interfaces/database/flow'; +import { BaseNode } from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { Handle, NodeProps, Position } from '@xyflow/react'; import { get } from 'lodash'; @@ -20,7 +20,7 @@ function InnerAgentNode({ data, isConnectable = true, selected, -}: NodeProps>) { +}: NodeProps>) { const edges = useGraphStore((state) => state.edges); const { t } = useTranslation(); diff --git a/web/src/pages/agent/canvas/node/begin-node.tsx b/web/src/pages/agent/canvas/node/begin-node.tsx index 3ae76c62b4..60c20ad9c4 100644 --- a/web/src/pages/agent/canvas/node/begin-node.tsx +++ b/web/src/pages/agent/canvas/node/begin-node.tsx @@ -1,4 +1,4 @@ -import { BaseNode } from '@/interfaces/database/flow'; +import { BaseNode } from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { NodeProps, Position } from '@xyflow/react'; import get from 'lodash/get'; diff --git a/web/src/pages/agent/canvas/node/categorize-node.tsx b/web/src/pages/agent/canvas/node/categorize-node.tsx index 4d79e5c4fa..dfbcff0858 100644 --- a/web/src/pages/agent/canvas/node/categorize-node.tsx +++ b/web/src/pages/agent/canvas/node/categorize-node.tsx @@ -1,4 +1,4 @@ -import { ICategorizeNode } from '@/interfaces/database/flow'; +import { ICategorizeNode } from '@/interfaces/database/agent'; import { NodeProps, Position } from '@xyflow/react'; import { get } from 'lodash'; import { memo } from 'react'; diff --git a/web/src/pages/agent/canvas/node/file-node.tsx b/web/src/pages/agent/canvas/node/file-node.tsx index 480710cb17..d98c53edc3 100644 --- a/web/src/pages/agent/canvas/node/file-node.tsx +++ b/web/src/pages/agent/canvas/node/file-node.tsx @@ -1,4 +1,4 @@ -import { IBeginNode } from '@/interfaces/database/flow'; +import { IBeginNode } from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { NodeProps, Position } from '@xyflow/react'; import get from 'lodash/get'; diff --git a/web/src/pages/agent/canvas/node/index.tsx b/web/src/pages/agent/canvas/node/index.tsx index 8d20748581..e4edd23b71 100644 --- a/web/src/pages/agent/canvas/node/index.tsx +++ b/web/src/pages/agent/canvas/node/index.tsx @@ -1,4 +1,4 @@ -import { IRagNode } from '@/interfaces/database/flow'; +import { IRagNode } from '@/interfaces/database/agent'; import { NodeProps, Position } from '@xyflow/react'; import { PropsWithChildren, memo } from 'react'; import { NodeHandleId } from '../../constant'; diff --git a/web/src/pages/agent/canvas/node/iteration-node.tsx b/web/src/pages/agent/canvas/node/iteration-node.tsx index c893e77236..13eca01336 100644 --- a/web/src/pages/agent/canvas/node/iteration-node.tsx +++ b/web/src/pages/agent/canvas/node/iteration-node.tsx @@ -1,7 +1,7 @@ import { IIterationNode, IIterationStartNode, -} from '@/interfaces/database/flow'; +} from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { NodeProps, NodeResizeControl, Position } from '@xyflow/react'; import { memo } from 'react'; diff --git a/web/src/pages/agent/canvas/node/keyword-node.tsx b/web/src/pages/agent/canvas/node/keyword-node.tsx index 4d40d1a2ec..ecab93ca2e 100644 --- a/web/src/pages/agent/canvas/node/keyword-node.tsx +++ b/web/src/pages/agent/canvas/node/keyword-node.tsx @@ -1,5 +1,5 @@ import { useTheme } from '@/components/theme-provider'; -import { IKeywordNode } from '@/interfaces/database/flow'; +import { IKeywordNode } from '@/interfaces/database/agent'; import { Handle, NodeProps, Position } from '@xyflow/react'; import classNames from 'classnames'; import { get } from 'lodash'; diff --git a/web/src/pages/agent/canvas/node/message-node.tsx b/web/src/pages/agent/canvas/node/message-node.tsx index 4a556b47e6..e11e08836e 100644 --- a/web/src/pages/agent/canvas/node/message-node.tsx +++ b/web/src/pages/agent/canvas/node/message-node.tsx @@ -1,5 +1,5 @@ import { NodeCollapsible } from '@/components/collapse'; -import { IMessageNode } from '@/interfaces/database/flow'; +import { IMessageNode } from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { useGetVariableLabelOrTypeByValue } from '@/pages/agent/hooks/use-get-begin-query'; import { NodeProps } from '@xyflow/react'; diff --git a/web/src/pages/agent/canvas/node/note-node/index.tsx b/web/src/pages/agent/canvas/node/note-node/index.tsx index 6ffaaf494d..8ff4c1f24a 100644 --- a/web/src/pages/agent/canvas/node/note-node/index.tsx +++ b/web/src/pages/agent/canvas/node/note-node/index.tsx @@ -9,7 +9,7 @@ import { } from '@/components/ui/form'; import { Input } from '@/components/ui/input'; import { Textarea } from '@/components/ui/textarea'; -import { INoteNode } from '@/interfaces/database/flow'; +import { INoteNode } from '@/interfaces/database/agent'; import { zodResolver } from '@hookform/resolvers/zod'; import { NotebookPen } from 'lucide-react'; import { memo } from 'react'; diff --git a/web/src/pages/agent/canvas/node/retrieval-node.tsx b/web/src/pages/agent/canvas/node/retrieval-node.tsx index 374066567c..04829b5b72 100644 --- a/web/src/pages/agent/canvas/node/retrieval-node.tsx +++ b/web/src/pages/agent/canvas/node/retrieval-node.tsx @@ -2,7 +2,7 @@ import { NodeCollapsible } from '@/components/collapse'; import { RAGFlowAvatar } from '@/components/ragflow-avatar'; import { useFetchKnowledgeList } from '@/hooks/use-knowledge-request'; import { useFetchAllMemoryList } from '@/hooks/use-memory-request'; -import { BaseNode } from '@/interfaces/database/flow'; +import { BaseNode } from '@/interfaces/database/agent'; import { NodeProps, Position } from '@xyflow/react'; import classNames from 'classnames'; import { get } from 'lodash'; diff --git a/web/src/pages/agent/canvas/node/rewrite-node.tsx b/web/src/pages/agent/canvas/node/rewrite-node.tsx index 520c472938..9a73728995 100644 --- a/web/src/pages/agent/canvas/node/rewrite-node.tsx +++ b/web/src/pages/agent/canvas/node/rewrite-node.tsx @@ -1,5 +1,5 @@ import { useTheme } from '@/components/theme-provider'; -import { IRewriteNode } from '@/interfaces/database/flow'; +import { IRewriteNode } from '@/interfaces/database/agent'; import { Handle, NodeProps, Position } from '@xyflow/react'; import classNames from 'classnames'; import { get } from 'lodash'; diff --git a/web/src/pages/agent/canvas/node/splitter-node.tsx b/web/src/pages/agent/canvas/node/splitter-node.tsx index 21173867a7..955764e377 100644 --- a/web/src/pages/agent/canvas/node/splitter-node.tsx +++ b/web/src/pages/agent/canvas/node/splitter-node.tsx @@ -1,4 +1,4 @@ -import { IRagNode } from '@/interfaces/database/flow'; +import { IRagNode } from '@/interfaces/database/agent'; import { NodeProps, Position } from '@xyflow/react'; import { PropsWithChildren, memo } from 'react'; import { NodeHandleId, Operator } from '../../constant'; diff --git a/web/src/pages/agent/canvas/node/switch-node.tsx b/web/src/pages/agent/canvas/node/switch-node.tsx index c169ae4dcd..8d6de78b80 100644 --- a/web/src/pages/agent/canvas/node/switch-node.tsx +++ b/web/src/pages/agent/canvas/node/switch-node.tsx @@ -1,7 +1,7 @@ import { Card, CardContent } from '@/components/ui/card'; import { SwitchOperatorOptions } from '@/constants/agent'; import { LogicalOperatorIcon } from '@/hooks/logic-hooks/use-build-operator-options'; -import { ISwitchCondition, ISwitchNode } from '@/interfaces/database/flow'; +import { ISwitchCondition, ISwitchNode } from '@/interfaces/database/agent'; import { NodeProps, Position } from '@xyflow/react'; import { memo, useCallback } from 'react'; import { useGetVariableLabelOrTypeByValue } from '../../hooks/use-get-begin-query'; diff --git a/web/src/pages/agent/canvas/node/use-build-categorize-handle-positions.ts b/web/src/pages/agent/canvas/node/use-build-categorize-handle-positions.ts index 9973441e79..64f2b46a50 100644 --- a/web/src/pages/agent/canvas/node/use-build-categorize-handle-positions.ts +++ b/web/src/pages/agent/canvas/node/use-build-categorize-handle-positions.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { useUpdateNodeInternals } from '@xyflow/react'; import { get } from 'lodash'; import { useEffect, useMemo } from 'react'; diff --git a/web/src/pages/agent/canvas/node/use-build-switch-handle-positions.ts b/web/src/pages/agent/canvas/node/use-build-switch-handle-positions.ts index ee221bf82a..8638c190f0 100644 --- a/web/src/pages/agent/canvas/node/use-build-switch-handle-positions.ts +++ b/web/src/pages/agent/canvas/node/use-build-switch-handle-positions.ts @@ -1,4 +1,4 @@ -import { ISwitchCondition, RAGFlowNodeType } from '@/interfaces/database/flow'; +import { ISwitchCondition, RAGFlowNodeType } from '@/interfaces/database/agent'; import { useUpdateNodeInternals } from '@xyflow/react'; import get from 'lodash/get'; import { useEffect, useMemo } from 'react'; diff --git a/web/src/pages/agent/context.ts b/web/src/pages/agent/context.ts index 3b9a4e5c96..2012fb7329 100644 --- a/web/src/pages/agent/context.ts +++ b/web/src/pages/agent/context.ts @@ -1,6 +1,6 @@ import { INodeEvent } from '@/hooks/use-send-message'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { IMessage } from '@/interfaces/database/chat'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; import { HandleType, Position } from '@xyflow/react'; import { Dispatch, SetStateAction, createContext } from 'react'; import { useAddNode } from './hooks/use-add-node'; diff --git a/web/src/pages/agent/form-sheet/next.tsx b/web/src/pages/agent/form-sheet/next.tsx index 1b8b0a65e5..30c87d0551 100644 --- a/web/src/pages/agent/form-sheet/next.tsx +++ b/web/src/pages/agent/form-sheet/next.tsx @@ -7,7 +7,7 @@ import { } from '@/components/ui/sheet'; import { useTranslate } from '@/hooks/common-hooks'; import { IModalProps } from '@/interfaces/common'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { cn } from '@/lib/utils'; import { lowerFirst } from 'lodash'; import { CirclePlay, X } from 'lucide-react'; diff --git a/web/src/pages/agent/form/agent-form/use-values.ts b/web/src/pages/agent/form/agent-form/use-values.ts index fb7f94861a..032a046646 100644 --- a/web/src/pages/agent/form/agent-form/use-values.ts +++ b/web/src/pages/agent/form/agent-form/use-values.ts @@ -1,5 +1,5 @@ import { useFetchModelId } from '@/hooks/logic-hooks'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { get, isEmpty, omit } from 'lodash'; import { useMemo } from 'react'; import { initialAgentValues } from '../../constant'; diff --git a/web/src/pages/agent/form/begin-form/use-values.ts b/web/src/pages/agent/form/begin-form/use-values.ts index 10326bae83..f272977c57 100644 --- a/web/src/pages/agent/form/begin-form/use-values.ts +++ b/web/src/pages/agent/form/begin-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/web/src/pages/agent/form/categorize-form/use-values.ts b/web/src/pages/agent/form/categorize-form/use-values.ts index a920ec4cce..79e54a44f0 100644 --- a/web/src/pages/agent/form/categorize-form/use-values.ts +++ b/web/src/pages/agent/form/categorize-form/use-values.ts @@ -1,5 +1,5 @@ import { ModelVariableType } from '@/constants/knowledge'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty, isPlainObject } from 'lodash'; import { useMemo } from 'react'; diff --git a/web/src/pages/agent/form/code-form/next-variable.tsx b/web/src/pages/agent/form/code-form/next-variable.tsx index 39a2dd4a48..d46c7305c7 100644 --- a/web/src/pages/agent/form/code-form/next-variable.tsx +++ b/web/src/pages/agent/form/code-form/next-variable.tsx @@ -12,7 +12,7 @@ import { import { BlurInput } from '@/components/ui/input'; import { RAGFlowSelect } from '@/components/ui/select'; import { Separator } from '@/components/ui/separator'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { X } from 'lucide-react'; import { ReactNode } from 'react'; import { useFieldArray, useFormContext } from 'react-hook-form'; diff --git a/web/src/pages/agent/form/code-form/use-values.ts b/web/src/pages/agent/form/code-form/use-values.ts index ea6f2d67cf..f920a9744e 100644 --- a/web/src/pages/agent/form/code-form/use-values.ts +++ b/web/src/pages/agent/form/code-form/use-values.ts @@ -1,6 +1,5 @@ import { ProgrammingLanguage } from '@/constants/agent'; -import { ICodeForm } from '@/interfaces/database/agent'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { ICodeForm, RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialCodeValues } from '../../constant'; diff --git a/web/src/pages/agent/form/iteration-form/dynamic-output.tsx b/web/src/pages/agent/form/iteration-form/dynamic-output.tsx index 8cb8a4b482..1d473700ad 100644 --- a/web/src/pages/agent/form/iteration-form/dynamic-output.tsx +++ b/web/src/pages/agent/form/iteration-form/dynamic-output.tsx @@ -11,7 +11,7 @@ import { } from '@/components/ui/form'; import { Separator } from '@/components/ui/separator'; import { Operator } from '@/constants/agent'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { t } from 'i18next'; import { isEmpty } from 'lodash'; import { X } from 'lucide-react'; diff --git a/web/src/pages/agent/form/iteration-form/use-values.ts b/web/src/pages/agent/form/iteration-form/use-values.ts index 29cd063241..0d2bde6ed5 100644 --- a/web/src/pages/agent/form/iteration-form/use-values.ts +++ b/web/src/pages/agent/form/iteration-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialIterationValues } from '../../constant'; diff --git a/web/src/pages/agent/form/loop-form/use-values.ts b/web/src/pages/agent/form/loop-form/use-values.ts index cf7a1054a9..2519fa2d15 100644 --- a/web/src/pages/agent/form/loop-form/use-values.ts +++ b/web/src/pages/agent/form/loop-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty, omit } from 'lodash'; import { useMemo } from 'react'; diff --git a/web/src/pages/agent/form/message-form/use-values.ts b/web/src/pages/agent/form/message-form/use-values.ts index 6a90881bec..1b539f61e6 100644 --- a/web/src/pages/agent/form/message-form/use-values.ts +++ b/web/src/pages/agent/form/message-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialMessageValues } from '../../constant'; diff --git a/web/src/pages/agent/form/retrieval-form/use-values.ts b/web/src/pages/agent/form/retrieval-form/use-values.ts index 1718645f07..e6c0893fc8 100644 --- a/web/src/pages/agent/form/retrieval-form/use-values.ts +++ b/web/src/pages/agent/form/retrieval-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialRetrievalValues } from '../../constant'; diff --git a/web/src/pages/agent/form/string-transform-form/use-values.ts b/web/src/pages/agent/form/string-transform-form/use-values.ts index d4596e3399..1b3ddd589a 100644 --- a/web/src/pages/agent/form/string-transform-form/use-values.ts +++ b/web/src/pages/agent/form/string-transform-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { diff --git a/web/src/pages/agent/form/switch-form/use-values.ts b/web/src/pages/agent/form/switch-form/use-values.ts index 990bd01249..9eff9f287f 100644 --- a/web/src/pages/agent/form/switch-form/use-values.ts +++ b/web/src/pages/agent/form/switch-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialSwitchValues } from '../../constant'; diff --git a/web/src/pages/agent/form/user-fill-up-form/use-values.ts b/web/src/pages/agent/form/user-fill-up-form/use-values.ts index 0af1c78c35..905695aca3 100644 --- a/web/src/pages/agent/form/user-fill-up-form/use-values.ts +++ b/web/src/pages/agent/form/user-fill-up-form/use-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; import { initialUserFillUpValues } from '../../constant'; diff --git a/web/src/pages/agent/hooks.tsx b/web/src/pages/agent/hooks.tsx index 59bbe3bc90..86b491f402 100644 --- a/web/src/pages/agent/hooks.tsx +++ b/web/src/pages/agent/hooks.tsx @@ -2,7 +2,7 @@ import { Connection, Edge, getOutgoers } from '@xyflow/react'; import React, { useCallback, useEffect } from 'react'; // import { shallow } from 'zustand/shallow'; import { settledModelVariableMap } from '@/constants/knowledge'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { get, lowerFirst, omit } from 'lodash'; import { UseFormReturn } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; diff --git a/web/src/pages/agent/hooks/use-before-delete.tsx b/web/src/pages/agent/hooks/use-before-delete.tsx index d08333c861..ef60b758b1 100644 --- a/web/src/pages/agent/hooks/use-before-delete.tsx +++ b/web/src/pages/agent/hooks/use-before-delete.tsx @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { Node, OnBeforeDelete } from '@xyflow/react'; import { Operator } from '../constant'; import useGraphStore from '../store'; diff --git a/web/src/pages/agent/hooks/use-build-dsl.ts b/web/src/pages/agent/hooks/use-build-dsl.ts index 47ec1c2259..021b3f8cbf 100644 --- a/web/src/pages/agent/hooks/use-build-dsl.ts +++ b/web/src/pages/agent/hooks/use-build-dsl.ts @@ -1,6 +1,8 @@ import { useFetchAgent } from '@/hooks/use-agent-request'; -import { GlobalVariableType } from '@/interfaces/database/agent'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { + GlobalVariableType, + RAGFlowNodeType, +} from '@/interfaces/database/agent'; import { useCallback } from 'react'; import { Operator } from '../constant'; import useGraphStore from '../store'; diff --git a/web/src/pages/agent/hooks/use-fetch-data.ts b/web/src/pages/agent/hooks/use-fetch-data.ts index 5a1ca40cb5..7221b06c4f 100644 --- a/web/src/pages/agent/hooks/use-fetch-data.ts +++ b/web/src/pages/agent/hooks/use-fetch-data.ts @@ -1,5 +1,5 @@ import { useFetchAgent } from '@/hooks/use-agent-request'; -import { IGraph } from '@/interfaces/database/flow'; +import { IGraph } from '@/interfaces/database/agent'; import { useEffect } from 'react'; import { useSetGraphInfo } from './use-set-graph'; diff --git a/web/src/pages/agent/hooks/use-form-values.ts b/web/src/pages/agent/hooks/use-form-values.ts index edb2abbbd5..507b5d2835 100644 --- a/web/src/pages/agent/hooks/use-form-values.ts +++ b/web/src/pages/agent/hooks/use-form-values.ts @@ -1,4 +1,4 @@ -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { isEmpty } from 'lodash'; import { useMemo } from 'react'; diff --git a/web/src/pages/agent/hooks/use-get-begin-query.tsx b/web/src/pages/agent/hooks/use-get-begin-query.tsx index 4c4c73f440..82265a3025 100644 --- a/web/src/pages/agent/hooks/use-get-begin-query.tsx +++ b/web/src/pages/agent/hooks/use-get-begin-query.tsx @@ -1,7 +1,7 @@ import { AgentGlobals, AgentStructuredOutputField } from '@/constants/agent'; import { useFetchAgent } from '@/hooks/use-agent-request'; import { DefaultOptionType } from '@/interfaces/antd-compat'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import { buildNodeOutputOptions, buildOutputOptions, diff --git a/web/src/pages/agent/hooks/use-save-graph.ts b/web/src/pages/agent/hooks/use-save-graph.ts index ac764605d5..fc16659a5c 100644 --- a/web/src/pages/agent/hooks/use-save-graph.ts +++ b/web/src/pages/agent/hooks/use-save-graph.ts @@ -3,8 +3,10 @@ import { useResetAgent, useSetAgent, } from '@/hooks/use-agent-request'; -import { GlobalVariableType } from '@/interfaces/database/agent'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { + GlobalVariableType, + RAGFlowNodeType, +} from '@/interfaces/database/agent'; import { formatDate } from '@/utils/date'; import { useDebounceEffect } from 'ahooks'; import { useCallback, useEffect, useState } from 'react'; diff --git a/web/src/pages/agent/hooks/use-set-graph.ts b/web/src/pages/agent/hooks/use-set-graph.ts index 6dd68a330d..df5c111da3 100644 --- a/web/src/pages/agent/hooks/use-set-graph.ts +++ b/web/src/pages/agent/hooks/use-set-graph.ts @@ -1,4 +1,4 @@ -import { IGraph } from '@/interfaces/database/flow'; +import { IGraph } from '@/interfaces/database/agent'; import { useCallback } from 'react'; import useGraphStore from '../store'; diff --git a/web/src/pages/agent/interface.ts b/web/src/pages/agent/interface.ts index 41c295b699..ac405f87db 100644 --- a/web/src/pages/agent/interface.ts +++ b/web/src/pages/agent/interface.ts @@ -1,5 +1,5 @@ import { FormInstance } from '@/interfaces/antd-compat'; -import { RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; export interface IOperatorForm { onValuesChange?(changedValues: any, values: any): void; diff --git a/web/src/pages/agent/store.ts b/web/src/pages/agent/store.ts index 168c9df445..83919e3695 100644 --- a/web/src/pages/agent/store.ts +++ b/web/src/pages/agent/store.ts @@ -1,5 +1,5 @@ import type { IAgentForm } from '@/interfaces/database/agent'; -import { IAgentNode, RAGFlowNodeType } from '@/interfaces/database/flow'; +import { RAGFlowNodeType } from '@/interfaces/database/agent'; import type {} from '@redux-devtools/extension'; import { Connection, @@ -528,9 +528,7 @@ const useGraphStore = create()( return generateNodeNamesWithIncreasingIndex(name, nodes); }, generateAgentToolName: (id: string, name: string) => { - const node = get().nodes.find( - (x) => x.id === id, - ) as IAgentNode; + const node = get().nodes.find((x) => x.id === id) as RAGFlowNodeType; if (!node) { return ''; diff --git a/web/src/pages/agent/utils.ts b/web/src/pages/agent/utils.ts index 2fe592b578..a876d57389 100644 --- a/web/src/pages/agent/utils.ts +++ b/web/src/pages/agent/utils.ts @@ -1,13 +1,13 @@ -import { FormInstance, FormListFieldData } from '@/interfaces/antd-compat'; import { DSL, + DSLComponents, GlobalVariableType, IAgentForm, ICategorizeForm, ICategorizeItem, ICategorizeItemResult, + RAGFlowNodeType, } from '@/interfaces/database/agent'; -import { DSLComponents, RAGFlowNodeType } from '@/interfaces/database/flow'; import { buildSelectOptions } from '@/utils/component-util'; import { buildOptions, removeUselessFieldsFromValues } from '@/utils/form'; import { Edge, Node, XYPosition } from '@xyflow/react'; @@ -573,22 +573,6 @@ export const getOperatorIndex = (handleTitle: string) => { return handleTitle.split(' ').at(-1); }; -// Get the value of other forms except itself -export const getOtherFieldValues = ( - form: FormInstance, - formListName: string = 'items', - field: FormListFieldData, - latestField: string, -) => - (form.getFieldValue([formListName]) ?? []) - .map((x: any) => { - return get(x, latestField); - }) - .filter( - (x: string) => - x !== form.getFieldValue([formListName, field.name, latestField]), - ); - export const generateSwitchHandleText = (idx: number) => { return `Case ${idx + 1}`; }; diff --git a/web/src/pages/home/banner.tsx b/web/src/pages/home/banner.tsx index 8f4bc4cdd7..8beeb2e76b 100644 --- a/web/src/pages/home/banner.tsx +++ b/web/src/pages/home/banner.tsx @@ -42,8 +42,8 @@ export function Banner() { export function NextBanner() { const { t, i18n } = useTranslation(); return ( -