happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimpleChatTCRV:Vision:HandleUserSubmit: Ensure cleanup even early 

There can be issue with chat.add->chat.save, in that trying to
store into localStorage or so can raise exception, like quota
exceeded and so.

So now trap chat.add also and inturn for now take care of clearing
image state while also trapping and rethrowing a new error which
identifies the above location, as well as tracks the original err
This commit is contained in:
hanishkvc 2025-11-10 21:17:37 +05:30
parent 4ee6e271fb
commit 4e4dc30ffe
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/server/public_simplechat/simplechat.js
View File

@ -1034,6 +1034,12 @@ class MultiChatUI {
}
}
dataurl_plus_clear() {
this.elInFileX.elImg.src = "";
//this.me.dataURLs.pop()
this.me.dataURLs.length = 0;
}
/**
* Reset user input ui.
* * clear user input (if requested, default true)
@ -1044,6 +1050,7 @@ class MultiChatUI {
ui_reset_userinput(bClearElInUser=true) {
if (bClearElInUser) {
this.elInUser.value = "";
this.dataurl_plus_clear()
}
this.elInUser.disabled = false;
this.elInUser.focus();
@ -1111,7 +1118,6 @@ class MultiChatUI {
secContents.classList.add('chat-message-contents')
secMain.append(secContents)
// Add the content
//entry = ui.el_create_append_p(`${msg.content_equiv()}`, secContents);
let showList = []
if (msg.ns.has_reasoning()) {
showList.push(['reasoning', `!!!Reasoning: ${msg.ns.getReasoningContent()} !!!\n\n`])
@ -1359,13 +1365,19 @@ class MultiChatUI {
this.elInUser.placeholder = "dont forget to enter a message, before submitting to ai"
return;
}
let image = undefined
if (this.me.dataURLs.length > 0) {
image = /** @type{string} */(this.me.dataURLs[0])
this.me.dataURLs.pop()
try {
let image = undefined
if (this.me.dataURLs.length > 0) {
image = /** @type{string} */(this.me.dataURLs[0])
}
chat.add(new ChatMessageEx(new NSChatMessage(Roles.User, content, undefined, undefined, undefined, undefined, image)))
} catch (err) {
throw new Error("HandleUserSubmit:ChatAdd failure", {cause: err})
} finally {
// TODO:MAYBE: in future if we dont want to clear up user loaded image on failure
// move this to end of try block
this.dataurl_plus_clear()
}
chat.add(new ChatMessageEx(new NSChatMessage(Roles.User, content, undefined, undefined, undefined, undefined, image)))
this.elInFileX.elImg.src = ""
}
if (this.elInUser.dataset.placeholder) {
this.elInUser.placeholder = this.elInUser.dataset.placeholder;