4.7-production (#1053)

* 4.7-alpha3 (#62)

* doc

* Optimize possible null Pointers and parts of Ux

* fix: mulity index training error

* feat: doc and rename question guide

* fix ios speech input (#59)

* fix: prompt editor variables nowrap (#61)

* change openapi import in http module with curl import (#60)

* chore(ui): dataset import modal ui (#58)

* chore(ui): dataset import modal ui

* use component

* fix height

* 4.7 (#63)

* fix: claude3 image type verification failed (#1038) (#1040)

* perf: curl import modal

* doc img

* perf: adapt cohere rerank

* perf: code

* perf: input style

* doc

---------

Co-authored-by: xiaotian <dimsky@163.com>

* fix: ts

* docker deploy

* perf: prompt call

* doc

* ts

* finish ui

* perf: outlink detail ux

* perf: user schema

* fix: plugin update

* feat: get current time plugin

* fix: ts

* perf: fetch anamation

* perf: mark ux

* doc

* perf: select app ux

* fix: split text custom string conflict

* peref: inform readed

* doc

* memo flow component

* perf: version

* faq

* feat: flow max runtimes

* feat: similarity tip

* feat: auto detect file encoding

* Supports asymmetric vector model

* fix: ts

* perf: max w

* move code

* perf: hide whisper

* fix: ts

* feat: system msg modal

* perf: catch error

* perf: inform tip

* fix: inform

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
Co-authored-by: xiaotian <dimsky@163.com>

projects/app/src/service/events/utils.ts

@@ -2,6 +2,7 @@ import { TeamErrEnum } from '@fastgpt/global/common/error/code/team';
 import { checkTeamAIPoints } from '@fastgpt/service/support/permission/teamLimit';
 import { sendOneInform } from '../support/user/inform/api';
 import { lockTrainingDataByTeamId } from '@fastgpt/service/core/dataset/training/controller';
+import { InformLevelEnum } from '@fastgpt/global/support/user/inform/constants';
 
 export const checkTeamAiPointsAndLock = async (teamId: string, tmbId: string) => {
   try {
@@ -12,7 +13,7 @@ export const checkTeamAiPointsAndLock = async (teamId: string, tmbId: string) =>
       // send inform and lock data
       try {
         sendOneInform({
-          type: 'system',
+          level: InformLevelEnum.important,
           title: '文本训练任务中止',
           content:
             '该团队账号AI积分不足，文本训练任务中止，重新充值后将会继续。暂停的任务将在 7 天后被删除。',

projects/app/src/service/mongo.ts

@@ -23,7 +23,7 @@ export function connectToDatabase(): Promise<void> {
     afterHook: async () => {
       // init system config
       getInitConfig();
-      // init vector database, init root user
+      //init vector database, init root user
       await Promise.all([initVectorStore(), initRootUser()]);
 
       startMongoWatch();
@@ -36,7 +36,7 @@ export function connectToDatabase(): Promise<void> {
   });
 }
 
-async function initRootUser() {
+async function initRootUser(retry = 3): Promise<any> {
   try {
     const rootUser = await MongoUser.findOne({
       username: 'root'
@@ -48,12 +48,9 @@ async function initRootUser() {
     await mongoSessionRun(async (session) => {
       // init root user
       if (rootUser) {
-        await MongoUser.findOneAndUpdate(
-          { username: 'root' },
-          {
-            password: hashStr(psw)
-          }
-        );
+        await rootUser.updateOne({
+          password: hashStr(psw)
+        });
       } else {
         const [{ _id }] = await MongoUser.create(
           [
@@ -75,7 +72,12 @@ async function initRootUser() {
       password: psw
     });
   } catch (error) {
-    console.log('init root user error', error);
-    exit(1);
+    if (retry > 0) {
+      console.log('retry init root user');
+      return initRootUser(retry - 1);
+    } else {
+      console.error('init root user error', error);
+      exit(1);
+    }
   }
 }

projects/app/src/service/support/user/inform/api.ts

@@ -1,8 +1,8 @@
 import { POST } from '@fastgpt/service/common/api/plusRequest';
-import { SendInformProps } from '@fastgpt/global/support/user/inform/type';
+import { SendInform2UserProps } from '@fastgpt/global/support/user/inform/type';
 import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
-export function sendOneInform(data: SendInformProps) {
+export function sendOneInform(data: SendInform2UserProps) {
   if (!FastGPTProUrl) return;
   return POST('/support/user/inform/create', data);
 }

projects/app/src/service/support/wallet/usage/push.ts

@@ -181,12 +181,12 @@ export const pushQuestionGuideUsage = ({
   createUsage({
     teamId,
     tmbId,
-    appName: 'core.app.Next Step Guide',
+    appName: 'core.app.Question Guide',
     totalPoints,
     source: UsageSourceEnum.fastgpt,
     list: [
       {
-        moduleName: 'core.app.Next Step Guide',
+        moduleName: 'core.app.Question Guide',
         amount: totalPoints,
         model: modelName,
         tokens