From 88d10451c9f502f27070621dbacfe8cd1383b63a Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Fri, 5 Jul 2024 10:27:38 +0800 Subject: [PATCH] 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 --- .../zh-cn/docs/development/openapi/dataset.md | 3 +- .../zh-cn/docs/development/upgrading/486.md | 6 +- packages/global/core/chat/utils.ts | 11 +++ packages/plugins/src/fetchUrl/template.json | 2 +- packages/service/core/chat/controller.ts | 12 ++-- .../core/dataset/collection/controller.ts | 45 ------------ .../service/core/dataset/collection/utils.ts | 14 +++- .../service/core/workflow/dispatch/utils.ts | 15 ++-- .../components/ChatBox/hooks/useChatBox.tsx | 1 - projects/app/src/global/core/dataset/api.d.ts | 9 ++- projects/app/src/pages/api/core/app/update.ts | 8 +-- projects/app/src/pages/api/core/chat/init.ts | 4 +- .../src/pages/api/core/chat/outLink/init.ts | 6 +- .../app/src/pages/api/core/chat/team/init.ts | 6 +- .../dataset/collection/create/csvTable.ts | 9 +-- .../core/dataset/collection/create/link.ts | 14 ++-- .../dataset/collection/create/localFile.ts | 3 +- .../core/dataset/collection/create/text.ts | 3 +- .../app/src/pages/api/core/dataset/create.ts | 9 --- .../app/src/pages/api/v1/chat/completions.ts | 10 +-- .../detail/components/SimpleApp/AppCard.tsx | 21 +++--- .../detail/components/SimpleApp/EditForm.tsx | 3 +- .../chat/components/ChatHistorySlider.tsx | 37 +++++----- .../src/pages/chat/components/ToolMenu.tsx | 2 +- .../service/core/dataset/data/controller.ts | 3 +- projects/app/src/web/core/workflow/utils.ts | 69 ++++++++++--------- 26 files changed, 160 insertions(+), 165 deletions(-) diff --git a/docSite/content/zh-cn/docs/development/openapi/dataset.md b/docSite/content/zh-cn/docs/development/openapi/dataset.md index 7d0570ee752..2c8879a809e 100644 --- a/docSite/content/zh-cn/docs/development/openapi/dataset.md +++ b/docSite/content/zh-cn/docs/development/openapi/dataset.md @@ -13,7 +13,7 @@ weight: 853 -## 创建训练订单(4.6.9地址发生改动) +## 创建训练订单 {{< tabs tabTotal="2" >}} {{< tab tabName="请求示例" >}} @@ -26,6 +26,7 @@ curl --location --request POST 'https://api.fastgpt.in/api/support/wallet/usage/ --header 'Authorization: Bearer {{apikey}}' \ --header 'Content-Type: application/json' \ --data-raw '{ + "datasetId": "知识库 ID", "name": "可选，自定义订单名称，例如：文档训练-fastgpt.docx" }' ``` diff --git a/docSite/content/zh-cn/docs/development/upgrading/486.md b/docSite/content/zh-cn/docs/development/upgrading/486.md index 107ff9d969e..0695de57d52 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/486.md +++ b/docSite/content/zh-cn/docs/development/upgrading/486.md @@ -38,5 +38,7 @@ curl --location --request POST 'https://{{host}}/api/admin/initv486' \ 3. 新增 - 网页抓取和数学计算器系统插件 4. 新增 - 移动文本加工和自定义反馈到基础节点中 5. 优化 - Read file 默认选中从节点，实现 MongoDB 读写分离，减轻主节点压力 -6. 修复 - 工作流中团队插件加载异常 -7. 修复 - 知识库集合目录导航失效 \ No newline at end of file +6. 优化 - 知识库导入接口，返回值对齐 +7. 修复 - 工作流中团队插件加载异常 +8. 修复 - 知识库集合目录导航失效 +9. 修复 - 通过 API 调用 chat 接口，传递 System 异常 \ No newline at end of file diff --git a/packages/global/core/chat/utils.ts b/packages/global/core/chat/utils.ts index 75a858ee1d3..c5548f98a5f 100644 --- a/packages/global/core/chat/utils.ts +++ b/packages/global/core/chat/utils.ts @@ -3,6 +3,17 @@ import { FlowNodeTypeEnum } from '../workflow/node/constant'; import { ChatItemValueTypeEnum, ChatRoleEnum } from './constants'; import { ChatHistoryItemResType, ChatItemType, UserChatItemValueItemType } from './type.d'; +// Concat 2 -> 1, and sort by role +export const concatHistories = (histories1: ChatItemType[], histories2: ChatItemType[]) => { + const newHistories = [...histories1, ...histories2]; + return newHistories.sort((a, b) => { + if (a.obj === ChatRoleEnum.System) { + return -1; + } + return 1; + }); +}; + export const getChatTitleFromChatMessage = (message?: ChatItemType, defaultValue = '新对话') => { // @ts-ignore const textMsg = message?.value.find((item) => item.type === ChatItemValueTypeEnum.text); diff --git a/packages/plugins/src/fetchUrl/template.json b/packages/plugins/src/fetchUrl/template.json index 2915513481a..324bcc74542 100644 --- a/packages/plugins/src/fetchUrl/template.json +++ b/packages/plugins/src/fetchUrl/template.json @@ -88,7 +88,7 @@ "x": 1050.9890727421412, "y": -415.2085119990912 }, - "version": "486", + "version": "481", "inputs": [ { "key": "system_addInputParam", diff --git a/packages/service/core/chat/controller.ts b/packages/service/core/chat/controller.ts index b5de13f7726..e594fed2772 100644 --- a/packages/service/core/chat/controller.ts +++ b/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[] => { diff --git a/packages/service/core/dataset/collection/controller.ts b/packages/service/core/dataset/collection/controller.ts index 60e6ca48391..954a055e824 100644 --- a/packages/service/core/dataset/collection/controller.ts +++ b/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, diff --git a/packages/service/core/dataset/collection/utils.ts b/packages/service/core/dataset/collection/utils.ts index 4bf106f1105..9501101fdbe 100644 --- a/packages/service/core/dataset/collection/utils.ts +++ b/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 => { 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 + }; }; diff --git a/packages/service/core/workflow/dispatch/utils.ts b/packages/service/core/workflow/dispatch/utils.ts index 00fbcbedeed..5759b084d18 100644 --- a/packages/service/core/workflow/dispatch/utils.ts +++ b/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 */ diff --git a/projects/app/src/components/ChatBox/hooks/useChatBox.tsx b/projects/app/src/components/ChatBox/hooks/useChatBox.tsx index 0fa2e1346c0..3023ab42c59 100644 --- a/projects/app/src/components/ChatBox/hooks/useChatBox.tsx +++ b/projects/app/src/components/ChatBox/hooks/useChatBox.tsx @@ -41,7 +41,6 @@ export const useChatBox = () => { const map: Record void> = { md: () => { - console.log(history); fileDownload({ text: history .map((item) => { diff --git a/projects/app/src/global/core/dataset/api.d.ts b/projects/app/src/global/core/dataset/api.d.ts index 59f0163c883..9b60a98e569 100644 --- a/projects/app/src/global/core/dataset/api.d.ts +++ b/projects/app/src/global/core/dataset/api.d.ts @@ -1,4 +1,7 @@ -import { PushDatasetDataChunkProps } from '@fastgpt/global/core/dataset/api'; +import { + PushDatasetDataChunkProps, + PushDatasetDataResponse +} from '@fastgpt/global/core/dataset/api'; import { DatasetSearchModeEnum, DatasetSourceReadTypeEnum, @@ -31,6 +34,10 @@ export type RebuildEmbeddingProps = { }; /* ================= collection ===================== */ +export type CreateCollectionResponse = Promise<{ + collectionId: string; + results: PushDatasetDataResponse; +}>; /* ================= data ===================== */ export type InsertOneDatasetDataProps = PushDatasetDataChunkProps & { diff --git a/projects/app/src/pages/api/core/app/update.ts b/projects/app/src/pages/api/core/app/update.ts index 1eab9b37026..2e9546e4393 100644 --- a/projects/app/src/pages/api/core/app/update.ts +++ b/projects/app/src/pages/api/core/app/update.ts @@ -154,10 +154,8 @@ async function handler(req: ApiRequestProps) return onUpdate(session); }); - } - - // Update default permission - if (isDefaultPermissionChanged) { + } else if (isDefaultPermissionChanged) { + // Update default permission await mongoSessionRun(async (session) => { if (isFolder) { // Sync children default permission @@ -193,6 +191,8 @@ async function handler(req: ApiRequestProps) return onUpdate(session, defaultPermission); }); + } else { + return onUpdate(); } } diff --git a/projects/app/src/pages/api/core/chat/init.ts b/projects/app/src/pages/api/core/chat/init.ts index 380dd4863ca..b360262b048 100644 --- a/projects/app/src/pages/api/core/chat/init.ts +++ b/projects/app/src/pages/api/core/chat/init.ts @@ -42,7 +42,7 @@ async function handler( } // get app and history - const [{ history }, { nodes }] = await Promise.all([ + const [{ histories }, { nodes }] = await Promise.all([ getChatItems({ appId, chatId, @@ -60,7 +60,7 @@ async function handler( title: chat?.title || '新对话', userAvatar: undefined, variables: chat?.variables || {}, - history, + history: histories, app: { chatConfig: getAppChatConfig({ chatConfig: app.chatConfig, diff --git a/projects/app/src/pages/api/core/chat/outLink/init.ts b/projects/app/src/pages/api/core/chat/outLink/init.ts index 0268b99929b..89a51ef6bf0 100644 --- a/projects/app/src/pages/api/core/chat/outLink/init.ts +++ b/projects/app/src/pages/api/core/chat/outLink/init.ts @@ -41,7 +41,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) throw new Error(ChatErrEnum.unAuthChat); } - const [{ history }, { nodes }] = await Promise.all([ + const [{ histories }, { nodes }] = await Promise.all([ getChatItems({ appId: app._id, chatId, @@ -56,7 +56,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ]); // pick share response field - history.forEach((item) => { + histories.forEach((item) => { if (item.obj === ChatRoleEnum.AI) { item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData }); } @@ -70,7 +70,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) //@ts-ignore userAvatar: tmb?.userId?.avatar, variables: chat?.variables || {}, - history, + history: histories, app: { chatConfig: getAppChatConfig({ chatConfig: app.chatConfig, diff --git a/projects/app/src/pages/api/core/chat/team/init.ts b/projects/app/src/pages/api/core/chat/team/init.ts index d2cd17b331f..f10fc9be2ae 100644 --- a/projects/app/src/pages/api/core/chat/team/init.ts +++ b/projects/app/src/pages/api/core/chat/team/init.ts @@ -47,7 +47,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) } // get app and history - const [{ history }, { nodes }] = await Promise.all([ + const [{ histories }, { nodes }] = await Promise.all([ getChatItems({ appId, chatId, @@ -58,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ]); // pick share response field - history.forEach((item) => { + histories.forEach((item) => { if (item.obj === ChatRoleEnum.AI) { item.responseData = filterPublicNodeResponseData({ flowResponses: item.responseData }); } @@ -71,7 +71,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) title: chat?.title || '新对话', userAvatar: team?.avatar, variables: chat?.variables || {}, - history, + history: histories, app: { chatConfig: getAppChatConfig({ chatConfig: app.chatConfig, diff --git a/projects/app/src/pages/api/core/dataset/collection/create/csvTable.ts b/projects/app/src/pages/api/core/dataset/collection/create/csvTable.ts index 59e38665917..9267c480b91 100644 --- a/projects/app/src/pages/api/core/dataset/collection/create/csvTable.ts +++ b/projects/app/src/pages/api/core/dataset/collection/create/csvTable.ts @@ -18,8 +18,9 @@ import { getLLMModel, getVectorModel } from '@fastgpt/service/core/ai/model'; import { rawText2Chunks } from '@fastgpt/service/core/dataset/read'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; import { NextAPI } from '@/service/middleware/entry'; +import { CreateCollectionResponse } from '@/global/core/dataset/api'; -async function handler(req: NextApiRequest) { +async function handler(req: NextApiRequest): CreateCollectionResponse { const { datasetId, parentId, fileId } = req.body as FileIdCreateDatasetCollectionParams; const trainingType = TrainingModeEnum.chunk; const { teamId, tmbId, dataset } = await authDataset({ @@ -50,7 +51,7 @@ async function handler(req: NextApiRequest) { insertLen: predictDataLimitLength(trainingType, chunks) }); - await mongoSessionRun(async (session) => { + return mongoSessionRun(async (session) => { // 4. create collection const { _id: collectionId } = await createOneCollection({ teamId, @@ -80,7 +81,7 @@ async function handler(req: NextApiRequest) { }); // 6. insert to training queue - await pushDataListToTrainingQueue({ + const insertResult = await pushDataListToTrainingQueue({ teamId, tmbId, datasetId: dataset._id, @@ -97,7 +98,7 @@ async function handler(req: NextApiRequest) { session }); - return collectionId; + return { collectionId, results: insertResult }; }); } export default NextAPI(handler); diff --git a/projects/app/src/pages/api/core/dataset/collection/create/link.ts b/projects/app/src/pages/api/core/dataset/collection/create/link.ts index c0291f82c05..359364c794c 100644 --- a/projects/app/src/pages/api/core/dataset/collection/create/link.ts +++ b/projects/app/src/pages/api/core/dataset/collection/create/link.ts @@ -15,8 +15,9 @@ import { reloadCollectionChunks } from '@fastgpt/service/core/dataset/collection import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; import { NextAPI } from '@/service/middleware/entry'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; +import { CreateCollectionResponse } from '@/global/core/dataset/api'; -async function handler(req: NextApiRequest) { +async function handler(req: NextApiRequest): CreateCollectionResponse { const { link, trainingType = TrainingModeEnum.chunk, @@ -40,7 +41,7 @@ async function handler(req: NextApiRequest) { insertLen: predictDataLimitLength(trainingType, new Array(10)) }); - await mongoSessionRun(async (session) => { + return mongoSessionRun(async (session) => { // 2. create collection const collection = await createOneCollection({ ...body, @@ -70,7 +71,7 @@ async function handler(req: NextApiRequest) { }); // load - await reloadCollectionChunks({ + const result = await reloadCollectionChunks({ collection: { ...collection.toObject(), datasetId: dataset @@ -80,7 +81,12 @@ async function handler(req: NextApiRequest) { session }); - return collection; + return { + collectionId: collection._id, + results: { + insertLen: result.insertLen + } + }; }); } diff --git a/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts b/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts index 2e3c428850f..df0b4ed10ba 100644 --- a/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts +++ b/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts @@ -23,8 +23,9 @@ import { MongoImage } from '@fastgpt/service/common/file/image/schema'; import { readRawTextByLocalFile } from '@fastgpt/service/common/file/read/utils'; import { NextAPI } from '@/service/middleware/entry'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; +import { CreateCollectionResponse } from '@/global/core/dataset/api'; -async function handler(req: NextApiRequest, res: NextApiResponse) { +async function handler(req: NextApiRequest, res: NextApiResponse): CreateCollectionResponse { /** * Creates the multer uploader */ diff --git a/projects/app/src/pages/api/core/dataset/collection/create/text.ts b/projects/app/src/pages/api/core/dataset/collection/create/text.ts index 4d71025c6c5..2c75e334bf4 100644 --- a/projects/app/src/pages/api/core/dataset/collection/create/text.ts +++ b/projects/app/src/pages/api/core/dataset/collection/create/text.ts @@ -17,8 +17,9 @@ import { getLLMModel, getVectorModel } from '@fastgpt/service/core/ai/model'; import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun'; import { NextAPI } from '@/service/middleware/entry'; import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'; +import { CreateCollectionResponse } from '@/global/core/dataset/api'; -async function handler(req: NextApiRequest) { +async function handler(req: NextApiRequest): CreateCollectionResponse { const { name, text, diff --git a/projects/app/src/pages/api/core/dataset/create.ts b/projects/app/src/pages/api/core/dataset/create.ts index a2436960eeb..47351a06b74 100644 --- a/projects/app/src/pages/api/core/dataset/create.ts +++ b/projects/app/src/pages/api/core/dataset/create.ts @@ -1,7 +1,6 @@ import type { NextApiRequest } from 'next'; import { MongoDataset } from '@fastgpt/service/core/dataset/schema'; import type { CreateDatasetParams } from '@/global/core/dataset/api.d'; -import { createDefaultCollection } from '@fastgpt/service/core/dataset/collection/controller'; import { authUserPer } from '@fastgpt/service/support/permission/user/auth'; import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants'; import { getLLMModel, getVectorModel, getDatasetModel } from '@fastgpt/service/core/ai/model'; @@ -50,14 +49,6 @@ async function handler(req: NextApiRequest) { defaultPermission }); - if (type === DatasetTypeEnum.dataset) { - await createDefaultCollection({ - datasetId: _id, - teamId, - tmbId - }); - } - return _id; } diff --git a/projects/app/src/pages/api/v1/chat/completions.ts b/projects/app/src/pages/api/v1/chat/completions.ts index 2d49fabf3d8..e4cb2afc3fb 100644 --- a/projects/app/src/pages/api/v1/chat/completions.ts +++ b/projects/app/src/pages/api/v1/chat/completions.ts @@ -26,6 +26,7 @@ import requestIp from 'request-ip'; import { getUsageSourceByAuthType } from '@fastgpt/global/support/wallet/usage/tools'; import { authTeamSpaceToken } from '@/service/support/permission/auth/team'; import { + concatHistories, filterPublicNodeResponseData, removeEmptyUserInput } from '@fastgpt/global/core/chat/utils'; @@ -119,6 +120,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { let startTime = Date.now(); + // Web chat params: [Human, AI] const chatMessages = GPTMessages2Chats(messages); if (chatMessages[chatMessages.length - 1].obj !== ChatRoleEnum.Human) { chatMessages.pop(); @@ -170,7 +172,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { // 1. get and concat history; 2. get app workflow const limit = getMaxHistoryLimitFromNodes(app.modules); - const [{ history }, { nodes, edges, chatConfig }] = await Promise.all([ + const [{ histories }, { nodes, edges, chatConfig }] = await Promise.all([ getChatItems({ appId: app._id, chatId, @@ -179,7 +181,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { }), getAppLatestVersion(app._id, app) ]); - const concatHistories = history.concat(chatMessages); + const newHistories = concatHistories(histories, chatMessages); const responseChatItemId: string | undefined = messages[messages.length - 1].dataId; /* start flow controller */ @@ -198,7 +200,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { runtimeEdges: initWorkflowEdgeStatus(edges), variables, query: removeEmptyUserInput(question.value), - histories: concatHistories, + histories: newHistories, stream, detail, maxRunTimes: 200 @@ -217,7 +219,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { modules: setEntryEntries(app.modules), variables, inputFiles: files, - histories: concatHistories, + histories: newHistories, startParams: { userChatInput: text }, diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx index 1678e60f515..f050d006929 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/AppCard.tsx @@ -10,7 +10,6 @@ import { Checkbox, ModalFooter } from '@chakra-ui/react'; -import { DragHandleIcon } from '@chakra-ui/icons'; import { useRouter } from 'next/router'; import { AppSchema } from '@fastgpt/global/core/app/type.d'; import { useTranslation } from 'next-i18next'; @@ -28,11 +27,13 @@ import MyModal from '@fastgpt/web/components/common/MyModal'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { postTransition2Workflow } from '@/web/core/app/api/app'; import { AppTypeEnum } from '@fastgpt/global/core/app/constants'; +import { useSystem } from '@fastgpt/web/hooks/useSystem'; const AppCard = () => { const router = useRouter(); const { t } = useTranslation(); const { appT } = useI18n(); + const { isPc } = useSystem(); const { appDetail, setAppDetail, onOpenInfoEdit, onDelApp } = useContextSelector( AppContext, @@ -68,7 +69,7 @@ const AppCard = () => { return ( <> {/* basic info */} - + @@ -149,13 +150,15 @@ const AppCard = () => { /> )} - (appDetail.permission.hasManagePer ? onOpenInfoEdit() : undefined)} - > - - + {isPc && ( + (appDetail.permission.hasManagePer ? onOpenInfoEdit() : undefined)} + > + + + )} {TeamTagsSet && setTeamTagsSet(undefined)} />} diff --git a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx index 3b2f3ebfa94..2b358d9d12d 100644 --- a/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx +++ b/projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx @@ -29,7 +29,6 @@ import type { SettingAIDataType } from '@fastgpt/global/core/app/type.d'; import DeleteIcon, { hoverDeleteStyles } from '@fastgpt/web/components/common/Icon/delete'; import { TTSTypeEnum } from '@/web/core/app/constants'; import { getSystemVariables } from '@/web/core/app/utils'; -import { useUpdate } from 'ahooks'; import { useI18n } from '@/web/context/I18n'; import { useContextSelector } from 'use-context-selector'; import { AppContext } from '@/pages/app/detail/components/context'; @@ -49,7 +48,7 @@ const ScheduledTriggerConfig = dynamic( const WelcomeTextConfig = dynamic(() => import('@/components/core/app/WelcomeTextConfig')); const BoxStyles: BoxProps = { - px: 5, + px: [4, 6], py: '16px', borderBottomWidth: '1px', borderBottomColor: 'borderColor.low' diff --git a/projects/app/src/pages/chat/components/ChatHistorySlider.tsx b/projects/app/src/pages/chat/components/ChatHistorySlider.tsx index dd00288778f..1b5274119e5 100644 --- a/projects/app/src/pages/chat/components/ChatHistorySlider.tsx +++ b/projects/app/src/pages/chat/components/ChatHistorySlider.tsx @@ -140,7 +140,7 @@ const ChatHistorySlider = ({ fontSize={'sm'} onClick={() => canRouteToDetail && - router.replace({ + router.push({ pathname: '/app/detail', query: { appId } }) @@ -156,27 +156,26 @@ const ChatHistorySlider = ({ {/* menu */} - - {!isPc && appId && ( - - mr={1} - inlineStyles={{ - px: 1 - }} - list={[ - { label: t('core.chat.Recent use'), value: TabEnum.recently }, - ...(!isTeamChat ? [{ label: t('App'), value: TabEnum.app }] : []), - { label: t('core.chat.History'), value: TabEnum.history } - ]} - value={currentTab} - onChange={setCurrentTab} - /> - )} - + {!isPc && appId && ( + + flex={'1 0 0'} + mr={1} + inlineStyles={{ + px: 1 + }} + list={[ + { label: t('core.chat.Recent use'), value: TabEnum.recently }, + ...(!isTeamChat ? [{ label: t('App'), value: TabEnum.app }] : []), + { label: t('core.chat.History'), value: TabEnum.history } + ]} + value={currentTab} + onChange={setCurrentTab} + /> + )}