Skip to content

Commit 5019911

Browse files
authored
Update the front end to adapt to the new return format (#237)
Signed-off-by: Yue, Wenjiao <[email protected]>
1 parent dbee190 commit 5019911

File tree

2 files changed

+20
-32
lines changed

2 files changed

+20
-32
lines changed

ChatQnA/docker/ui/svelte/src/lib/modules/chat/ChatMessage.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
2525
export let msg: Message;
2626
export let time: string = "";
27-
console.log("msg", msg);
2827
</script>
2928

3029
<div

ChatQnA/docker/ui/svelte/src/routes/+page.svelte

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
}
6666
6767
function storeMessages() {
68-
console.log('localStorage', chatMessages);
6968
7069
localStorage.setItem(
7170
LOCAL_STORAGE_KEY.STORAGE_CHAT_KEY,
@@ -77,30 +76,10 @@
7776
const eventSource = await fetchTextStream(query, knowledge_1);
7877
7978
eventSource.addEventListener("message", (e: any) => {
80-
let currentMsg = e.data;
81-
currentMsg = currentMsg.replace("@#$", " ")
82-
console.log("currentMsg", currentMsg);
83-
if (currentMsg == "[DONE]") {
84-
console.log("done getCurrentTimeStamp", getCurrentTimeStamp);
85-
let startTime = chatMessages[chatMessages.length - 1].time;
86-
87-
loading = false;
88-
let totalTime = parseFloat(((getCurrentTimeStamp() - startTime) / 1000).toFixed(2));
89-
console.log("done totalTime", totalTime);
90-
console.log(
91-
"chatMessages[chatMessages.length - 1]",
92-
chatMessages[chatMessages.length - 1]
93-
);
94-
95-
if (chatMessages.length - 1 !== -1) {
96-
chatMessages[chatMessages.length - 1].time = totalTime;
97-
}
98-
console.log("done chatMessages", chatMessages);
99-
100-
storeMessages();
101-
} else {
79+
let Msg = e.data;
80+
if (Msg.startsWith("b")) {
81+
const currentMsg = Msg.slice(2, -1);
10282
if (chatMessages[chatMessages.length - 1].role == MessageRole.User) {
103-
10483
chatMessages = [
10584
...chatMessages,
10685
{
@@ -110,13 +89,24 @@
11089
time: startSendTime,
11190
},
11291
];
113-
console.log("? chatMessages", chatMessages);
11492
} else {
11593
let content = chatMessages[chatMessages.length - 1].content as string;
116-
chatMessages[chatMessages.length - 1].content =
117-
content + currentMsg;
94+
chatMessages[chatMessages.length - 1].content = content + currentMsg;
11895
}
11996
scrollToBottom(scrollToDiv);
97+
} else if (Msg === "[DONE]") {
98+
let startTime = chatMessages[chatMessages.length - 1].time;
99+
100+
loading = false;
101+
let totalTime = parseFloat(
102+
((getCurrentTimeStamp() - startTime) / 1000).toFixed(2)
103+
);
104+
105+
if (chatMessages.length - 1 !== -1) {
106+
chatMessages[chatMessages.length - 1].time = totalTime;
107+
}
108+
109+
storeMessages();
120110
}
121111
});
122112
eventSource.stream();
@@ -171,7 +161,7 @@
171161
class="fixed relative flex w-full flex-col items-center justify-between bg-white p-2 pb-0"
172162
>
173163
<div class="relative my-4 flex w-full flex-row justify-center">
174-
<div class="focus:border-none relative w-full">
164+
<div class="relative w-full focus:border-none">
175165
<input
176166
class="text-md block w-full border-0 border-b-2 border-gray-300 px-1 py-4
177167
text-gray-900 focus:border-gray-300 focus:ring-0 dark:border-gray-600 dark:bg-gray-700 dark:text-white dark:placeholder-gray-400 dark:focus:border-blue-500 dark:focus:ring-blue-500"
@@ -210,7 +200,7 @@
210200
<button
211201
class="bg-primary text-primary-foreground hover:bg-primary/90 group flex items-center justify-center space-x-2 p-2"
212202
type="button"
213-
data-testid='clear-chat'
203+
data-testid="clear-chat"
214204
on:click={() => handelClearHistory()}
215205
><svg
216206
xmlns="http://www.w3.org/2000/svg"
@@ -228,8 +218,7 @@
228218
{/if}
229219
<!-- clear -->
230220

231-
<div class="mx-auto flex h-full w-full flex-col" data-testid='chat-message'
232-
>
221+
<div class="mx-auto flex h-full w-full flex-col" data-testid="chat-message">
233222
<Scrollbar
234223
classLayout="flex flex-col gap-1 mr-4"
235224
className="chat-scrollbar h-0 w-full grow px-2 pt-2 mt-3 mr-5"

0 commit comments

Comments
 (0)