From 47f674666b0fea651315d77d0dbe08bab9c993d1 Mon Sep 17 00:00:00 2001 From: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:04:00 +0800 Subject: [PATCH] fix: app/dataset create (#4554) --- projects/app/src/pages/api/core/app/create.ts | 32 +++++++++---------- .../src/pages/api/core/app/folder/create.ts | 26 +++++++-------- .../app/src/pages/api/core/dataset/create.ts | 31 +++++++++--------- .../pages/api/core/dataset/folder/create.ts | 21 ++++++------ 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/projects/app/src/pages/api/core/app/create.ts b/projects/app/src/pages/api/core/app/create.ts index 70ab57aed..b44be3ec9 100644 --- a/projects/app/src/pages/api/core/app/create.ts +++ b/projects/app/src/pages/api/core/app/create.ts @@ -1,23 +1,23 @@ -import { AppFolderTypeList, AppTypeEnum } from '@fastgpt/global/core/app/constants'; -import { MongoApp } from '@fastgpt/service/core/app/schema'; -import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; -import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit'; -import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; -import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema'; import { NextAPI } from '@/service/middleware/entry'; -import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; -import type { AppSchema } from '@fastgpt/global/core/app/type'; -import { ApiRequestProps } from '@fastgpt/service/type/next'; +import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; +import { AppFolderTypeList, AppTypeEnum } from '@fastgpt/global/core/app/constants'; +import type { AppSchema } from '@fastgpt/global/core/app/type'; import { defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant'; -import { ClientSession } from '@fastgpt/service/common/mongo'; -import { authApp } from '@fastgpt/service/support/permission/app/auth'; -import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; -import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema'; -import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils'; -import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; +import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; +import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; +import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils'; +import { ClientSession } from '@fastgpt/service/common/mongo'; +import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; +import { MongoApp } from '@fastgpt/service/core/app/schema'; +import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema'; +import { authApp } from '@fastgpt/service/support/permission/app/auth'; +import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit'; +import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; +import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema'; +import { ApiRequestProps } from '@fastgpt/service/type/next'; export type CreateAppBody = { parentId?: ParentIdType; @@ -38,7 +38,7 @@ async function handler(req: ApiRequestProps) { // 凭证校验 const { teamId, tmbId, userId } = parentId - ? await authApp({ req, appId: parentId, per: TeamAppCreatePermissionVal, authToken: true }) + ? await authApp({ req, appId: parentId, per: WritePermissionVal, authToken: true }) : await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal }); // 上限校验 diff --git a/projects/app/src/pages/api/core/app/folder/create.ts b/projects/app/src/pages/api/core/app/folder/create.ts index 3afbf313f..7c515f3cc 100644 --- a/projects/app/src/pages/api/core/app/folder/create.ts +++ b/projects/app/src/pages/api/core/app/folder/create.ts @@ -1,23 +1,23 @@ +import { NextAPI } from '@/service/middleware/entry'; +import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; +import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; +import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; +import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; -import { MongoApp } from '@fastgpt/service/core/app/schema'; -import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; import { OwnerPermissionVal, PerResourceTypeEnum, WritePermissionVal } from '@fastgpt/global/support/permission/constant'; -import { ApiRequestProps } from '@fastgpt/service/type/next'; -import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; -import { NextAPI } from '@/service/middleware/entry'; -import { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; -import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; -import { authApp } from '@fastgpt/service/support/permission/app/auth'; -import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; -import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; -import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission'; -import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller'; import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; +import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; +import { MongoApp } from '@fastgpt/service/core/app/schema'; +import { authApp } from '@fastgpt/service/support/permission/app/auth'; +import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller'; +import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission'; import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema'; +import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; +import { ApiRequestProps } from '@fastgpt/service/type/next'; export type CreateAppFolderBody = { parentId?: ParentIdType; @@ -34,7 +34,7 @@ async function handler(req: ApiRequestProps) { // 凭证校验 const { teamId, tmbId } = parentId - ? await authApp({ req, appId: parentId, per: TeamAppCreatePermissionVal, authToken: true }) + ? await authApp({ req, appId: parentId, per: WritePermissionVal, authToken: true }) : await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal }); // Create app diff --git a/projects/app/src/pages/api/core/dataset/create.ts b/projects/app/src/pages/api/core/dataset/create.ts index dba740ad9..2a5767820 100644 --- a/projects/app/src/pages/api/core/dataset/create.ts +++ b/projects/app/src/pages/api/core/dataset/create.ts @@ -1,22 +1,23 @@ -import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; import type { CreateDatasetParams } from '@/global/core/dataset/api.d'; -import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; -import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; -import { - getLLMModel, - getEmbeddingModel, - getDatasetModel, - getDefaultEmbeddingModel -} from '@fastgpt/service/core/ai/model'; -import { checkTeamDatasetLimit } from '@fastgpt/service/support/permission/teamLimit'; import { NextAPI } from '@/service/middleware/entry'; -import type { ApiRequestProps } from '@fastgpt/service/type/next'; import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; -import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; +import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; +import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; +import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; +import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils'; import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; -import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller'; -import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; +import { + getDatasetModel, + getDefaultEmbeddingModel, + getEmbeddingModel, + getLLMModel +} from '@fastgpt/service/core/ai/model'; +import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; +import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; +import { checkTeamDatasetLimit } from '@fastgpt/service/support/permission/teamLimit'; +import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; +import type { ApiRequestProps } from '@fastgpt/service/type/next'; export type DatasetCreateQuery = {}; export type DatasetCreateBody = CreateDatasetParams; @@ -46,7 +47,7 @@ async function handler( datasetId: parentId, authToken: true, authApiKey: true, - per: TeamDatasetCreatePermissionVal + per: WritePermissionVal }) : await authUserPer({ req, diff --git a/projects/app/src/pages/api/core/dataset/folder/create.ts b/projects/app/src/pages/api/core/dataset/folder/create.ts index 8564af6c4..9d5f863e0 100644 --- a/projects/app/src/pages/api/core/dataset/folder/create.ts +++ b/projects/app/src/pages/api/core/dataset/folder/create.ts @@ -1,21 +1,22 @@ -import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; import { NextAPI } from '@/service/middleware/entry'; -import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; -import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; +import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; +import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; +import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; import { OwnerPermissionVal, - PerResourceTypeEnum + PerResourceTypeEnum, + WritePermissionVal } from '@fastgpt/global/support/permission/constant'; -import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; +import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; -import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; -import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants'; -import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; +import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller'; +import { authDataset } from '@fastgpt/service/support/permission/dataset/auth'; import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission'; import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema'; -import { TeamDatasetCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; +import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; +import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; export type DatasetFolderCreateQuery = {}; export type DatasetFolderCreateBody = { parentId?: string; @@ -39,7 +40,7 @@ async function handler( datasetId: parentId, authToken: true, authApiKey: true, - per: TeamDatasetCreatePermissionVal + per: WritePermissionVal }) : await authUserPer({ req,