mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-01 02:01:34 +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>
275 lines
8.0 KiB
TypeScript
275 lines
8.0 KiB
TypeScript
import { useCallback, useEffect, useRef, useState, type ReactNode } from 'react';
|
|
import { type LinkedListResponse, type LinkedPaginationProps } from '../common/fetch/type';
|
|
import { Box, type BoxProps } from '@chakra-ui/react';
|
|
import { useTranslation } from 'next-i18next';
|
|
import { useScroll, useMemoizedFn, useDebounceEffect, useLatest } from 'ahooks';
|
|
import MyBox from '../components/common/MyBox';
|
|
import { useRequest } from './useRequest';
|
|
|
|
const threshold = 200;
|
|
|
|
export function useLinkedScroll<
|
|
TParams extends LinkedPaginationProps,
|
|
TData extends LinkedListResponse
|
|
>(
|
|
api: (data: TParams) => Promise<TData>,
|
|
{
|
|
pageSize = 10,
|
|
params = {},
|
|
currentData,
|
|
defaultScroll = 'top',
|
|
showErrorToast = true
|
|
}: {
|
|
pageSize?: number;
|
|
params?: Record<string, any>;
|
|
currentData?: { id: string; anchor?: any };
|
|
defaultScroll?: 'top' | 'bottom';
|
|
showErrorToast?: boolean;
|
|
}
|
|
) {
|
|
const { t } = useTranslation();
|
|
const [dataList, setDataList] = useState<TData['list']>([]);
|
|
const [hasMorePrev, setHasMorePrev] = useState(true);
|
|
const [hasMoreNext, setHasMoreNext] = useState(true);
|
|
|
|
// 锚点,用于记录顶部和底部的数据
|
|
const anchorRef = useRef({
|
|
top: null as TData['list'][number] | null,
|
|
bottom: null as TData['list'][number] | null
|
|
});
|
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
const itemRefs = useRef<Map<string, HTMLElement | null>>(new Map());
|
|
const isInit = useRef(false);
|
|
|
|
const scrollToItem = useCallback(
|
|
async (id?: string) => {
|
|
if (!id) {
|
|
id = defaultScroll === 'top' ? dataList[0]?.id : dataList[dataList.length - 1]?.id;
|
|
}
|
|
|
|
const itemIndex = dataList.findIndex((item) => item.id === id);
|
|
if (itemIndex === -1) {
|
|
return;
|
|
}
|
|
|
|
const element = itemRefs.current.get(id);
|
|
if (!element || !containerRef.current) {
|
|
requestAnimationFrame(() => scrollToItem(id));
|
|
return;
|
|
}
|
|
|
|
const elementRect = element.getBoundingClientRect();
|
|
const containerRect = containerRef.current.getBoundingClientRect();
|
|
|
|
const scrollTop = containerRef.current.scrollTop + elementRect.top - containerRect.top;
|
|
|
|
containerRef.current.scrollTo({
|
|
top: scrollTop
|
|
});
|
|
},
|
|
[dataList, defaultScroll]
|
|
);
|
|
|
|
const { runAsync: callApi, loading: isLoading } = useRequest(api);
|
|
|
|
let scrollSign = useRef(false);
|
|
const { runAsync: loadInitData } = useRequest(
|
|
async ({ scrollWhenFinish, refresh } = { scrollWhenFinish: true, refresh: false }) => {
|
|
if (isLoading) return;
|
|
|
|
// 已经被加载的数据,直接滚动到该位置
|
|
const item = dataList.find((item) => item.id === currentData?.id);
|
|
if (item && !refresh) {
|
|
scrollToItem(item.id);
|
|
return;
|
|
}
|
|
|
|
const response = await callApi({
|
|
initialId: currentData?.id,
|
|
anchor: currentData?.anchor,
|
|
pageSize,
|
|
...params
|
|
} as TParams);
|
|
|
|
setHasMorePrev(response.hasMorePrev);
|
|
setHasMoreNext(response.hasMoreNext);
|
|
|
|
scrollSign.current = scrollWhenFinish;
|
|
setDataList(response.list);
|
|
|
|
if (response.list.length > 0) {
|
|
anchorRef.current.top = response.list[0];
|
|
anchorRef.current.bottom = response.list[response.list.length - 1];
|
|
}
|
|
},
|
|
{
|
|
refreshDeps: [currentData],
|
|
onFinally() {
|
|
isInit.current = true;
|
|
},
|
|
manual: false,
|
|
errorToast: showErrorToast ? undefined : ''
|
|
}
|
|
);
|
|
useEffect(() => {
|
|
if (!isInit.current) return;
|
|
loadInitData({ refresh: true, scrollWhenFinish: true });
|
|
}, [params]);
|
|
useEffect(() => {
|
|
if (scrollSign.current) {
|
|
scrollSign.current = false;
|
|
scrollToItem(currentData?.id);
|
|
}
|
|
}, [dataList]);
|
|
|
|
const { runAsync: loadPrevData, loading: prevLoading } = useRequest(
|
|
async (scrollRef = containerRef) => {
|
|
if (!anchorRef.current.top || !hasMorePrev || isLoading) return;
|
|
|
|
const prevScrollTop = scrollRef?.current?.scrollTop || 0;
|
|
const prevScrollHeight = scrollRef?.current?.scrollHeight || 0;
|
|
|
|
const response = await callApi({
|
|
prevId: anchorRef.current.top.id,
|
|
anchor: anchorRef.current.top.anchor,
|
|
pageSize,
|
|
...params
|
|
} as TParams);
|
|
|
|
if (!response) return;
|
|
|
|
setHasMorePrev(response.hasMorePrev);
|
|
|
|
if (response.list.length > 0) {
|
|
setDataList((prev) => [...response.list, ...prev]);
|
|
anchorRef.current.top = response.list[0];
|
|
|
|
setTimeout(() => {
|
|
if (scrollRef?.current) {
|
|
const newHeight = scrollRef.current.scrollHeight;
|
|
const heightDiff = newHeight - prevScrollHeight;
|
|
scrollRef.current.scrollTop = prevScrollTop + heightDiff;
|
|
}
|
|
}, 0);
|
|
}
|
|
|
|
return response;
|
|
},
|
|
{
|
|
refreshDeps: [hasMorePrev, isLoading, params, pageSize],
|
|
errorToast: showErrorToast ? undefined : ''
|
|
}
|
|
);
|
|
|
|
const { runAsync: loadNextData, loading: nextLoading } = useRequest(
|
|
async (scrollRef = containerRef) => {
|
|
if (!anchorRef.current.bottom || !hasMoreNext || isLoading) return;
|
|
|
|
const prevScrollTop = scrollRef?.current?.scrollTop || 0;
|
|
|
|
const response = await callApi({
|
|
nextId: anchorRef.current.bottom.id,
|
|
anchor: anchorRef.current.bottom.anchor,
|
|
pageSize,
|
|
...params
|
|
} as TParams);
|
|
|
|
if (!response) return;
|
|
|
|
setHasMoreNext(response.hasMoreNext);
|
|
|
|
if (response.list.length > 0) {
|
|
setDataList((prev) => [...prev, ...response.list]);
|
|
anchorRef.current.bottom = response.list[response.list.length - 1];
|
|
|
|
setTimeout(() => {
|
|
if (scrollRef?.current) {
|
|
scrollRef.current.scrollTop = prevScrollTop;
|
|
}
|
|
}, 0);
|
|
}
|
|
|
|
return response;
|
|
},
|
|
{
|
|
refreshDeps: [hasMoreNext, isLoading, params, pageSize],
|
|
errorToast: showErrorToast ? undefined : ''
|
|
}
|
|
);
|
|
|
|
const ScrollData = useCallback(
|
|
({
|
|
children,
|
|
ScrollContainerRef,
|
|
...props
|
|
}: {
|
|
children: ReactNode;
|
|
ScrollContainerRef?: React.RefObject<HTMLDivElement>;
|
|
} & BoxProps) => {
|
|
// If external ref is provided, use it; otherwise use internal ref
|
|
const actualContainerRef = ScrollContainerRef || containerRef;
|
|
const scroll = useScroll(actualContainerRef);
|
|
|
|
// Merge refs: set both internal and external refs when element mounts
|
|
const setRefs = useCallback(
|
|
(el: HTMLDivElement | null) => {
|
|
// @ts-ignore - RefObject.current is readonly, but we need to set it
|
|
containerRef.current = el;
|
|
if (ScrollContainerRef) {
|
|
// @ts-ignore - RefObject.current is readonly, but we need to set it
|
|
ScrollContainerRef.current = el;
|
|
}
|
|
},
|
|
[ScrollContainerRef]
|
|
);
|
|
|
|
useDebounceEffect(
|
|
() => {
|
|
if (!actualContainerRef?.current || isLoading) return;
|
|
|
|
const { scrollTop, scrollHeight, clientHeight } = actualContainerRef.current;
|
|
|
|
// 滚动到底部附近,加载更多下方数据
|
|
if (scrollTop + clientHeight >= scrollHeight - threshold) {
|
|
loadNextData(actualContainerRef);
|
|
}
|
|
|
|
// 滚动到顶部附近,加载更多上方数据
|
|
if (scrollTop <= threshold) {
|
|
loadPrevData(actualContainerRef);
|
|
}
|
|
},
|
|
[scroll],
|
|
{ wait: 200 }
|
|
);
|
|
|
|
return (
|
|
<MyBox ref={setRefs} h={'100%'} overflow={'auto'} isLoading={isLoading} {...props}>
|
|
{hasMorePrev && prevLoading && (
|
|
<Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
|
|
{t('common:is_requesting')}
|
|
</Box>
|
|
)}
|
|
{children}
|
|
{hasMoreNext && nextLoading && (
|
|
<Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
|
|
{t('common:is_requesting')}
|
|
</Box>
|
|
)}
|
|
</MyBox>
|
|
);
|
|
},
|
|
[isLoading]
|
|
);
|
|
|
|
return {
|
|
dataList,
|
|
setDataList,
|
|
isLoading,
|
|
loadInitData,
|
|
ScrollData,
|
|
itemRefs,
|
|
scrollToItem
|
|
};
|
|
}
|