diff --git a/packages/global/support/user/constant.ts b/packages/global/support/user/constant.ts index 6c9adbae7..6d91e5960 100644 --- a/packages/global/support/user/constant.ts +++ b/packages/global/support/user/constant.ts @@ -7,3 +7,24 @@ export const InformTypeMap = { label: '系统通知' } }; + +export enum TeamMemberRoleEnum { + owner = 'owner', + admin = 'admin', + member = 'member', + visitor = 'visitor' +} +export const TeamMemberRoleMap = { + [TeamMemberRoleEnum.owner]: { + label: 'user.team.role.owner' + }, + [TeamMemberRoleEnum.admin]: { + label: 'user.team.role.admin' + }, + [TeamMemberRoleEnum.member]: { + label: 'user.team.role.member' + }, + [TeamMemberRoleEnum.visitor]: { + label: 'user.team.role.visitor' + } +}; diff --git a/packages/global/support/user/controller.d.ts b/packages/global/support/user/controller.d.ts new file mode 100644 index 000000000..0979da826 --- /dev/null +++ b/packages/global/support/user/controller.d.ts @@ -0,0 +1,21 @@ +export type CreateTeamProps = { + ownerId: string; + name: string; + avatar?: string; +}; +export type UpdateTeamProps = { + id: string; + name?: string; + avatar?: string; +}; +export type updateTeamBalanceProps = { + id: string; + balance: number; +}; + +export type CreateTeamMemberProps = { + ownerId: string; + teamId: string; + userId: string; + name?: string; +}; diff --git a/packages/global/support/user/type.d.ts b/packages/global/support/user/type.d.ts index 6568e0e4a..9c4b6e852 100644 --- a/packages/global/support/user/type.d.ts +++ b/packages/global/support/user/type.d.ts @@ -1,4 +1,4 @@ -import { InformTypeEnum } from './constant'; +import { InformTypeEnum, TeamMemberRoleEnum } from './constant'; export type UserModelSchema = { _id: string; @@ -30,3 +30,19 @@ export type UserInformSchema = { content: string; read: boolean; }; + +export type TeamSchema = { + _id: string; + name: string; + ownerId: string; + avatar: string; + createTime: Date; +}; + +export type TeamMemberSchema = { + _id: string; + name: string; + teamId: string; + userId: string; + role: `${TeamMemberRoleEnum}`; +}; diff --git a/packages/service/support/user/schema.ts b/packages/service/support/user/schema.ts index fbfe7036a..29c397d45 100644 --- a/packages/service/support/user/schema.ts +++ b/packages/service/support/user/schema.ts @@ -4,6 +4,8 @@ import { hashStr } from '@fastgpt/global/common/string/tools'; import { PRICE_SCALE } from '@fastgpt/global/common/bill/constants'; import type { UserModelSchema } from '@fastgpt/global/support/user/type'; +export const userCollectionName = 'users'; + const UserSchema = new Schema({ username: { // 可以是手机/邮箱,新的验证都只用手机 @@ -60,4 +62,5 @@ const UserSchema = new Schema({ } }); -export const MongoUser: Model = models['user'] || model('user', UserSchema); +export const MongoUser: Model = + models[userCollectionName] || model(userCollectionName, UserSchema); diff --git a/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx b/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx index 377d01c2c..a2ef86cd8 100644 --- a/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx +++ b/projects/app/src/components/core/module/Flow/components/nodes/NodeCQNode.tsx @@ -121,14 +121,13 @@ const NodeCQNode = ({ data }: NodeProps) => { onChangeNode({ moduleId, - type: 'updateOutput', - key: agentKey, - value: outputs.concat({ + type: 'addOutput', + value: { key, label: '', type: FlowNodeOutputTypeEnum.hidden, targets: [] - }) + } }); }} > diff --git a/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts b/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts index c24bc5d04..09b679778 100644 --- a/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts +++ b/projects/app/src/service/moduleDispatch/agent/classifyQuestion.ts @@ -127,6 +127,9 @@ ${systemPrompt} tokens: response.usage?.total_tokens || 0 }; } catch (error) { + console.log(agentFunction.parameters); + console.log(response.choices?.[0]?.message); + console.log('Your model may not support function_call', error); return { diff --git a/projects/app/src/service/moduleDispatch/agent/extract.ts b/projects/app/src/service/moduleDispatch/agent/extract.ts index e6e7c76dc..528e2c820 100644 --- a/projects/app/src/service/moduleDispatch/agent/extract.ts +++ b/projects/app/src/service/moduleDispatch/agent/extract.ts @@ -141,6 +141,9 @@ async function functionCall({ try { return JSON.parse(response.choices?.[0]?.message?.function_call?.arguments || '{}'); } catch (error) { + console.log(agentFunction.parameters); + console.log(response.choices?.[0]?.message); + console.log('Your model may not support function_call', error); return {}; } })();