mirror of
https://github.com/labring/FastGPT.git
synced 2025-10-17 16:45:02 +00:00
V4.12.0 features (#5435)
* add logs chart (#5352) * charts * chart data * log chart * delete * rename api * fix * move api * fix * fix * pro config * fix * feat: Repository interaction (#5356) * feat: 1好像功能没问题了,明天再测 * feat: 2 解决了昨天遗留的bug,但全选按钮又bug了 * feat: 3 第三版,解决了全选功能bug * feat: 4 第四版,下面改小细节 * feat: 5 我勒个痘 * feat: 6 * feat: 6 pr * feat: 7 * feat: 8 * feat: 9 * feat: 10 * feat: 11 * feat: 12 * perf: checkbox ui * refactor: tweak login loyout (#5357) Co-authored-by: Archer <545436317@qq.com> * login ui * app chat log chart pro display (#5392) * app chat log chart pro display * add canopen props * perf: pro tag tip * perf: pro tag tip * feat: openrouter provider (#5406) * perf: login ui * feat: openrouter provider * provider * perf: custom error throw * perf: emb batch (#5407) * perf: emb batch * perf: vector retry * doc * doc (#5411) * doc * fix: team folder will add to workflow * fix: generateToc shell * Tool price (#5376) * resolve conflicts for cherry-pick * fix i18n * Enhance system plugin template data structure and update ToolSelectModal to include CostTooltip component * refactor: update systemKeyCost type to support array of objects in plugin and workflow types * refactor: simplify systemKeyCost type across plugin and workflow types to a single number * refactor: streamline systemKeyCost handling in plugin and workflow components * fix * fix * perf: toolset price config;fix: workflow array selector ui (#5419) * fix: workflow array selector ui * update default model tip * perf: toolset price config * doc * fix: test * Refactor/chat (#5418) * refactor: add homepage configuration; add home chat page; add side bar animated collapse and layout * fix: fix lint rules * chore: improve logics and code * chore: more clearer logics * chore: adjust api --------- Co-authored-by: Archer <545436317@qq.com> * perf: chat setting code * del history * logo image * perf: home chat ui * feat: enhance chat response handling with external links and user info (#5427) * feat: enhance chat response handling with external links and user info * fix * cite code * perf: toolset add in workflow * fix: test * fix: search paraentId * Fix/chat (#5434) * wip: rebase了upstream * wip: adapt mobile UI * fix: fix chat page logic and UI * fix: fix UI and improve some logics * fix: model selector missing logo; vision model to retrieve file * perf: role selector * fix: chat ui * optimize export app chat log (#5436) * doc * chore: move components to proper directory; fix the api to get app list (#5437) * chore: improve team app panel display form (#5438) * feat: add home chat log tab * chore: improve team app panel display form * chore: improve log panel * fix: spec * doc * fix: log permission * fix: dataset schema required * add loading status * remove ui weight * manage log * fix: log detail per * doc * fix: log menu * rename permission * bg color * fix: app log per * fix: log key selector * fix: log * doc --------- Co-authored-by: heheer <zhiyu44@qq.com> Co-authored-by: colnii <1286949794@qq.com> Co-authored-by: 伍闲犬 <76519998+xqvvu@users.noreply.github.com> Co-authored-by: Ctrlz <143257420+ctrlz526@users.noreply.github.com> Co-authored-by: 伍闲犬 <whoeverimf5@gmail.com> Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { connectionMongo, getMongoModel } from '../../common/mongo';
|
||||
const { Schema } = connectionMongo;
|
||||
import { type ChatSchema as ChatType } from '@fastgpt/global/core/chat/type.d';
|
||||
import { ChatSourceEnum, ChatSourceMap } from '@fastgpt/global/core/chat/constants';
|
||||
import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
|
||||
import {
|
||||
TeamCollectionName,
|
||||
TeamMemberCollectionName
|
||||
|
@@ -4,6 +4,7 @@ import { addLog } from '../../common/system/log';
|
||||
import { delFileByFileIdList, getGFSCollection } from '../../common/file/gridfs/controller';
|
||||
import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
|
||||
import { MongoChat } from './chatSchema';
|
||||
import { UserError } from '@fastgpt/global/common/error/utils';
|
||||
|
||||
export async function getChatItems({
|
||||
appId,
|
||||
@@ -72,7 +73,8 @@ export const deleteChatFiles = async ({
|
||||
chatIdList?: string[];
|
||||
appId?: string;
|
||||
}) => {
|
||||
if (!appId && !chatIdList) return Promise.reject('appId or chatIdList is required');
|
||||
if (!appId && !chatIdList)
|
||||
return Promise.reject(new UserError('appId or chatIdList is required'));
|
||||
|
||||
const appChatIdList = await (async () => {
|
||||
if (appId) {
|
||||
|
@@ -14,6 +14,7 @@ import { pushChatLog } from './pushChatLog';
|
||||
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
|
||||
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
|
||||
import { extractDeepestInteractive } from '@fastgpt/global/core/workflow/runtime/utils';
|
||||
import { MongoAppChatLog } from '../app/logs/chatLogsSchema';
|
||||
|
||||
type Props = {
|
||||
chatId: string;
|
||||
@@ -163,6 +164,62 @@ export async function saveChat({
|
||||
});
|
||||
});
|
||||
|
||||
try {
|
||||
const userId = outLinkUid || tmbId;
|
||||
const now = new Date();
|
||||
const fifteenMinutesAgo = new Date(now.getTime() - 15 * 60 * 1000);
|
||||
|
||||
const aiResponse = processedContent.find((item) => item.obj === ChatRoleEnum.AI);
|
||||
const errorCount = aiResponse?.responseData?.some((item) => item.errorText) ? 1 : 0;
|
||||
const totalPoints =
|
||||
aiResponse?.responseData?.reduce(
|
||||
(sum: number, item: any) => sum + (item.totalPoints || 0),
|
||||
0
|
||||
) || 0;
|
||||
|
||||
const hasHistoryChat = await MongoAppChatLog.exists({
|
||||
appId,
|
||||
userId,
|
||||
createTime: { $lt: now }
|
||||
});
|
||||
|
||||
await MongoAppChatLog.updateOne(
|
||||
{
|
||||
chatId,
|
||||
appId,
|
||||
updateTime: { $gte: fifteenMinutesAgo }
|
||||
},
|
||||
{
|
||||
$inc: {
|
||||
chatItemCount: 1,
|
||||
errorCount,
|
||||
totalPoints,
|
||||
totalResponseTime: durationSeconds
|
||||
},
|
||||
$set: {
|
||||
updateTime: now,
|
||||
sourceName
|
||||
},
|
||||
$setOnInsert: {
|
||||
appId,
|
||||
teamId,
|
||||
chatId,
|
||||
userId,
|
||||
source,
|
||||
createTime: now,
|
||||
goodFeedbackCount: 0,
|
||||
badFeedbackCount: 0,
|
||||
isFirstChat: !hasHistoryChat
|
||||
}
|
||||
},
|
||||
{
|
||||
upsert: true
|
||||
}
|
||||
);
|
||||
} catch (error) {
|
||||
addLog.error('update chat log error', error);
|
||||
}
|
||||
|
||||
if (isUpdateUseTime) {
|
||||
await MongoApp.findByIdAndUpdate(appId, {
|
||||
updateTime: new Date()
|
||||
|
37
packages/service/core/chat/setting/schema.ts
Normal file
37
packages/service/core/chat/setting/schema.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import { connectionMongo, getMongoModel } from '../../../common/mongo';
|
||||
import { type ChatSettingSchema as ChatSettingType } from '@fastgpt/global/core/chat/setting/type';
|
||||
import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
|
||||
import { AppCollectionName } from '../../app/schema';
|
||||
|
||||
const { Schema } = connectionMongo;
|
||||
|
||||
export const ChatSettingCollectionName = 'chat_settings';
|
||||
|
||||
const ChatSettingSchema = new Schema({
|
||||
teamId: {
|
||||
type: Schema.Types.ObjectId,
|
||||
ref: TeamCollectionName,
|
||||
required: true
|
||||
},
|
||||
appId: {
|
||||
type: Schema.Types.ObjectId,
|
||||
ref: AppCollectionName,
|
||||
required: true
|
||||
},
|
||||
slogan: String,
|
||||
dialogTips: String,
|
||||
selectedTools: {
|
||||
type: Array,
|
||||
default: []
|
||||
},
|
||||
homeTabTitle: String,
|
||||
wideLogoUrl: String,
|
||||
squareLogoUrl: String
|
||||
});
|
||||
|
||||
ChatSettingSchema.index({ teamId: 1 });
|
||||
|
||||
export const MongoChatSetting = getMongoModel<ChatSettingType>(
|
||||
ChatSettingCollectionName,
|
||||
ChatSettingSchema
|
||||
);
|
Reference in New Issue
Block a user