mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-23 05:12:39 +00:00
fix: package plus request (#4492)
* fix plus request (#4476) * perf: package plus request * perf: plus request fix * fix: doc --------- Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
import { getFeishuAndYuqueDatasetFileList } from '@/service/core/dataset/apiDataset/controller';
|
||||
import { NextAPI } from '@/service/middleware/entry';
|
||||
import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
|
||||
import { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
|
||||
import { APIFileItem } from '@fastgpt/global/core/dataset/apiDataset';
|
||||
import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
|
||||
import { useApiDatasetRequest } from '@fastgpt/service/core/dataset/apiDataset/api';
|
||||
import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
|
||||
@@ -14,8 +12,6 @@ export type GetApiDatasetFileListProps = {
|
||||
datasetId: string;
|
||||
};
|
||||
|
||||
export type GetApiDatasetFileListResponse = APIFileItem[];
|
||||
|
||||
async function handler(req: NextApiRequest) {
|
||||
let { searchKey = '', parentId = null, datasetId } = req.body;
|
||||
|
||||
@@ -35,7 +31,7 @@ async function handler(req: NextApiRequest) {
|
||||
return useApiDatasetRequest({ apiServer }).listFiles({ searchKey, parentId });
|
||||
}
|
||||
if (feishuServer || yuqueServer) {
|
||||
return getFeishuAndYuqueDatasetFileList({
|
||||
return global.getProApiDatasetFileList({
|
||||
feishuServer,
|
||||
yuqueServer,
|
||||
parentId
|
||||
|
@@ -10,7 +10,6 @@ import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
|
||||
import { authChatCrud, authCollectionInChat } from '@/service/support/permission/auth/chat';
|
||||
import { getCollectionWithDataset } from '@fastgpt/service/core/dataset/controller';
|
||||
import { useApiDatasetRequest } from '@fastgpt/service/core/dataset/apiDataset/api';
|
||||
import { POST } from '@fastgpt/service/common/api/plusRequest';
|
||||
|
||||
export type readCollectionSourceQuery = {};
|
||||
|
||||
@@ -106,8 +105,7 @@ async function handler(
|
||||
}
|
||||
|
||||
if (feishuServer || yuqueServer) {
|
||||
return POST<string>(`/core/dataset/systemApiDataset`, {
|
||||
type: 'read',
|
||||
return global.getProApiDatasetFilePreviewUrl({
|
||||
apiFileId: collection.apiFileId,
|
||||
feishuServer,
|
||||
yuqueServer
|
||||
|
@@ -11,6 +11,18 @@ import { defaultGroup, defaultTemplateTypes } from '@fastgpt/web/core/workflow/c
|
||||
import { MongoPluginGroups } from '@fastgpt/service/core/app/plugin/pluginGroupSchema';
|
||||
import { MongoTemplateTypes } from '@fastgpt/service/core/app/templates/templateTypeSchema';
|
||||
import { loadSystemModels } from '@fastgpt/service/core/ai/config/utils';
|
||||
import { POST } from '@fastgpt/service/common/api/plusRequest';
|
||||
import {
|
||||
DeepRagSearchProps,
|
||||
SearchDatasetDataResponse
|
||||
} from '@fastgpt/service/core/dataset/search/controller';
|
||||
import { AuthOpenApiLimitProps } from '@fastgpt/service/support/openapi/auth';
|
||||
import { ConcatUsageProps, CreateUsageProps } from '@fastgpt/global/support/wallet/usage/api';
|
||||
import {
|
||||
getProApiDatasetFileContentRequest,
|
||||
getProApiDatasetFileListRequest,
|
||||
getProApiDatasetFilePreviewUrlRequest
|
||||
} from '@/service/core/dataset/apiDataset/controller';
|
||||
|
||||
export const readConfigData = async (name: string) => {
|
||||
const splitName = name.split('.');
|
||||
@@ -36,12 +48,37 @@ export const readConfigData = async (name: string) => {
|
||||
|
||||
/* Init global variables */
|
||||
export function initGlobalVariables() {
|
||||
if (global.communityPlugins) return;
|
||||
function initPlusRequest() {
|
||||
global.textCensorHandler = function textCensorHandler({ text }: { text: string }) {
|
||||
return POST<{ code: number; message?: string }>('/common/censor/check', { text });
|
||||
};
|
||||
|
||||
global.deepRagHandler = function deepRagHandler(data: DeepRagSearchProps) {
|
||||
return POST<SearchDatasetDataResponse>('/core/dataset/deepRag', data);
|
||||
};
|
||||
|
||||
global.authOpenApiHandler = function authOpenApiHandler(data: AuthOpenApiLimitProps) {
|
||||
return POST<AuthOpenApiLimitProps>('/support/openapi/authLimit', data);
|
||||
};
|
||||
|
||||
global.createUsageHandler = function createUsageHandler(data: CreateUsageProps) {
|
||||
return POST('/support/wallet/usage/createUsage', data);
|
||||
};
|
||||
|
||||
global.concatUsageHandler = function concatUsageHandler(data: ConcatUsageProps) {
|
||||
return POST('/support/wallet/usage/concatUsage', data);
|
||||
};
|
||||
|
||||
global.getProApiDatasetFileList = getProApiDatasetFileListRequest;
|
||||
global.getProApiDatasetFileContent = getProApiDatasetFileContentRequest;
|
||||
global.getProApiDatasetFilePreviewUrl = getProApiDatasetFilePreviewUrlRequest;
|
||||
}
|
||||
|
||||
global.communityPlugins = [];
|
||||
global.qaQueueLen = global.qaQueueLen ?? 0;
|
||||
global.vectorQueueLen = global.vectorQueueLen ?? 0;
|
||||
initHttpAgent();
|
||||
initPlusRequest();
|
||||
}
|
||||
|
||||
/* Init system data(Need to connected db). It only needs to run once */
|
||||
|
@@ -1,14 +1,35 @@
|
||||
import { GetApiDatasetFileListResponse } from '@/pages/api/core/dataset/apiDataset/list';
|
||||
import { FeishuServer, YuqueServer } from '@fastgpt/global/core/dataset/apiDataset';
|
||||
import { APIFileItem, ApiFileReadContentResponse } from '@fastgpt/global/core/dataset/apiDataset';
|
||||
import { POST } from '@fastgpt/service/common/api/plusRequest';
|
||||
import {
|
||||
GetProApiDatasetFileContentParams,
|
||||
GetProApiDatasetFileListParams,
|
||||
GetProApiDatasetFilePreviewUrlParams,
|
||||
ProApiDatasetOperationTypeEnum
|
||||
} from '@fastgpt/service/core/dataset/apiDataset/proApi';
|
||||
|
||||
export const getFeishuAndYuqueDatasetFileList = async (data: {
|
||||
feishuServer?: FeishuServer;
|
||||
yuqueServer?: YuqueServer;
|
||||
parentId?: string;
|
||||
}) => {
|
||||
const res = await POST<GetApiDatasetFileListResponse>('/core/dataset/systemApiDataset', {
|
||||
type: 'list',
|
||||
export const getProApiDatasetFileListRequest = async (data: GetProApiDatasetFileListParams) => {
|
||||
const res = await POST<APIFileItem[]>('/core/dataset/systemApiDataset', {
|
||||
type: ProApiDatasetOperationTypeEnum.LIST,
|
||||
...data
|
||||
});
|
||||
return res;
|
||||
};
|
||||
|
||||
export const getProApiDatasetFileContentRequest = async (
|
||||
data: GetProApiDatasetFileContentParams
|
||||
) => {
|
||||
const res = await POST<ApiFileReadContentResponse>('/core/dataset/systemApiDataset', {
|
||||
type: ProApiDatasetOperationTypeEnum.CONTENT,
|
||||
...data
|
||||
});
|
||||
return res;
|
||||
};
|
||||
|
||||
export const getProApiDatasetFilePreviewUrlRequest = async (
|
||||
data: GetProApiDatasetFilePreviewUrlParams
|
||||
) => {
|
||||
const res = await POST<string>('/core/dataset/systemApiDataset', {
|
||||
type: ProApiDatasetOperationTypeEnum.READ,
|
||||
...data
|
||||
});
|
||||
return res;
|
||||
|
@@ -52,10 +52,7 @@ import type {
|
||||
import type { UpdateDatasetDataProps } from '@fastgpt/global/core/dataset/controller';
|
||||
import type { DatasetFolderCreateBody } from '@/pages/api/core/dataset/folder/create';
|
||||
import type { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
|
||||
import type {
|
||||
GetApiDatasetFileListProps,
|
||||
GetApiDatasetFileListResponse
|
||||
} from '@/pages/api/core/dataset/apiDataset/list';
|
||||
import type { GetApiDatasetFileListProps } from '@/pages/api/core/dataset/apiDataset/list';
|
||||
import type {
|
||||
listExistIdQuery,
|
||||
listExistIdResponse
|
||||
@@ -74,6 +71,7 @@ import type {
|
||||
getTrainingErrorBody,
|
||||
getTrainingErrorResponse
|
||||
} from '@/pages/api/core/dataset/training/getTrainingError';
|
||||
import type { APIFileItem } from '@fastgpt/global/core/dataset/apiDataset';
|
||||
|
||||
/* ======================== dataset ======================= */
|
||||
export const getDatasets = (data: GetDatasetListBody) =>
|
||||
@@ -254,6 +252,6 @@ export const getCollectionSource = (data: readCollectionSourceBody) =>
|
||||
|
||||
/* ================== apiDataset ======================== */
|
||||
export const getApiDatasetFileList = (data: GetApiDatasetFileListProps) =>
|
||||
POST<GetApiDatasetFileListResponse>('/core/dataset/apiDataset/list', data);
|
||||
POST<APIFileItem[]>('/core/dataset/apiDataset/list', data);
|
||||
export const getApiDatasetFileListExistId = (data: listExistIdQuery) =>
|
||||
GET<listExistIdResponse>('/core/dataset/apiDataset/listExistId', data);
|
||||
|
Reference in New Issue
Block a user