mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-09 01:02:24 +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>
281 lines
8.2 KiB
TypeScript
281 lines
8.2 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest';
|
|
import { delay, retryFn, batchRun } from '@fastgpt/global/common/system/utils';
|
|
|
|
describe('system utils', () => {
|
|
describe('delay', () => {
|
|
it('should resolve after specified milliseconds', async () => {
|
|
const start = Date.now();
|
|
await delay(100);
|
|
const elapsed = Date.now() - start;
|
|
|
|
// Allow some tolerance for timing
|
|
expect(elapsed).toBeGreaterThanOrEqual(95);
|
|
expect(elapsed).toBeLessThan(200);
|
|
});
|
|
|
|
it('should resolve with empty string', async () => {
|
|
const result = await delay(0);
|
|
expect(result).toBe('');
|
|
});
|
|
|
|
it('should work with zero delay', async () => {
|
|
const start = Date.now();
|
|
await delay(0);
|
|
const elapsed = Date.now() - start;
|
|
|
|
expect(elapsed).toBeLessThan(50);
|
|
});
|
|
});
|
|
|
|
describe('retryFn', () => {
|
|
it('should return result on first success', async () => {
|
|
const fn = vi.fn().mockResolvedValue('success');
|
|
|
|
const result = await retryFn(fn, 3);
|
|
|
|
expect(result).toBe('success');
|
|
expect(fn).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it('should retry on failure and eventually succeed', async () => {
|
|
const fn = vi
|
|
.fn()
|
|
.mockRejectedValueOnce(new Error('fail 1'))
|
|
.mockRejectedValueOnce(new Error('fail 2'))
|
|
.mockResolvedValueOnce('success');
|
|
|
|
const result = await retryFn(fn, 3);
|
|
|
|
expect(result).toBe('success');
|
|
expect(fn).toHaveBeenCalledTimes(3);
|
|
});
|
|
|
|
it('should reject after all attempts exhausted', async () => {
|
|
const error = new Error('persistent failure');
|
|
const fn = vi.fn().mockRejectedValue(error);
|
|
|
|
await expect(retryFn(fn, 2)).rejects.toThrow('persistent failure');
|
|
expect(fn).toHaveBeenCalledTimes(3); // initial + 2 retries
|
|
});
|
|
|
|
it('should use default attempts of 3', async () => {
|
|
const fn = vi.fn().mockRejectedValue(new Error('fail'));
|
|
|
|
await expect(retryFn(fn)).rejects.toThrow('fail');
|
|
expect(fn).toHaveBeenCalledTimes(4); // initial + 3 retries
|
|
});
|
|
|
|
it('should work with custom attempts', async () => {
|
|
const fn = vi.fn().mockRejectedValue(new Error('fail'));
|
|
|
|
await expect(retryFn(fn, 1)).rejects.toThrow('fail');
|
|
expect(fn).toHaveBeenCalledTimes(2); // initial + 1 retry
|
|
});
|
|
|
|
it('should handle zero attempts', async () => {
|
|
const fn = vi.fn().mockRejectedValue(new Error('fail'));
|
|
|
|
await expect(retryFn(fn, 0)).rejects.toThrow('fail');
|
|
expect(fn).toHaveBeenCalledTimes(1); // only initial attempt
|
|
});
|
|
|
|
it('should preserve return value type', async () => {
|
|
const objectResult = { data: 'test', count: 42 };
|
|
const fn = vi.fn().mockResolvedValue(objectResult);
|
|
|
|
const result = await retryFn(fn, 3);
|
|
|
|
expect(result).toEqual(objectResult);
|
|
});
|
|
});
|
|
|
|
describe('batchRun', () => {
|
|
it('should process all items', async () => {
|
|
const arr = [1, 2, 3, 4, 5];
|
|
const fn = vi.fn((x: number) => x * 2);
|
|
|
|
const result = await batchRun(arr, fn, 2);
|
|
|
|
expect(result).toEqual([2, 4, 6, 8, 10]);
|
|
expect(fn).toHaveBeenCalledTimes(5);
|
|
});
|
|
|
|
it('should use default batch size of 10', async () => {
|
|
const arr = Array.from({ length: 15 }, (_, i) => i + 1);
|
|
const fn = vi.fn((x: number) => x);
|
|
|
|
const result = await batchRun(arr, fn);
|
|
|
|
expect(result).toHaveLength(15);
|
|
expect(fn).toHaveBeenCalledTimes(15);
|
|
expect(result).toEqual(Array.from({ length: 15 }, (_, i) => i + 1));
|
|
});
|
|
|
|
it('should handle empty array', async () => {
|
|
const arr: number[] = [];
|
|
const fn = vi.fn();
|
|
|
|
const result = await batchRun(arr, fn, 5);
|
|
|
|
expect(result).toEqual([]);
|
|
expect(fn).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('should process items with custom batch size', async () => {
|
|
const arr = [1, 2, 3, 4, 5, 6, 7, 8];
|
|
const fn = vi.fn((x: number) => Promise.resolve(x * 3));
|
|
|
|
const result = await batchRun(arr, fn, 3);
|
|
|
|
expect(result).toEqual([3, 6, 9, 12, 15, 18, 21, 24]);
|
|
expect(fn).toHaveBeenCalledTimes(8);
|
|
});
|
|
|
|
it('should handle async functions', async () => {
|
|
const arr = ['a', 'b', 'c'];
|
|
const fn = async (x: string) => {
|
|
await delay(10);
|
|
return x.toUpperCase();
|
|
};
|
|
|
|
const result = await batchRun(arr, fn, 2);
|
|
|
|
expect(result).toEqual(['A', 'B', 'C']);
|
|
});
|
|
|
|
it('should work with batch size larger than array', async () => {
|
|
const arr = [1, 2, 3];
|
|
const fn = vi.fn((x: number) => x + 1);
|
|
|
|
const result = await batchRun(arr, fn, 10);
|
|
|
|
expect(result).toEqual([2, 3, 4]);
|
|
expect(fn).toHaveBeenCalledTimes(3);
|
|
});
|
|
|
|
it('should work with batch size of 1', async () => {
|
|
const arr = [10, 20, 30];
|
|
const fn = vi.fn((x: number) => x / 10);
|
|
|
|
const result = await batchRun(arr, fn, 1);
|
|
|
|
expect(result).toEqual([1, 2, 3]);
|
|
expect(fn).toHaveBeenCalledTimes(3);
|
|
});
|
|
|
|
it('should handle complex objects', async () => {
|
|
const arr = [
|
|
{ id: 1, name: 'Alice' },
|
|
{ id: 2, name: 'Bob' },
|
|
{ id: 3, name: 'Charlie' }
|
|
];
|
|
const fn = (item: { id: number; name: string }) => ({
|
|
...item,
|
|
processed: true
|
|
});
|
|
|
|
const result = await batchRun(arr, fn, 2);
|
|
|
|
expect(result).toEqual([
|
|
{ id: 1, name: 'Alice', processed: true },
|
|
{ id: 2, name: 'Bob', processed: true },
|
|
{ id: 3, name: 'Charlie', processed: true }
|
|
]);
|
|
});
|
|
|
|
it('should preserve result order even with varying processing times', async () => {
|
|
const arr = [5, 4, 3, 2, 1];
|
|
const fn = async (x: number) => {
|
|
// Simulate varying processing times - smaller values finish faster
|
|
await delay(x * 2);
|
|
return x * 10;
|
|
};
|
|
|
|
const result = await batchRun(arr, fn, 3);
|
|
|
|
// Result order must match original array order, not completion order
|
|
expect(result).toEqual([50, 40, 30, 20, 10]);
|
|
});
|
|
|
|
it('should pass correct index to callback for each item', async () => {
|
|
const arr = ['a', 'b', 'c', 'd', 'e'];
|
|
const receivedIndices: number[] = [];
|
|
|
|
await batchRun(
|
|
arr,
|
|
async (item, index) => {
|
|
receivedIndices.push(index);
|
|
return item;
|
|
},
|
|
3
|
|
);
|
|
|
|
// Every index from 0 to arr.length-1 should be received exactly once
|
|
expect(receivedIndices.sort((a, b) => a - b)).toEqual([0, 1, 2, 3, 4]);
|
|
});
|
|
|
|
it('should have index matching the original array position', async () => {
|
|
const arr = ['x', 'y', 'z'];
|
|
const indexItemPairs: Array<[number, string]> = [];
|
|
|
|
await batchRun(
|
|
arr,
|
|
async (item, index) => {
|
|
indexItemPairs.push([index, item]);
|
|
return item;
|
|
},
|
|
2
|
|
);
|
|
|
|
// Each index should correspond to the correct item in the original array
|
|
for (const [index, item] of indexItemPairs) {
|
|
expect(arr[index]).toBe(item);
|
|
}
|
|
});
|
|
|
|
it('should preserve index-result mapping with concurrent async delays', async () => {
|
|
// Items with reverse delay: first item takes longest, last item finishes first
|
|
const arr = [100, 80, 60, 40, 20];
|
|
const fn = async (item: number, index: number) => {
|
|
await delay(item); // Longer items take more time
|
|
return { index, value: item };
|
|
};
|
|
|
|
const result = await batchRun(arr, fn, 5);
|
|
|
|
// Despite different completion times, result[i] must correspond to arr[i]
|
|
expect(result).toEqual([
|
|
{ index: 0, value: 100 },
|
|
{ index: 1, value: 80 },
|
|
{ index: 2, value: 60 },
|
|
{ index: 3, value: 40 },
|
|
{ index: 4, value: 20 }
|
|
]);
|
|
});
|
|
|
|
it('should pass sequential indices starting from 0', async () => {
|
|
const arr = [10, 20, 30];
|
|
const indices: number[] = [];
|
|
|
|
await batchRun(
|
|
arr,
|
|
async (_item, index) => {
|
|
indices.push(index);
|
|
},
|
|
1 // batchSize=1 ensures sequential execution
|
|
);
|
|
|
|
expect(indices).toEqual([0, 1, 2]);
|
|
});
|
|
|
|
it('should not mutate the original array', async () => {
|
|
const arr = [1, 2, 3, 4, 5];
|
|
const arrCopy = [...arr];
|
|
|
|
await batchRun(arr, async (x) => x * 2, 3);
|
|
|
|
expect(arr).toEqual(arrCopy);
|
|
});
|
|
});
|
|
});
|