Optimize the structure and naming of projects (#335)

client/src/pages/api/admin/initv44.ts

@@ -3,7 +3,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { authUser } from '@/service/utils/auth';
 import { connectToDatabase, KB } from '@/service/mongo';
-import { KbTypeEnum } from '@/constants/kb';
+import { KbTypeEnum } from '@/constants/dataset';
 import { PgClient } from '@/service/pg';
 import { PgDatasetTableName } from '@/constants/plugin';
 

client/src/pages/api/core/dataset/allDataset.ts

@@ -3,7 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { getVectorModel } from '@/service/utils/data';
-import { KbListItemType } from '@/types/plugin';
+import type { DatasetsItemType } from '@/types/core/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -22,7 +22,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       vectorModel: getVectorModel(item.vectorModel)
     }));
 
-    jsonRes<KbListItemType[]>(res, {
+    jsonRes<DatasetsItemType[]>(res, {
       data
     });
   } catch (err) {

client/src/pages/api/core/dataset/create.ts

@@ -2,11 +2,11 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { CreateKbParams } from '@/api/request/kb';
+import type { CreateDatasetParams } from '@/api/core/dataset/index.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { name, tags, avatar, vectorModel, parentId, type } = req.body as CreateKbParams;
+    const { name, tags, avatar, vectorModel, parentId, type } = req.body as CreateDatasetParams;
 
     // 凭证校验
     const { userId } = await authUser({ req, authToken: true });

client/src/pages/api/core/dataset/data/getDataById.ts

@@ -3,8 +3,8 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
-import type { KbDataItemType } from '@/types/plugin';
 import { PgDatasetTableName } from '@/constants/plugin';
+import type { PgDataItemType } from '@/types/core/dataset/data';
 
 export type Response = {
   id: string;
@@ -29,7 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     const where: any = [['user_id', userId], 'AND', ['id', dataId]];
 
-    const searchRes = await PgClient.select<KbDataItemType>(PgDatasetTableName, {
+    const searchRes = await PgClient.select<PgDataItemType>(PgDatasetTableName, {
       fields: ['kb_id', 'id', 'q', 'a', 'source', 'file_id'],
       where,
       limit: 1

client/src/pages/api/core/dataset/data/getDataList.ts

@@ -3,9 +3,9 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
-import type { KbDataItemType } from '@/types/plugin';
 import { PgDatasetTableName } from '@/constants/plugin';
-import { OtherFileId } from '@/constants/kb';
+import { OtherFileId } from '@/constants/dataset';
+import type { PgDataItemType } from '@/types/core/dataset/data';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -50,7 +50,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     ];
 
     const [searchRes, total] = await Promise.all([
-      PgClient.select<KbDataItemType>(PgDatasetTableName, {
+      PgClient.select<PgDataItemType>(PgDatasetTableName, {
         fields: ['id', 'q', 'a', 'source', 'file_id'],
         where,
         order: [{ field: 'id', mode: 'DESC' }],

client/src/pages/api/core/dataset/data/insertData.ts

@@ -1,18 +1,18 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, KB } from '@/service/mongo';
+import { connectToDatabase } from '@/service/mongo';
 import { authKb, authUser } from '@/service/utils/auth';
 import { withNextCors } from '@/service/utils/tools';
 import { PgDatasetTableName } from '@/constants/plugin';
-import { insertKbItem, PgClient } from '@/service/pg';
+import { insertData2Dataset, PgClient } from '@/service/pg';
 import { getVectorModel } from '@/service/utils/data';
 import { getVector } from '@/pages/api/openapi/plugin/vector';
-import { DatasetItemType } from '@/types/plugin';
+import { DatasetDataItemType } from '@/types/core/dataset/data';
 import { countPromptTokens } from '@/utils/common/tiktoken';
 
 export type Props = {
   kbId: string;
-  data: DatasetItemType;
+  data: DatasetDataItemType;
 };
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
@@ -58,7 +58,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
       userId
     });
 
-    const response = await insertKbItem({
+    const response = await insertData2Dataset({
       userId,
       kbId,
       data: [

client/src/pages/api/core/dataset/data/pushData.ts

@@ -8,19 +8,9 @@ import { PgDatasetTableName, TrainingModeEnum } from '@/constants/plugin';
 import { startQueue } from '@/service/utils/tools';
 import { PgClient } from '@/service/pg';
 import { getVectorModel } from '@/service/utils/data';
-import { DatasetItemType } from '@/types/plugin';
+import { DatasetDataItemType } from '@/types/core/dataset/data';
 import { countPromptTokens } from '@/utils/common/tiktoken';
-
-export type Props = {
-  kbId: string;
-  data: DatasetItemType[];
-  mode: `${TrainingModeEnum}`;
-  prompt?: string;
-};
-
-export type Response = {
-  insertLen: number;
-};
+import type { PushDataProps, PushDataResponse } from '@/api/core/dataset/data.d';
 
 const modeMap = {
   [TrainingModeEnum.index]: true,
@@ -29,7 +19,7 @@ const modeMap = {
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { kbId, data, mode = TrainingModeEnum.index, prompt } = req.body as Props;
+    const { kbId, data, mode = TrainingModeEnum.index, prompt } = req.body as PushDataProps;
 
     if (!kbId || !Array.isArray(data)) {
       throw new Error('KbId or data is empty');
@@ -48,7 +38,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
     // 凭证校验
     const { userId } = await authUser({ req });
 
-    jsonRes<Response>(res, {
+    jsonRes<PushDataResponse>(res, {
       data: await pushDataToKb({
         kbId,
         data,
@@ -71,7 +61,7 @@ export async function pushDataToKb({
   data,
   mode,
   prompt
-}: { userId: string } & Props): Promise<Response> {
+}: { userId: string } & PushDataProps): Promise<PushDataResponse> {
   const [kb, vectorModel] = await Promise.all([
     authKb({
       userId,
@@ -94,7 +84,7 @@ export async function pushDataToKb({
 
   // 过滤重复的 qa 内容
   const set = new Set();
-  const filterData: DatasetItemType[] = [];
+  const filterData: DatasetDataItemType[] = [];
 
   data.forEach((item) => {
     if (!item.q) return;
@@ -150,7 +140,7 @@ export async function pushDataToKb({
     )
   )
     .filter((item) => item.status === 'fulfilled')
-    .map<DatasetItemType>((item: any) => item.value);
+    .map<DatasetDataItemType>((item: any) => item.value);
 
   // 插入记录
   const insertRes = await TrainingData.insertMany(

client/src/pages/api/core/dataset/data/updateData.ts

@@ -4,19 +4,13 @@ import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import { withNextCors } from '@/service/utils/tools';
 import { KB, connectToDatabase } from '@/service/mongo';
-import { getVector } from '../plugin/vector';
+import { getVector } from '@/pages/api/openapi/plugin/vector';
 import { PgDatasetTableName } from '@/constants/plugin';
-
-export type Props = {
-  dataId: string;
-  kbId: string;
-  a?: string;
-  q?: string;
-};
+import type { UpdateDataPrams } from '@/api/core/dataset/data.d';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { dataId, a = '', q = '', kbId } = req.body as Props;
+    const { dataId, a = '', q = '', kbId } = req.body as UpdateDataPrams;
 
     if (!dataId) {
       throw new Error('缺少参数');

client/src/pages/api/core/dataset/file/delById.ts

@@ -6,7 +6,7 @@ import { GridFSStorage } from '@/service/lib/gridfs';
 import { PgClient } from '@/service/pg';
 import { PgDatasetTableName } from '@/constants/plugin';
 import { Types } from 'mongoose';
-import { OtherFileId } from '@/constants/kb';
+import { OtherFileId } from '@/constants/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

client/src/pages/api/core/dataset/file/detail.ts

@@ -3,8 +3,8 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { GridFSStorage } from '@/service/lib/gridfs';
-import { OtherFileId } from '@/constants/kb';
-import type { FileInfo } from '@/types/plugin';
+import { OtherFileId } from '@/constants/dataset';
+import type { GSFileInfoType } from '@/types/common/file';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -15,7 +15,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     const { userId } = await authUser({ req, authToken: true });
 
     if (fileId === OtherFileId) {
-      return jsonRes<FileInfo>(res, {
+      return jsonRes<GSFileInfoType>(res, {
         data: {
           id: OtherFileId,
           size: 0,
@@ -31,7 +31,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     const file = await gridFs.findAndAuthFile(fileId);
 
-    jsonRes<FileInfo>(res, {
+    jsonRes<GSFileInfoType>(res, {
       data: file
     });
   } catch (err) {

client/src/pages/api/core/dataset/file/list.ts

@@ -5,7 +5,7 @@ import { authUser } from '@/service/utils/auth';
 import { GridFSStorage } from '@/service/lib/gridfs';
 import { PgClient } from '@/service/pg';
 import { PgDatasetTableName } from '@/constants/plugin';
-import { FileStatusEnum, OtherFileId } from '@/constants/kb';
+import { FileStatusEnum, OtherFileId } from '@/constants/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

client/src/pages/api/core/dataset/list.ts

@@ -3,8 +3,8 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { getVectorModel } from '@/service/utils/data';
-import { KbListItemType } from '@/types/plugin';
-import { KbTypeEnum } from '@/constants/kb';
+import type { DatasetsItemType } from '@/types/core/dataset';
+import { KbTypeEnum } from '@/constants/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -27,7 +27,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       }))
     );
 
-    jsonRes<KbListItemType[]>(res, {
+    jsonRes<DatasetsItemType[]>(res, {
       data
     });
   } catch (err) {

client/src/pages/api/core/dataset/paths.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
-import { KbPathItemType } from '@/types/plugin';
+import type { DatasetPathItemType } from '@/types/core/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
@@ -9,7 +9,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     const { parentId } = req.query as { parentId: string };
 
-    jsonRes<KbPathItemType[]>(res, {
+    jsonRes<DatasetPathItemType[]>(res, {
       data: await getParents(parentId)
     });
   } catch (err) {
@@ -20,7 +20,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
   }
 }
 
-async function getParents(parentId?: string): Promise<KbPathItemType[]> {
+async function getParents(parentId?: string): Promise<DatasetPathItemType[]> {
   if (!parentId) {
     return [];
   }

client/src/pages/api/core/dataset/searchTest.ts

@@ -3,20 +3,14 @@ import { jsonRes } from '@/service/response';
 import { authUser } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import { withNextCors } from '@/service/utils/tools';
-import { getVector } from '../plugin/vector';
-import type { KbTestItemType } from '@/types/plugin';
+import { getVector } from '../../openapi/plugin/vector';
 import { PgDatasetTableName } from '@/constants/plugin';
 import { KB } from '@/service/mongo';
-
-export type Props = {
-  kbId: string;
-  text: string;
-};
-export type Response = KbTestItemType['results'];
+import type { SearchTestProps, SearchTestResponseType } from '@/api/core/dataset/index.d';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { kbId, text } = req.body as Props;
+    const { kbId, text } = req.body as SearchTestProps;
 
     if (!kbId || !text) {
       throw new Error('缺少参数');
@@ -49,7 +43,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
         COMMIT;`
     );
 
-    jsonRes<Response>(res, {
+    jsonRes<SearchTestResponseType>(res, {
       data: response?.[2]?.rows || []
     });
   } catch (err) {

client/src/pages/api/core/dataset/update.ts

@@ -2,11 +2,11 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { KbUpdateParams } from '@/api/request/kb';
+import type { DatasetUpdateParams } from '@/api/core/dataset/index.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { id, parentId, name, avatar, tags } = req.body as KbUpdateParams;
+    const { id, parentId, name, avatar, tags } = req.body as DatasetUpdateParams;
 
     if (!id) {
       throw new Error('缺少参数');