v4.6.9-alpha (#918)

Co-authored-by: Mufei <327958099@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

packages/service/support/outLink/schema.ts

@@ -6,6 +6,7 @@ import {
   TeamCollectionName,
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
+import { appCollectionName } from '../../core/app/schema';
 
 const OutLinkSchema = new Schema({
   shareId: {
@@ -24,7 +25,7 @@ const OutLinkSchema = new Schema({
   },
   appId: {
     type: Schema.Types.ObjectId,
-    ref: 'model',
+    ref: appCollectionName,
     required: true
   },
   type: {

packages/service/support/permission/auth/common.ts

@@ -1,7 +1,5 @@
-import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { parseHeaderCert } from '../controller';
 import { AuthModeType } from '../type';
-import { authOutLinkValid } from './outLink';
 import { SERVICE_LOCAL_HOST } from '../../../common/system/tools';
 
 export const authCert = async (props: AuthModeType) => {
@@ -13,25 +11,6 @@ export const authCert = async (props: AuthModeType) => {
     canWrite: true
   };
 };
-export async function authCertOrShareId({
-  shareId,
-  ...props
-}: AuthModeType & { shareId?: string }) {
-  if (!shareId) {
-    return authCert(props);
-  }
-
-  const { shareChat } = await authOutLinkValid({ shareId });
-
-  return {
-    teamId: String(shareChat.teamId),
-    tmbId: String(shareChat.tmbId),
-    authType: AuthUserTypeEnum.outLink,
-    apikey: '',
-    isOwner: false,
-    canWrite: false
-  };
-}
 
 /* auth the request from local service */
 export const authRequestFromLocal = ({ req }: AuthModeType) => {

packages/service/support/user/team/controller.ts

@@ -23,11 +23,11 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamItemType>
     avatar: tmb.teamId.avatar,
     balance: tmb.teamId.balance,
     tmbId: String(tmb._id),
+    teamDomain: tmb.teamId?.teamDomain,
     role: tmb.role,
     status: tmb.status,
     defaultTeam: tmb.defaultTeam,
-    canWrite: tmb.role !== TeamMemberRoleEnum.visitor,
-    maxSize: tmb.teamId.maxSize
+    canWrite: tmb.role !== TeamMemberRoleEnum.visitor
   };
 }
 
@@ -55,14 +55,12 @@ export async function createDefaultTeam({
   teamName = 'My Team',
   avatar = '/icon/logo.svg',
   balance,
-  maxSize = 5,
   session
 }: {
   userId: string;
   teamName?: string;
   avatar?: string;
   balance?: number;
-  maxSize?: number;
   session: ClientSession;
 }) {
   // auth default team
@@ -82,7 +80,6 @@ export async function createDefaultTeam({
           name: teamName,
           avatar,
           balance,
-          maxSize,
           createTime: new Date()
         }
       ],
@@ -106,8 +103,7 @@ export async function createDefaultTeam({
     console.log('default team exist', userId);
     await MongoTeam.findByIdAndUpdate(tmb.teamId, {
       $set: {
-        ...(balance !== undefined && { balance }),
-        maxSize
+        ...(balance !== undefined && { balance })
       }
     });
   }

packages/service/support/user/team/teamSchema.ts

@@ -25,11 +25,7 @@ const TeamSchema = new Schema({
     type: Number,
     default: 0
   },
-  maxSize: {
-    type: Number,
-    default: 1
-  },
-  tagsUrl: {
+  teamDomain: {
     type: String
   },
   limit: {

packages/service/support/user/team/teamTagsSchema.ts

@@ -1,23 +1,24 @@
 import { connectionMongo, type Model } from '../../../common/mongo';
 const { Schema, model, models } = connectionMongo;
-import { TeamTagsSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
+import { TeamTagSchema as TeamTagsSchemaType } from '@fastgpt/global/support/user/team/type.d';
 import {
   TeamCollectionName,
   TeamTagsCollectionName
 } from '@fastgpt/global/support/user/team/constant';
 
-const TeamTagsSchema = new Schema({
-  label: {
-    type: String,
-    required: true
-  },
+const TeamTagSchema = new Schema({
   teamId: {
     type: Schema.Types.ObjectId,
     ref: TeamCollectionName,
     required: true
   },
   key: {
-    type: String
+    type: String,
+    required: true
+  },
+  label: {
+    type: String,
+    required: true
   },
   createTime: {
     type: Date,
@@ -26,10 +27,10 @@ const TeamTagsSchema = new Schema({
 });
 
 try {
-  TeamTagsSchema.index({ teamId: 1 });
+  TeamTagSchema.index({ teamId: 1 });
 } catch (error) {
   console.log(error);
 }
 
 export const MongoTeamTags: Model<TeamTagsSchemaType> =
-  models[TeamTagsCollectionName] || model(TeamTagsCollectionName, TeamTagsSchema);
+  models[TeamTagsCollectionName] || model(TeamTagsCollectionName, TeamTagSchema);

packages/service/support/wallet/usage/controller.ts

@@ -31,13 +31,19 @@ export const createTrainingUsage = async ({
           {
             moduleName: 'support.wallet.moduleName.index',
             model: vectorModel,
-            charsLength: 0,
+            tokens: 0,
             amount: 0
           },
           {
             moduleName: 'support.wallet.moduleName.qa',
             model: agentModel,
-            charsLength: 0,
+            tokens: 0,
+            amount: 0
+          },
+          {
+            moduleName: 'core.dataset.training.Auto mode',
+            model: agentModel,
+            tokens: 0,
             amount: 0
           }
         ]

packages/service/support/wallet/usage/utils.ts

@@ -0,0 +1,28 @@
+import { ModelTypeEnum, getModelMap } from '../../../core/ai/model';
+
+export const formatModelChars2Points = ({
+  model,
+  tokens = 0,
+  modelType,
+  multiple = 1000
+}: {
+  model: string;
+  tokens: number;
+  modelType: `${ModelTypeEnum}`;
+  multiple?: number;
+}) => {
+  const modelData = getModelMap?.[modelType]?.(model);
+  if (!modelData) {
+    return {
+      totalPoints: 0,
+      modelName: ''
+    };
+  }
+
+  const totalPoints = (modelData.charsPointsPrice || 0) * (tokens / multiple);
+
+  return {
+    modelName: modelData.name,
+    totalPoints
+  };
+};