@agent-smith/cli 0.0.23 → 0.0.25

package/dist/agent.d.ts

@@ -1,4 +1,4 @@
-import { LmTaskBuilder } from "@agent-smith/lmtask";
+import { LmTaskBuilder } from "../../lmtask/dist/task.js";
 import { marked } from 'marked';
 import { FeatureType } from "./interfaces.js";
 declare let brain: import("@agent-smith/brain").AgentBrain<Record<string, any>>;

package/dist/agent.js

@@ -1,5 +1,5 @@
 import { useAgentBrain } from "@agent-smith/brain";
-import { LmTaskBuilder } from "@agent-smith/lmtask";
+import { LmTaskBuilder } from "../../lmtask/dist/task.js";
 import { marked } from 'marked';
 import { markedTerminal } from "marked-terminal";
 marked.use(markedTerminal());

package/dist/cmd/lib/execute_job.js

@@ -18,11 +18,6 @@ async function executeJobCmd(name, args = [], options = {}) {
     let i = 0;
     for (const [name, task] of Object.entries(job.tasks)) {
         if (task.type == "task") {
-            let conf = {};
-            let vars = {};
-            const tv = initTaskVars(args);
-            conf = tv.conf;
-            vars = i == 0 ? tv.vars : params;
             const { found, path } = getFeatureSpec(name, "task");
             if (!found) {
                 return { ok: false, data: {}, error: `Task ${name} not found` };
@@ -33,7 +28,14 @@ async function executeJobCmd(name, args = [], options = {}) {
             }
             const taskSpec = taskBuilder.readFromYaml(tres.ymlTask);
             let m = taskSpec.model.name;
-            let t = taskSpec.template.name;
+            let t = taskSpec.model.template;
+            let conf = {};
+            let vars = {};
+            const tv = initTaskVars(args, taskSpec?.inferParams ? taskSpec.inferParams : {});
+            console.log("TIP", taskSpec.inferParams);
+            console.log("IP", tv.conf.inferParams);
+            conf = tv.conf;
+            vars = i == 0 ? tv.vars : params;
             if (conf?.model) {
                 m = conf.model;
             }

package/dist/cmd/lib/execute_task.js

@@ -2,6 +2,8 @@ import { brain, initAgent, taskBuilder } from "../../agent.js";
 import { getFeatureSpec } from "../../state/features.js";
 import { isChatMode, isDebug } from "../../state/state.js";
 import { initTaskVars, parseInputOptions, readTask } from "./utils.js";
+import { useTemplateForModel } from "@agent-smith/tfm";
+const tfm = useTemplateForModel();
 async function executeTaskCmd(args = [], options = {}) {
     await initAgent();
     if (isDebug.value) {
@@ -30,18 +32,47 @@ async function executeTaskCmd(args = [], options = {}) {
     }
     const taskSpec = taskBuilder.readFromYaml(res.ymlTask);
     const task = taskBuilder.fromYaml(res.ymlTask);
-    const { conf, vars } = initTaskVars(args);
+    const { conf, vars } = initTaskVars(args, taskSpec?.inferParams ? taskSpec.inferParams : {});
     if (isDebug.value) {
         console.log("Task conf:", conf);
         console.log("Task vars:", vars);
     }
     let m = taskSpec.model.name;
-    let t = taskSpec.template.name;
+    let t = taskSpec.model.template;
+    let c = taskSpec.model.ctx;
     if (conf?.model) {
         m = conf.model;
+        if (conf?.template) {
+            t = conf.template;
+        }
+        else {
+            const gt = tfm.guess(m);
+            if (gt == "none") {
+                throw new Error(`Unable to guess the template for ${conf.model}: please provide a template name"`);
+            }
+            t = gt;
+        }
+    }
+    else {
+        if (conf?.size) {
+            if (!taskSpec?.models) {
+                throw new Error(`Model ${conf.size} not found in task`);
+            }
+            if (!Object.keys(taskSpec.models).includes(conf.size)) {
+                throw new Error(`Model ${conf.size} not found in task`);
+            }
+            m = taskSpec.models[conf.size].name;
+            t = taskSpec.models[conf.size].template;
+            c = taskSpec.models[conf.size].ctx;
+        }
     }
-    if (conf?.template) {
-        t = conf.template;
+    conf.model = {
+        name: m,
+        template: t,
+        ctx: c,
+    };
+    if (isDebug.value) {
+        console.log("Model:", conf.model);
     }
     const ex = brain.getOrCreateExpertForModel(m, t);
     if (!ex) {
@@ -62,9 +93,6 @@ async function executeTaskCmd(args = [], options = {}) {
     if (isDebug.value) {
         conf.debug = true;
     }
-    if (isDebug.value) {
-        console.log("Vars", vars);
-    }
     const data = await task.run({ prompt: pr, ...vars }, conf);
     if (data?.error) {
         return { ok: false, data: "", conf: conf, error: `Error executing task: ${data.error}` };

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

@@ -6,7 +6,7 @@ declare function readTask(taskpath: string): {
     ymlTask: string;
 };
 declare function readTasksDir(dir: string): Array<string>;
-declare function initTaskVars(args: Array<any>): {
+declare function initTaskVars(args: Array<any>, inferParams: Record<string, any>): {
     conf: Record<string, any>;
     vars: Record<string, any>;
 };

package/dist/cmd/lib/utils.js

@@ -73,8 +73,8 @@ function readTasksDir(dir) {
     });
     return tasks;
 }
-function initTaskVars(args) {
-    const conf = {};
+function initTaskVars(args, inferParams) {
+    const conf = { inferParams: inferParams };
     const vars = {};
     args.forEach((a) => {
         if (a.includes("=")) {
@@ -92,12 +92,13 @@ function initTaskVars(args) {
                 }
             }
             else if (k == "ip") {
-                const ip = {};
                 v.split(",").forEach((p) => {
                     const s = p.split(":");
-                    ip[s[0]] = parseFloat(s[1]);
+                    conf["inferParams"][s[0]] = parseFloat(s[1]);
                 });
-                conf.inferParams = ip;
+            }
+            else if (k == "s") {
+                conf.size = v;
             }
             else {
                 vars[k] = v;

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.23",
+  "version": "0.0.25",
   "scripts": {
     "buildrl": "rm -rf dist/* && rollup -c",
     "build": "rm -rf dist/* && tsc",