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

SimpleChatTC:Fixup auto toolcall wrt newer ChatShow flow 

This is a initial go wrt the new overall flow, should work, but
need to cross check.
This commit is contained in:
hanishkvc 2025-11-02 04:23:47 +05:30
parent dd0a7ec500
commit c21bef4ddd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,15 +867,16 @@ class MultiChatUI {
/** /**
* Reset/Setup Tool Call UI parts as needed * Reset/Setup Tool Call UI parts as needed
* @param {ChatMessageEx} ar * @param {ChatMessageEx} ar
* @param {boolean} bAuto
*/ */
ui_reset_toolcall_as_needed(ar) { ui_reset_toolcall_as_needed(ar, bAuto = false) {
if (ar.has_toolcall()) { if (ar.has_toolcall()) {
this.elDivTool.hidden = false this.elDivTool.hidden = false
this.elInToolName.value = ar.ns.tool_calls[0].function.name this.elInToolName.value = ar.ns.tool_calls[0].function.name
this.elInToolName.dataset.tool_call_id = ar.ns.tool_calls[0].id this.elInToolName.dataset.tool_call_id = ar.ns.tool_calls[0].id
this.elInToolArgs.value = ar.ns.tool_calls[0].function.arguments this.elInToolArgs.value = ar.ns.tool_calls[0].function.arguments
this.elBtnTool.disabled = false this.elBtnTool.disabled = false
if (gMe.tools.auto > 0) { if ((gMe.tools.auto > 0) && (bAuto)) {
this.timers.toolcallTriggerClick = setTimeout(()=>{ this.timers.toolcallTriggerClick = setTimeout(()=>{
this.elBtnTool.click() this.elBtnTool.click()
}, gMe.tools.auto*this.TimePeriods.ToolCallAutoTimeUnit) }, gMe.tools.auto*this.TimePeriods.ToolCallAutoTimeUnit)
@ -976,16 +977,18 @@ class MultiChatUI {
} }
// Handle tool call ui, if reqd // Handle tool call ui, if reqd
let bTC = false let bTC = false
let bAuto = false
if (msg.ns.role === Roles.Assistant) { if (msg.ns.role === Roles.Assistant) {
if (iFromLast == 0) { if (iFromLast == 0) {
bTC = true bTC = true
bAuto = true
} else if ((iFromLast == 1) && (nextMsg != undefined)) { } else if ((iFromLast == 1) && (nextMsg != undefined)) {
if (nextMsg.ns.role == Roles.ToolTemp) { if (nextMsg.ns.role == Roles.ToolTemp) {
bTC = true bTC = true
} }
} }
if (bTC) { if (bTC) {
this.ui_reset_toolcall_as_needed(msg); this.ui_reset_toolcall_as_needed(msg, bAuto);
} }
} }
// Handle tool call non ui // Handle tool call non ui