From 9a22a8f4b20a85c1a9757b4a46736447cae0261d Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 22 八月 2024 10:33:18 +0800
Subject: [PATCH] fix: 会话修改
---
src/views/sessionManager/components/agentSession.vue | 360 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 291 insertions(+), 69 deletions(-)
diff --git a/src/views/sessionManager/components/agentSession.vue b/src/views/sessionManager/components/agentSession.vue
index b408c10..3226171 100644
--- a/src/views/sessionManager/components/agentSession.vue
+++ b/src/views/sessionManager/components/agentSession.vue
@@ -3,7 +3,30 @@
<div class="header___lEPyH">
<div class="chatHeader">
<div class="chatHeaderBox">
- <span class="title">{{agentTitle}}</span>
+<!-- <span class="title">{{agentTitle}}</span>-->
+ <a-popover
+ position="bottom"
+ trigger="click"
+ >
+ <a-button border
+ >{{agentTitle}}
+ <icon-down style="margin-left: 4px" />
+ </a-button>
+ <template #content>
+ <a-button
+ type="text"
+ class="button"
+ style="color: #2a2a2b"
+ @click="handleClick()"
+ >
+ <template #icon>
+ <icon-edit />
+ </template>
+ 淇敼鍚嶇О
+ </a-button>
+ <!-- <a-divider style="margin: 10px 0" />-->
+ </template>
+ </a-popover>
</div>
</div>
</div>
@@ -12,13 +35,13 @@
id="agentHome"
class="chat-list"
style="
- width: 90%;
+ width: 80%;
overflow: auto;
height: calc(100vh - 380px);
margin: 0px auto 20px;
"
>
- <div class="chat-item" v-for="sessionDetail in sessionDetailList">
+ <div class="chat-item" v-for="(sessionDetail,index) in sessionDetailList">
<a-comment v-if="sessionDetail.role === 'user'">
<template #avatar>
<img
@@ -42,11 +65,28 @@
/>
</template>
<template #content>
- <a-card :class="{ chatItemAnswer: theme === 'light' }">
- <div :class="{ light: theme === 'light' }"
- >{{ sessionDetail.content }}
- </div>
- </a-card>
+<!-- <a-card :class="{ chatItemAnswer: theme === 'light' }">-->
+<!-- <div :class="{ light: theme === 'light' }"-->
+<!-- >{{ sessionDetail.content }}-->
+<!-- </div>-->
+<!-- </a-card>-->
+ <a-textarea
+ readonly
+ auto-size
+ v-model="sessionDetail.content"
+ :class="{ chatItemAnswer: theme === 'light' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
+ >
+ </a-textarea>
+ </template>
+ <template #actions>
+ <span class="action" v-if="index != 0" @click="copy(sessionDetail.content)">
+ <icon-copy /> 澶嶅埗
+ </span>
+ <span class="action" v-if="index != 0 && index == sessionDetailList.length - 1" @click="reGenerate()">
+ <icon-refresh /> 閲嶆柊鐢熸垚
+ </span>
</template>
</a-comment>
<a-comment v-else-if="sessionDetail.role === 'last'">
@@ -63,9 +103,19 @@
auto-size
v-model="displayedText"
:class="{ chatItemAnswer: theme === 'light' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
>
</a-textarea>
</template>
+<!-- <template #actions>-->
+<!-- <div class="action"-->
+<!-- @click="stopChat"-->
+<!-- style="background: var(--color-bg-2);color: var(--color-primary-light-4);" v-if="displayedText != ''">-->
+<!-- <icon-record-stop />-->
+<!-- 鍋滄鐢熸垚-->
+<!-- </div>-->
+<!-- </template>-->
</a-comment>
</div>
<!-- <div class="chartStart" v-if="isStart" @click="startChat"
@@ -84,6 +134,8 @@
show-word-limit
:disabled="chatDis"
:class="{ textItemAnswer: theme === 'dark' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
:auto-size="{
minRows: 12,
maxRows: 5,
@@ -94,14 +146,28 @@
<a-button
:disabled="chatDis"
@click="sentClick"
- type="primary"
+ type="text"
style="border-radius: 24px"
:loading="loading"
- size="large"
- >鍙戦��</a-button
+ >
+ <icon-send size="32" style="color: #0960bd;"/>
+ </a-button
>
</div>
</div>
+ <a-modal v-model:visible="visible" title="淇敼鍚嶇О" @before-open="handleOpened" @cancel="handleCancel" :footer="false" title-align="start">
+ <a-form ref="formRef" :rules="rules" :model="agentObj" @submit="handleSubmit" >
+ <a-form-item field="name" label="鍚嶇О">
+ <a-input v-model="agentTitle" placeholder="璇疯緭鍏ュ悕绉�"/>
+ </a-form-item>
+ <a-form-item>
+ <div style="width: 100%;text-align: right">
+ <a-button @click="visible = false">鍙栨秷</a-button>
+ <a-button style="margin-left: 10px" type="primary" html-type="submit">纭畾</a-button>
+ </div>
+ </a-form-item>
+ </a-form>
+ </a-modal>
</div>
</template>
@@ -113,6 +179,8 @@
import { EventSourceParserStream } from 'eventsource-parser/stream';
import { agentResetApi, agentSetApi, getAgentSessionDetailsApi } from "@/api/agentSession";
import EventBus from '@/utils/EventBus';
+import useClipboard from "vue-clipboard3";
+import { addSessionApi, getSessionDetailsApi } from "@/api/session";
const props = defineProps({
modalObj: Object,
});
@@ -139,12 +207,59 @@
const agentList = ref([]);
const selectValue = ref('');
const sectionList = ref({});
-
+let chatObj = reactive({});
+const isStopChat = ref(false)
const appStore = useAppStore();
const theme = computed(() => {
return appStore.theme;
});
+const visible = ref(false);
+let isHistory = ref(false);//鏄惁鏄巻鍙茶褰�
+let dsl = reactive({});
+
+
+
+const rules = {
+ name: [
+ {
+ required: true,
+ message:'鍚嶇О涓嶅厑璁镐负绌�',
+ },
+ ],
+}
+
+const handleSubmit = async({values, errors}) => {
+ if(errors) return;
+ // agentObj.name = agentTitle.value;
+ // agentObj.conversation_id = agentObj.id;
+ console.log(agentObj, 'agentObj');
+ let chatData = {
+ id:agentObj.id,
+ conversation_id:agentObj.id,
+ name: agentTitle.value
+ }
+ const { code, data } = await addSessionApi(chatData);
+ if (data) {
+ Message.success("淇敼鎴愬姛");
+ handleCancel()
+ // queryAgentSessionDetail(agentObj.id);
+ }
+}
+
+const handleClick = () => {
+ visible.value = true;
+};
+const handleCancel = () => {
+ visible.value = false;
+}
+
+const handleOpened =(el) => {
+ // Object.assign(form,{
+ // name: '',// 鐢ㄦ埛鍚�
+ // });
+ // formRef.value.resetFields();
+}
// 鍒濆鍖栭〉闈�
@@ -154,6 +269,7 @@
const createNewAgent = async (session) => {
Object.assign(agentObj, session);
+ isHistory.value = false;
initPage();
@@ -241,18 +357,47 @@
if (code == 0) {
console.log(data,'浼氳瘽璇︽儏');
sessionDetailList.value = data.dsl.messages;
- agentTitle.value = data.name || '鏈懡鍚嶄細璇�';
+ agentTitle.value = `鍜�${data.title}鐨勪細璇漙 || '鏈懡鍚嶄細璇�';
refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
}
};
+// 鑾峰彇agent浼氳瘽璇︽儏
+const querySessionDetail = async (session) => {
+ Object.assign(agentObj, session);
+ agentObj.id = session.dialog_id;
+ activeSessionId.value = session.id;
+ agentTitle.value = session.name;
+ console.log(agentTitle.value, '浼氳瘽鍚嶇О');
+ const { code, data } = await getSessionDetailsApi(session.id);
+ if (code == 200) {
+ sessionDetailList.value = data.message.messages;
+ const res = await getAgentSessionDetailsApi(session.dialog_id);
+ if (res.code == 0) {
+ console.log(res.data,'浼氳瘽璇︽儏');
+ Object.assign(dsl, res.data.dsl);
+ refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
+ }
+ }
+};
+const { toClipboard } = useClipboard();
+const copy = async (text) => {
+ await toClipboard(text); //鍙傛暟涓鸿澶嶅埗鐨勬枃鏈�
+}
const sentClick = () => {
sendMessage('click');
};
+
+// 閲嶆柊鐢熸垚
+const reGenerate = () => {
+ let inputContent = sessionDetailList.value[sessionDetailList.value.length-2].content
+ startChat(inputContent)
+};
+
const sendMessage = async (event) => {
if (event.keyCode == 13 || event === 'click') {
if (!event.shiftKey) {
@@ -261,8 +406,8 @@
event.preventDefault(); // 闃绘榛樿琛屼负锛屽嵆涓嶆崲琛�
}
- chatDis.value = true;
- loading.value = true;
+ // chatDis.value = true;
+ // loading.value = true;
// if (!agentObj.id) {
// Message.warning('璇烽�夋嫨浼氳瘽');
// chatDis.value = false;
@@ -275,58 +420,7 @@
// }
if (inputMsg.value) {
- sessionDetailList.value.push({
- content: inputMsg.value,
- role: 'user',
- });
- sessionDetailList.value.push({ role: 'last' });
- refreshScroll();
- const response = await fetch(
- '/api/v1/canvas/completion',
- {
- method: 'POST',
- headers: {
- 'Authorization': getAuthorization(),
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify({
- id: agentObj.id,
- message: inputMsg.value,
- }),
- }
- );
-
- const reader = response?.body
- ?.pipeThrough(new TextDecoderStream())
- .pipeThrough(new EventSourceParserStream())
- .getReader();
- currIndex.value = 0;
- while (true) {
- const x = await reader?.read();
- if (x) {
- const { done, value } = x;
- console.log(x, 999);
- try {
- const val = JSON.parse(value?.data || '');
- const d = val?.data;
- if (typeof d !== 'boolean') {
- console.info('data:', d);
- streamStr.value = d.content;
- startDisplayStr();
- }
- } catch (e) {
- console.warn(e);
- }
- if (done) {
- console.info('done');
- displayedText.value = '';
- queryAgentSessionDetail(agentObj.id);
- break;
- }
- }
- }
- chatDis.value = false;
- loading.value = false;
+ startChat(inputMsg.value)
inputMsg.value = '';
} else {
Message.warning('娑堟伅涓嶈兘涓虹┖');
@@ -336,6 +430,106 @@
}
}
};
+
+
+const startChat = async(valMsg)=>{
+ sessionDetailList.value.push({
+ content: valMsg,
+ role: 'user',
+ });
+ sessionDetailList.value.push({ role: 'last' });
+ refreshScroll();
+ let chatStr = {
+ id: agentObj.id,
+ message: valMsg,
+ }
+ if(isHistory.value){
+ chatStr.dsl = dsl;
+ }
+ const response = await fetch(
+ '/api/v1/canvas/completion',
+ {
+ method: 'POST',
+ headers: {
+ 'Authorization': getAuthorization(),
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(chatStr),
+ }
+ );
+
+ const reader = response?.body
+ ?.pipeThrough(new TextDecoderStream())
+ .pipeThrough(new EventSourceParserStream())
+ .getReader();
+ currIndex.value = 0;
+ while (true) {
+ const x = await reader?.read();
+ if (x) {
+ const { done, value } = x;
+ // console.log(x, 999);
+ try {
+ const val = JSON.parse(value?.data || '');
+ const d = val?.data;
+ if (typeof d !== 'boolean') {
+ console.info('data:', d);
+ streamStr.value = d.content;
+ startDisplayStr();
+ }
+ } catch (e) {
+ console.warn(e);
+ }
+ if (done) {
+ console.info('done');
+ displayedText.value = '';
+ queryAgentSessionDetail(agentObj.id);
+ EventBus.emit('queryAppUsageList');
+ break;
+ }
+ }
+ }
+ chatDis.value = false;
+ loading.value = false;
+}
+
+const stopChat=async()=>{
+ // const { code, data } = await stopChatApi(activeSessionId.value);
+ // if (code === 200) {
+ // Message.success("宸插仠姝�");
+ // queryNewSessionDetail(activeSessionId.value);
+ // }
+ loading.value = false;
+ chatDis.value = false;
+ isStopChat.value = true;
+ console.log('stopChat');
+ console.log(displayedText.value, 'displayedText');
+ console.log(sessionDetailList.value, 'sessionDetailList');
+ let inputText = sessionDetailList.value[sessionDetailList.value.length-2].content
+ // 鏁扮粍鍚堝苟
+ let lastArr = [{
+ content: inputText,
+ role: "user"
+ },{
+ content: displayedText.value,
+ role: "assistant"
+ }]
+ sessionDetailList.value = sessionDetailList.value.splice(0, sessionDetailList.value.length-2).concat(lastArr);
+ console.log(sessionDetailList.value, 'sessionDetailList2');
+ console.log(chatObj, 'chatObj瀵硅薄');
+ chatObj.message = chatObj.message.concat(lastArr);
+ // clearTimeout(timer!);
+ // timer = null;
+ // const { code, data } = await addSessionApi(chatObj);
+ // if (data) {
+ // //鍋滄瀹氭椂鍣�
+ // clearTimeout(timer!);
+ // timer = null;
+ // displayedText.value = "";
+ // queryNewSessionDetail(activeSessionId.value);
+ // }
+
+
+}
const handleShiftEnter = (event) => {
event.preventDefault();
@@ -375,9 +569,15 @@
EventBus.on('createAgent', (data) => {
createNewAgent(data);
});
+ EventBus.on('queryAgentSessionDetail', (data) => {
+ Object.assign(agentObj, data);
+ isHistory.value = true;
+ querySessionDetail(data);
+ });
});
onBeforeUnmount(() => {
EventBus.off('createAgent');
+ EventBus.off('queryAgentSessionDetail');
});
watch(
@@ -478,6 +678,8 @@
.chat_bottom {
display: flex;
align-items: center;
+ width: 78%;
+ margin: 0 auto;
.center-bottom {
// position: absolute;
// width: 90%;
@@ -498,8 +700,8 @@
.btn-send {
position: absolute !important;
- right: 10px;
- bottom: 10px;
+ right: 4px;
+ top: 80px;
z-index: 10;
}
:deep(.arco-btn-size-large) {
@@ -545,6 +747,26 @@
text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙锋潵浠ｆ浛琚殣钘忕殑鏂囧瓧 */
white-space: nowrap; /* 涓嶆崲琛岋紝浣垮唴瀹瑰湪涓�琛屽唴鏄剧ず */
max-width: 200px;
+ .title{
+ color: var(--color-text-1);
+ font-size: 12px;
+ }
}
}
+
+.action {
+ cursor: pointer;
+ display: inline-block;
+ padding: 0 10px;
+ color: var(--color-text-1);
+ line-height: 24px;
+ background: transparent;
+ border-radius: 2px;
+ cursor: pointer;
+ transition: all 0.1s ease;
+ font-size: 12px;
+}
+.action:hover {
+ background: var(--color-fill-3);
+}
</style>
--
Gitblit v1.8.0