tune-sdk 0.2.19 → 0.2.21

package/dist/tune.js

@@ -2046,12 +2046,14 @@ TunePromise.prototype.finally = (function(onFinally) {
 });
 
 function text2run(text, ctx, opts) {
-  var msgs, stopVal, stream, hookMsg, resolve, reject, p, iter;
+  var msgs, stopVal, stream, hookMsg, errors, hookTurnEnd, resolve, reject, p, iter;
   if (!ctx) throw Error("context not set");
   var msgs;
   var stopVal;
   var stream;
   var hookMsg;
+  var errors;
+  var hookTurnEnd;
   var resolve;
   var reject;
   msgs = [];
@@ -2060,6 +2062,8 @@ function text2run(text, ctx, opts) {
   hookMsg = (function(msg) {
     return msg;
   });
+  errors = (((typeof opts !== "undefined") && (opts !== null) && !Number.isNaN(opts) && (typeof opts.errors !== "undefined") && (opts.errors !== null) && !Number.isNaN(opts.errors)) ? opts.errors : (((typeof "throw" !== "undefined") && ("throw" !== null) && !Number.isNaN("throw")) ? "throw" : undefined));
+  hookTurnEnd = (((typeof opts !== "undefined") && (opts !== null) && !Number.isNaN(opts) && (typeof opts.hookTurnEnd !== "undefined") && (opts.hookTurnEnd !== null) && !Number.isNaN(opts.hookTurnEnd)) ? opts.hookTurnEnd : (((typeof(function() {}) !== "undefined") && ((function() {}) !== null) && !Number.isNaN((function() {}))) ? (function() {}) : undefined));
   resolve = undefined;
   reject = undefined;
   var p;
@@ -2088,7 +2092,7 @@ function text2run(text, ctx, opts) {
   }
   stop;
   async function doit() {
-    var ast, payload, provider, model, res, ctype, err, reader, data, done, reData, reComment, usage;
+    var ast, payload, provider, model, res, ctype, err, reader, data, done, reData, reComment, usage, _ref;
     while (!stop(msgs)) {
       var ast;
       ast = await text2ast(text + "\n" + msg2text(msgs), ctx);
@@ -2115,6 +2119,7 @@ function text2run(text, ctx, opts) {
         iter.result = {
           value: msgs
         };
+        hookTurnEnd(msgs);
         continue;
       }
       payload = await payload2http(payload, ctx);
@@ -2135,6 +2140,7 @@ function text2run(text, ctx, opts) {
           value: msgs,
           done: true
         };
+        hookTurnEnd(msgs);
         continue;
       }
       var reader;
@@ -2181,7 +2187,7 @@ function text2run(text, ctx, opts) {
               return JSON.parse(item);
             }));
             it = it.reduce((function(msg, chunk) {
-              var delta, tc, tcIdx;
+              var delta, tc, tcIdx, func;
               if (chunk.usage) usage = chunk.usage;
               var delta;
               delta = (((typeof chunk !== "undefined") && (chunk !== null) && !Number.isNaN(chunk) && (typeof chunk.choices !== "undefined") && (chunk.choices !== null) && !Number.isNaN(chunk.choices) && (typeof chunk.choices[0] !== "undefined") && (chunk.choices[0] !== null) && !Number.isNaN(chunk.choices[0]) && (typeof chunk.choices[0].delta !== "undefined") && (chunk.choices[0].delta !== null) && !Number.isNaN(chunk.choices[0].delta)) ? chunk.choices[0].delta : (((typeof {} !== "undefined") && ({} !== null) && !Number.isNaN({})) ? {} : undefined));
@@ -2194,11 +2200,21 @@ function text2run(text, ctx, opts) {
               if (delta.content) {
                 msg.content = msg.content || "";
                 msg.content += delta.content;
-              } else if (delta.tool_calls) {
+              }
+              if (delta.reasoning) {
+                msg.reasoning = msg.reasoning || "";
+                msg.reasoning += delta.reasoning;
+              }
+              if (delta.tool_calls) {
                 msg.tool_calls = msg.tool_calls || [];
                 tc = delta.tool_calls[0];
                 tcIdx = tc.index || 0;
-                !msg.tool_calls[tcIdx] ? msg.tool_calls[tcIdx] = tc : msg.tool_calls[tcIdx].function.arguments += (tc.function.arguments || "");
+                if (!msg.tool_calls[tcIdx]) {
+                  msg.tool_calls[tcIdx] = tc;
+                } else {
+                  func = msg.tool_calls[tcIdx].function;
+                  func.arguments = (func.arguments || "") + (tc.function.arguments || "");
+                }
               }
               return msg;
             }), {
@@ -2213,18 +2229,25 @@ function text2run(text, ctx, opts) {
           })(data += (((typeof res !== "undefined") && (res !== null) && !Number.isNaN(res) && (typeof res.value !== "undefined") && (res.value !== null) && !Number.isNaN(res.value)) ? res.value : (((typeof "" !== "undefined") && ("" !== null) && !Number.isNaN("")) ? "" : undefined)));
         }
         msgs = iter.result.value;
+        hookTurnEnd(msgs);
         if (usage) await ctx.usage(provider, model, usage);
       }
     }
