@agent-smith/cli 0.0.35 → 0.0.36

package/dist/cmd/lib/execute_action.js

@@ -26,7 +26,12 @@ function pythonAction(path) {
         title: "",
         run: async (args) => {
             const out = await runPyScript(pyShell, "python3", path, args);
-            return { data: out.join("\n"), error: "", ok: true };
+            const txt = out.join("\n");
+            let data = txt;
+            if (txt.startsWith("{") || txt.startsWith("[")) {
+                data = JSON.parse(data);
+            }
+            return { data: data, error: "", ok: true };
         }
     });
     return action;

package/dist/cmd/lib/execute_job.js

@@ -4,7 +4,7 @@ import { useAgentJob } from "@agent-smith/jobs";
 import { brain, marked, taskBuilder } from '../../agent.js';
 import { getFeatureSpec } from '../../state/features.js';
 import { formatMode, isDebug, isVerbose } from '../../state/state.js';
-import { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, readTask } from './utils.js';
+import { createJsAction, initActionVars, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, readTask } from './utils.js';
 import { pythonAction, systemAction } from './execute_action.js';
 async function executeJobCmd(name, args = [], options = {}) {
     const { job, found } = await _dispatchReadJob(name);
@@ -54,7 +54,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                         params.prompt = params.text;
                     }
                     else {
-                        throw new Error(`No prompt provided for task ${name}.\Params: ${params}`);
+                        throw new Error(`No prompt provided for task ${name}.\Params: ${JSON.stringify(params, null, 2)}`);
                     }
                 }
                 const vs = initTaskParams(params, taskSpec?.inferParams ? taskSpec.inferParams : {});
@@ -87,6 +87,7 @@ async function executeJobCmd(name, args = [], options = {}) {
             ex.backend.setOnToken((t) => {
                 process.stdout.write(t);
             });
+            brain.setDefaultExpert(ex);
             conf["expert"] = ex;
             try {
                 if (isDebug.value || isVerbose.value) {
@@ -96,6 +97,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                     const invars = { ...params, ...vars };
                     try {
                         res = await job.runTask(name, invars, conf);
+                        console.log("");
                     }
                     catch (e) {
                         throw new Error(`Error running task ${name}: ${e}`);
@@ -139,6 +141,11 @@ async function executeJobCmd(name, args = [], options = {}) {
         else {
             try {
                 const _p = i == 0 ? args : params;
+                let nextParams = {};
+                if (i == 0) {
+                    const { vars } = initActionVars(args);
+                    nextParams = vars;
+                }
                 if (isDebug.value) {
                     console.log(i + 1, "Running action", name, _p);
                 }
@@ -160,7 +167,7 @@ async function executeJobCmd(name, args = [], options = {}) {
                 else {
                     params = res.data;
                 }
-                params = res.data;
+                params = { ...res.data, ...nextParams };
             }
             catch (err) {
                 return { error: `Error executing (${task.type}) task ${name}: ${err}` };

package/dist/cmd/lib/utils.d.ts

@@ -14,10 +14,11 @@ declare function initTaskParams(params: Record<string, any>, inferParams: Record
     conf: Record<string, any>;
     vars: Record<string, any>;
 };
+declare function initActionVars(args: Array<any>): Record<string, any>;
 declare function initTaskVars(args: Array<any>, inferParams: Record<string, any>): {
     conf: Record<string, any>;
     vars: Record<string, any>;
 };
 declare function parseInputOptions(options: any): Promise<string | null>;
 declare function createJsAction(action: CallableFunction): AgentTask<FeatureType>;
-export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/dist/cmd/lib/utils.js

@@ -135,9 +135,56 @@ function initTaskParams(params, inferParams) {
         conf.inferParams.images = params.images;
         delete params.images;
     }
+    if (params?.size) {
+        conf.size = params.size;
+        delete params.size;
+    }
+    if (params?.model) {
+        conf.model = params.model;
+        delete params.model;
+    }
+    if (params?.template) {
+        conf.template = params.template;
+        delete params.template;
+    }
     const res = { conf: conf, vars: params };
     return res;
 }
+function initActionVars(args) {
+    const vars = {};
+    args.forEach((a) => {
+        if (a.includes("=")) {
+            const t = a.split("=");
+            const k = t[0];
+            const v = t[1];
+            switch (k) {
+                case "m":
+                    if (v.includes("/")) {
+                        const _s = v.split("/");
+                        vars.model = _s[0];
+                        vars.template = _s[1];
+                    }
+                    else {
+                        vars.model = v;
+                    }
+                    break;
+                case "ip":
+                    v.split(",").forEach((p) => {
+                        const s = p.split(":");
+                        vars["inferParams"][s[0]] = parseFloat(s[1]);
+                    });
+                    break;
+                case "s":
+                    vars.size = v;
+                    break;
+                default:
+                    vars[k] = v;
+                    break;
+            }
+        }
+    });
+    return { vars };
+}
 function initTaskVars(args, inferParams) {
     const conf = { inferParams: inferParams };
     const vars = {};
@@ -195,4 +242,4 @@ function createJsAction(action) {
     });
     return task;
 }
-export { createJsAction, initTaskConf, initTaskParams, initTaskVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };
+export { createJsAction, initTaskConf, initTaskParams, initTaskVars, initActionVars, parseInputOptions, processOutput, readPromptFile, readTask, readTasksDir, setOptions };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@agent-smith/cli",
   "description": "Agent Smith: terminal client for language model agents",
   "repository": "https://github.com/synw/agent-smith",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc --noCheck",