perf: collection created response (#1947)

* perf: collection created response

* update openapi doc

* remove default collection

* perf: chat ui

* fix: system prompt concat

* perf: published check

* perf: update app

packages/service/core/chat/controller.ts

@@ -13,24 +13,24 @@ export async function getChatItems({
   chatId?: string;
   limit?: number;
   field: string;
-}): Promise<{ history: ChatItemType[] }> {
+}): Promise<{ histories: ChatItemType[] }> {
   if (!chatId) {
-    return { history: [] };
+    return { histories: [] };
   }
 
-  const history = await MongoChatItem.find({ appId, chatId }, field)
+  const histories = await MongoChatItem.find({ appId, chatId }, field)
     .sort({ _id: -1 })
     .limit(limit)
     .lean();
 
-  history.reverse();
+  histories.reverse();
 
-  history.forEach((item) => {
+  histories.forEach((item) => {
     // @ts-ignore
     item.value = adaptStringValue(item.value);
   });
 
-  return { history };
+  return { histories };
 }
 /* 临时适配旧的对话记录 */
 export const adaptStringValue = (value: any): ChatItemValueItemType[] => {

packages/service/core/dataset/collection/controller.ts

@@ -75,54 +75,9 @@ export async function createOneCollection({
     { session }
   );
 
-  // create default collection
-  if (type === DatasetCollectionTypeEnum.folder) {
-    await createDefaultCollection({
-      datasetId,
-      parentId: collection._id,
-      teamId,
-      tmbId,
-      session
-    });
-  }
-
   return collection;
 }
 
-// create default collection
-export function createDefaultCollection({
-  name = '手动录入',
-  datasetId,
-  parentId,
-  teamId,
-  tmbId,
-  session
-}: {
-  name?: '手动录入' | '手动标注';
-  datasetId: string;
-  parentId?: string;
-  teamId: string;
-  tmbId: string;
-  session?: ClientSession;
-}) {
-  return MongoDatasetCollection.create(
-    [
-      {
-        name,
-        teamId,
-        tmbId,
-        datasetId,
-        parentId,
-        type: DatasetCollectionTypeEnum.virtual,
-        trainingType: TrainingModeEnum.chunk,
-        chunkSize: 0,
-        updateTime: new Date('2099')
-      }
-    ],
-    { session }
-  );
-}
-
 /* delete collection related images/files */
 export const delCollectionRelatedSource = async ({
   collections,

packages/service/core/dataset/collection/utils.ts

@@ -10,6 +10,7 @@ import {
 } from '@fastgpt/global/core/dataset/constants';
 import { hashStr } from '@fastgpt/global/common/string/tools';
 import { ClientSession } from '../../../common/mongo';
+import { PushDatasetDataResponse } from '@fastgpt/global/core/dataset/api';
 
 /**
  * get all collection by top collectionId
@@ -138,7 +139,7 @@ export const reloadCollectionChunks = async ({
   billId?: string;
   rawText?: string;
   session: ClientSession;
-}) => {
+}): Promise<PushDatasetDataResponse> => {
   const {
     title,
     rawText: newRawText,
@@ -149,7 +150,10 @@ export const reloadCollectionChunks = async ({
     newRawText: rawText
   });
 
-  if (isSameRawText) return;
+  if (isSameRawText)
+    return {
+      insertLen: 0
+    };
 
   // split data
   const { chunks } = splitText2Chunks({
@@ -164,7 +168,7 @@ export const reloadCollectionChunks = async ({
     return Promise.reject('Training model error');
   })();
 
-  await MongoDatasetTraining.insertMany(
+  const result = await MongoDatasetTraining.insertMany(
     chunks.map((item, i) => ({
       teamId: col.teamId,
       tmbId,
@@ -191,4 +195,8 @@ export const reloadCollectionChunks = async ({
     },
     { session }
   );
+
+  return {
+    insertLen: result.length
+  };
 };

packages/service/core/workflow/dispatch/utils.ts

@@ -1,12 +1,11 @@
 import { getErrText } from '@fastgpt/global/common/error/utils';
-import { replaceSensitiveText } from '@fastgpt/global/common/string/tools';
+import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
 import type { ChatItemType } from '@fastgpt/global/core/chat/type.d';
 import {
   WorkflowIOValueTypeEnum,
   NodeOutputKeyEnum
 } from '@fastgpt/global/core/workflow/constants';
 import { RuntimeEdgeItemType } from '@fastgpt/global/core/workflow/runtime/type';
-import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io';
 
 export const filterToolNodeIdByEdges = ({
   nodeId,
@@ -45,10 +44,16 @@ export const filterToolNodeIdByEdges = ({
 
 export const getHistories = (history?: ChatItemType[] | number, histories: ChatItemType[] = []) => {
   if (!history) return [];
-  if (typeof history === 'number') return histories.slice(-(history * 2));
-  if (Array.isArray(history)) return history;
 
-  return [];
+  const systemHistories = histories.filter((item) => item.obj === ChatRoleEnum.System);
+
+  const filterHistories = (() => {
+    if (typeof history === 'number') return histories.slice(-(history * 2));
+    if (Array.isArray(history)) return history;
+    return [];
+  })();
+
+  return [...systemHistories, ...filterHistories];
 };
 
 /* value type format */