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

SimpleChatTC:ToolCalling:Seprat out JSWebWorker and ProxyBasedWeb 

Remove the unneed (belonging to the other file) stuff from tooljs
and toolweb files.

Update tools manager to make use of the new toolweb module
This commit is contained in:
hanishkvc 2025-10-26 15:54:47 +05:30
parent d00e5b341a
commit 978ee3db1e
3 changed files with 25 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
tools/server/public_simplechat/tooljs.mjs
View File

@ -1,5 +1,5 @@
//@ts-check
// DANGER DANGER DANGER - Simple and Stupid - Use from a discardable VM only
// ALERT - Simple Stupid flow - Using from a discardable VM is better
// Helpers to handle tools/functions calling wrt
// * javascript interpreter
// * simple arithmatic calculator
@ -72,162 +72,6 @@ function calc_run(toolcallid, toolname, obj) {
}
/**
* Send a message to Tools WebWorker's monitor in main thread directly
* @param {MessageEvent<any>} mev
*/
function message_toolsworker(mev) {
// @ts-ignore
gToolsWorker.onmessage(mev)
}
let fetchweburlraw_meta = {
"type": "function",
"function": {
"name": "fetch_web_url_raw",
"description": "Fetch the requested web url through a proxy server and return the got content as is, in few seconds",
"parameters": {
"type": "object",
"properties": {
"url":{
"type":"string",
"description":"url of the web page to fetch from the internet"
}
},
"required": ["url"]
}
}
}
/**
* Implementation of the fetch web url raw logic. Dumb initial go.
* Expects a simple minded proxy server to be running locally
* * listening on port 3128
* * expecting http requests
* * with a query token named url wrt the path urlraw
* which gives the actual url to fetch
* ALERT: Accesses a seperate/external web proxy/caching server, be aware and careful
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function fetchweburlraw_run(toolcallid, toolname, obj) {
if (gToolsWorker.onmessage != null) {
// @ts-ignore
let newUrl = `${document['gMe'].tools.fetchProxyUrl}/urlraw?url=${encodeURIComponent(obj.url)}`
fetch(newUrl).then(resp => {
if (!resp.ok) {
throw new Error(`${resp.status}:${resp.statusText}`);
}
return resp.text()
}).then(data => {
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}}))
}).catch((err)=>{
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}}))
})
}
}
/**
* Setup fetch_web_url_raw for tool calling
* NOTE: Currently the logic is setup for the bundled simpleproxy.py
* @param {Object<string, Object<string, any>>} tcs
*/
async function fetchweburlraw_setup(tcs) {
// @ts-ignore
let got = await fetch(`${document["gMe"].tools.fetchProxyUrl}/aum?url=jambudweepe.multiverse.987654321123456789`).then(resp=>{
if (resp.statusText != 'bharatavarshe') {
console.log("WARN:ToolJS:FetchWebUrlRaw:Dont forget to run the bundled local.tools/simpleproxy.py to enable me")
return
} else {
console.log("INFO:ToolJS:FetchWebUrlRaw:Enabling...")
}
tcs["fetch_web_url_raw"] = {
"handler": fetchweburlraw_run,
"meta": fetchweburlraw_meta,
"result": ""
};
}).catch(err=>console.log(`WARN:ToolJS:FetchWebUrlRaw:ProxyServer missing?:${err}\nDont forget to run the bundled local.tools/simpleproxy.py`))
}
let fetchweburltext_meta = {
"type": "function",
"function": {
"name": "fetch_web_url_text",
"description": "Fetch the requested web url through a proxy server and return its text content after stripping away the html tags as well as head, script, style, header, footer, nav blocks, in few seconds",
"parameters": {
"type": "object",
"properties": {
"url":{
"type":"string",
"description":"url of the page that will be fetched from the internet and inturn unwanted stuff stripped from its contents to some extent"
}
},
"required": ["url"]
}
}
}
/**
* Implementation of the fetch web url text logic. Dumb initial go.
* Expects a simple minded proxy server to be running locally
* * listening on port 3128
* * expecting http requests
* * with a query token named url wrt urltext path,
* which gives the actual url to fetch
* * strips out head as well as any script, style, header, footer, nav and so blocks in body
* before returning remaining body contents.
* ALERT: Accesses a seperate/external web proxy/caching server, be aware and careful
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function fetchweburltext_run(toolcallid, toolname, obj) {
if (gToolsWorker.onmessage != null) {
// @ts-ignore
let newUrl = `${document['gMe'].tools.fetchProxyUrl}/urltext?url=${encodeURIComponent(obj.url)}`
fetch(newUrl).then(resp => {
if (!resp.ok) {
throw new Error(`${resp.status}:${resp.statusText}`);
}
return resp.text()
}).then(data => {
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: data}}))
}).catch((err)=>{
message_toolsworker(new MessageEvent('message', {data: {id: toolcallid, name: toolname, data: `Error:${err}`}}))
})
}
}
/**
* Setup fetch_web_url_text for tool calling
* NOTE: Currently the logic is setup for the bundled simpleproxy.py
* @param {Object<string, Object<string, any>>} tcs
*/
async function fetchweburltext_setup(tcs) {
// @ts-ignore
let got = await fetch(`${document["gMe"].tools.fetchProxyUrl}/aum?url=jambudweepe.akashaganga.multiverse.987654321123456789`).then(resp=>{
if (resp.statusText != 'bharatavarshe') {
console.log("WARN:ToolJS:FetchWebUrlText:Dont forget to run the bundled local.tools/simpleproxy.py to enable me")
return
} else {
console.log("INFO:ToolJS:FetchWebUrlText:Enabling...")
}
tcs["fetch_web_url_text"] = {
"handler": fetchweburltext_run,
"meta": fetchweburltext_meta,
"result": ""
};
}).catch(err=>console.log(`WARN:ToolJS:FetchWebUrlText:ProxyServer missing?:${err}\nDont forget to run the bundled local.tools/simpleproxy.py`))
}
/**
* @type {Object<string, Object<string, any>>}
*/
@ -252,6 +96,4 @@ export let tc_switch = {
*/
export async function init(toolsWorker) {
gToolsWorker = toolsWorker
await fetchweburlraw_setup(tc_switch)
await fetchweburltext_setup(tc_switch)
}

21
tools/server/public_simplechat/tools.mjs
View File

@ -1,30 +1,42 @@
//@ts-check
// DANGER DANGER DANGER - Simple and Stupid - Use from a discardable VM only
// ALERT - Simple Stupid flow - Using from a discardable VM is better
// Helpers to handle tools/functions calling in a direct and dangerous way
// by Humans for All
//
import * as tjs from './tooljs.mjs'
import * as tweb from './toolweb.mjs'
let gToolsWorker = new Worker('./toolsworker.mjs', { type: 'module' });
/**
* Maintain currently available tool/function calls
* @type {Object<string,Object<string,any>>}
*/
export let tc_switch = {}
export async function init() {
return tjs.init(gToolsWorker).then(()=>{
let toolNames = []
/**
* @type {string[]}
*/
let toolNames = []
await tjs.init(gToolsWorker).then(()=>{
for (const key in tjs.tc_switch) {
tc_switch[key] = tjs.tc_switch[key]
toolNames.push(key)
}
return toolNames
})
let tNs = await tweb.init(gToolsWorker)
for (const key in tNs) {
tc_switch[key] = tNs[key]
toolNames.push(key)
}
return toolNames
}
export function meta() {
let tools = []
for (const key in tc_switch) {
@ -33,6 +45,7 @@ export function meta() {
return tools
}
/**
* Setup the callback that will be called when ever message
* is recieved from the Tools Web Worker.

90
tools/server/public_simplechat/toolweb.mjs
View File

@ -1,8 +1,6 @@
//@ts-check
// DANGER DANGER DANGER - Simple and Stupid - Use from a discardable VM only
// Helpers to handle tools/functions calling wrt
// * javascript interpreter
// * simple arithmatic calculator
// ALERT - Simple Stupid flow - Using from a discardable VM is better
// Helpers to handle tools/functions calling related to web access
// by Humans for All
//
@ -10,68 +8,6 @@
let gToolsWorker = /** @type{Worker} */(/** @type {unknown} */(null));
let js_meta = {
"type": "function",
"function": {
"name": "run_javascript_function_code",
"description": "Runs given code using eval within a web worker context in a browser's javascript environment and returns the console.log outputs of the execution after few seconds",
"parameters": {
"type": "object",
"properties": {
"code": {
"type": "string",
"description": "The code that will be run using eval within a web worker in the browser's javascript interpreter environment."
}
},
"required": ["code"]
}
}
}
/**
* Implementation of the javascript interpretor logic. Minimal skeleton for now.
* ALERT: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function js_run(toolcallid, toolname, obj) {
gToolsWorker.postMessage({ id: toolcallid, name: toolname, code: obj["code"]})
}
let calc_meta = {
"type": "function",
"function": {
"name": "simple_calculator",
"description": "Calculates the provided arithmatic expression using console.log within a web worker of a browser's javascript interpreter environment and returns the output of the execution once it is done in few seconds",
"parameters": {
"type": "object",
"properties": {
"arithexpr":{
"type":"string",
"description":"The arithmatic expression that will be calculated by passing it to console.log of a browser's javascript interpreter."
}
},
"required": ["arithexpr"]
}
}
}
/**
* Implementation of the simple calculator logic. Minimal skeleton for now.
* ALERT: Has access to the javascript web worker environment and can mess with it and beyond
* @param {string} toolcallid
* @param {string} toolname
* @param {any} obj
*/
function calc_run(toolcallid, toolname, obj) {
gToolsWorker.postMessage({ id: toolcallid, name: toolname, code: `console.log(${obj["arithexpr"]})`})
}
/**
* Send a message to Tools WebWorker's monitor in main thread directly
* @param {MessageEvent<any>} mev
@ -228,30 +164,18 @@ async function fetchweburltext_setup(tcs) {
}
/**
* @type {Object<string, Object<string, any>>}
*/
export let tc_switch = {
"run_javascript_function_code": {
"handler": js_run,
"meta": js_meta,
"result": ""
},
"simple_calculator": {
"handler": calc_run,
"meta": calc_meta,
"result": ""
},
}
/**
* Used to get hold of the web worker to use for running tool/function call related code
* Also to setup tool calls, which need to cross check things at runtime
* @param {Worker} toolsWorker
*/
export async function init(toolsWorker) {
/**
* @type {Object<string, Object<string, any>>} tcs
*/
let tc_switch = {}
gToolsWorker = toolsWorker
await fetchweburlraw_setup(tc_switch)
await fetchweburltext_setup(tc_switch)
return tc_switch
}