tune-sdk 0.3.3 → 0.3.5

package/dist/tune.js

@@ -1219,7 +1219,7 @@ Context.prototype.exec = (async function(name, args) {
   }
   return _ref;
 });
-Context.prototype.write = (async function(name, args) {
+Context.prototype.write = (async function(name, content, props) {
   var ws, cur, res, _res, _ref;
   ws = (this.ws || [])
     .slice();
@@ -1227,7 +1227,7 @@ Context.prototype.write = (async function(name, args) {
   cur = ws.shift();
   _res = [];
   while (cur) {
-    res = await cur.call(this, name, args, this);
+    res = await cur.call(this, name, content, props);
     if (res) break;
     if (typeof(_ref = (cur = ws.shift())) !== 'undefined') _res.push(_ref);
   }
@@ -1730,11 +1730,16 @@ async function ast2payload(ast, ctx) {
   roles.push(lastRole);
 
   function transformRoles(memo, item, index, arr) {
-    var tcItem, lines, toolIndex, tc;
-    if ((item.role === "user" || item.role === "system" || item.role === "tool_call")) item.content = (Array.isArray(item.content) ? item.content.map((function(item) {
-      if (item.text) item.text = unescape(item.text);
+    var escapeOptions, tcItem, lines, toolIndex, tc;
+    var escapeOptions;
+    escapeOptions = {
+      vars: item.role === "user" || item.role === "system" || item.role === "tool_call",
+      roles: true
+    };
+    item.content = (Array.isArray(item.content) ? item.content.map((function(item) {
+      if (item.text) item.text = unescape(item.text, escapeOptions);
       return item;
-    })) : unescape(item.content));
+    })) : unescape(item.content, escapeOptions));
 
     function findToolCalls() {
       var item1, _i, _ref, _len;
@@ -2018,7 +2023,10 @@ async function toolCall(payload, ctx) {
     transformRes;
     var content;
     content = transformRes(res);
-    if ((((typeof tools !== "undefined") && (tools !== null) && !Number.isNaN(tools) && (typeof tools[tc.name] !== "undefined") && (tools[tc.name] !== null) && !Number.isNaN(tools[tc.name]) && (typeof tools[tc.name].escapeOutput !== "undefined") && (tools[tc.name].escapeOutput !== null) && !Number.isNaN(tools[tc.name].escapeOutput)) ? tools[tc.name].escapeOutput : (((typeof true !== "undefined") && (true !== null) && !Number.isNaN(true)) ? true : undefined))) content = escape(content);
+    if ((((typeof tools !== "undefined") && (tools !== null) && !Number.isNaN(tools) && (typeof tools[tc.name] !== "undefined") && (tools[tc.name] !== null) && !Number.isNaN(tools[tc.name]) && (typeof tools[tc.name].escapeOutput !== "undefined") && (tools[tc.name].escapeOutput !== null) && !Number.isNaN(tools[tc.name].escapeOutput)) ? tools[tc.name].escapeOutput : (((typeof true !== "undefined") && (true !== null) && !Number.isNaN(true)) ? true : undefined))) content = escape(content, {
+      vars: true,
+      roles: false
+    });
     return {
       role: "tool",
       id: item.id,
@@ -2282,7 +2290,7 @@ function text2run(text, ctx, opts) {
 }
 text2run;
 async function file2run(args, params, ctx) {
-  var lctx, text, stop, errors, turnsSaved, node, longFormatRegex, isLong, initialText, response, res, r, chunk, itergMKZ8fG, _ref;
+  var lctx, text, stop, errors, turnsSaved, node, longFormatRegex, isLong, initialText, response, res, r, chunk, iterg8EYRCS, _ref;
   var lctx;
   lctx = ctx.clone();
   if (params) lctx.ms.unshift(envmd(params));
@@ -2374,7 +2382,7 @@ async function file2run(args, params, ctx) {
       hookTurnEnd: save
     });
     chunk = {};
-    itergMKZ8fG = new AsyncIter();
+    iterg8EYRCS = new AsyncIter();
     (async function($lastRes) {
       var _ref;
       try {
@@ -2382,20 +2390,20 @@ async function file2run(args, params, ctx) {
           chunk = await r.next();
           res = (chunk.value || "");
           $lastRes = transformOutput(res) || $lastRes;
-          itergMKZ8fG.result = {
+          iterg8EYRCS.result = {
             value: $lastRes
           }
         }
-        _ref = itergMKZ8fG.result = {
+        _ref = iterg8EYRCS.result = {
           value: $lastRes,
           done: true
         }
       } catch (e) {
-        _ref = (itergMKZ8fG.err = e);
+        _ref = (iterg8EYRCS.err = e);
       }
       return _ref;
     })();
-    _ref = itergMKZ8fG;
+    _ref = iterg8EYRCS;
   }
   return _ref;
 }
@@ -2405,6 +2413,10 @@ function msg2text(msg, long) {
   var _ref, _ref0, _ref1;
 
   function mkline(role, content) {
+    content = escape(content, {
+      vars: role === "user" || role === "system",
+      roles: true
+    });
     return (long ? tpl("{role}:{new_line}{content}", {
       role: role,
       content: content,
@@ -2503,7 +2515,9 @@ function msg2text(msg, long) {
               return tpl("{role}: {name}{ args}{\ntext}", {
                 name: tc.function.name,
                 args: args,
-                text: text,
+                text: escape(text, {
+                  roles: true
+                }),
                 role: (long ? "tool_call" : "tc")
               });
             }))
@@ -2546,18 +2560,35 @@ function msg2role(msg) {
 }
 msg2role;
 
-function escape(text) {
-  return String((((typeof text !== "undefined") && (text !== null) && !Number.isNaN(text)) ? text : (((typeof "" !== "undefined") && ("" !== null) && !Number.isNaN("")) ? "" : undefined)))
-    .replace(/@/g, "\\@")
-    .replace(/^(s|u|a|c|tr|tc|err|system|user|comment|assistant|tool_call|tool_result|error):/gm, "\\$1:");
+function escape(text, opts) {
+  var result;
+  var opts;
+  var result;
+  opts = opts || {
+    vars: true,
+    roles: true
+  }
+  result = String((((typeof text !== "undefined") && (text !== null) && !Number.isNaN(text)) ? text : (((typeof "" !== "undefined") && ("" !== null) && !Number.isNaN("")) ? "" : undefined)));
+  if (opts.vars) result = result.replace(/@/g, "\\@");
+  if (opts.roles) result = result.replace(/^(s|u|a|c|tr|tc|err|system|user|comment|assistant|tool_call|tool_result|error):/gm, "\\$1:");
+  return result;
 }
 escape;
 
-function unescape(text) {
-  return String((((typeof text !== "undefined") && (text !== null) && !Number.isNaN(text)) ? text : (((typeof "" !== "undefined") && ("" !== null) && !Number.isNaN("")) ? "" : undefined)))
+function unescape(text, opts) {
+  var result;
+  var opts;
+  var result;
+  opts = opts || {
+    vars: true,
+    roles: true
+  }
+  result = String((((typeof text !== "undefined") && (text !== null) && !Number.isNaN(text)) ? text : (((typeof "" !== "undefined") && ("" !== null) && !Number.isNaN("")) ? "" : undefined)));
+  if (opts.vars) result = result
     .replace(/\\(?<item>@{1,2}\{\s*[~\.\-\w/]+\s*)(?<proc>(?:\s*\|\s*\w+(?:\s+\w+)*)*\})/g, "$<item>$<proc>")
-    .replace(/\\(?<item>@{1,2}[~\.\-\w/]+)/g, "$<item>")
-    .replace(/^\\(s|system|u|user|a|assistant|c|comment|tr|tool_result|tc|tool_call|err|error):/gm, "$1:");
+    .replace(/\\(?<item>@{1,2}[~\.\-\w/]+)/g, "$<item>");
+  if (opts.roles) result = result.replace(/^\\(s|system|u|user|a|assistant|c|comment|tr|tool_result|tc|tool_call|err|error):/gm, "$1:");
+  return result;
 }
 unescape;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tune-sdk",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "chat with llm in a text file. core package",
   "main": "dist/tune.js",
   "module": "dist/tune.mjs",

package/src/contextws.js

@@ -72,7 +72,6 @@ function ContextWebsocket(url, { debug } = {}) {
   assert(typeof url !== 'undefined', 'url is not set');
 
   socket = new WebSocket(url);
-  console.log(socket)
 
   this.socket = socket;
   this.callbacks = Object.create(null);
@@ -105,7 +104,7 @@ ContextWebsocket.prototype._onClose = function () {
 
 ContextWebsocket.prototype._send = async function (payload) {
   const data = JSON.stringify(payload);
-  this.debug('==>', data);
+  this.debug('tune ==>', data);
   await this.ready;
   this.socket.send(data);
 };
@@ -135,7 +134,7 @@ ContextWebsocket.prototype._onMessage = function (event) {
     return;
   }
 
-  this.debug('<==', msg);
+  this.debug('tune <==', msg);
   if (!msg || !msg.id) return;
 
   const cb = this.callbacks[msg.id];
@@ -176,6 +175,7 @@ ContextWebsocket.prototype.read = function (name, binary) {
   return this._call('read', [name, binary], false);
 };
 
+
 ContextWebsocket.prototype.write = function (name, content) {
   return this._call('write', [name, content], false);
 };
@@ -197,5 +197,12 @@ if (typeof module !== 'undefined' && module.exports) {
   module.exports = ContextWebsocket;
 } else {
   window.ContextWebsocket = ContextWebsocket;
-  window.ctx = new ContextWebsocket(window.location.origin.replace(/^http/, 'ws'));
+  window.ctx = new ContextWebsocket(window.location.origin.replace(/^http/, 'ws'), { debug: console.debug });
+  window.addEventListener('error', async (event) => {
+    window.ctx._call('log', [event.error?.stack || event.message ], false);
+  })
+  window.addEventListener('unhandledrejection', async (event) => {
+    const err = event.reason instanceof Error ? event.reason : new Error(String(event.reason));
+    window.ctx._call('log', [err.stack || err.message], false);
+  });
 }

package/src/ws.js

@@ -1,9 +1,27 @@
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const WebSocket = require('ws');
 const mime = require('mime-types');
 
+// skips loopback, docker (172.x, 192.168.x docker ranges), and common vpn (tun/tap) interfaces
+function getPublicIPv4() {
+  const ifaces = os.networkInterfaces();
+  const skipNames = /^(docker|br-|veth|tun|tap|vmnet|vbox)/i;
+  const skipRanges = /^(172\.(1[6-9]|2\d|3[01])\.|10\.)/; // docker bridge ranges
+
+  for (const [name, addrs] of Object.entries(ifaces)) {
+    if (skipNames.test(name)) continue;
+    for (const addr of addrs) {
+      if (addr.family === 'IPv4' && !addr.internal && !skipRanges.test(addr.address)) {
+        return addr.address;
+      }
+    }
+  }
+  return 'localhost';
+}
+
 function makeServer({ port, static, root, ctx }) {
   root = path.join(root || process.cwd());
 
@@ -46,6 +64,7 @@ function makeServer({ port, static, root, ctx }) {
       let lctx = ctx.clone()
       let { id, method, args, ...rest } = JSON.parse(msg.toString());
       let result = { id }
+      console.log("[context]", method, ...args)
       if (method === "read") {
         const [ name, binary ] = args
         let content = await lctx.read(name, binary)
@@ -104,6 +123,9 @@ function makeServer({ port, static, root, ctx }) {
             }
           })()
         }
+      } else if (method === "log") {
+        console.log("[browser]:", ...args)
+        result.done = true
       } else {
         result.error = { message: `method not found ${method}`}
       }
@@ -115,7 +137,8 @@ function makeServer({ port, static, root, ctx }) {
     if (Number.isNaN(parseInt(port))) {
       console.log(`listening ${port}`);
     } else {
-      console.log(`listening http://localhost:${port}`);
+      const host = getPublicIPv4();
+      console.log(`listening http://${host}:${port}`);
     }
   });
 }