From 68df4582c1edaf1952e6c21d769981e348fb3d04 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 20 二月 2025 18:00:29 +0800
Subject: [PATCH] 流输出
---
src/components/chat/Chat.vue | 339 ++++++++++++++++++++++---------------------------------
1 files changed, 137 insertions(+), 202 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 1f15143..975fc85 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -1,11 +1,5 @@
<template>
- <ChatContainer
- :loading="chatListLoading"
- :more-is-loading="moreIsLoading"
- :is-share-page="isSharePage"
- :chat-width="chatWidth"
- ref="containerRef"
- >
+ <ChatContainer :loading="chatListLoading" :more-is-loading="moreIsLoading" :is-share-page="isSharePage" ref="containerRef">
<!-- 娑堟伅鍒楄〃 -->
<template #message-list>
<MessageList
@@ -15,6 +9,7 @@
@shareClick="shareClick"
@setCommonQuestionClick="setCommonPhraseClick"
@sendChatMessage="sendChatMessage"
+ @stopGenClick="stopGenClick"
@askMoreClick="askMoreClick"
/>
<el-empty v-else-if="isSharePage && !chatListLoading" :image-size="200">
@@ -26,17 +21,20 @@
<!-- 杈撳叆鍖哄煙 -->
<template #input-area>
- <PlayBar
- ref="playBarRef"
- v-model:voicePageIsShow="voicePageIsShow"
- :isTalking="isTalking"
- :isHome="false"
- :msgList="computedMessageList"
- v-model="messageContent.values"
- @sendClick="sendClick"
- @stopGenClick="stopGenClick"
- :style="{ width: chatWidth }"
- />
+ <div class="w-full">
+ <PlayBar
+ ref="playBarRef"
+ v-model:voicePageIsShow="voicePageIsShow"
+ :isTalking="isTalking"
+ :isHome="false"
+ :msgList="computedMessageList"
+ v-model="messageContent.values"
+ @sendClick="sendClick"
+ @stopGenClick="stopGenClick"
+ :style="{ width: chatWidth }"
+ class="mx-auto"
+ />
+ </div>
</template>
<!-- 鎶藉眽 -->
@@ -52,17 +50,17 @@
import axios from 'axios';
import { orderBy } from 'lodash-es';
import moment from 'moment';
-import { computed, onActivated, onMounted, ref } from 'vue';
+import { computed, nextTick, onActivated, onMounted, ref } from 'vue';
import { loadAmisSource } from '../amis/load';
-import { convertProcessItem, convertProcessToStep, formatShowTimeYear, useScrollLoad } from './hooks/useScrollLoad';
+import { useScrollLoad } from './hooks/useScrollLoad';
import type { ChatContent } from './model/types';
import { AnswerState, AnswerType, RoleEnum, type ChatMessage } from './model/types';
import { getShareChatJsonByPost, questionStreamByPost } from '/@/api/ai/chat';
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
import { Logger } from '/@/model/logger/Logger';
-
-import { ElMessage } from 'element-plus';
+import { triggerRef } from 'vue';
+import { ElLoadingService, ElMessage } from 'element-plus';
import ChatContainer from './components/ChatContainer.vue';
import ShareLinkDlg from './components/shareLink/index.vue';
import router from '/@/router';
@@ -79,12 +77,18 @@
import emitter from '/@/utils/mitt';
import { useCompRef } from '/@/utils/types';
import { toMyFixed } from '/@/utils/util';
+import { useLoadData } from './hooks/useLoadData';
+import { useSyncMsg } from './hooks/useSyncMsg';
+import { getCurrentPosition } from '/@/utils/brower';
const containerRef = useCompRef(ChatContainer);
const chatListDom = computed(() => containerRef.value?.chatListDom);
-const chatWidth = '75%';
+const scrollToBottom = () => {
+ containerRef.value?.scrollToBottom();
+};
+const { loadReplyData, parseContent, parseExtraContent, convertProcessItem, convertProcessToStep, formatShowTimeYear } = useLoadData();
const voicePageIsShow = ref(false);
let isTalking = ref(false);
-
+const chatWidth = computed(() => containerRef.value?.chatWidth);
let messageContent = ref<ChatContent>({
type: AnswerType.Text,
values: '',
@@ -97,116 +101,22 @@
return messageList.value.filter((v) => !!v);
});
-const parseExtraContent = (res) => {
- if (!res) return {};
- const askMoreList = orderBy(res.context_history, [(item) => Number(item.radio)], ['desc']);
- const errCode = res?.err_code;
- const errMsg = res?.json_msg;
- const origin = res;
-
- return {
- askMoreList,
- errCode,
- errMsg,
- origin,
- };
-};
-
-const parseContent = (res, reportIsShow = false, extraContent?) => {
- if (!res) return null;
- let content: ChatContent = {
- type: AnswerType.Text,
- values: '瑙ｆ瀽澶辫触锛�',
- };
- if (res.type) {
- res.answer_type = res.type;
- }
- const curExtraContent = parseExtraContent(res);
-
- switch (res.answer_type) {
- case AnswerType.RecordSet:
- content = {
- type: AnswerType.RecordSet,
- values: res.values,
- };
- break;
- case AnswerType.Text:
- content = {
- type: AnswerType.Text,
- values: res.values ?? res.answer,
- };
- break;
- case AnswerType.Script:
- content = {
- type: AnswerType.Script,
- values: res,
- };
- break;
-
- case AnswerType.Knowledge:
- content = {
- type: AnswerType.Knowledge,
- values: res.knowledge,
- };
-
- break;
- case AnswerType.Report:
- content = {
- type: AnswerType.Report,
- values: (res?.reports ?? []).map((item) => ({
- content: parseContent(item, reportIsShow, { origin: item, conclusion: item.conclusion ?? [] }),
- })),
- };
- break;
-
- case AnswerType.Summary:
- content = {
- type: AnswerType.Summary,
- values: res.summary?.map((item) => {
- item.reportIsShow = reportIsShow;
- return item;
- }),
- };
- break;
- case AnswerType.Url:
- content = {
- type: AnswerType.Url,
- values: res.url,
- };
- break;
- case AnswerType.Map:
- content = {
- type: AnswerType.Map,
- values: res.values,
- };
- break;
- default:
- content = {
- type: AnswerType.Text,
- values: '瑙ｆ瀽澶辫触锛�',
- };
- break;
- }
- if (!extraContent) {
- content = {
- ...content,
- ...curExtraContent,
- };
- } else {
- content = {
- ...content,
- ...extraContent,
- };
- }
-
- return content;
-};
-
let questionRes = null;
-let position = null;
const preQuestion = ref(null);
let lastAxiosSource: CancelTokenSource = null;
+
+// 閫氳繃淇敼 isTalking 鏉ヨЕ鍙戞洿鏂�
+const triggerRefresh = () => {
+ isTalking.value = !isTalking.value;
+
+ nextTick(() => {
+ isTalking.value = !isTalking.value;
+ });
+};
+
+let streamOutputIsStart = false;
+let position: Position = null;
const questionAi = async (text) => {
let judgeParams = null;
if (!preQuestion.value) {
@@ -224,11 +134,21 @@
...judgeParams,
} as any;
- if (position) {
- const longitude = position.coords.longitude;
- const latitude = position.coords.latitude;
- params.cur_pos = [longitude, latitude].join(',');
- }
+ // if (!position) {
+ // const loadingInstance = ElLoadingService({
+ // text: '鑾峰彇浣嶇疆涓�...',
+ // target: '.layout-parent',
+ // fullscreen:false,
+ // });
+ // position = await getCurrentPosition().finally(() => {
+ // loadingInstance.close();
+ // });
+ // }
+
+ // if (position) {
+ // const { latitude, longitude } = position;
+ // params.cur_pos = [longitude, latitude].join(',');
+ // }
if (activeGroupType.value) {
params.group_type = activeGroupType.value;
@@ -255,33 +175,36 @@
};
const checkReportEmpty = () => {
const isEmpty = !questionRes?.reports || questionRes?.reports?.length === 0;
-
return isEmpty;
};
questionStreamByPost(
params,
(chunkRes) => {
Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
-
if (chunkRes.mode === 'result') {
lastIsResult = true;
const res = chunkRes.value;
-
if (checkReportEmpty()) {
const resReport = getResReport();
resReport.reports.push(res);
questionRes = resReport;
+ // resReport.reports = resReport.reports.concat([]);
resolve(resReport);
} else {
const lastMsg = computedMessageList.value.at(-1);
-
+ // lastMsg.content.values = lastMsg.content.values.concat([]);
// 宸茬粡瑙ｆ瀽杩囦竴娆� reports
+ if (!lastMsg.content.values) {
+ lastMsg.content.values = [];
+ }
+
lastMsg.content.values.push({
content: parseContent(res, true, {
origin: res,
}),
});
}
+ triggerRefresh();
return;
// chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽';
}
@@ -340,14 +263,29 @@
chunkRes.value = '鍒嗘瀽缁撴潫';
}
}
+ const getLastGroup = () => {
+ const lastGroup = computedMessageList.value.at(-1).stepGroup[0];
+ return lastGroup;
+ };
+ const getLastStepList = () => {
+ const stepList = getLastGroup()?.value ?? [];
+ return stepList;
+ };
+ const getLastStepItem = () => {
+ const stepList = getLastStepList();
+ const lastStepItem = stepList.at(-1);
+ return lastStepItem;
+ };
+
+ const checkStepItem = (stepItem) => {
+ if (!stepItem.subStep) {
+ stepItem.subStep = [];
+ }
+ };
if (chunkRes.mode === 'question') {
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
- const stepList = lastGroup?.value ?? [];
- const lastStepItem = stepList.at(-1);
- if (!lastStepItem.subStep) {
- lastStepItem.subStep = [];
- }
+ const lastStepItem = getLastStepItem();
+ checkStepItem(lastStepItem);
lastStepItem.subStep.push({
type: chunkRes.value.type,
data: chunkRes.value,
@@ -355,40 +293,62 @@
scrollToBottom();
return;
}
- // 鏆傛椂涓嶈�冭檻澶氫釜 report鎯呭喌
- // if (lastIsResult && chunkRes.mode !== 'finish') {
- // // 寮�濮嬪鍔犳柊鐨� stepGroup
- // computedMessageList.value.at(-1).stepGroup.push({
- // value: [],
- // isShow: true,
- // });
- // lastIsResult = false;
- // }
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
+ // 鏆傛椂涓嶈�冭檻澶氫釜 report 鎯呭喌
+
+ if (lastIsResult && chunkRes.mode !== 'finish') {
+ // const lastTow = computedMessageList.value.at(-1);
+ // lastTow.stepGroup.at(-1).value.at(-1).finishLoading = true;
+ // lastTow.content.values = lastTow.content.values.concat([]);
+
+ // 寮�濮嬪鍔犳柊鐨� stepGroup锛屽悗缁殑 stepGroup 骞舵病鏈夊疄闄呬綔鐢紝鍙槸涓轰簡鍋氳凯浠ｇ敤锛岃凯浠ｅ嚭缁勪欢锛屽睅灞变唬鐮佸疄鍦ㄥお闅炬敼浜嗭紒锛侊紒
+ computedMessageList.value.at(-1).stepGroup.push({
+ value: [],
+ isShow: true,
+ });
+ lastIsResult = false;
+ }
+ const lastGroup = computedMessageList.value.at(-1).stepGroup[0];
const stepList = lastGroup?.value ?? [];
const currentTimeStamp = new Date().getTime();
- const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
if (chunkRes.mode === 'finish') {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
stepList.at(-1).ms = ms;
isTalking.value = false;
-
+ streamOutputIsStart = false;
return;
}
if (stepList?.length >= 1) {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+
stepList.at(-1).ms = ms;
} else {
const stepGroup = computedMessageList.value.at(-1).stepGroup;
if (stepGroup.length > 1) {
const lastStepList = stepGroup.at(-2).value;
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+
lastStepList.at(-1).ms = ms;
}
}
lastTimestamp = currentTimeStamp;
- const stepItem = convertProcessItem(chunkRes);
- stepList.push(stepItem);
+ if (!streamOutputIsStart) {
+ const stepItem = convertProcessItem(chunkRes);
+ stepList.push(stepItem);
+ } else {
+ const lastItem = stepList.at(-1);
+ lastItem.title += chunkRes.value ?? '';
+ }
+
+ if (chunkRes.mode === 'begin_stream') {
+ streamOutputIsStart = true;
+ }
+ if (chunkRes.mode === 'end_stream') {
+ streamOutputIsStart = false;
+ }
+
// 寮哄埗瑙﹀彂鏇存柊
scrollToBottom();
@@ -487,15 +447,15 @@
try {
const [userItem, assistantItem] = addChatItem(content);
-
resMsgContent = await questionAi(content.values);
-
updateLoadIndex();
userItem.historyId = questionRes?.history_id;
+ const current = moment().format('YYYY-MM-DD HH:mm:ss');
+ userItem.createTime = current;
userItem.content.values = questionRes?.question ?? userItem.content.values;
assistantItem.historyId = questionRes?.history_id;
- const currentTime = formatShowTimeYear(moment().format('YYYY-MM-DD HH:mm:ss'));
+ const currentTime = formatShowTimeYear(current);
assistantItem.createTime = currentTime;
assistantItem.content = resMsgContent;
setTimeout(() => {
@@ -513,9 +473,21 @@
container: chatListDom,
historyGroupId: currentRouteId,
messageList,
- parseAnswerContent: parseContent,
+ loadReplyData,
});
-
+useSyncMsg({
+ msgList: messageList,
+ updateLoadIndex,
+ historyGroupId: currentRouteId,
+ checkCanSync: (data) => {
+ return !isTalking.value && !moreIsLoading.value;
+ },
+ showTip: (data) => {
+ playBarRef.value.showSyncTip(data);
+ },
+ loadReplyData,
+ scrollToBottom,
+});
const chatListLoading = ref(true);
onActivated(() => {
@@ -528,9 +500,6 @@
values: activeChatRoom.value?.title,
};
sendChatMessage();
-};
-const scrollToBottom = () => {
- containerRef.value?.scrollToBottom();
};
const initHistoryChat = () => {
@@ -609,8 +578,6 @@
loadAmisSource();
});
-
-
const askMoreClick = (item) => {
if (!item.question) return;
sendChatMessage({ type: AnswerType.Text, values: item.question });
@@ -640,37 +607,5 @@
</script>
<style scoped lang="scss">
-pre {
- font-family: -apple-system, 'Noto Sans', 'Helvetica Neue', Helvetica, 'Nimbus Sans L', Arial, 'Liberation Sans', 'PingFang SC',
- 'Hiragino Sans GB', 'Noto Sans CJK SC', 'Source Han Sans SC', 'Source Han Sans CN', 'Microsoft YaHei', 'Wenquanyi Micro Hei',
- 'WenQuanYi Zen Hei', 'ST Heiti', SimHei, 'WenQuanYi Zen Hei Sharp', sans-serif;
-}
-
-.more-loading {
- :deep(.el-loading-spinner) {
- --loading-size: 35px;
- margin-top: 0;
- .circular {
- width: var(--loading-size);
- height: var(--loading-size);
- }
- }
-}
-
-:deep(.el-step__icon.is-text) {
- --radius-size: 24px;
- width: var(--radius-size);
- height: var((--radius-size));
-}
-
-:deep(.el-step__icon-inner) {
- font-size: 16px !important;
-}
-:deep(.el-step__description) {
- min-height: 20px;
-}
-
-:deep(.el-step:last-of-type .el-step__description) {
- // display: none;
-}
+@import './index.scss';
</style>
--
Gitblit v1.9.3