mirror of
https://github.com/labring/FastGPT.git
synced 2026-04-27 02:08:10 +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>
208 lines
5.6 KiB
TypeScript
208 lines
5.6 KiB
TypeScript
import { delay } from '@fastgpt/global/common/system/utils';
|
|
import { getLogger, LogCategories } from '../../logger';
|
|
import { Pool } from 'pg';
|
|
import type { QueryResultRow } from 'pg';
|
|
import { PG_ADDRESS } from '../constants';
|
|
|
|
const logger = getLogger(LogCategories.INFRA.POSTGRES);
|
|
|
|
export const connectPg = async (): Promise<Pool> => {
|
|
if (global.pgClient) {
|
|
return global.pgClient;
|
|
}
|
|
|
|
const pool = new Pool({
|
|
connectionString: PG_ADDRESS,
|
|
// 连接池配置
|
|
max: Number(process.env.DB_MAX_LINK || 30), // 增加到 30,支持更高并发
|
|
min: 15, // 调整为 max 的 50%
|
|
keepAlive: true,
|
|
|
|
// 超时配置
|
|
idleTimeoutMillis: 1800000, // 30分钟,减少频繁重连
|
|
connectionTimeoutMillis: 30000, // 30秒,给予充足的连接获取时间
|
|
query_timeout: 60000, // 60秒,向量检索可能需要更长时间
|
|
statement_timeout: 90000, // 90秒,比 query_timeout 长
|
|
idle_in_transaction_session_timeout: 60000, // 保持 60秒
|
|
|
|
// 额外推荐配置
|
|
allowExitOnIdle: false, // 防止连接池过早关闭
|
|
application_name: 'fastgpt-vector-db' // 便于数据库监控识别
|
|
});
|
|
global.pgClient = pool;
|
|
|
|
global.pgClient.on('error', async (err) => {
|
|
logger.error('Postgres pool error', { error: err });
|
|
});
|
|
global.pgClient.on('connect', async () => {
|
|
logger.info('Postgres pool connected');
|
|
});
|
|
global.pgClient.on('remove', async (client) => {
|
|
logger.warn('Postgres connection removed from pool');
|
|
});
|
|
|
|
try {
|
|
await global.pgClient.connect();
|
|
return global.pgClient;
|
|
} catch (error) {
|
|
logger.error('Postgres connection failed', { error });
|
|
global.pgClient?.removeAllListeners();
|
|
global.pgClient?.end();
|
|
global.pgClient = null;
|
|
|
|
await delay(1000);
|
|
logger.warn('Postgres reconnecting after failure');
|
|
|
|
return connectPg();
|
|
}
|
|
};
|
|
|
|
type WhereProps = (string | [string, string | number])[];
|
|
type GetProps = {
|
|
fields?: string[];
|
|
where?: WhereProps;
|
|
order?: { field: string; mode: 'DESC' | 'ASC' | string }[];
|
|
limit?: number;
|
|
offset?: number;
|
|
};
|
|
|
|
type DeleteProps = {
|
|
where: WhereProps;
|
|
};
|
|
|
|
type ValuesProps = { key: string; value?: string | number }[];
|
|
type UpdateProps = {
|
|
values: ValuesProps;
|
|
where: WhereProps;
|
|
};
|
|
type InsertProps = {
|
|
values: ValuesProps[];
|
|
};
|
|
|
|
class PgClass {
|
|
private getWhereStr(where?: WhereProps) {
|
|
return where
|
|
? `WHERE ${where
|
|
.map((item) => {
|
|
if (typeof item === 'string') {
|
|
return item;
|
|
}
|
|
const val = typeof item[1] === 'number' ? item[1] : `'${String(item[1])}'`;
|
|
return `${item[0]}=${val}`;
|
|
})
|
|
.join(' ')}`
|
|
: '';
|
|
}
|
|
private getUpdateValStr(values: ValuesProps) {
|
|
return values
|
|
.map((item) => {
|
|
const val =
|
|
typeof item.value === 'number'
|
|
? item.value
|
|
: `'${String(item.value).replace(/\'/g, '"')}'`;
|
|
|
|
return `${item.key}=${val}`;
|
|
})
|
|
.join(',');
|
|
}
|
|
private getInsertValStr(values: ValuesProps[]) {
|
|
return values
|
|
.map(
|
|
(items) =>
|
|
`(${items
|
|
.map((item) =>
|
|
typeof item.value === 'number'
|
|
? item.value
|
|
: `'${String(item.value).replace(/\'/g, '"')}'`
|
|
)
|
|
.join(',')})`
|
|
)
|
|
.join(',');
|
|
}
|
|
|
|
async query<T extends QueryResultRow = any>(sql: string) {
|
|
const pg = await connectPg();
|
|
const start = Date.now();
|
|
return pg.query<T>(sql).then((res) => {
|
|
const time = Date.now() - start;
|
|
|
|
if (time > 1000) {
|
|
const safeSql = sql.replace(/'\[[^\]]*?\]'/g, "'[x]'");
|
|
logger.warn('Postgres slow query detected', {
|
|
level: 'slow-2',
|
|
durationMs: time,
|
|
sql: safeSql
|
|
});
|
|
} else if (time > 300) {
|
|
const safeSql = sql.replace(/'\[[^\]]*?\]'/g, "'[x]'");
|
|
logger.warn('Postgres slow query detected', {
|
|
level: 'slow-1',
|
|
durationMs: time,
|
|
sql: safeSql
|
|
});
|
|
}
|
|
|
|
return res;
|
|
});
|
|
}
|
|
|
|
async select<T extends QueryResultRow = any>(table: string, props: GetProps) {
|
|
const sql = `SELECT ${
|
|
!props.fields || props.fields?.length === 0 ? '*' : props.fields?.join(',')
|
|
}
|
|
FROM ${table}
|
|
${this.getWhereStr(props.where)}
|
|
${
|
|
props.order
|
|
? `ORDER BY ${props.order.map((item) => `${item.field} ${item.mode}`).join(',')}`
|
|
: ''
|
|
}
|
|
LIMIT ${props.limit || 10} OFFSET ${props.offset || 0}
|
|
`;
|
|
|
|
return this.query<T>(sql);
|
|
}
|
|
async count(table: string, props: GetProps) {
|
|
const sql = `SELECT COUNT(${props?.fields?.[0] || '*'})
|
|
FROM ${table}
|
|
${this.getWhereStr(props.where)}
|
|
`;
|
|
|
|
return this.query(sql).then((res) => Number(res.rows[0]?.count || 0));
|
|
}
|
|
async delete(table: string, props: DeleteProps) {
|
|
const sql = `DELETE FROM ${table} ${this.getWhereStr(props.where)}`;
|
|
return this.query(sql);
|
|
}
|
|
async update(table: string, props: UpdateProps) {
|
|
if (props.values.length === 0) {
|
|
return {
|
|
rowCount: 0
|
|
};
|
|
}
|
|
|
|
const sql = `UPDATE ${table} SET ${this.getUpdateValStr(props.values)} ${this.getWhereStr(
|
|
props.where
|
|
)}`;
|
|
return this.query(sql);
|
|
}
|
|
async insert(table: string, props: InsertProps) {
|
|
if (props.values.length === 0) {
|
|
return {
|
|
rowCount: 0,
|
|
rows: []
|
|
};
|
|
}
|
|
|
|
const fields = props.values[0].map((item) => item.key).join(',');
|
|
const sql = `INSERT INTO ${table} (${fields}) VALUES ${this.getInsertValStr(
|
|
props.values
|
|
)} RETURNING id`;
|
|
|
|
return this.query<{ id: string }>(sql);
|
|
}
|
|
}
|
|
|
|
export const PgClient = new PgClass();
|
|
export const Pg = global.pgClient;
|