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

SimpleChatTC:Reasoning: Cleanup the initial go 

Rather simplify and make the content_equiv provide a relatively
simple and neat representation of the reasoning with content and
toolcall as the cases may be.

Also remove the partial new para that I had introduced in the
initial go for reasoning.
This commit is contained in:
hanishkvc 2025-10-28 15:16:14 +05:30
parent dbb5512b20
commit 47d9550131
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,25 +251,25 @@ class ChatMessageEx {
return true return true
} }
/**
* Collate all the different parts of a chat message into a single string object.
*
* This currently includes reasoning, content and toolcall parts.
*/
content_equiv() { content_equiv() {
let reasoning = "" let reasoning = ""
let content = ""
let toolcall = ""
if (this.ns.reasoning_content.trim() !== "") { if (this.ns.reasoning_content.trim() !== "") {
reasoning = this.ns.reasoning_content.trim() reasoning = `!!!Reasoning: ${this.ns.reasoning_content.trim()} !!!\n`;
} }
if (this.ns.content !== "") { if (this.ns.content !== "") {
if (reasoning !== "") { content = this.ns.content;
return `!!!Reasoning: ${reasoning}!!! ${this.ns.content}`;
} }
return this.ns.content; if (this.has_toolcall()) {
} else if (this.has_toolcall()) { toolcall = `\n\n<tool_call>\n<tool_name>${this.ns.tool_calls[0].function.name}</tool_name>\n<tool_args>${this.ns.tool_calls[0].function.arguments}</tool_args>\n</tool_call>\n`;
let ret = ""
if (reasoning !== "") {
ret = `!!!Reasoning: ${reasoning}!!!`
}
return `${ret}<tool_call>\n<tool_name>${this.ns.tool_calls[0].function.name}</tool_name>\n<tool_args>${this.ns.tool_calls[0].function.arguments}</tool_args>\n</tool_call>`;
} else {
return ""
} }
return `${reasoning} ${content} ${toolcall}`;
} }
} }
@ -495,10 +495,6 @@ class SimpleChat {
let last = undefined; let last = undefined;
for(const x of this.recent_chat(gMe.chatProps.iRecentUserMsgCnt)) { for(const x of this.recent_chat(gMe.chatProps.iRecentUserMsgCnt)) {
if (x.ns.role != Roles.ToolTemp) { if (x.ns.role != Roles.ToolTemp) {
if (x.ns.reasoning_content.trim() === "") {
let entry = ui.el_create_append_p(`>>${x.ns.role}!<<: ${x.ns.reasoning_content}`, div);
entry.className = `role-${x.ns.role}`;
}
let entry = ui.el_create_append_p(`${x.ns.role}: ${x.content_equiv()}`, div); let entry = ui.el_create_append_p(`${x.ns.role}: ${x.content_equiv()}`, div);
entry.className = `role-${x.ns.role}`; entry.className = `role-${x.ns.role}`;
last = entry; last = entry;