mirror of
https://github.com/labring/FastGPT.git
synced 2026-04-26 02:07:28 +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>
382 lines
9.2 KiB
TypeScript
382 lines
9.2 KiB
TypeScript
import React, { type ReactNode, type RefObject, useMemo, useRef, useState } from 'react';
|
|
import { Box, type BoxProps } from '@chakra-ui/react';
|
|
import { useToast } from './useToast';
|
|
import { getErrText } from '@fastgpt/global/common/error/utils';
|
|
import {
|
|
useBoolean,
|
|
useLockFn,
|
|
useMemoizedFn,
|
|
useScroll,
|
|
useVirtualList,
|
|
useThrottleEffect
|
|
} from 'ahooks';
|
|
import MyBox from '../components/common/MyBox';
|
|
import { useTranslation } from 'next-i18next';
|
|
import { useRequest } from './useRequest';
|
|
import type { PaginationType, PaginationResponseType } from '@fastgpt/global/openapi/api';
|
|
|
|
type ItemHeight<T> = (index: number, data: T) => number;
|
|
const thresholdVal = 100;
|
|
|
|
export type ScrollListType = ({
|
|
children,
|
|
EmptyChildren,
|
|
isLoading,
|
|
...props
|
|
}: {
|
|
children: React.ReactNode;
|
|
EmptyChildren?: React.ReactNode;
|
|
isLoading?: boolean;
|
|
} & BoxProps) => React.JSX.Element;
|
|
|
|
export function useVirtualScrollPagination<
|
|
TParams extends PaginationType,
|
|
TData extends PaginationResponseType
|
|
>(
|
|
api: (data: TParams) => Promise<TData>,
|
|
{
|
|
refreshDeps,
|
|
itemHeight = 50,
|
|
overscan = 10,
|
|
|
|
pageSize = 10,
|
|
defaultParams = {}
|
|
}: {
|
|
refreshDeps?: any[];
|
|
|
|
itemHeight: number | ItemHeight<TData['list'][0]>;
|
|
overscan?: number;
|
|
|
|
pageSize?: number;
|
|
defaultParams?: Record<string, any>;
|
|
}
|
|
) {
|
|
const { t } = useTranslation();
|
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
const wrapperRef = useRef(null);
|
|
const { toast } = useToast();
|
|
|
|
const [data, setData] = useState<TData['list']>([]);
|
|
const [total, setTotal] = useState(0);
|
|
const [isLoading, { setTrue, setFalse }] = useBoolean(false);
|
|
|
|
const noMore = data.length >= total;
|
|
|
|
const [list] = useVirtualList<TData['list'][0]>(data, {
|
|
containerTarget: containerRef,
|
|
wrapperTarget: wrapperRef,
|
|
itemHeight,
|
|
overscan
|
|
});
|
|
|
|
const loadData = useLockFn(async ({ init = false }: { init?: boolean } = {}) => {
|
|
if (noMore && !init) return;
|
|
|
|
const offset = init ? 0 : data.length;
|
|
|
|
setTrue();
|
|
|
|
try {
|
|
const res = await api({
|
|
offset,
|
|
pageSize,
|
|
...defaultParams
|
|
} as TParams);
|
|
|
|
setTotal(res.total);
|
|
|
|
if (offset === 0) {
|
|
// init or reload
|
|
setData(res.list);
|
|
} else {
|
|
setData((prev) => [...prev, ...res.list]);
|
|
}
|
|
} catch (error: any) {
|
|
toast({
|
|
title: getErrText(error, t('common:core.chat.error.data_error')),
|
|
status: 'error'
|
|
});
|
|
console.log(error);
|
|
}
|
|
|
|
setFalse();
|
|
});
|
|
|
|
const scroll2Top = () => {
|
|
if (containerRef.current) {
|
|
containerRef.current.scrollTop = 0;
|
|
}
|
|
};
|
|
|
|
const ScrollList = useMemoizedFn(
|
|
({
|
|
children,
|
|
EmptyChildren,
|
|
isLoading,
|
|
...props
|
|
}: {
|
|
children: React.ReactNode;
|
|
EmptyChildren?: React.ReactNode;
|
|
isLoading?: boolean;
|
|
} & BoxProps) => {
|
|
return (
|
|
<MyBox isLoading={isLoading} ref={containerRef} overflow={'overlay'} {...props}>
|
|
<Box ref={wrapperRef}>
|
|
{children}
|
|
{noMore && list.length > 0 && (
|
|
<Box py={4} textAlign={'center'} color={'myGray.600'} fontSize={'xs'}>
|
|
{t('common:no_more_data')}
|
|
</Box>
|
|
)}
|
|
</Box>
|
|
|
|
{list.length === 0 && !isLoading && EmptyChildren && <>{EmptyChildren}</>}
|
|
</MyBox>
|
|
);
|
|
}
|
|
);
|
|
|
|
// Reload data
|
|
useRequest(
|
|
async () => {
|
|
loadData({ init: true });
|
|
},
|
|
{
|
|
manual: false,
|
|
refreshDeps
|
|
}
|
|
);
|
|
|
|
// Check if scroll to bottom
|
|
const scroll = useScroll(containerRef);
|
|
useThrottleEffect(
|
|
() => {
|
|
if (!containerRef.current || list.length === 0) return;
|
|
const { scrollTop, scrollHeight, clientHeight } = containerRef.current;
|
|
|
|
if (scrollTop + clientHeight >= scrollHeight - thresholdVal) {
|
|
loadData({ init: false });
|
|
}
|
|
},
|
|
[scroll],
|
|
{
|
|
wait: 50
|
|
}
|
|
);
|
|
|
|
return {
|
|
containerRef,
|
|
scrollDataList: list,
|
|
total,
|
|
totalData: data,
|
|
setData,
|
|
isLoading,
|
|
ScrollList,
|
|
fetchData: loadData,
|
|
scroll2Top
|
|
};
|
|
}
|
|
|
|
export function useScrollPagination<
|
|
TParams extends PaginationType,
|
|
TData extends PaginationResponseType
|
|
>(
|
|
api: (data: TParams) => Promise<TData>,
|
|
{
|
|
scrollLoadType = 'bottom',
|
|
|
|
pageSize = 10,
|
|
params,
|
|
EmptyTip,
|
|
showErrorToast = true,
|
|
disabled = false,
|
|
|
|
...props
|
|
}: {
|
|
scrollLoadType?: 'top' | 'bottom';
|
|
|
|
pageSize?: number;
|
|
params?: Omit<TParams, 'pageNum' | 'offset' | 'pageSize'>;
|
|
EmptyTip?: React.JSX.Element;
|
|
showErrorToast?: boolean;
|
|
disabled?: boolean;
|
|
} & Parameters<typeof useRequest>[1]
|
|
) {
|
|
const { t } = useTranslation();
|
|
const { toast } = useToast();
|
|
|
|
const [data, setData] = useState<TData['list']>([]);
|
|
const [total, setTotal] = useState(0);
|
|
const [isLoading, { setTrue, setFalse }] = useBoolean(false);
|
|
const isEmpty = total === 0 && !isLoading;
|
|
|
|
const noMore = data.length >= total;
|
|
|
|
const loadData = useLockFn(
|
|
async ({
|
|
init = false,
|
|
ScrollContainerRef
|
|
}: {
|
|
init?: boolean;
|
|
ScrollContainerRef?: RefObject<HTMLDivElement>;
|
|
} = {}) => {
|
|
if (noMore && !init) return;
|
|
|
|
setTrue();
|
|
|
|
if (init) {
|
|
setData([]);
|
|
setTotal(0);
|
|
}
|
|
|
|
const offset = init ? 0 : data.length;
|
|
|
|
try {
|
|
const res = await api({
|
|
offset,
|
|
pageSize,
|
|
...params
|
|
} as TParams);
|
|
|
|
setTotal(res.total);
|
|
|
|
if (scrollLoadType === 'top') {
|
|
const prevHeight = ScrollContainerRef?.current?.scrollHeight || 0;
|
|
const prevScrollTop = ScrollContainerRef?.current?.scrollTop || 0;
|
|
|
|
function adjustScrollPosition() {
|
|
requestAnimationFrame(
|
|
ScrollContainerRef?.current
|
|
? () => {
|
|
if (ScrollContainerRef?.current) {
|
|
const newHeight = ScrollContainerRef.current.scrollHeight;
|
|
const heightDiff = newHeight - prevHeight;
|
|
ScrollContainerRef.current.scrollTop = prevScrollTop + heightDiff;
|
|
}
|
|
}
|
|
: adjustScrollPosition
|
|
);
|
|
}
|
|
|
|
const newData = offset === 0 ? res.list : [...res.list, ...data];
|
|
setData(newData);
|
|
adjustScrollPosition();
|
|
} else {
|
|
const newData = offset === 0 ? res.list : [...data, ...res.list];
|
|
setData(newData);
|
|
}
|
|
} catch (error: any) {
|
|
if (showErrorToast) {
|
|
toast({
|
|
title: t(getErrText(error, t('common:core.chat.error.data_error'))),
|
|
status: 'error'
|
|
});
|
|
}
|
|
console.log(error);
|
|
}
|
|
|
|
setFalse();
|
|
}
|
|
);
|
|
|
|
let ScrollRef = useRef<HTMLDivElement>(null);
|
|
const ScrollData = useMemoizedFn(
|
|
({
|
|
children,
|
|
ScrollContainerRef,
|
|
isLoading: isLoadingProp,
|
|
...props
|
|
}: {
|
|
isLoading?: boolean;
|
|
children: ReactNode;
|
|
ScrollContainerRef?: RefObject<HTMLDivElement>;
|
|
} & BoxProps) => {
|
|
const ref = ScrollContainerRef || ScrollRef;
|
|
const loadText = useMemo(() => {
|
|
if (isLoading || isLoadingProp) return t('common:is_requesting');
|
|
if (noMore) return t('common:request_end');
|
|
return t('common:request_more');
|
|
}, [isLoading, noMore]);
|
|
|
|
const scroll = useScroll(ref);
|
|
|
|
// Watch scroll position
|
|
useThrottleEffect(
|
|
() => {
|
|
if (!ref?.current || noMore || isLoading || data.length === 0) return;
|
|
const { scrollTop, scrollHeight, clientHeight } = ref.current;
|
|
|
|
if (
|
|
(scrollLoadType === 'bottom' &&
|
|
scrollTop + clientHeight >= scrollHeight - thresholdVal) ||
|
|
(scrollLoadType === 'top' && scrollTop < thresholdVal)
|
|
) {
|
|
loadData({ init: false, ScrollContainerRef: ref });
|
|
}
|
|
},
|
|
[scroll],
|
|
{ wait: 50 }
|
|
);
|
|
|
|
return (
|
|
<MyBox
|
|
ref={ref}
|
|
h={'100%'}
|
|
overflow={'auto'}
|
|
isLoading={isLoading || isLoadingProp}
|
|
{...props}
|
|
>
|
|
{scrollLoadType === 'top' && total > 0 && isLoading && (
|
|
<Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
|
|
{t('common:is_requesting')}
|
|
</Box>
|
|
)}
|
|
{children}
|
|
{scrollLoadType === 'bottom' && !isEmpty && (
|
|
<Box
|
|
mt={2}
|
|
fontSize={'xs'}
|
|
color={'blackAlpha.500'}
|
|
textAlign={'center'}
|
|
cursor={loadText === t('common:request_more') ? 'pointer' : 'default'}
|
|
onClick={() => {
|
|
if (loadText !== t('common:request_more')) return;
|
|
loadData({ init: false });
|
|
}}
|
|
>
|
|
{loadText}
|
|
</Box>
|
|
)}
|
|
{isEmpty && EmptyTip}
|
|
</MyBox>
|
|
);
|
|
}
|
|
);
|
|
|
|
// Reload data
|
|
useRequest(
|
|
async () => {
|
|
if (disabled) return;
|
|
loadData({ init: true });
|
|
},
|
|
{
|
|
manual: false,
|
|
...props
|
|
}
|
|
);
|
|
|
|
const refreshList = useMemoizedFn(() => {
|
|
loadData({ init: true });
|
|
});
|
|
|
|
return {
|
|
ScrollData,
|
|
isLoading,
|
|
total: Math.max(total, data.length),
|
|
data,
|
|
setData,
|
|
fetchData: loadData,
|
|
refreshList
|
|
};
|
|
}
|