@eko-ai/eko 2.1.4 → 2.1.5

package/dist/index.esm.js

@@ -371,6 +371,7 @@ function fixXmlTag(code) {
 class Context {
     constructor(taskId, config, agents, chain) {
         this.paused = false;
+        this.conversation = [];
         this.taskId = taskId;
         this.config = config;
         this.agents = agents;
@@ -14729,7 +14730,7 @@ class RetryLanguageModel {
         const names = [...this.names, ...this.names];
         for (let i = 0; i < names.length; i++) {
             const name = names[i];
-            const llm = this.getLLM(name);
+            const llm = await this.getLLM(name);
             if (!llm) {
                 continue;
             }
@@ -14781,7 +14782,7 @@ class RetryLanguageModel {
         const names = [...this.names, ...this.names];
         for (let i = 0; i < names.length; i++) {
             const name = names[i];
-            const llm = this.getLLM(name);
+            const llm = await this.getLLM(name);
             if (!llm) {
                 continue;
             }
@@ -14836,42 +14837,58 @@ class RetryLanguageModel {
         }
         return Promise.reject(new Error("No LLM available"));
     }
-    getLLM(name) {
+    async getLLM(name) {
         const llm = this.llms[name];
         if (!llm) {
             return null;
         }
+        let apiKey;
+        if (typeof llm.apiKey === "string") {
+            apiKey = llm.apiKey;
+        }
+        else {
+            apiKey = await llm.apiKey();
+        }
+        let baseURL = undefined;
+        if (llm.config?.baseURL) {
+            if (typeof llm.config.baseURL === "string") {
+                baseURL = llm.config.baseURL;
+            }
+            else {
+                baseURL = await llm.config.baseURL();
+            }
+        }
         if (llm.provider == "openai") {
             return createOpenAI({
-                apiKey: llm.apiKey,
-                baseURL: llm.config?.baseURL,
+                apiKey: apiKey,
+                baseURL: baseURL,
             }).languageModel(llm.model);
         }
         else if (llm.provider == "anthropic") {
             return createAnthropic({
-                apiKey: llm.apiKey,
-                baseURL: llm.config?.baseURL,
+                apiKey: apiKey,
+                baseURL: baseURL,
             }).languageModel(llm.model);
         }
         else if (llm.provider == "google") {
             return createGoogleGenerativeAI({
-                apiKey: llm.apiKey,
-                baseURL: llm.config?.baseURL,
+                apiKey: apiKey,
+                baseURL: baseURL,
             }).languageModel(llm.model);
         }
         else if (llm.provider == "aws") {
-            let keys = llm.apiKey.split("=");
+            let keys = apiKey.split("=");
             return createAmazonBedrock({
                 accessKeyId: keys[0],
                 secretAccessKey: keys[1],
-                baseURL: llm.config?.baseURL,
+                baseURL: baseURL,
                 region: llm.config?.region || "us-west-1",
             }).languageModel(llm.model);
         }
         else if (llm.provider == "openrouter") {
             return createOpenRouter({
-                apiKey: llm.apiKey,
-                baseURL: llm.config?.baseURL,
+                apiKey: apiKey,
+                baseURL: baseURL,
             }).languageModel(llm.model);
         }
         else {
@@ -18790,6 +18807,29 @@ class Agent {
     async handleMessages(agentContext, messages, tools) {
         // Only keep the last image / file, large tool-text-result
         handleLargeContextMessages(messages);
+        // User dialogue
+        const userPrompts = agentContext.context.conversation
+            .splice(0, agentContext.context.conversation.length)
+            .filter((s) => !!s);
+        if (userPrompts.length > 0) {
+            const lastMessage = messages[messages.length - 1];
+            if (lastMessage.role == "user") {
+                for (let i = 0; i < userPrompts.length; i++) {
+                    lastMessage.content.push({
+                        type: "text",
+                        text: userPrompts[i],
+                    });
+                }
+            }
+            else {
+                messages.push({
+                    role: "user",
+                    content: userPrompts.map((s) => {
+                        return { type: "text", text: s };
+                    }),
+                });
+            }
+        }
     }
     async callInnerTool(fun) {
         let result = await fun();
@@ -19392,6 +19432,7 @@ class Eko {
         if (context.paused) {
             context.paused = false;
         }
+        context.conversation = [];
         if (context.controller.signal.aborted) {
             context.controller = new AbortController();
         }
@@ -19466,11 +19507,13 @@ class Eko {
         return [...this.taskMap.keys()];
     }
     deleteTask(taskId) {
+        this.abortTask(taskId);
         return this.taskMap.delete(taskId);
     }
     abortTask(taskId) {
         let context = this.taskMap.get(taskId);
         if (context) {
+            context.paused = false;
             context.controller.abort();
             return true;
         }
@@ -19488,6 +19531,13 @@ class Eko {
             return false;
         }
     }
+    chatTask(taskId, userPrompt) {
+        let context = this.taskMap.get(taskId);
+        if (context) {
+            context.conversation.push(userPrompt);
+            return context.conversation;
+        }
+    }
     addAgent(agent) {
         this.config.agents = this.config.agents || [];
         this.config.agents.push(agent);