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

SimpleChatTC:DataStore:Cleanup:Msg, duplicate on routing side 

Avoid the duplicate plumbing code and use a common ops plumbing
helper.

Remove args[key] oversight from DataStoreList msg on webworkr
This commit is contained in:
hanishkvc 2025-10-30 06:28:27 +05:30
parent 57dd228512
commit 5935ecceca
2 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tools/server/public_simplechat/tooldb.mjs
View File

@ -28,19 +28,6 @@ let dsget_meta = {
} }
/**
* Implementation of the data store get logic. Minimal skeleton for now.
* NOTE: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} chatid
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function dsget_run(chatid, toolcallid, toolname, obj) {
gToolsDBWorker.postMessage({ cid: chatid, tcid: toolcallid, name: toolname, args: obj})
}
let dsset_meta = { let dsset_meta = {
"type": "function", "type": "function",
"function": { "function": {
@ -64,19 +51,6 @@ let dsset_meta = {
} }
/**
* Implementation of the data store set logic. Minimal skeleton for now.
* NOTE: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} chatid
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function dsset_run(chatid, toolcallid, toolname, obj) {
gToolsDBWorker.postMessage({ cid: chatid, tcid: toolcallid, name: toolname, args: obj})
}
let dsdel_meta = { let dsdel_meta = {
"type": "function", "type": "function",
"function": { "function": {
@ -96,19 +70,6 @@ let dsdel_meta = {
} }
/**
* Implementation of the data store delete logic. Minimal skeleton for now.
* NOTE: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} chatid
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function dsdel_run(chatid, toolcallid, toolname, obj) {
gToolsDBWorker.postMessage({ cid: chatid, tcid: toolcallid, name: toolname, args: obj})
}
let dslist_meta = { let dslist_meta = {
"type": "function", "type": "function",
"function": { "function": {
@ -124,14 +85,14 @@ let dslist_meta = {
/** /**
* Implementation of the data store list logic. Minimal skeleton for now. * Implementation of the minimal needed plumbing for data store related ops triggering.
* NOTE: Has access to the javascript web worker environment and can mess with it and beyond * NOTE: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} chatid * @param {string} chatid
* @param {string} toolcallid * @param {string} toolcallid
* @param {string} toolname * @param {string} toolname
* @param {any} obj * @param {any} obj
*/ */
function dslist_run(chatid, toolcallid, toolname, obj) { function dsops_run(chatid, toolcallid, toolname, obj) {
gToolsDBWorker.postMessage({ cid: chatid, tcid: toolcallid, name: toolname, args: obj}) gToolsDBWorker.postMessage({ cid: chatid, tcid: toolcallid, name: toolname, args: obj})
} }
@ -142,22 +103,22 @@ function dslist_run(chatid, toolcallid, toolname, obj) {
*/ */
export let tc_switch = { export let tc_switch = {
"data_store_get": { "data_store_get": {
"handler": dsget_run, "handler": dsops_run,
"meta": dsget_meta, "meta": dsget_meta,
"result": "" "result": ""
}, },
"data_store_set": { "data_store_set": {
"handler": dsset_run, "handler": dsops_run,
"meta": dsset_meta, "meta": dsset_meta,
"result": "" "result": ""
}, },
"data_store_delete": { "data_store_delete": {
"handler": dsdel_run, "handler": dsops_run,
"meta": dsdel_meta, "meta": dsdel_meta,
"result": "" "result": ""
}, },
"data_store_list": { "data_store_list": {
"handler": dslist_run, "handler": dsops_run,
"meta": dslist_meta, "meta": dslist_meta,
"result": "" "result": ""
}, },

4
tools/server/public_simplechat/toolsdbworker.mjs
View File

@ -53,7 +53,7 @@ self.onmessage = async function (ev) {
cid: ev.data.cid, cid: ev.data.cid,
tcid: ev.data.tcid, tcid: ev.data.tcid,
name: ev.data.name, name: ev.data.name,
data: { 'status': 'ok', 'data': reqList.result, 'msg': `DataStoreList:Ok:${args['key']}:${reqList.result}`} data: { 'status': 'ok', 'data': reqList.result, 'msg': `DataStoreList:Ok:${reqList.result}`}
}); });
} }
reqList.onerror = (evList) => { reqList.onerror = (evList) => {
@ -62,7 +62,7 @@ self.onmessage = async function (ev) {
cid: ev.data.cid, cid: ev.data.cid,
tcid: ev.data.tcid, tcid: ev.data.tcid,
name: ev.data.name, name: ev.data.name,
data: { 'status': 'error', 'msg': `DataStoreList:Err:${args['key']}:${reqList.error}`} data: { 'status': 'error', 'msg': `DataStoreList:Err:${reqList.error}`}
}); });
} }
break; break;