@agent-smith/task 0.3.3 → 0.4.0

package/dist/task.js

@@ -23,7 +23,7 @@ class Task {
         }
         let model = this.def.model;
         let ctx = this.def.ctx;
-        const useTemplates = this.agent.lm.providerType !== "openai";
+        //const useTemplates = this.agent.lm.providerType !== "openai";
         if (conf) {
             if (conf?.model) {
                 model = conf.model;
@@ -39,7 +39,8 @@ class Task {
         if (this.agent.lm.providerType == "ollama") {
             await this.agent.lm.loadModel(model.name, ctx);
         }
-        this.def = applyVariables(this.def, params);
+        //console.log("PARAMS", params);
+        //console.log("DEF PR", this.def.prompt);
         let tpl = new PromptTemplate("none");
         const options = {};
         if (conf?.onToolCall) {
@@ -73,24 +74,22 @@ class Task {
                 });
             }
         }
-        if (useTemplates) {
-            this.def.model = model;
-            tpl = formatTaskTemplate(this.def, model?.template ? model.template : undefined);
-            this.def.inferParams = formatInferParams(this.def.inferParams ?? {}, conf ?? {}, tpl);
-            //tpl.replacePrompt(this.def.prompt);
-            if (hasTools) {
-                if (!tpl?.toolsDef) {
-                    throw new Error(`The template ${tpl.name} does not have tools and the task ${this.def.name} specifies some`);
-                }
-                this.def.tools?.forEach((t) => tpl.addTool(t));
+        applyVariables(this.def, params);
+        this.def.model = model;
+        tpl = formatTaskTemplate(this.def, model?.template ? model.template : undefined);
+        this.def.inferParams = formatInferParams(this.def.inferParams ?? {}, conf ?? {}, tpl);
+        //tpl.replacePrompt(this.def.prompt);
+        if (hasTools) {
+            if (!tpl?.toolsDef) {
+                throw new Error(`The template ${tpl.name} does not have tools and the task ${this.def.name} specifies some`);
             }
-            ;
-            //finalPrompt = params.prompt;
+            this.def.tools?.forEach((t) => tpl.addTool(t));
         }
-        else {
-            this.def.inferParams = formatInferParams(this.def.inferParams ?? {}, conf ?? {});
-        }
-        //console.log("DEF", this.def);
+        ;
+        //finalPrompt = params.prompt;
+        /*console.log("-------------------------");
+        console.log("DEF", this.def);
+        console.log("-------------------------");*/
         //console.log("P", params.prompt);
         const finalPrompt = this.def.prompt.replace("{prompt}", params.prompt);
         //console.log("FP", finalPrompt);
@@ -110,7 +109,7 @@ class Task {
                 });
             }
             console.log("-----------", model.name, "- Template:", tpl.name, "- Ctx:", ctx, "-----------");
-            console.log(useTemplates ? tpl.prompt(finalPrompt) : finalPrompt);
+            console.log(this.agent.lm.providerType != 'openai' ? tpl.prompt(finalPrompt) : finalPrompt);
             console.log("----------------------------------------------");
             console.log("Infer params:", this.def.inferParams);
             console.log("----------------------------------------------");
@@ -135,24 +134,17 @@ class Task {
         if (isRoutingAgent) {
             options.isToolsRouter = true;
         }
-        if (!useTemplates) {
-            if (this.def.template?.system) {
-                options.system = this.def.template.system;
-            }
-            if (this.def?.shots) {
-                options.history = options?.history ? [...options.history, ...this.def.shots] : this.def.shots;
-            }
-            //console.log("RUN AGENT (TASK) params:", this.def.inferParams);
-            //console.log("RUN AGENT (TASK) options:", options);
-            answer = await this.agent.run(finalPrompt, this.def.inferParams, options);
-        }
-        else {
-            //console.log("RUN AGENT (TASK) params:", this.def.inferParams);
-            //console.log("RUN AGENT (TASK) options:", options);
-            answer = await this.agent.run(finalPrompt, this.def.inferParams, options, tpl);
+        if (this.def.template?.system) {
+            options.system = this.def.template.system;
+        }
+        if (this.def?.shots) {
+            options.history = options?.history ? [...this.def.shots, ...options.history] : this.def.shots;
+        }
+        //console.log("RUN AGENT (TASK) params:", this.def.inferParams);
+        //console.log("RUN AGENT (TASK) options:", options);
+        answer = await this.agent.run(finalPrompt, this.def.inferParams, options, tpl);
+        if (this.agent.lm.providerType == "openai") {
             tpl.history = this.agent.history;
-            //console.log("RAW ANSWER", answer);
-            //console.log("\nHISTORY", this.agent.history);
         }
         // remove task tools from the agent
         if (hasTools) {

package/dist/variables.js

@@ -35,10 +35,14 @@ function applyVariables(taskDef, taskInput) {
     }
     // apply variables
     for (const [k, v] of Object.entries(taskInput)) {
+        //console.log("APPLY", k, v);
         taskDef.prompt = taskDef.prompt.replaceAll(`{${k}}`, v);
         if (taskDef.template?.system) {
             taskDef.template.system = taskDef.template.system.replaceAll(`{${k}}`, v);
         }
+        if (taskDef.template?.afterSystem) {
+            taskDef.template.afterSystem = taskDef.template.afterSystem.replaceAll(`{${k}}`, v);
+        }
         if (taskDef?.shots) {
             const nshots = new Array();
             taskDef.shots.forEach(s => {
@@ -51,6 +55,7 @@ function applyVariables(taskDef, taskInput) {
             taskDef.shots = nshots;
         }
     }
+    //console.log("TD FINAL", taskDef);
     return taskDef;
 }
 export { applyVariables, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-smith/task",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "A toolkit to create human friendly agents: the language model tasks module",
   "repository": {
     "type": "git",
@@ -14,8 +14,8 @@
     "docs": "typedoc --entryPointStrategy expand"
   },
   "dependencies": {
-    "@agent-smith/agent": "^0.3.3",
-    "@agent-smith/tfm": "^0.2.0",
+    "@agent-smith/agent": "^0.4.0",
+    "@agent-smith/tfm": "^0.3.0",
     "modprompt": "^0.14.2",
     "yaml": "^2.8.2"
   },
@@ -23,10 +23,10 @@
     "@locallm/api": "^0.7.3",
     "@locallm/types": "^0.7.1",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.1.0",
+    "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^25.3.1",
-    "openai": "6.25.0",
+    "@types/node": "^25.3.5",
+    "openai": "6.27.0",
     "restmix": "^0.6.1",
     "rollup": "^4.59.0",
     "tslib": "^2.8.1",
@@ -48,4 +48,4 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "MIT"
-}
+}