@agent-smith/task 0.1.8 → 0.2.0

package/dist/task.d.ts

@@ -1,4 +1,3 @@
-import { ToolSpec } from '@locallm/types';
 import { Agent } from "@agent-smith/agent";
 import { TaskConf, TaskDef, TaskInput, TaskOutput } from "./interfaces.js";
 declare class Task {
@@ -7,6 +6,5 @@ declare class Task {
     constructor(agent: Agent, def: TaskDef);
     static fromYaml(agent: Agent, txt: string): Task;
     run(params: TaskInput, conf?: TaskConf): Promise<TaskOutput>;
-    addTools(tools: Array<ToolSpec>): Task;
 }
 export { Task };

package/dist/task.js

@@ -15,10 +15,11 @@ class Task {
         return new Task(agent, data);
     }
     async run(params, conf) {
+        //console.log("TASK DEF", this.def);
         //console.log("TASK CONF", conf);
         //console.log("TOOLS", this.agent.tools);
         if (!params?.prompt) {
-            throw new Error(`Task ${this.def.name}: no prompt parameter provided. Parameters: ${params}`);
+            throw new Error(`Task ${this.def.name}: no prompt parameter provided. Parameters: ${JSON.stringify(params, null, 2)}`);
         }
         let model = this.def.model;
         let ctx = this.def.ctx;
@@ -40,32 +41,49 @@ class Task {
         }
         this.def = applyVariables(this.def, params);
         let tpl = new PromptTemplate("none");
-        let finalPrompt;
         const options = {};
-        const agentToolsList = Object.values(this.agent.tools);
+        if (conf?.onToolCall) {
+            options.onToolCall = conf.onToolCall;
+        }
+        if (conf?.onToolCallEnd) {
+            options.onToolCallEnd = conf.onToolCallEnd;
+        }
+        let hasTools = false;
+        // add task tools to the agent
+        if (this.def?.tools) {
+            if (this.def?.tools.length > 0) {
+                hasTools = true;
+                this.def.tools.forEach(t => {
+                    this.agent.tools[t.name] = t;
+                });
+            }
+        }
         if (useTemplates) {
             tpl = formatTaskTemplate(this.def, model?.template ? model.template : undefined);
             this.def.inferParams = formatInferParams(this.def.inferParams ?? {}, conf ?? {}, tpl);
             //tpl.replacePrompt(this.def.prompt);
-            if (agentToolsList.length > 0) {
+            if (hasTools) {
                 if (!tpl?.toolsDef) {
                     throw new Error(`The template ${tpl.name} does not have tools and the task ${this.def.name} specifies some`);
                 }
-                agentToolsList.forEach((t) => tpl.addTool(t));
+                this.def.tools?.forEach((t) => tpl.addTool(t));
             }
             ;
-            finalPrompt = params.prompt;
+            //finalPrompt = params.prompt;
         }
         else {
             this.def.inferParams = formatInferParams(this.def.inferParams ?? {}, conf ?? {});
-            finalPrompt = this.def.prompt.replace("{prompt}", params.prompt);
         }
+        //console.log("DEF", this.def);
+        //console.log("P", params.prompt);
+        const finalPrompt = this.def.prompt.replace("{prompt}", params.prompt);
+        //console.log("FP", finalPrompt);
         // model
         if (model) {
             this.def.inferParams.model = model;
         }
-        if (agentToolsList.length > 0) {
-            options.tools = agentToolsList;
+        if (hasTools) {
+            options.tools = this.def.tools;
         }
         if (conf?.debug) {
             console.log("-----------", model.name, "- Template:", tpl.name, "- Ctx:", ctx, "-----------");
@@ -87,6 +105,10 @@ class Task {
             // cut debug here. TODO: debug log levels
             options.debug = false;
         }
+        const isRoutingAgent = this.def.description.includes("routing agent");
+        if (isRoutingAgent) {
+            options.isToolsRouter = true;
+        }
         if (!useTemplates) {
             if (this.def.template?.system) {
                 options.system = this.def.template.system;
@@ -106,12 +128,14 @@ class Task {
             //console.log("RAW ANSWER", answer);
             //console.log("\nHISTORY", this.agent.history);
         }
+        // remove task tools from the agent
+        if (hasTools) {
+            this.def.tools?.forEach(t => {
+                delete this.agent.tools[t.name];
+            });
+        }
         //console.log("TASK: ANSWER FINAL:", { answer: answer.result, errors: {}, template: answer.template })
         return { answer, template: tpl };
     }
-    addTools(tools) {
-        tools.forEach(t => this.agent.tools[t.name] = t);
-        return this;
-    }
 }
 export { Task };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-smith/task",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "A toolkit to create human friendly agents: the language model tasks module",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "docs": "typedoc --entryPointStrategy expand"
   },
   "dependencies": {
-    "@agent-smith/agent": "^0.1.6",
+    "@agent-smith/agent": "^0.1.8",
     "@agent-smith/tfm": "^0.2.0",
     "modprompt": "^0.12.6",
     "yaml": "^2.8.2"
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@locallm/api": "^0.7.3",
     "openai": "6.15.0",
-    "@locallm/types": "^0.6.4",
+    "@locallm/types": "^0.6.7",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.3.0",