@agent-smith/task 0.0.2 → 0.0.3

package/dist/interfaces.d.ts

@@ -62,19 +62,24 @@ interface TaskVariableDef {
     type: string | Array<string>;
     description: string;
 }
+interface TaskOptionalVariableDef extends TaskVariableDef {
+    default?: any;
+}
+interface TaskVariables {
+    required?: Record<string, TaskVariableDef>;
+    optional?: Record<string, TaskOptionalVariableDef>;
+}
 interface TaskDef {
     name: string;
-    description: string;
     prompt: string;
+    description: string;
+    model: ModelSpec;
+    ctx: number;
     template?: TemplateSpec;
     inferParams?: InferenceParams;
-    model: ModelSpec;
     models?: Record<string, ModelSpec>;
     shots?: Array<HistoryTurn>;
-    variables?: {
-        required?: Record<string, TaskVariableDef>;
-        optional?: Record<string, TaskVariableDef>;
-    };
+    variables?: TaskVariables;
     tools?: Array<ToolSpec>;
     toolsList?: Array<string>;
 }
@@ -83,4 +88,4 @@ interface TaskOutput {
     errors: Record<string, string>;
     template?: PromptTemplate;
 }
-export { ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef, };
+export { ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef, TaskOptionalVariableDef, TaskVariables, };

package/dist/main.d.ts

@@ -1,3 +1,3 @@
 import { Task } from "./task.js";
-import { ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef } from "./interfaces.js";
-export { Task, ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef, };
+import { ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef, TaskOptionalVariableDef, TaskVariables } from "./interfaces.js";
+export { Task, ModelSpec, TaskInput, TaskDef, TemplateSpec, TaskConf, TaskOutput, TaskVariableDef, TaskOptionalVariableDef, TaskVariables, };

package/dist/task.d.ts

@@ -1,5 +1,5 @@
 import { ToolSpec } from '@locallm/types';
-import { Agent } from "../../agent/dist/agent.js";
+import { Agent } from "@agent-smith/agent";
 import { TaskConf, TaskDef, TaskInput, TaskOutput } from "./interfaces.js";
 declare class Task {
     def: TaskDef;

package/dist/task.js

@@ -21,10 +21,14 @@ class Task {
             throw new Error("Please provide a prompt parameter");
         }
         let model = this.def.model;
+        let ctx = this.def.ctx;
         const useTemplates = this.agent.lm.providerType !== "openai";
         if (conf) {
             if (conf?.model) {
                 model = conf.model;
+                if (model?.ctx) {
+                    ctx = model.ctx;
+                }
             }
             if (conf?.modelname) {
                 let found = false;
@@ -33,18 +37,26 @@ class Task {
                         if (modelName == conf.modelname) {
                             found = true;
                             const m = _mod;
+                            if (m?.ctx) {
+                                ctx = m.ctx;
+                            }
                             model = m;
                             break;
                         }
                     }
                 }
                 if (!found) {
-                    throw new Error(`No model found for ${conf.modelname}. Available models:\n${params?.models}`);
+                    if (this.agent.lm.providerType == "ollama") {
+                        model = { name: conf.modelname };
+                    }
+                    else {
+                        throw new Error(`No model found for ${conf.modelname}. Available models:\n${params?.models}`);
+                    }
                 }
             }
         }
         if (this.agent.lm.providerType == "ollama") {
-            await this.agent.lm.loadModel(model.name, model.ctx);
+            await this.agent.lm.loadModel(model.name, ctx);
         }
         this.def = applyVariables(this.def, params);
         let tpl = new PromptTemplate("none");
@@ -72,16 +84,16 @@ class Task {
             options.tools = agentToolsList;
         }
         if (conf?.debug) {
-            console.log("-----------", model.name, "/", model.template, "-----------");
+            console.log("-----------", model.name, "- Template:", tpl.name, "- Ctx:", ctx, "-----------");
             console.log(finalPrompt);
             console.log("----------------------------------------------");
             console.log("Infer params:", this.def.inferParams);
             console.log("----------------------------------------------");
         }
-        if (!this.def.inferParams?.extra) {
-            this.def.inferParams["extra"] = {};
-        }
         if (this.agent.lm.providerType == "ollama") {
+            if (!this.def.inferParams?.extra) {
+                this.def.inferParams["extra"] = {};
+            }
             // tell Ollama to apply no template
             this.def.inferParams["extra"]["raw"] = true;
         }

package/dist/templates.js

@@ -2,6 +2,11 @@ import { PromptTemplate } from "modprompt";
 import { useTemplateForModel } from "@agent-smith/tfm";
 const tfm = useTemplateForModel();
 function formatTaskTemplate(taskDef, templateName) {
+    //console.log("FTTaskdef", taskDef);
+    //console.log("FTTpl", templateName);
+    if (!taskDef?.model) {
+        throw new Error("Provide a model to run the task " + taskDef.name);
+    }
     if ((!taskDef.model?.template)) {
         const gt = tfm.guess(taskDef.model.name);
         if (gt == "none") {

package/dist/variables.js

@@ -11,7 +11,8 @@ function applyVariables(taskDef, taskInput) {
         if (taskDef.variables?.optional) {
             for (const name of Object.keys(taskDef.variables.optional)) {
                 if (!(name in taskInput)) {
-                    taskDef.prompt = taskDef.prompt.replaceAll(`{${name}}`, "");
+                    const v = taskDef.variables.optional[name]?.default ?? "";
+                    taskDef.prompt = taskDef.prompt.replaceAll(`{${name}}`, v);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-smith/task",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "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.0.2",
+    "@agent-smith/agent": "^0.0.3",
     "@agent-smith/tfm": "^0.1.2",
     "@locallm/api": "0.4.2",
     "modprompt": "^0.12.0",