From c79dd89ef0c5a0e75c86136202e5c408c184a2f8 Mon Sep 17 00:00:00 2001
From: liudong <liudong>
Date: 星期六, 24 八月 2024 19:25:39 +0800
Subject: [PATCH] 新建会话修改
---
src/views/sessionManager/components/agentSession.vue | 476 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 384 insertions(+), 92 deletions(-)
diff --git a/src/views/sessionManager/components/agentSession.vue b/src/views/sessionManager/components/agentSession.vue
index 53aaf45..9f193ca 100644
--- a/src/views/sessionManager/components/agentSession.vue
+++ b/src/views/sessionManager/components/agentSession.vue
@@ -1,17 +1,53 @@
<template>
<!-- 鍐呭-->
+ <div class="header___lEPyH">
+ <div class="chatHeader">
+ <div class="chatHeaderBox">
+<!-- <span class="title">{{agentTitle}}</span>-->
+ <a-popover
+ position="bottom"
+ trigger="click"
+ >
+ <a-button border
+ >
+ <span style="
+ width: 100px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ ">{{ from.name }}</span>
+ <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>
<a-scrollbar
ref="scrollbar"
- id="home"
+ 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
@@ -35,11 +71,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'">
@@ -56,8 +109,18 @@
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>
@@ -77,34 +140,66 @@
show-word-limit
:disabled="chatDis"
:class="{ textItemAnswer: theme === 'dark' }"
+ :style="{backgroundColor: theme === 'light' ? '#ffffff' : '#000000'}"
+ style="border: none"
:auto-size="{
minRows: 12,
maxRows: 5,
}"
/>
- <div class="btn-send">
- <!-- <icon-send size="32" /> -->
+ <div style="width: 100%;display: flex;justify-content: space-between">
+ <span></span>
<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 class="btn-send">-->
+<!-- <!– <icon-send size="32" /> –>-->
+<!-- <a-button-->
+<!-- :disabled="chatDis"-->
+<!-- @click="sentClick"-->
+<!-- type="text"-->
+<!-- style="border-radius: 24px"-->
+<!-- :loading="loading"-->
+<!-- >-->
+<!-- <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="from" @submit="handleSubmit" >
+ <a-form-item field="name" label="鍚嶇О">
+ <a-input v-model="from.name" 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>
<script setup lang="ts">
-import { defineProps, ref, watch, defineEmits, onMounted, reactive, computed, nextTick } from "vue";
+import { defineProps, ref, watch, defineEmits, onMounted, reactive, computed, nextTick, onBeforeUnmount } from "vue";
import { Message } from '@arco-design/web-vue';
import { useAppStore } from "@/store";
import { getAuthorization } from "@/utils/auth";
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,
});
@@ -117,6 +212,7 @@
const dialogId = ref('');
const chatDis = ref(false);
const loading = ref(false);
+const agentTitle = ref("鏈懡鍚嶄細璇�");
const currIndex = ref(0);
@@ -125,27 +221,78 @@
const streamStr = ref('');
const inputMsg = ref('');
const activeSessionId = ref('');
+const conversation_id = ref('');
const fieldNames = { value: 'id', label: 'name' };
const agentObj = reactive({});
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;
});
+let from = reactive({
+ name:'鏈懡鍚嶄細璇�',
+});
+const visible = ref(false);
+let isHistory = ref(false);//鏄惁鏄巻鍙茶褰�
+let dsl = reactive({});
+const chatDataMeg = reactive({});
+
+
+const rules = {
+ name: [
+ {
+ required: true,
+ message:'鍚嶇О涓嶅厑璁镐负绌�',
+ },
+ ],
+}
+
+const handleSubmit = async({values, errors}) => {
+ if(errors) return;
+ console.log(agentObj, 'agentObj');
+ let chatData = {
+ id:conversation_id.value,
+ conversation_id:conversation_id.value,
+ name: from.name
+ }
+ const { code, data } = await addSessionApi(chatData);
+ if (data) {
+ Message.success("淇敼鎴愬姛");
+ handleCancel()
+ }
+}
+
+const handleClick = () => {
+ visible.value = true;
+};
+const handleCancel = () => {
+ visible.value = false;
+}
+
+const handleOpened =(el) => {
+ // Object.assign(form,{
+ // name: '',// 鐢ㄦ埛鍚�
+ // });
+ // formRef.value.resetFields();
+}
// 鍒濆鍖栭〉闈�
const initPage = async () => {
agentSet();
- agentReset();
- agentCompletion();
- queryAgentSessionDetail(agentObj.id);
};
+const createNewAgent = async (session) => {
+ console.log(session,'鏂板缓agent浼氳瘽瀵硅薄');
+ Object.assign(agentObj, session);
+ isHistory.value = false;
+ initPage();
+}
// 璋冪敤set鏂规硶
const agentSet = async () => {
const res = await agentSetApi({
@@ -153,8 +300,10 @@
title: agentObj.title,
dsl: agentObj.dsl,
});
- if (res.code === 200) {
- // Message.success('淇敼鎴愬姛');
+ // console.log(res,'agentSet');
+ if (res.code == 0) {
+ conversation_id.value = res.data.conversation_id;
+ agentReset();
}
}
// 璋冪敤reset鏂规硶
@@ -162,8 +311,9 @@
const res = await agentResetApi({
id: agentObj.id,
});
- if (res.code === 200) {
+ if (res.code == 0) {
// Message.success('淇敼鎴愬姛');
+ agentCompletion();
}
}
// 璋冪敤completion鏂规硶
@@ -216,23 +366,53 @@
inputMsg.value = '';
}
// 璋冪敤get鏂规硶
-
const queryAgentSessionDetail = async (id) => {
const { code, data } = await getAgentSessionDetailsApi(id);
if (code == 0) {
- console.log(data,'浼氳瘽璇︽儏');
+ console.log(data,'agent浼氳瘽璇︽儏');
+ Object.assign(chatObj, data);
sessionDetailList.value = data.dsl.messages;
- // refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
+ agentTitle.value = `${data.title}` || '鏈懡鍚嶄細璇�';
+ from.name = `${data.title}` || '鏈懡鍚嶄細璇�';
+ refreshScroll(); //鍒锋柊婊氬姩鏉′綅缃�
+ }
+};
+
+// 鍘嗗彶璁板綍璺宠浆鑾峰彇agent浼氳瘽璇︽儏
+const querySessionDetail = async (session) => {
+ conversation_id.value = session.id;
+ from.name = session.name;
+ 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,'agent浼氳瘽璇︽儏');
+ Object.assign(agentObj, res.data);
+ Object.assign(chatObj, 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) {
@@ -241,72 +421,21 @@
event.preventDefault(); // 闃绘榛樿琛屼负锛屽嵆涓嶆崲琛�
}
- chatDis.value = true;
- loading.value = true;
- if (!activeSessionId.value) {
- Message.warning('璇烽�夋嫨浼氳瘽');
- chatDis.value = false;
- loading.value = false;
- return;
- }
+ // chatDis.value = true;
+ // loading.value = true;
+ // if (!agentObj.id) {
+ // Message.warning('璇烽�夋嫨浼氳瘽');
+ // chatDis.value = false;
+ // loading.value = false;
+ // return;
+ // }
// if (displayedText.value) {
// querySessionList();
// }
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({
- conversation_id: activeSessionId.value,
- messages: 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('娑堟伅涓嶈兘涓虹┖');
@@ -314,6 +443,116 @@
loading.value = false;
}
}
+ }
+};
+
+
+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 = '';
+ if (isStopChat.value) {
+ isStopChat.value = false;
+ setChatDataMeg(chatDataMeg);
+ } else {
+ queryAgentSessionDetail(agentObj.id);
+ EventBus.emit('queryAppUsageList');
+ }
+ break;
+ }
+ }
+ }
+ chatDis.value = false;
+ loading.value = false;
+}
+
+const stopChat=async()=>{
+ // const { code, data } = await stopChatApi(agentObj.id);
+ // if (code === 200) {
+ // Message.success("宸插仠姝�");
+ // }
+ 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.dsl.messages = chatObj.dsl.messages.concat(lastArr);
+ Object.assign(chatDataMeg, {
+ id: chatObj.id,
+ conversation_id: chatObj.id,
+ message: sessionDetailList.value,
+ });
+
+}
+
+
+const setChatDataMeg = async (chatData) => {
+ const { code, data } = await addSessionApi(chatData);
+ if (data) {
+ //鍋滄瀹氭椂鍣�
+ clearTimeout(timer!);
+ timer = null;
+ // displayedText.value = "";
+ queryAgentSessionDetail(chatObj.id);
}
};
@@ -345,24 +584,33 @@
const scrollbar = ref(null);
const refreshScroll = () => {
nextTick(() => {
- const container = document.getElementById('home');
+ const container = document.getElementById('agentHome');
scrollbar.value.scrollTop(container.scrollHeight);
});
};
onMounted(() => {
-
+ EventBus.on('createAgent', (data) => {
+ createNewAgent(data);
+ });
+ EventBus.on('queryAgentSessionDetail', (data) => {
+ isHistory.value = true;
+ querySessionDetail(data);
+ });
+});
+onBeforeUnmount(() => {
+ EventBus.off('createAgent');
+ EventBus.off('queryAgentSessionDetail');
});
watch(
() => props.modalObj,
(newVal, oldVal) => {
- console.log(newVal,'鐩戝惉鍙樺寲');
- Object.assign(agentObj, newVal);
+ // Object.assign(agentObj, newVal);
//璋冪敤agent鍒濆鍖栨柟娉�
if(JSON.stringify(newVal) != '{}'){
- initPage();
+ // initPage();
}
},{
immediate: true,
@@ -454,6 +702,8 @@
.chat_bottom {
display: flex;
align-items: center;
+ width: 78%;
+ margin: 0 auto;
.center-bottom {
// position: absolute;
// width: 90%;
@@ -474,8 +724,8 @@
.btn-send {
position: absolute !important;
- right: 10px;
- bottom: 10px;
+ right: 4px;
+ top: 80px;
z-index: 10;
}
:deep(.arco-btn-size-large) {
@@ -501,4 +751,46 @@
}
}
}
+.header___lEPyH {
+ width: 100%;
+ height: 46px;
+ position: relative;
+ backdrop-filter: blur(15px);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ -webkit-backdrop-filter: blur(15px);
+ .chatHeaderBox {
+ width: auto;
+ border-radius: 8px;
+ padding: 4px 20px;
+ transition: all var(--animation-duration) var(--animation-transition);
+ display: flex;
+ align-items: flex-end;
+ overflow: hidden; /* 闅愯棌瓒呭嚭鐨勫唴瀹� */
+ 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