vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SimpleChat: Move handling oneshot mode server response

Browse source 
Move handling of the oneshot mode server response into SimpleChat.

Also add plumbing for moving multipart server response into same.
This commit is contained in:
HanishKVC 2024-05-28 08:46:32 +05:30
parent 9d0e65d16a
commit 8f97c23895
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
examples/server/public_simplechat/simplechat.js
View file

@ -49,7 +49,11 @@ let gUsageMsg = `
class SimpleChat { class SimpleChat {
constructor() { /**
* @param {string} chatId
*/
constructor(chatId) {
this.chatId = chatId;
/** /**
* Maintain in a form suitable for common LLM web service chat/completions' messages entry * Maintain in a form suitable for common LLM web service chat/completions' messages entry
* @type {ChatMessages} * @type {ChatMessages}
@ -311,6 +315,23 @@ class SimpleChat {
return sysPrompt; return sysPrompt;
} }
/**
* Handle the oneshot response from server/ai-model
* @param {Response} resp
* @param {string} apiEP
*/
async handle_response_oneshot(resp, apiEP) {
let respBody = await resp.json();
console.debug(`DBUG:SimpleChat:SC:${this.chatId}:HandleUserSubmit:RespBody:${JSON.stringify(respBody)}`);
return this.response_extract(respBody, apiEP);
}
async handle_response(resp, apiEP) {
if (apiEP == ApiEP.Type.Chat) {
return this.handle_response_oneshot(resp, apiEP);
}
}
} }
@ -424,7 +445,7 @@ class MultiChatUI {
* @param {boolean} bSwitchSession * @param {boolean} bSwitchSession
*/ */
new_chat_session(chatId, bSwitchSession=false) { new_chat_session(chatId, bSwitchSession=false) {
this.simpleChats[chatId] = new SimpleChat(); this.simpleChats[chatId] = new SimpleChat(chatId);
if (bSwitchSession) { if (bSwitchSession) {
this.handle_session_switch(chatId); this.handle_session_switch(chatId);
} }
@ -509,10 +530,8 @@ class MultiChatUI {
body: theBody, body: theBody,
}); });
//let respBody = await resp.json();
let respBody = await this.read_json_early(chat, resp); let respBody = await this.read_json_early(chat, resp);
console.debug(`DBUG:SimpleChat:MCUI:${chatId}:HandleUserSubmit:RespBody:${JSON.stringify(respBody)}`); let theResp = chat.handle_response(respBody, apiEP);
let theResp = chat.response_extract(respBody, apiEP);
chat.add(Roles.Assistant, theResp.assistant); chat.add(Roles.Assistant, theResp.assistant);
if (chatId == this.curChatId) { if (chatId == this.curChatId) {
chat.show(this.elDivChat); chat.show(this.elDivChat);