gitea/FastGPT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: code

Browse Source
This commit is contained in:
archer
2023-09-01 11:47:06 +08:00
parent 68cdf50cb6
commit 23cc2f81e9
8 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/service/events/pushBill.ts
View File

@@ -72,7 +72,7 @@ export const updateShareChatBill = async ({
}
);
} catch (err) {
addLog.error('update shareChat error', { err });
addLog.error('update shareChat error', err);
}
};
@@ -111,7 +111,7 @@ export const pushQABill = async ({
$inc: { balance: -total }
});
} catch (err) {
addLog.error('Create completions bill error', { err });
addLog.error('Create completions bill error', err);
billId && Bill.findByIdAndDelete(billId);
}
};
@@ -160,7 +160,7 @@ export const pushGenerateVectorBill = async ({
$inc: { balance: -total }
});
} catch (err) {
addLog.error('Create generateVector bill error', { err });
addLog.error('Create generateVector bill error', err);
billId && Bill.findByIdAndDelete(billId);
}
} catch (error) {

30
client/src/service/mongo.ts
View File

@@ -4,9 +4,8 @@ import { startQueue } from './utils/tools';
import { getInitConfig } from '@/pages/api/system/getInitData';
import { User } from './models/user';
import { PRICE_SCALE } from '@/constants/common';
import { connectPg, PgClient } from './pg';
import { initPg } from './pg';
import { createHashPassword } from '@/utils/tools';
import { PgTrainingTableName } from '@/constants/plugin';
import { createLogger, format, transports } from 'winston';
import 'winston-mongodb';
@@ -81,9 +80,9 @@ function initLogger() {
format.printf((info) => {
if (info.level === 'error') {
console.log(info.meta);
return `${info.level}: ${[info.timestamp]}: ${info.message}`;
return `[${info.level.toLocaleUpperCase()}]: ${[info.timestamp]}: ${info.message}`;
}
return `${info.level}: ${[info.timestamp]}: ${info.message}${
return `[${info.level.toLocaleUpperCase()}]: ${[info.timestamp]}: ${info.message}${
info.meta ? `: ${JSON.stringify(info.meta)}` : ''
}`;
})
@@ -123,29 +122,6 @@ async function initRootUser() {
console.log('init root user error', error);
}
}
async function initPg() {
try {
await connectPg();
await PgClient.query(`
CREATE EXTENSION IF NOT EXISTS vector;
CREATE TABLE IF NOT EXISTS ${PgTrainingTableName} (
id BIGSERIAL PRIMARY KEY,
vector VECTOR(1536) NOT NULL,
user_id VARCHAR(50) NOT NULL,
kb_id VARCHAR(50) NOT NULL,
source VARCHAR(100),
q TEXT NOT NULL,
a TEXT NOT NULL
);
CREATE INDEX IF NOT EXISTS modelData_userId_index ON ${PgTrainingTableName} USING HASH (user_id);
CREATE INDEX IF NOT EXISTS modelData_kbId_index ON ${PgTrainingTableName} USING HASH (kb_id);
CREATE INDEX IF NOT EXISTS idx_model_data_md5_q_a_user_id_kb_id ON ${PgTrainingTableName} (md5(q), md5(a), user_id, kb_id);
`);
console.log('init pg successful');
} catch (error) {
console.log('init pg error', error);
}
}
export * from './models/chat';
export * from './models/chatItem';

26
client/src/service/pg.ts
View File

@@ -1,6 +1,8 @@
import { Pool } from 'pg';
import type { QueryResultRow } from 'pg';
import { PgTrainingTableName } from '@/constants/plugin';
import { exit } from 'process';
import { addLog } from './utils/tools';
export const connectPg = async (): Promise<Pool> => {
if (global.pgClient) {
@@ -184,3 +186,27 @@ export const insertKbItem = ({
])
});
};
export async function initPg() {
try {
await connectPg();
await PgClient.query(`
CREATE EXTENSION IF NOT EXISTS vector;
CREATE TABLE IF NOT EXISTS ${PgTrainingTableName} (
id BIGSERIAL PRIMARY KEY,
vector VECTOR(1536) NOT NULL,
user_id VARCHAR(50) NOT NULL,
kb_id VARCHAR(50) NOT NULL,
source VARCHAR(100),
q TEXT NOT NULL,
a TEXT NOT NULL
);
CREATE INDEX IF NOT EXISTS modelData_userId_index ON ${PgTrainingTableName} USING HASH (user_id);
CREATE INDEX IF NOT EXISTS modelData_kbId_index ON ${PgTrainingTableName} USING HASH (kb_id);
CREATE INDEX IF NOT EXISTS idx_model_data_md5_q_a_user_id_kb_id ON ${PgTrainingTableName} (md5(q), md5(a), user_id, kb_id);
`);
console.log('init pg successful');
} catch (error) {
addLog.error('init pg error', error);
}
}

36
client/src/service/response.ts
View File

@@ -53,23 +53,7 @@ export const jsonRes = <T = any>(
msg = openaiError[error.response.statusText];
}
addLog.error(msg, {
message: msg,
stack: error?.stack,
...(error?.config && {
config: {
headers: error.config.headers,
url: error.config.url,
data: error.config.data
}
}),
...(error?.response && {
response: {
status: error.response.status,
statusText: error.response.statusText
}
})
});
addLog.error(`response error: ${msg}`, error);
}
res.status(code).json({
@@ -110,23 +94,7 @@ export const sseErrRes = (res: NextApiResponse, error: any) => {
msg = openaiError[error.response.statusText];
}
addLog.error(`sse error: ${msg}`, {
message: msg,
stack: error?.stack,
...(error?.config && {
config: {
headers: error.config.headers,
url: error.config.url,
data: error.config.data
}
}),
...(error?.response && {
response: {
status: error.response.status,
statusText: error.response.statusText
}
})
});
addLog.error(`sse error: ${msg}`, error);
sseResponse({
res,

21
client/src/service/utils/tools.ts
View File

@@ -94,7 +94,24 @@ export const addLog = {
info: (msg: string, obj?: Record<string, any>) => {
global.logger?.info(msg, { meta: obj });
},
error: (msg: string, obj?: Record<string, any>) => {
global.logger?.error(msg, { meta: obj });
error: (msg: string, error?: any) => {
global.logger?.error(msg, {
meta: {
stack: error?.stack,
...(error?.config && {
config: {
headers: error.config.headers,
url: error.config.url,
data: error.config.data
}
}),
...(error?.response && {
response: {
status: error.response.status,
statusText: error.response.statusText
}
})
}
});
}
};