From a287ace12692fd1bb6f9895aecd58822b7d5e656 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Sat, 27 May 2023 15:18:10 +0800 Subject: [PATCH] perf: code --- docs/deploy/fastgpt/pg/init.sql | 3 +- src/api/plugins/kb.ts | 4 +- src/constants/model.ts | 10 ----- src/constants/plugin.ts | 6 +-- src/pages/api/admin/countTraining.ts | 6 +-- src/pages/api/openapi/kb/appKbSearch.ts | 3 -- src/pages/api/openapi/kb/pushData.ts | 37 +++++++++++++++++- src/pages/api/openapi/kb/updateData.ts | 2 - src/pages/api/plugins/kb/data/getDataById.ts | 2 +- src/pages/api/plugins/kb/data/getDataList.ts | 2 +- .../api/plugins/kb/data/getTrainingData.ts | 21 +++------- src/pages/kb/components/DataCard.tsx | 5 +-- src/pages/kb/components/Detail.tsx | 6 +-- src/pages/kb/components/InputDataModal.tsx | 8 ++-- src/pages/kb/components/SelectCsvModal.tsx | 8 ++-- src/pages/kb/components/SelectFileModal.tsx | 12 +++--- src/service/events/generateQA.ts | 8 ++-- src/service/events/generateVector.ts | 38 ++----------------- src/service/pg.ts | 4 +- src/service/response.ts | 2 +- src/types/mongoSchema.d.ts | 4 +- src/types/pg.d.ts | 8 +--- src/types/plugin.d.ts | 1 - 23 files changed, 82 insertions(+), 118 deletions(-) diff --git a/docs/deploy/fastgpt/pg/init.sql b/docs/deploy/fastgpt/pg/init.sql index 294ffcf14..2882abc82 100644 --- a/docs/deploy/fastgpt/pg/init.sql +++ b/docs/deploy/fastgpt/pg/init.sql @@ -6,14 +6,13 @@ CREATE EXTENSION IF NOT EXISTS vector; CREATE TABLE IF NOT EXISTS modelData ( id BIGSERIAL PRIMARY KEY, vector VECTOR(1536) NOT NULL, - status VARCHAR(50) NOT NULL, user_id VARCHAR(50) NOT NULL, kb_id VARCHAR(50), q TEXT NOT NULL, a TEXT NOT NULL ); -- create index -CREATE INDEX IF NOT EXISTS modelData_status_index ON modelData USING HASH (status); CREATE INDEX IF NOT EXISTS modelData_userId_index ON modelData USING HASH (user_id); CREATE INDEX IF NOT EXISTS modelData_kbId_index ON modelData USING HASH (kb_id); +-- vector 索引，可以到 pg vector 去配置，根据数据量去配置 EOSQL diff --git a/src/api/plugins/kb.ts b/src/api/plugins/kb.ts index 09d890e23..9cae025d8 100644 --- a/src/api/plugins/kb.ts +++ b/src/api/plugins/kb.ts @@ -1,7 +1,7 @@ import { GET, POST, PUT, DELETE } from '../request'; import type { KbItemType } from '@/types/plugin'; import { RequestPaging } from '@/types/index'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; import { Props as PushDataProps } from '@/pages/api/openapi/kb/pushData'; export type KbUpdateParams = { id: string; name: string; tags: string; avatar: string }; @@ -66,5 +66,5 @@ export const postSplitData = (data: { kbId: string; chunks: string[]; prompt: string; - mode: `${TrainingTypeEnum}`; + mode: `${TrainingModeEnum}`; }) => POST(`/openapi/text/pushData`, data); diff --git a/src/constants/model.ts b/src/constants/model.ts index 945f2262a..6909b595b 100644 --- a/src/constants/model.ts +++ b/src/constants/model.ts @@ -96,16 +96,6 @@ export const formatModelStatus = { } }; -export enum ModelDataStatusEnum { - ready = 'ready', - waiting = 'waiting' -} - -export const ModelDataStatusMap: Record<`${ModelDataStatusEnum}`, string> = { - ready: '训练完成', - waiting: '训练中' -}; - /* 知识库搜索时的配置 */ // 搜索方式 export enum appVectorSearchModeEnum { diff --git a/src/constants/plugin.ts b/src/constants/plugin.ts index a464e448b..187a7b7a2 100644 --- a/src/constants/plugin.ts +++ b/src/constants/plugin.ts @@ -1,8 +1,8 @@ -export enum TrainingTypeEnum { +export enum TrainingModeEnum { 'qa' = 'qa', 'index' = 'index' } export const TrainingTypeMap = { - [TrainingTypeEnum.qa]: 'qa', - [TrainingTypeEnum.index]: 'index' + [TrainingModeEnum.qa]: 'qa', + [TrainingModeEnum.index]: 'index' }; diff --git a/src/pages/api/admin/countTraining.ts b/src/pages/api/admin/countTraining.ts index 48de12e3d..a3485cb9c 100644 --- a/src/pages/api/admin/countTraining.ts +++ b/src/pages/api/admin/countTraining.ts @@ -3,7 +3,7 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { jsonRes } from '@/service/response'; import { authUser } from '@/service/utils/auth'; import { connectToDatabase, TrainingData } from '@/service/mongo'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; export default async function handler(req: NextApiRequest, res: NextApiResponse) { try { @@ -23,8 +23,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) jsonRes(res, { data: { - qaListLen: result.find((item) => item._id === TrainingTypeEnum.qa)?.count || 0, - vectorListLen: result.find((item) => item._id === TrainingTypeEnum.index)?.count || 0 + qaListLen: result.find((item) => item._id === TrainingModeEnum.qa)?.count || 0, + vectorListLen: result.find((item) => item._id === TrainingModeEnum.index)?.count || 0 } }); } catch (error) { diff --git a/src/pages/api/openapi/kb/appKbSearch.ts b/src/pages/api/openapi/kb/appKbSearch.ts index 40f5e4f85..8eaeb981d 100644 --- a/src/pages/api/openapi/kb/appKbSearch.ts +++ b/src/pages/api/openapi/kb/appKbSearch.ts @@ -10,7 +10,6 @@ import { authModel } from '@/service/utils/auth'; import { ChatModelMap } from '@/constants/model'; import { ChatRoleEnum } from '@/constants/chat'; import { openaiEmbedding } from '../plugin/openaiEmbedding'; -import { ModelDataStatusEnum } from '@/constants/model'; import { modelToolMap } from '@/utils/plugin'; export type QuoteItemType = { id: string; q: string; a: string; isEdit: boolean }; @@ -102,8 +101,6 @@ export async function appKbSearch({ PgClient.select('modelData', { fields: ['id', 'q', 'a'], where: [ - ['status', ModelDataStatusEnum.ready], - 'AND', `kb_id IN (${model.chat.relatedKbs.map((item) => `'${item}'`).join(',')})`, 'AND', `vector <=> '[${promptVector}]' < ${similarity}` diff --git a/src/pages/api/openapi/kb/pushData.ts b/src/pages/api/openapi/kb/pushData.ts index ecf9c560b..fff18ad17 100644 --- a/src/pages/api/openapi/kb/pushData.ts +++ b/src/pages/api/openapi/kb/pushData.ts @@ -5,13 +5,13 @@ import { connectToDatabase, TrainingData } from '@/service/mongo'; import { authUser } from '@/service/utils/auth'; import { authKb } from '@/service/utils/auth'; import { withNextCors } from '@/service/utils/tools'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; import { startQueue } from '@/service/utils/tools'; export type Props = { kbId: string; data: { a: KbDataItemType['a']; q: KbDataItemType['q'] }[]; - mode: `${TrainingTypeEnum}`; + mode: `${TrainingModeEnum}`; prompt?: string; }; @@ -60,6 +60,39 @@ export async function pushDataToKb({ return {}; } + // 去重 + // 过滤重复的 qa 内容 + // const searchRes = await Promise.allSettled( + // dataItems.map(async ({ q, a = '' }) => { + // if (!q) { + // return Promise.reject('q为空'); + // } + + // q = q.replace(/\\n/g, '\n'); + // a = a.replace(/\\n/g, '\n'); + + // // Exactly the same data, not push + // try { + // const count = await PgClient.count('modelData', { + // where: [['user_id', userId], 'AND', ['kb_id', kbId], 'AND', ['q', q], 'AND', ['a', a]] + // }); + + // if (count > 0) { + // return Promise.reject('已经存在'); + // } + // } catch (error) { + // error; + // } + // return Promise.resolve({ + // q, + // a + // }); + // }) + // ); + // const filterData = searchRes + // .filter((item) => item.status === 'fulfilled') + // .map<{ q: string; a: string }>((item: any) => item.value); + // 插入记录 await TrainingData.insertMany( data.map((item) => ({ diff --git a/src/pages/api/openapi/kb/updateData.ts b/src/pages/api/openapi/kb/updateData.ts index 59154999a..ba53b8060 100644 --- a/src/pages/api/openapi/kb/updateData.ts +++ b/src/pages/api/openapi/kb/updateData.ts @@ -1,8 +1,6 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { jsonRes } from '@/service/response'; import { authUser } from '@/service/utils/auth'; -import { ModelDataStatusEnum } from '@/constants/model'; -import { generateVector } from '@/service/events/generateVector'; import { PgClient } from '@/service/pg'; import { withNextCors } from '@/service/utils/tools'; import { openaiEmbedding } from '../plugin/openaiEmbedding'; diff --git a/src/pages/api/plugins/kb/data/getDataById.ts b/src/pages/api/plugins/kb/data/getDataById.ts index f78274cbf..1c36eb85e 100644 --- a/src/pages/api/plugins/kb/data/getDataById.ts +++ b/src/pages/api/plugins/kb/data/getDataById.ts @@ -22,7 +22,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse< const where: any = [['user_id', userId], 'AND', ['id', dataId]]; const searchRes = await PgClient.select('modelData', { - fields: ['id', 'q', 'a', 'status'], + fields: ['id', 'q', 'a'], where, limit: 1 }); diff --git a/src/pages/api/plugins/kb/data/getDataList.ts b/src/pages/api/plugins/kb/data/getDataList.ts index 81e3e75ef..8edb9855d 100644 --- a/src/pages/api/plugins/kb/data/getDataList.ts +++ b/src/pages/api/plugins/kb/data/getDataList.ts @@ -35,7 +35,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse< ]; const searchRes = await PgClient.select('modelData', { - fields: ['id', 'q', 'a', 'status'], + fields: ['id', 'q', 'a'], where, order: [{ field: 'id', mode: 'DESC' }], limit: pageSize, diff --git a/src/pages/api/plugins/kb/data/getTrainingData.ts b/src/pages/api/plugins/kb/data/getTrainingData.ts index e6bb8ec24..98c070b66 100644 --- a/src/pages/api/plugins/kb/data/getTrainingData.ts +++ b/src/pages/api/plugins/kb/data/getTrainingData.ts @@ -2,10 +2,9 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { jsonRes } from '@/service/response'; import { connectToDatabase, TrainingData } from '@/service/mongo'; import { authUser } from '@/service/utils/auth'; -import { generateQA } from '@/service/events/generateQA'; -import { generateVector } from '@/service/events/generateVector'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; import { Types } from 'mongoose'; +import { startQueue } from '@/service/utils/tools'; /* 拆分数据成QA */ export default async function handler(req: NextApiRequest, res: NextApiResponse) { @@ -36,23 +35,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) jsonRes(res, { data: { - qaListLen: result.find((item) => item._id === TrainingTypeEnum.qa)?.count || 0, - vectorListLen: result.find((item) => item._id === TrainingTypeEnum.index)?.count || 0 + qaListLen: result.find((item) => item._id === TrainingModeEnum.qa)?.count || 0, + vectorListLen: result.find((item) => item._id === TrainingModeEnum.index)?.count || 0 } }); if (init) { - const list = await TrainingData.find( - { - userId, - kbId - }, - '_id' - ).limit(10); - list.forEach((item) => { - generateQA(); - generateVector(); - }); + startQueue(); } } catch (err) { jsonRes(res, { diff --git a/src/pages/kb/components/DataCard.tsx b/src/pages/kb/components/DataCard.tsx index b4ce8343b..6064a3b26 100644 --- a/src/pages/kb/components/DataCard.tsx +++ b/src/pages/kb/components/DataCard.tsx @@ -22,7 +22,6 @@ import { import { QuestionOutlineIcon } from '@chakra-ui/icons'; import type { BoxProps } from '@chakra-ui/react'; import type { KbDataItemType } from '@/types/plugin'; -import { ModelDataStatusMap } from '@/constants/model'; import { usePagination } from '@/hooks/usePagination'; import { getKbDataList, @@ -92,7 +91,7 @@ const DataCard = ({ kbId }: { kbId: string }) => { } = useDisclosure(); const { data: { qaListLen = 0, vectorListLen = 0 } = {}, refetch } = useQuery( - ['getModelSplitDataList'], + ['getModelSplitDataList', kbId], () => getTrainingData({ kbId, init: false }), { onError(err) { @@ -240,7 +239,6 @@ const DataCard = ({ kbId }: { kbId: string }) => { 补充知识 - 状态 操作 @@ -253,7 +251,6 @@ const DataCard = ({ kbId }: { kbId: string }) => { {item.a || '-'} - {ModelDataStatusMap[item.status]} { } }, onError(err: any) { + loadKbList(true); + setLastKbId(''); + router.replace(`/kb`); toast({ title: getErrText(err, '获取知识库异常'), status: 'error' }); - loadKbList(true); - setLastKbId(''); - router.replace(`/kb?kbId=${myKbList[0]?._id || ''}`); } }); diff --git a/src/pages/kb/components/InputDataModal.tsx b/src/pages/kb/components/InputDataModal.tsx index b1c442748..c74b2ff4f 100644 --- a/src/pages/kb/components/InputDataModal.tsx +++ b/src/pages/kb/components/InputDataModal.tsx @@ -13,7 +13,8 @@ import { import { useForm } from 'react-hook-form'; import { postKbDataFromList, putKbDataById } from '@/api/plugins/kb'; import { useToast } from '@/hooks/useToast'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; +import { getErrText } from '@/utils/tools'; export type FormData = { dataId?: string; a: string; q: string }; @@ -61,7 +62,7 @@ const InputDataModal = ({ q: e.q } ], - mode: TrainingTypeEnum.index + mode: TrainingModeEnum.index }); toast({ @@ -75,10 +76,9 @@ const InputDataModal = ({ onSuccess(); } catch (err: any) { toast({ - title: err?.message || '出现了点意外~', + title: getErrText(err, '出现了点意外~'), status: 'error' }); - console.log(err); } setLoading(false); }, diff --git a/src/pages/kb/components/SelectCsvModal.tsx b/src/pages/kb/components/SelectCsvModal.tsx index 3faac308c..447a84ac3 100644 --- a/src/pages/kb/components/SelectCsvModal.tsx +++ b/src/pages/kb/components/SelectCsvModal.tsx @@ -19,7 +19,8 @@ import { postKbDataFromList } from '@/api/plugins/kb'; import Markdown from '@/components/Markdown'; import { useMarkdown } from '@/hooks/useMarkdown'; import { fileDownload } from '@/utils/file'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; +import { getErrText } from '@/utils/tools'; const csvTemplate = `question,answer\n"什么是 laf","laf 是一个云函数开发平台……"\n"什么是 sealos","Sealos 是以 kubernetes 为内核的云操作系统发行版,可以……"`; @@ -56,9 +57,8 @@ const SelectJsonModal = ({ })) ); } catch (error: any) { - console.log(error); toast({ - title: error?.message || 'csv 文件格式有误', + title: getErrText(error, 'csv 文件格式有误'), status: 'error' }); } @@ -74,7 +74,7 @@ const SelectJsonModal = ({ const res = await postKbDataFromList({ kbId, data: fileData, - mode: TrainingTypeEnum.index + mode: TrainingModeEnum.index }); toast({ diff --git a/src/pages/kb/components/SelectFileModal.tsx b/src/pages/kb/components/SelectFileModal.tsx index c26f204c7..6706dfda9 100644 --- a/src/pages/kb/components/SelectFileModal.tsx +++ b/src/pages/kb/components/SelectFileModal.tsx @@ -20,19 +20,19 @@ import { useMutation } from '@tanstack/react-query'; import { postKbDataFromList } from '@/api/plugins/kb'; import Radio from '@/components/Radio'; import { splitText_token } from '@/utils/file'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; import { getErrText } from '@/utils/tools'; const fileExtension = '.txt,.doc,.docx,.pdf,.md'; const modeMap = { - qa: { + [TrainingModeEnum.qa]: { maxLen: 2800, slideLen: 800, price: 4, isPrompt: true }, - index: { + [TrainingModeEnum.index]: { maxLen: 800, slideLen: 300, price: 0.4, @@ -53,7 +53,7 @@ const SelectFileModal = ({ const { toast } = useToast(); const [prompt, setPrompt] = useState(''); const { File, onOpen } = useSelectFile({ fileType: fileExtension, multiple: true }); - const [mode, setMode] = useState<`${TrainingTypeEnum}`>(TrainingTypeEnum.index); + const [mode, setMode] = useState<`${TrainingModeEnum}`>(TrainingModeEnum.index); const [fileTextArr, setFileTextArr] = useState(['']); const [splitRes, setSplitRes] = useState<{ tokens: number; chunks: string[] }>({ tokens: 0, @@ -122,9 +122,9 @@ const SelectFileModal = ({ onClose(); onSuccess(); }, - onError() { + onError(err) { toast({ - title: '导入文件失败', + title: getErrText(err, '导入文件失败'), status: 'error' }); } diff --git a/src/service/events/generateQA.ts b/src/service/events/generateQA.ts index ce75e7f51..d6e8909c2 100644 --- a/src/service/events/generateQA.ts +++ b/src/service/events/generateQA.ts @@ -7,7 +7,7 @@ import { modelServiceToolMap } from '../utils/chat'; import { ChatRoleEnum } from '@/constants/chat'; import { BillTypeEnum } from '@/constants/user'; import { pushDataToKb } from '@/pages/api/openapi/kb/pushData'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; import { ERROR_ENUM } from '../errorCode'; export async function generateQA(): Promise { @@ -23,7 +23,7 @@ export async function generateQA(): Promise { // 找出一个需要生成的 dataItem (4分钟锁) const data = await TrainingData.findOneAndUpdate( { - mode: TrainingTypeEnum.qa, + mode: TrainingModeEnum.qa, lockTime: { $lte: new Date(Date.now() - 2 * 60 * 1000) } }, { @@ -115,7 +115,7 @@ A2: kbId, data: responseList, userId, - mode: TrainingTypeEnum.index + mode: TrainingModeEnum.index }); // delete data from training @@ -126,6 +126,7 @@ A2: global.qaQueueLen--; generateQA(); } catch (err: any) { + global.qaQueueLen--; // log if (err?.response) { console.log('openai error: 生成QA错误'); @@ -144,7 +145,6 @@ A2: } // unlock - global.qaQueueLen--; await TrainingData.findByIdAndUpdate(trainingId, { lockTime: new Date('2000/1/1') }); diff --git a/src/service/events/generateVector.ts b/src/service/events/generateVector.ts index 6463cf829..8ce7fb559 100644 --- a/src/service/events/generateVector.ts +++ b/src/service/events/generateVector.ts @@ -3,7 +3,7 @@ import { insertKbItem, PgClient } from '@/service/pg'; import { openaiEmbedding } from '@/pages/api/openapi/plugin/openaiEmbedding'; import { TrainingData } from '../models/trainingData'; import { ERROR_ENUM } from '../errorCode'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; /* 索引生成队列。每导入一次，就是一个单独的线程 */ export async function generateVector(): Promise { @@ -18,7 +18,7 @@ export async function generateVector(): Promise { try { const data = await TrainingData.findOneAndUpdate( { - mode: TrainingTypeEnum.index, + mode: TrainingModeEnum.index, lockTime: { $lte: new Date(Date.now() - 2 * 60 * 1000) } }, { @@ -50,38 +50,6 @@ export async function generateVector(): Promise { } ]; - // 过滤重复的 qa 内容 - // const searchRes = await Promise.allSettled( - // dataItems.map(async ({ q, a = '' }) => { - // if (!q) { - // return Promise.reject('q为空'); - // } - - // q = q.replace(/\\n/g, '\n'); - // a = a.replace(/\\n/g, '\n'); - - // // Exactly the same data, not push - // try { - // const count = await PgClient.count('modelData', { - // where: [['user_id', userId], 'AND', ['kb_id', kbId], 'AND', ['q', q], 'AND', ['a', a]] - // }); - - // if (count > 0) { - // return Promise.reject('已经存在'); - // } - // } catch (error) { - // error; - // } - // return Promise.resolve({ - // q, - // a - // }); - // }) - // ); - // const filterData = searchRes - // .filter((item) => item.status === 'fulfilled') - // .map<{ q: string; a: string }>((item: any) => item.value); - // 生成词向量 const vectors = await openaiEmbedding({ input: dataItems.map((item) => item.q), @@ -107,6 +75,7 @@ export async function generateVector(): Promise { global.vectorQueueLen--; generateVector(); } catch (err: any) { + global.vectorQueueLen--; // log if (err?.response) { console.log('openai error: 生成向量错误'); @@ -125,7 +94,6 @@ export async function generateVector(): Promise { } // unlock - global.vectorQueueLen--; await TrainingData.findByIdAndUpdate(trainingId, { lockTime: new Date('2000/1/1') }); diff --git a/src/service/pg.ts b/src/service/pg.ts index a5740d58b..5f0b42f2f 100644 --- a/src/service/pg.ts +++ b/src/service/pg.ts @@ -1,6 +1,5 @@ import { Pool } from 'pg'; import type { QueryResultRow } from 'pg'; -import { ModelDataStatusEnum } from '@/constants/model'; export const connectPg = async () => { if (global.pgClient) { @@ -180,8 +179,7 @@ export const insertKbItem = ({ { key: 'kb_id', value: kbId }, { key: 'q', value: item.q }, { key: 'a', value: item.a }, - { key: 'vector', value: `[${item.vector}]` }, - { key: 'status', value: ModelDataStatusEnum.ready } + { key: 'vector', value: `[${item.vector}]` } ]) }); }; diff --git a/src/service/response.ts b/src/service/response.ts index 1230d66f6..2dce57220 100644 --- a/src/service/response.ts +++ b/src/service/response.ts @@ -45,7 +45,7 @@ export const jsonRes = ( } else if (openaiError[error?.response?.statusText]) { msg = openaiError[error.response.statusText]; } - console.log(error?.message || error); + console.log(error); } res.json({ diff --git a/src/types/mongoSchema.d.ts b/src/types/mongoSchema.d.ts index 7299d3986..8bb144368 100644 --- a/src/types/mongoSchema.d.ts +++ b/src/types/mongoSchema.d.ts @@ -8,7 +8,7 @@ import { } from '@/constants/model'; import type { DataType } from './data'; import { BillTypeEnum } from '@/constants/user'; -import { TrainingTypeEnum } from '@/constants/plugin'; +import { TrainingModeEnum } from '@/constants/plugin'; export interface UserModelSchema { _id: string; @@ -74,7 +74,7 @@ export interface TrainingDataSchema { userId: string; kbId: string; lockTime: Date; - mode: `${TrainingTypeEnum}`; + mode: `${TrainingModeEnum}`; prompt: string; q: string; a: string; diff --git a/src/types/pg.d.ts b/src/types/pg.d.ts index 073cb1c88..3d3490306 100644 --- a/src/types/pg.d.ts +++ b/src/types/pg.d.ts @@ -1,11 +1,7 @@ -import { ModelDataStatusEnum } from '@/constants/model'; - export interface PgKBDataItemType { id: string; q: string; a: string; - status: `${ModelDataStatusEnum}`; - // model_id: string; - // user_id: string; - // kb_id: string; + user_id: string; + kb_id: string; } diff --git a/src/types/plugin.d.ts b/src/types/plugin.d.ts index ab513eb91..7526184a4 100644 --- a/src/types/plugin.d.ts +++ b/src/types/plugin.d.ts @@ -8,7 +8,6 @@ export interface KbItemType extends kbSchema { export interface KbDataItemType { id: string; - status: 'waiting' | 'ready'; q: string; // 提问词 a: string; // 原文 kbId: string;