mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-02 01:02:05 +08:00
76d6234de6
* Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * fix: transform avatar copy;perf: filter invalid tool * update llm response storage time * fix: openapi schema * update skill desc * feat: cache hit data * i18n * lock * chat logs support error filter & user search (#6373) * chat log support searching by user name * support error filter * fix * fix overflow * optimize * fix init script * fix * perf: get log users * updat ecomment * fix: ts * fix: test --------- Co-authored-by: archer <545436317@qq.com> * Fix: agent (#6376) * Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * 1. 把辅助生成前端上的 system prompt 加入到上下文中 2. mcp工具的前端渲染(图标) 3. 文件读取工具和文件上传进行关联 4. 添加了辅助生成返回格式出错的重试方案 5. ask 不出现在 plan 步骤中 6. 添加了辅助生成的头像和交互 UI * fix:read_file * helperbot ui * ts error * helper ui * delete Unused import * perf: helper bot * lock --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: xxyyh <2289112474@qq> * fix date variable required & model auth (#6386) * fix date variable required & model auth * doc * feat: add chat id to finish callback * fix: iphone safari shareId (#6387) * fix: iphone safari shareId * fix: mcp file list can't setting * fix: reason output field * fix: skip JSON validation for HTTP tool body with variable (#6392) * fix: skip JSON validation for HTTP tool body with variable * doc * workflow fitview * perf: selecting memory * perf: cp api * ui * perf: toolcall auto adapt * fix: catch workflow error * fix: ts * perf: pagination type * remove * ignore * update doc * fix: simple app tool select * add default avatar to logs user * perf: loading user * select dataset ui * rename version * feat: add global/common test * perf: packages/global/common test * feat: package/global/ai,app test * add global/chat test * global/core test * global/core test * feat: packages/global all test * perf: test * add server api test * perf: init shell * perf: init4150 shell * remove invalid code * update doc * remove log * fix: chat effect * fix: plan fake tool (#6398) * 1. 提示词防注入功能 2. 无工具不进入 plan,防止虚拟工具生成 * Agent-dataset * dataset * dataset presetInfo * prefix * perf: prompt --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: review * adapt kimi2.5 think toolcall * feat: invoke fastgpt user info (#6403) feat: invoke fastgpt user info * fix: invoke fastgpt user info return orgs (#6404) * skill and version * retry helperbot (#6405) Co-authored-by: xxyyh <2289112474@qq> * update template * remove log * doc * update doc * doc * perf: internal ip check * adapt get paginationRecords * tool call adapt * fix: test * doc * fix: agent initial version * adapt completions v1 * feat: instrumentation check * rename skill * add workflow demo mode tracks (#6407) * chore: 统一 skills 目录命名为小写 将 .claude/Skills/ 重命名为 .claude/skills/ 以保持命名一致性。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * add workflow demo mode tracks * code * optimize * fix: improve workflowDemoTrack based on PR review - Add comment to empty catch block for maintainability - Add @param docs to onDemoChange clarifying nodeCount usage - Replace silent .catch with console.debug for dev debugging - Handle appId changes by reporting old data before re-init Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * remove repeat skill * fix(workflow): filter out orphan edges to prevent runtime errors (#6399) * fix(workflow): filter out orphan edges to prevent runtime errors Runtime edges that reference non-existent nodes (orphan edges) can cause unexpected behavior or crashes during workflow dispatch. This change adds a pre-check to filter out such edges before execution begins, ensuring system stability even with inconsistent graph data. * fix(workflow): enhance orphan edge filtering with logging and tests - Refactor: Extract logic to 'filterOrphanEdges' in utils.ts for better reusability - Feat: Add performance monitoring (warn if >100ms) and comprehensive logging - Feat: Support detailed edge inspection in debug mode - Docs: Add JSDoc explaining causes of orphan edges (migration, manual edits) - Test: Add unit tests covering edge cases and performance (1000 edges) Addresses PR review feedback regarding logging, variable naming, and testing." * move code * move code * add more unit test --------- Co-authored-by: archer <545436317@qq.com> * test * perf: test * add server/common/string test * fix: resolve $ref references in MCP tool input schemas (#6395) (#6409) * fix: resolve $ref references in MCP tool input schemas (#6395) * add test code --------- Co-authored-by: archer <545436317@qq.com> * chore(docs): add fastgpt, fastgpt-plugin version choice guide (#6411) * chore(doc): add fastgpt version description * doc * doc --------- Co-authored-by: archer <545436317@qq.com> * fix:dataset cite and description info (#6410) * 1. 添加知识库引用(plan 步骤和直接知识库调用) 2. 提示词框中的@知识库工具 3. plan 中 step 的 description dataset_search 改为中文 * fix: i18n * prompt * prompt --------- Co-authored-by: xxyyh <2289112474@qq> * fix: tool call * perf: workflow props * fix: merge ECharts toolbox options instead of overwriting (#6269) (#6412) * feat: integrate logtape and otel (#6400) * fix: deps * feat(logger): integrate logtape and otel * wip(log): add basic infras logs * wip(log): add request id and inject it into context * wip(log): add basic tx logs * wip(log): migrate * wip(log): category * wip(log): more sub category * fix: type * fix: sessionRun * fix: export getLogger from client.ts * chore: improve logs * docs: update signoz and changelog * change type * fix: ts * remove skill.md * fix: lockfile specifier * fix: test --------- Co-authored-by: archer <545436317@qq.com> * init log * doc * remove invalid log * fix: review * template * replace new log * fix: ts * remove log * chore: migrate all addLog to logtape * move skill * chore: migrate all addLog to logtape (#6417) * update skill * remove log * fix: tool check --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: xuyafei1996 <54217479+xuyafei1996@users.noreply.github.com> Co-authored-by: ToukoYui <2331631097@qq.com> Co-authored-by: roy <whoeverimf5@gmail.com>
320 lines
10 KiB
TypeScript
320 lines
10 KiB
TypeScript
/**
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
*/
|
|
|
|
import type { CSSProperties } from 'react';
|
|
import { useEffect, useMemo, useState, useTransition } from 'react';
|
|
import { LexicalComposer } from '@lexical/react/LexicalComposer';
|
|
import { PlainTextPlugin } from '@lexical/react/LexicalPlainTextPlugin';
|
|
import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin';
|
|
import { ContentEditable } from '@lexical/react/LexicalContentEditable';
|
|
import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin';
|
|
import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
|
|
import { ListPlugin } from '@lexical/react/LexicalListPlugin';
|
|
import { CheckListPlugin } from '@lexical/react/LexicalCheckListPlugin';
|
|
import { TabIndentationPlugin } from '@lexical/react/LexicalTabIndentationPlugin';
|
|
import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary';
|
|
import { HeadingNode, QuoteNode } from '@lexical/rich-text';
|
|
import { ListItemNode, ListNode } from '@lexical/list';
|
|
import { CodeHighlightNode, CodeNode } from '@lexical/code';
|
|
import VariableLabelPickerPlugin from './plugins/VariableLabelPickerPlugin';
|
|
import ListDisplayFixPlugin from './plugins/ListDisplayFixPlugin';
|
|
import { Box, Flex } from '@chakra-ui/react';
|
|
import styles from './index.module.scss';
|
|
import VariablePlugin from './plugins/VariablePlugin';
|
|
import { VariableNode } from './plugins/VariablePlugin/node';
|
|
import type { EditorState, LexicalEditor } from 'lexical';
|
|
import OnBlurPlugin from './plugins/OnBlurPlugin';
|
|
import type { FormPropsType } from './type';
|
|
import { type EditorVariableLabelPickerType, type EditorVariablePickerType } from './type';
|
|
import { getNanoid } from '@fastgpt/global/common/string/tools';
|
|
import FocusPlugin from './plugins/FocusPlugin';
|
|
import { textToEditorState } from './utils';
|
|
import { MaxLengthPlugin } from './plugins/MaxLengthPlugin';
|
|
import { VariableLabelNode } from './plugins/VariableLabelPlugin/node';
|
|
import VariableLabelPlugin from './plugins/VariableLabelPlugin';
|
|
import { useDeepCompareEffect } from 'ahooks';
|
|
import MarkdownPlugin from './plugins/MarkdownPlugin';
|
|
import MyIcon from '../../Icon';
|
|
import ListExitPlugin from './plugins/ListExitPlugin';
|
|
import KeyDownPlugin from './plugins/KeyDownPlugin';
|
|
import EditablePlugin from './plugins/EditablePlugin';
|
|
import SkillPickerPlugin from './plugins/SkillPickerPlugin';
|
|
import type { SkillLabelItemType } from './plugins/SkillLabelPlugin';
|
|
import SkillLabelPlugin from './plugins/SkillLabelPlugin';
|
|
import { SkillNode } from './plugins/SkillLabelPlugin/node';
|
|
import type { SkillOptionItemType } from './plugins/SkillPickerPlugin';
|
|
|
|
const Placeholder = ({ children, padding }: { children: React.ReactNode; padding: string }) => (
|
|
<Box
|
|
position={'absolute'}
|
|
top={0}
|
|
left={0}
|
|
right={0}
|
|
bottom={0}
|
|
p={padding}
|
|
pointerEvents={'none'}
|
|
overflow={'hidden'}
|
|
>
|
|
<Box
|
|
color={'myGray.400'}
|
|
fontSize={'mini'}
|
|
userSelect={'none'}
|
|
whiteSpace={'pre-wrap'}
|
|
wordBreak={'break-all'}
|
|
h={'100%'}
|
|
>
|
|
{children}
|
|
</Box>
|
|
</Box>
|
|
);
|
|
|
|
export type EditorProps = {
|
|
isRichText?: boolean;
|
|
variables?: EditorVariablePickerType[];
|
|
variableLabels?: EditorVariableLabelPickerType[];
|
|
onAddToolFromEditor?: (toolKey: string) => Promise<string>;
|
|
onRemoveToolFromEditor?: (toolId: string) => void;
|
|
onConfigureTool?: (toolId: string) => void;
|
|
|
|
value: string;
|
|
|
|
skillOption?: SkillOptionItemType;
|
|
onRemoveSkill?: (id: string) => void;
|
|
onClickSkill?: (id: string) => void;
|
|
selectedSkills?: SkillLabelItemType[];
|
|
|
|
showOpenModal?: boolean;
|
|
minH?: number;
|
|
maxH?: number;
|
|
maxLength?: number;
|
|
placeholder?: string;
|
|
placeholderPadding?: string;
|
|
isInvalid?: boolean;
|
|
isDisabled?: boolean;
|
|
onKeyDown?: (e: React.KeyboardEvent) => void;
|
|
ExtensionPopover?: ((e: {
|
|
onChangeText: (text: string) => void;
|
|
iconButtonStyle: Record<string, any>;
|
|
}) => React.ReactNode)[];
|
|
boxStyle?: CSSProperties;
|
|
};
|
|
|
|
export default function Editor({
|
|
isRichText = false,
|
|
minH = 200,
|
|
maxH = 400,
|
|
maxLength,
|
|
showOpenModal = true,
|
|
onOpenModal,
|
|
|
|
// {{}} 类型,已弃用
|
|
variables = [],
|
|
// /选择变量
|
|
variableLabels = [],
|
|
// @选择技能
|
|
skillOption,
|
|
selectedSkills,
|
|
onClickSkill,
|
|
onRemoveSkill,
|
|
|
|
onChange,
|
|
onChangeText,
|
|
onBlur,
|
|
value = '',
|
|
placeholder = '',
|
|
placeholderPadding = '12px 14px',
|
|
bg = 'white',
|
|
isInvalid,
|
|
isDisabled = false,
|
|
onKeyDown,
|
|
ExtensionPopover,
|
|
boxStyle
|
|
}: EditorProps &
|
|
FormPropsType & {
|
|
onOpenModal?: () => void;
|
|
onChange: (editor: LexicalEditor) => void;
|
|
onChangeText?: ((text: string) => void) | undefined;
|
|
onBlur?: (editor: LexicalEditor) => void;
|
|
}) {
|
|
const [key, setKey] = useState(getNanoid(6));
|
|
const [_, startSts] = useTransition();
|
|
const [focus, setFocus] = useState(false);
|
|
const [scrollHeight, setScrollHeight] = useState(0);
|
|
|
|
const initialConfig = {
|
|
namespace: isRichText ? 'richPromptEditor' : 'promptEditor',
|
|
nodes: [
|
|
VariableNode,
|
|
VariableLabelNode,
|
|
SkillNode,
|
|
// Only register rich text nodes when in rich text mode
|
|
...(isRichText
|
|
? [HeadingNode, ListNode, ListItemNode, QuoteNode, CodeNode, CodeHighlightNode]
|
|
: [])
|
|
],
|
|
editorState: textToEditorState(value, isRichText),
|
|
onError: (error: Error) => {
|
|
console.error('Lexical errror', error);
|
|
}
|
|
};
|
|
|
|
useDeepCompareEffect(() => {
|
|
if (focus) return;
|
|
setKey(getNanoid(6));
|
|
}, [value, variables, variableLabels, skillOption, selectedSkills]);
|
|
|
|
const showFullScreenIcon = useMemo(() => {
|
|
return showOpenModal && scrollHeight > maxH;
|
|
}, [showOpenModal, scrollHeight, maxH]);
|
|
|
|
const iconButtonStyle = useMemo(
|
|
() => ({
|
|
position: 'absolute' as const,
|
|
bottom: 1,
|
|
right: showFullScreenIcon ? '34px' : 2,
|
|
zIndex: 10,
|
|
cursor: 'pointer',
|
|
borderRadius: '6px',
|
|
background: 'rgba(255, 255, 255, 0.01)',
|
|
backdropFilter: 'blur(6.6666669845581055px)',
|
|
alignItems: 'center',
|
|
justifyContent: 'center',
|
|
w: 6,
|
|
h: 6
|
|
}),
|
|
[showFullScreenIcon]
|
|
);
|
|
|
|
return (
|
|
<Box
|
|
className="nowheel"
|
|
position={'relative'}
|
|
width={'full'}
|
|
cursor={'text'}
|
|
color={'myGray.700'}
|
|
bg={focus ? 'white' : bg}
|
|
borderRadius={'md'}
|
|
>
|
|
<LexicalComposer initialConfig={initialConfig} key={key}>
|
|
{/* Text type */}
|
|
{isRichText ? (
|
|
<RichTextPlugin
|
|
contentEditable={
|
|
<ContentEditable
|
|
className={`${
|
|
isDisabled
|
|
? styles.contentEditable_disabled
|
|
: isInvalid
|
|
? styles.contentEditable_invalid
|
|
: styles.contentEditable
|
|
} ${styles.richText}`}
|
|
style={{
|
|
minHeight: `${minH}px`,
|
|
maxHeight: `${maxH}px`,
|
|
...boxStyle
|
|
}}
|
|
/>
|
|
}
|
|
placeholder={<Placeholder padding={placeholderPadding}>{placeholder}</Placeholder>}
|
|
ErrorBoundary={LexicalErrorBoundary}
|
|
/>
|
|
) : (
|
|
<PlainTextPlugin
|
|
contentEditable={
|
|
<ContentEditable
|
|
className={
|
|
isDisabled
|
|
? styles.contentEditable_disabled
|
|
: isInvalid
|
|
? styles.contentEditable_invalid
|
|
: styles.contentEditable
|
|
}
|
|
style={{
|
|
minHeight: `${minH}px`,
|
|
maxHeight: `${maxH}px`,
|
|
...boxStyle
|
|
}}
|
|
/>
|
|
}
|
|
placeholder={<Placeholder padding={placeholderPadding}>{placeholder}</Placeholder>}
|
|
ErrorBoundary={LexicalErrorBoundary}
|
|
/>
|
|
)}
|
|
|
|
<>
|
|
{/* Basic Plugin */}
|
|
<>
|
|
<HistoryPlugin />
|
|
<MaxLengthPlugin maxLength={maxLength || 999999} />
|
|
<FocusPlugin focus={focus} setFocus={setFocus} />
|
|
<KeyDownPlugin onKeyDown={onKeyDown} />
|
|
<OnBlurPlugin onBlur={onBlur} />
|
|
<OnChangePlugin
|
|
onChange={(editorState, editor) => {
|
|
const rootElement = editor.getRootElement();
|
|
setScrollHeight(rootElement?.scrollHeight || 0);
|
|
startSts(() => {
|
|
onChange?.(editor);
|
|
});
|
|
}}
|
|
/>
|
|
<EditablePlugin isDisabled={isDisabled || !onChangeText} />
|
|
</>
|
|
|
|
{/* 定制交互插件 */}
|
|
{variables.length > 0 && (
|
|
<>
|
|
<VariablePlugin variables={variables} />
|
|
{/* <VariablePickerPlugin variables={variables} /> */}
|
|
</>
|
|
)}
|
|
|
|
{variableLabels.length > 0 && (
|
|
<>
|
|
<VariableLabelPlugin variables={variableLabels} />
|
|
<VariableLabelPickerPlugin variables={variableLabels} isFocus={focus} />
|
|
</>
|
|
)}
|
|
|
|
{skillOption && onClickSkill && onRemoveSkill && selectedSkills && (
|
|
<>
|
|
<SkillLabelPlugin
|
|
selectedSkills={selectedSkills}
|
|
onClickSkill={onClickSkill}
|
|
onRemoveSkill={onRemoveSkill}
|
|
/>
|
|
<SkillPickerPlugin skillOption={skillOption} isFocus={focus} />
|
|
</>
|
|
)}
|
|
|
|
{isRichText && (
|
|
<>
|
|
<ListDisplayFixPlugin />
|
|
<TabIndentationPlugin />
|
|
<ListPlugin />
|
|
<CheckListPlugin />
|
|
<ListExitPlugin />
|
|
<MarkdownPlugin />
|
|
</>
|
|
)}
|
|
</>
|
|
</LexicalComposer>
|
|
|
|
{onChangeText &&
|
|
ExtensionPopover?.map((Item, index) => (
|
|
<Item key={index} iconButtonStyle={iconButtonStyle} onChangeText={onChangeText} />
|
|
))}
|
|
{showFullScreenIcon && (
|
|
<Flex onClick={onOpenModal} {...iconButtonStyle} right={2}>
|
|
<MyIcon name={'common/fullScreenLight'} w={'1rem'} color={'myGray.500'} />
|
|
</Flex>
|
|
)}
|
|
</Box>
|
|
);
|
|
}
|