-    return (stream ? (iter.result = {
-      value: msgs,
-      done: true
-    }) : resolve(msgs));
+    if (stream) {
+      iter.result = {
+        value: msgs,
+        done: true
+      };
+      _ref = hookTurnEnd(msgs);
+    } else {
+      _ref = resolve(msgs);
+    }
+    return _ref;
   }
   doit;
   doit()
     .catch((function(e) {
-      var err;
+      var err, _ref, _ref0;
       var err;
       err = e;
       if ((e.name !== "TuneError")) {
@@ -2232,30 +2255,78 @@ function text2run(text, ctx, opts) {
         err._stack = TuneError.ctx2stack(ctx);
         err.error = e;
       }
-      return (stream ? (iter.err = err) : reject(err));
+      if ((errors === "throw")) {
+        _ref0 = (stream ? (iter.err = err) : reject(err));
+      } else {
+        msgs.push({
+          role: "error",
+          content: err.stack
+        });
+        if (stream) {
+          iter.result = {
+            value: msgs,
+            done: true
+          };
+          _ref = hookTurnEnd(msgs);
+        } else {
+          _ref = resolve(msgs);
+        }
+        _ref0 = _ref;
+      }
+      return _ref0;
     }));
   if (stream) resolve(iter);
   return p;
 }
 text2run;
 async function file2run(args, params, ctx) {
-  var lctx, text, stop, node, response, res, r, chunk, itergQIFpf6, _ref;
+  var lctx, text, stop, errors, turnsSaved, longFormatRegex, isLong, initialText, node, response, res, r, chunk, itergeNE023, _ref;
   var lctx;
   lctx = ctx.clone();
   if (params) lctx.ms.unshift(envmd(params));
   var text;
   var stop;
+  var errors;
+  var turnsSaved;
   text = args.text;
   stop = (((typeof args !== "undefined") && (args !== null) && !Number.isNaN(args) && (typeof args.stop !== "undefined") && (args.stop !== null) && !Number.isNaN(args.stop)) ? args.stop : (((typeof "assistant" !== "undefined") && ("assistant" !== null) && !Number.isNaN("assistant")) ? "assistant" : undefined));
+  errors = (((typeof args !== "undefined") && (args !== null) && !Number.isNaN(args) && (typeof args.errors !== "undefined") && (args.errors !== null) && !Number.isNaN(args.errors)) ? args.errors : (((typeof "throw" !== "undefined") && ("throw" !== null) && !Number.isNaN("throw")) ? "throw" : undefined));
+  turnsSaved = 0;
+  var longFormatRegex;
+  var isLong;
+  longFormatRegex = /^(system|user|tool_call|tool_result|assistant|error):/;
+  isLong = false;
+  async function save(res) {
+    var _ref;
+    if ((args.filename && (((typeof args !== "undefined") && (args !== null) && !Number.isNaN(args) && (typeof args.save !== "undefined") && (args.save !== null) && !Number.isNaN(args.save)) ? args.save : undefined))) {
+      if ((turnsSaved === res.length)) return;
+      turnsSaved = res.length;
+      _ref = await ctx.write(args.filename, text + "\n" + msg2text(res, isLong));
+    } else {
+      _ref = undefined;
+    }
+    return _ref;
+  }
+  save;
+  var initialText;
+  initialText = (args.system ? tpl("system:\n{system}", args) : "");
   if (args.filename) {
     node = await ctx.resolve(args.filename);
-    if (node) lctx.stack.push(node);
+    node ? lctx.stack.push(node) : lctx.stack.push({
+      name: args.filename,
+      type: "text",
+      fullname: args.filename,
+      read: (async function() {
+        return initialText;
+      })
+    });
     if ((node && !text)) text = await node.read();
   }
-  if ((!text && args.system)) text = tpl("system:\n{system}", args);
+  if ((!text && args.system)) text = initialText;
   text = text || "";
-  if (args.user) text += tpl("\nuser:\n{user}", args);
+  if (args.user) text += ((text ? "\n" : "") + tpl("user:\n{user}", args));
   if (!text) throw new TuneError("ether 'text' or 'system' or 'user' should be specified or 'filename' should exist ");
+  isLong = longFormatRegex.test(text);
   var response;
   response = (((typeof args !== "undefined") && (args !== null) && !Number.isNaN(args) && (typeof args.response !== "undefined") && (args.response !== null) && !Number.isNaN(args.response)) ? args.response : (((typeof "content" !== "undefined") && ("content" !== null) && !Number.isNaN("content")) ? "content" : undefined));
 
@@ -2272,7 +2343,7 @@ async function file2run(args, params, ctx) {
         _ref = res;
         break;
       case "chat":
-        _ref = msg2text(res, true);
+        _ref = msg2text(res, isLong);
         break;
       default:
         _ref = undefined;
@@ -2281,54 +2352,44 @@ async function file2run(args, params, ctx) {
     return _ref;
   }
   transformOutput;
-  async function save() {
-    var longFormatRegex, _ref;
-    if ((args.filename && (((typeof args !== "undefined") && (args !== null) && !Number.isNaN(args) && (typeof args.save !== "undefined") && (args.save !== null) && !Number.isNaN(args.save)) ? args.save : undefined))) {
-      var longFormatRegex;
-      longFormatRegex = /^(system|user|tool_call|tool_result|assistant|error):/;
-      _ref = await ctx.write(args.filename, text + "\n" + msg2text(res, longFormatRegex.test(text)));
-    } else {
-      _ref = undefined;
-    }
-    return _ref;
-  }
-  save;
   if (!args.stream) {
     var res;
     res = await lctx.text2run(text, {
-      stop: stop
+      stop: stop,
+      errors: errors,
+      hookTurnEnd: save
     });
-    await save();
     _ref = transformOutput(res);
   } else {
     r = await lctx.text2run(text, {
       stop: stop,
-      stream: true
+      errors: errors,
+      stream: true,
+      hookTurnEnd: save
     });
     chunk = {};
-    itergQIFpf6 = new AsyncIter();
+    itergeNE023 = new AsyncIter();
     (async function($lastRes) {
       var _ref;
       try {
         while (!chunk.done) {
           chunk = await r.next();
           res = (chunk.value || "");
-          if (chunk.done) await save();
           $lastRes = transformOutput(res) || $lastRes;
-          itergQIFpf6.result = {
+          itergeNE023.result = {
             value: $lastRes
           }
         }
-        _ref = itergQIFpf6.result = {
+        _ref = itergeNE023.result = {
           value: $lastRes,
           done: true
         }
       } catch (e) {
-        _ref = (itergQIFpf6.err = e);
+        _ref = (itergeNE023.err = e);
       }
       return _ref;
     })();
-    _ref = itergQIFpf6;
+    _ref = itergeNE023;
   }
   return _ref;
 }
@@ -2341,7 +2402,7 @@ function msg2text(msg, long) {
     return (long ? tpl("{role}:{new_line}{content}", {
       role: role,
       content: content,
-      new_line: ((role === "system" || role === "user" || role === "assistant" || role === "tool_result") ? "\n" : " ")
+      new_line: ((role === "system" || role === "user" || role === "assistant" || role === "tool_result" || role === "error") ? "\n" : " ")
     }) : tpl("{role}: {content}", {
       role: $roles.long2short[role],
       content: content
@@ -2454,7 +2515,7 @@ function msg2text(msg, long) {
         _ref = mkline("comment", msg.content);
         break;
       case "error":
-        _ref = mkline("error ", msg.content);
+        _ref = mkline("error", msg.content);
         break;
       default:
         _ref = undefined;
@@ -2482,7 +2543,7 @@ 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):/gm, "\\$1:");
+    .replace(/^(s|u|a|c|tr|tc|err|system|user|comment|assistant|tool_call|tool_result|error):/gm, "\\$1:");
 }
 escape;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tune-sdk",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "description": "tune - LLM chat in text file",
   "main": "dist/tune.js",
   "module": "dist/tune.mjs",

package/src/cli.js

@@ -88,7 +88,7 @@ function validateArgs(args) {
     assert(typeof args.cmd === "string", "Command must be a string");
     assert((args.cmd === "rpc") || (args.cmd === "init"), "Unknown command: " + args.cmd);
   }
-  if ((!args.help && !args.version && !args.cmd && !args.user && !args.filename)) assert(false, "Must specify --user, --filename, a command (rpc|init), --version, or --help");
+  if ((!args.help && !args.version && !args.cmd && !args.user && !args.filename && !args.text)) assert(false, "Must specify --user, --filename, a command (rpc|init), --version, or --help");
   return args;
 }
 validateArgs;
@@ -274,6 +274,7 @@ async function runRpc(args) {
     flags: "a"
   }) : undefined);
   ctx = await initContext(args);
+  let cleanCtx = ctx.clone()
   server = rpc.jsonrpc({
     inStream: inStream,
     outStream: outStream,
@@ -284,10 +285,35 @@ async function runRpc(args) {
     }) : true),
     name: "server"
   }, {
-    init: (async function(methods) {
-      if ((-1 !== methods.indexOf("resolve"))) ctx.use(remoteContext.bind(server));
-      return;
-    }),
+      init: (async function(methods) {
+        if ((-1 !== methods.indexOf("resolve"))) ctx.use(remoteContext.bind(server));
+        return;
+      }),
+      resolve: async function(name, params) {
+        const node = await cleanCtx.resolve(name, params)
+        delete node.exec
+        delete node.read
+        return node 
+      },
+      read: async function read(name) {
+        const node = await cleanCtx.resolve(name)
+        if (!node) {
+          return ""
+        }
+        // todo binary
+        return node.read()
+      },
+
+      write: async function write(name, content) {
+        return cleanCtx.write(name, content)
+      },
+      exec: async function exec(name, params) {
+        const node  = await cleanCtx.resolve(name)
+        if (!node) {
+          throw Error(`cant execute ${name} - not found`)
+        }
+        return node.exec(params, cleanCtx)
+      },
       file2run: (async function(params, stream) {
         // backward compatibility
         let payload = params
@@ -298,6 +324,7 @@ async function runRpc(args) {
         }
         return ctx.file2run({
           ...payload, 
+          errors: "message",
           stream
         }, args);
       }),
@@ -319,7 +346,7 @@ async function run(args) {
   params = args.params || {}
   delete args.params;
   var res;
-  res = await ctx.file2run(args, params);
+  res = await ctx.file2run({ ...args, errors: "message", stop }, params);
   return (!args.silent ? console.log(res) : undefined);
 }
 run;
@@ -346,6 +373,9 @@ async function initContext(args) {
     }));
   dirs.push(getHomedir(args));
   dirs.unshift(pwd);
+  if (process.env.TUNE_PATH) {
+    dirs = dirs.concat(process.env.TUNE_PATH.split(path.delimiter))
+  }
   process.env.TUNE_PATH = dirs.join(path.delimiter);
   ctx = tune.makeContext({
     TUNE_PATH: process.env.TUNE_PATH,