v4.6.5 (#620)

2023-12-18 16:24:50 +08:00
parent d33c99f564
commit 703583fff7
130 changed files with 3418 additions and 2579 deletions
--- a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts
+++ b/projects/app/src/pages/api/core/app/form2Modules/fastgpt-simple.ts
@@ -53,7 +53,7 @@ function simpleChatTemplate({
          key: 'userChatInput',
          type: 'systemInput',
          label: '用户问题',
-          connected: true
+          connected: false
        }
      ],
      outputs: [
@@ -95,7 +95,7 @@ function simpleChatTemplate({
          label: '对话模型',
          required: true,
          value: formData.aiSettings.model,
-          connected: true
+          connected: false
        },
        {
          key: 'temperature',
@@ -115,7 +115,7 @@ function simpleChatTemplate({
              value: 10
            }
          ],
-          connected: true
+          connected: false
        },
        {
          key: 'maxToken',
@@ -135,7 +135,7 @@ function simpleChatTemplate({
              value: 4000
            }
          ],
-          connected: true
+          connected: false
        },
        {
          key: 'isResponseAnswerText',
@@ -143,21 +143,21 @@ function simpleChatTemplate({
          label: '返回AI内容',
          valueType: 'boolean',
          value: true,
-          connected: true
+          connected: false
        },
        {
          key: 'quoteTemplate',
          type: 'hidden',
          label: '引用内容模板',
          valueType: 'string',
-          connected: true
+          connected: false
        },
        {
          key: 'quotePrompt',
          type: 'hidden',
          label: '引用内容提示词',
          valueType: 'string',
-          connected: true
+          connected: false
        },
        {
          key: 'aiSettings',
@@ -176,7 +176,7 @@ function simpleChatTemplate({
          placeholder:
            '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
          value: formData.aiSettings.systemPrompt,
-          connected: true
+          connected: false
        },
        {
          key: 'quoteQA',
@@ -191,7 +191,7 @@ function simpleChatTemplate({
          type: 'target',
          label: 'core.module.input.label.chat history',
          valueType: 'chatHistory',
-          connected: true,
+          connected: false,
          value: 8
        },
        {
@@ -292,21 +292,21 @@ function datasetTemplate({
          value: formData.dataset.datasets,
          type: FlowNodeInputTypeEnum.custom,
          label: '关联的知识库',
-          connected: true
+          connected: false
        },
        {
          key: 'similarity',
          value: 0.1,
          type: FlowNodeInputTypeEnum.slider,
          label: '相关度',
-          connected: true
+          connected: false
        },
        {
          key: 'limit',
          value: 2000,
          type: FlowNodeInputTypeEnum.slider,
          label: '单次搜索上限',
-          connected: true
+          connected: false
        },
        {
          key: 'switch',
@@ -403,7 +403,7 @@ function datasetTemplate({
          label: '对话模型',
          required: true,
          value: formData.aiSettings.model,
-          connected: true
+          connected: false
        },
        {
          key: 'temperature',
@@ -423,7 +423,7 @@ function datasetTemplate({
              value: 10
            }
          ],
-          connected: true
+          connected: false
        },
        {
          key: 'maxToken',
@@ -443,7 +443,7 @@ function datasetTemplate({
              value: 4000
            }
          ],
-          connected: true
+          connected: false
        },
        {
          key: 'isResponseAnswerText',
@@ -451,21 +451,21 @@ function datasetTemplate({
          label: '返回AI内容',
          valueType: 'boolean',
          value: true,
-          connected: true
+          connected: false
        },
        {
          key: 'quoteTemplate',
          type: 'hidden',
          label: '引用内容模板',
          valueType: 'string',
-          connected: true
+          connected: false
        },
        {
          key: 'quotePrompt',
          type: 'hidden',
          label: '引用内容提示词',
          valueType: 'string',
-          connected: true
+          connected: false
        },
        {
          key: 'aiSettings',
@@ -484,7 +484,7 @@ function datasetTemplate({
          placeholder:
            '模型固定的引导词，通过调整该内容，可以引导模型聊天方向。该内容会被固定在上下文的开头。可使用变量，例如 {{language}}',
          value: formData.aiSettings.systemPrompt,
-          connected: true
+          connected: false
        },
        {
          key: 'quoteQA',
@@ -499,7 +499,7 @@ function datasetTemplate({
          type: 'target',
          label: 'core.module.input.label.chat history',
          valueType: 'chatHistory',
-          connected: true,
+          connected: false,
          value: 8
        },
        {
--- a/projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts
+++ b/projects/app/src/pages/api/core/app/form2Modules/fastgpt-universal.ts
@@ -39,49 +39,49 @@ function chatModelInput(formData: AppSimpleEditFormType): FlowNodeInputItemType[
      value: formData.aiSettings.model,
      type: 'custom',
      label: '对话模型',
-      connected: true
+      connected: false
    },
    {
      key: 'temperature',
      value: formData.aiSettings.temperature,
      type: 'slider',
      label: '温度',
-      connected: true
+      connected: false
    },
    {
      key: 'maxToken',
      value: formData.aiSettings.maxToken,
      type: 'custom',
      label: '回复上限',
-      connected: true
+      connected: false
    },
    {
      key: 'systemPrompt',
      value: formData.aiSettings.systemPrompt || '',
      type: 'textarea',
      label: '系统提示词',
-      connected: true
+      connected: false
    },
    {
      key: ModuleInputKeyEnum.aiChatIsResponseText,
      value: true,
      type: 'hidden',
      label: '返回AI内容',
-      connected: true
+      connected: false
    },
    {
      key: 'quoteTemplate',
      value: formData.aiSettings.quoteTemplate || '',
      type: 'hidden',
      label: '引用内容模板',
-      connected: true
+      connected: false
    },
    {
      key: 'quotePrompt',
      value: formData.aiSettings.quotePrompt || '',
      type: 'hidden',
      label: '引用内容提示词',
-      connected: true
+      connected: false
    },
    {
      key: 'switch',
@@ -93,7 +93,7 @@ function chatModelInput(formData: AppSimpleEditFormType): FlowNodeInputItemType[
      key: 'history',
      type: 'target',
      label: 'core.module.input.label.chat history',
-      connected: true,
+      connected: false,
      value: 6
    },
    {
@@ -118,9 +118,9 @@ function simpleChatTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
      inputs: [
        {
          key: 'userChatInput',
-          connected: true,
+          connected: false,
          label: '用户问题',
-          type: 'target'
+          type: 'systemInput'
        }
      ],
      outputs: [
@@ -179,8 +179,8 @@ function datasetTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
        {
          key: 'userChatInput',
          label: '用户问题',
-          type: 'target',
-          connected: true
+          type: 'systemInput',
+          connected: false
        }
      ],
      outputs: [
@@ -319,7 +319,7 @@ function datasetTemplate(formData: AppSimpleEditFormType): ModuleItemType[] {
                type: FlowNodeInputTypeEnum.textarea,
                valueType: ModuleIOValueTypeEnum.string,
                label: '回复的内容',
-                connected: true
+                connected: false
              }
            ],
            outputs: [],
--- a/projects/app/src/pages/api/core/app/getChatLogs.ts
+++ b/projects/app/src/pages/api/core/app/getChatLogs.ts
@@ -78,12 +78,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
                }
              }
            },
-            robotBadFeedbackCount: {
+            customFeedbacksCount: {
              $size: {
                $filter: {
                  input: '$chatitems',
                  as: 'item',
-                  cond: { $ifNull: ['$$item.robotBadFeedback', false] }
+                  cond: { $gt: [{ $size: { $ifNull: ['$$item.customFeedbacks', []] } }, 0] }
                }
              }
            },
@@ -102,7 +102,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
          $sort: {
            userBadFeedbackCount: -1,
            userGoodFeedbackCount: -1,
-            robotBadFeedbackCount: -1,
+            customFeedbacksCount: -1,
            updateTime: -1
          }
        },
@@ -118,7 +118,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
            messageCount: { $size: '$chatitems' },
            userGoodFeedbackCount: 1,
            userBadFeedbackCount: 1,
-            robotBadFeedbackCount: 1,
+            customFeedbacksCount: 1,
            markCount: 1
          }
        }
--- a/projects/app/src/pages/api/core/chat/feedback/adminUpdate.ts
+++ b/projects/app/src/pages/api/core/chat/feedback/adminUpdate.ts
@@ -4,22 +4,29 @@ import { connectToDatabase } from '@/service/mongo';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import type { AdminUpdateFeedbackParams } from '@/global/core/chat/api.d';
 import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
+import { autChatCrud } from '@/service/support/permission/auth/chat';

 /* 初始化我的聊天框，需要身份验证 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {
    await connectToDatabase();
-    const { chatItemId, datasetId, dataId, q, a } = req.body as AdminUpdateFeedbackParams;
+    const { appId, chatId, chatItemId, datasetId, dataId, q, a } =
+      req.body as AdminUpdateFeedbackParams;

    if (!chatItemId || !datasetId || !dataId || !q) {
      throw new Error('missing parameter');
    }

-    const { userId } = await authCert({ req, authToken: true });
+    await autChatCrud({
+      req,
+      authToken: true,
+      appId,
+      chatId,
+      per: 'r'
+    });

    await MongoChatItem.findOneAndUpdate(
      {
-        userId,
        dataId: chatItemId
      },
      {
--- a/projects/app/src/pages/api/core/chat/feedback/closeCustom.ts
+++ b/projects/app/src/pages/api/core/chat/feedback/closeCustom.ts
@@ -0,0 +1,47 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import type {
+  AdminUpdateFeedbackParams,
+  CloseCustomFeedbackParams
+} from '@/global/core/chat/api.d';
+import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
+import { autChatCrud } from '@/service/support/permission/auth/chat';
+
+/* 初始化我的聊天框，需要身份验证 */
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  try {
+    await connectToDatabase();
+    const { appId, chatId, chatItemId, index } = req.body as CloseCustomFeedbackParams;
+
+    if (!chatItemId || !appId || !chatId || !chatItemId) {
+      throw new Error('missing parameter');
+    }
+
+    await autChatCrud({
+      req,
+      authToken: true,
+      appId,
+      chatId,
+      per: 'r'
+    });
+    await authCert({ req, authToken: true });
+
+    await MongoChatItem.findOneAndUpdate(
+      { dataId: chatItemId },
+      { $unset: { [`customFeedbacks.${index}`]: 1 } }
+    );
+    await MongoChatItem.findOneAndUpdate(
+      { dataId: chatItemId },
+      { $pull: { customFeedbacks: null } }
+    );
+
+    jsonRes(res);
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}
--- a/projects/app/src/pages/api/core/chat/init.ts
+++ b/projects/app/src/pages/api/core/chat/init.ts
@@ -14,7 +14,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
  try {
    await connectToDatabase();

-    let { appId, chatId } = req.query as InitChatProps;
+    let { appId, chatId, loadCustomFeedbacks } = req.query as InitChatProps;

    if (!appId) {
      return jsonRes(res, {
@@ -43,7 +43,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    const { history } = await getChatItems({
      chatId,
      limit: 30,
-      field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback robotBadFeedback ${ModuleOutputKeyEnum.responseData}`
+      field: `dataId obj value adminFeedback userBadFeedback userGoodFeedback ${
+        ModuleOutputKeyEnum.responseData
+      } ${loadCustomFeedbacks ? 'customFeedbacks' : ''}`
    });

    jsonRes<InitChatResponse>(res, {