Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 47f67466 by Finley Ge Committed by GitHub
Options

fix: app/dataset create (#4554)

parent 0c9e56c1
Showing with 51 additions and 49 deletions
projects/app/src/pages/api/core/app/create.ts
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 { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import type { AppSchema } from '@fastgpt/global/core/app/type';
import { ApiRequestProps } from '@fastgpt/service/type/next';
import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type'; import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; 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 { defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
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 { 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 { authApp } from '@fastgpt/service/support/permission/app/auth';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; 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 { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils'; import { ApiRequestProps } from '@fastgpt/service/type/next';
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
export type CreateAppBody = { export type CreateAppBody = {
parentId?: ParentIdType; parentId?: ParentIdType;
...@@ -38,7 +38,7 @@ async function handler(req: ApiRequestProps<CreateAppBody>) { ...@@ -38,7 +38,7 @@ async function handler(req: ApiRequestProps<CreateAppBody>) {
// 凭证校验 // 凭证校验
const { teamId, tmbId, userId } = parentId 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 }); : await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal });
// 上限校验 // 上限校验
......
projects/app/src/pages/api/core/app/folder/create.ts
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 { 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 { import {
OwnerPermissionVal, OwnerPermissionVal,
PerResourceTypeEnum, PerResourceTypeEnum,
WritePermissionVal WritePermissionVal
} from '@fastgpt/global/support/permission/constant'; } from '@fastgpt/global/support/permission/constant';
import { ApiRequestProps } from '@fastgpt/service/type/next'; import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
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 { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; import { MongoApp } from '@fastgpt/service/core/app/schema';
import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission'; import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller'; import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller';
import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant'; import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema'; 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 = { export type CreateAppFolderBody = {
parentId?: ParentIdType; parentId?: ParentIdType;
...@@ -34,7 +34,7 @@ async function handler(req: ApiRequestProps<CreateAppFolderBody>) { ...@@ -34,7 +34,7 @@ async function handler(req: ApiRequestProps<CreateAppFolderBody>) {
// 凭证校验 // 凭证校验
const { teamId, tmbId } = parentId 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 }); : await authUserPer({ req, authToken: true, per: TeamAppCreatePermissionVal });
// Create app // Create app
......
projects/app/src/pages/api/core/dataset/create.ts
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import type { CreateDatasetParams } from '@/global/core/dataset/api.d'; import type { CreateDatasetParams } from '@/global/core/dataset/api.d';
import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; import { NextAPI } from '@/service/middleware/entry';
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; 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 { import {
getLLMModel,
getEmbeddingModel,
getDatasetModel, getDatasetModel,
getDefaultEmbeddingModel getDefaultEmbeddingModel,
getEmbeddingModel,
getLLMModel
} from '@fastgpt/service/core/ai/model'; } 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 { checkTeamDatasetLimit } from '@fastgpt/service/support/permission/teamLimit';
import { NextAPI } from '@/service/middleware/entry'; import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import type { ApiRequestProps } from '@fastgpt/service/type/next'; 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 { 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';
export type DatasetCreateQuery = {}; export type DatasetCreateQuery = {};
export type DatasetCreateBody = CreateDatasetParams; export type DatasetCreateBody = CreateDatasetParams;
...@@ -46,7 +47,7 @@ async function handler( ...@@ -46,7 +47,7 @@ async function handler(
datasetId: parentId, datasetId: parentId,
authToken: true, authToken: true,
authApiKey: true, authApiKey: true,
per: TeamDatasetCreatePermissionVal per: WritePermissionVal
}) })
: await authUserPer({ : await authUserPer({
req, req,
......
projects/app/src/pages/api/core/dataset/folder/create.ts
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry'; import { NextAPI } from '@/service/middleware/entry';
import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common'; 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 { import {
OwnerPermissionVal, OwnerPermissionVal,
PerResourceTypeEnum PerResourceTypeEnum,
WritePermissionVal
} from '@fastgpt/global/support/permission/constant'; } 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 { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; import { MongoDataset } from '@fastgpt/service/core/dataset/schema';
import { FolderImgUrl } from '@fastgpt/global/common/file/image/constants';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/controller'; 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 { syncCollaborators } from '@fastgpt/service/support/permission/inheritPermission';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema'; 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 DatasetFolderCreateQuery = {};
export type DatasetFolderCreateBody = { export type DatasetFolderCreateBody = {
parentId?: string; parentId?: string;
...@@ -39,7 +40,7 @@ async function handler( ...@@ -39,7 +40,7 @@ async function handler(
datasetId: parentId, datasetId: parentId,
authToken: true, authToken: true,
authApiKey: true, authApiKey: true,
per: TeamDatasetCreatePermissionVal per: WritePermissionVal
}) })
: await authUserPer({ : await authUserPer({
req, req,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment