@jarvis-agent/core 0.1.5 → 0.1.6

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-const config$1 = {
+const defaultConfig = {
     name: "Eko",
     platform: "mac",
     maxReactNum: 500,
@@ -14,7 +14,18 @@ const config$1 = {
     parallelToolCalls: true,
     expertMode: false,
     expertModeTodoLoopNum: 10,
+    streamFirstTimeout: 30000,
+    streamTokenTimeout: 180000,
 };
+let config$1 = { ...defaultConfig };
+function mergeGlobalConfig(userConfig) {
+    if (userConfig) {
+        config$1 = { ...defaultConfig, ...userConfig };
+    }
+    else {
+        config$1 = { ...defaultConfig };
+    }
+}
 
 var LogLevel;
 (function (LogLevel) {
@@ -23926,6 +23937,7 @@ class Context {
         this.chain = chain;
         this.variables = new Map();
         this.controller = new AbortController();
+        mergeGlobalConfig(config.globalConfig);
     }
     async checkAborted(noCheckPause) {
         if (this.controller.signal.aborted) {
@@ -29806,8 +29818,7 @@ async function compressAgentMessages(agentContext, messages, tools) {
 }
 async function doCompressAgentMessages(agentContext, messages, tools) {
     const ekoConfig = agentContext.context.config;
-    const rlm = new RetryLanguageModel(ekoConfig.llms, ekoConfig.compressLlms);
-    rlm.setContext(agentContext);
+    const rlm = new RetryLanguageModel(ekoConfig.llms, ekoConfig.compressLlms, ekoConfig.globalConfig?.streamFirstTimeout, ekoConfig.globalConfig?.streamTokenTimeout, agentContext);
     // extract used tool
     const usedTools = extractUsedTool(messages, tools);
     const snapshotTool = new TaskSnapshotTool();
@@ -31225,8 +31236,7 @@ class Planner {
     }
     async doPlan(taskPrompt, messages, saveHistory, retryNum = 0) {
         const config = this.context.config;
-        const rlm = new RetryLanguageModel(config.llms, config.planLlms);
-        rlm.setContext(this.context);
+        const rlm = new RetryLanguageModel(config.llms, config.planLlms, config.globalConfig?.streamFirstTimeout, config.globalConfig?.streamTokenTimeout, this.context);
         const request = {
             maxTokens: 8192,
             temperature: 0.7,
@@ -31683,8 +31693,7 @@ async function checkTaskReplan(agentContext) {
         if (!chain.planRequest || !chain.planResult) {
             return false;
         }
-        const rlm = new RetryLanguageModel(context.config.llms, context.config.planLlms);
-        rlm.setContext(agentContext);
+        const rlm = new RetryLanguageModel(context.config.llms, context.config.planLlms, context.config.globalConfig?.streamFirstTimeout, context.config.globalConfig?.streamTokenTimeout, agentContext);
         const agentExecution = getAgentExecutionPrompt(agentContext);
         const prompt = `# Task Execution Status
 ${agentExecution}
@@ -32719,7 +32728,7 @@ class EkoDialogue {
             params.messageId = params.messageId ?? this.memory.genMessageId();
             await this.addUserMessage(params.user, params.messageId);
         }
-        const rlm = new RetryLanguageModel(this.config.llms, this.config.chatLlms);
+        const rlm = new RetryLanguageModel(this.config.llms, this.config.chatLlms, this.config.globalConfig?.streamFirstTimeout, this.config.globalConfig?.streamTokenTimeout);
         for (let i = 0; i < 15; i++) {
             const messages = this.memory.buildMessages();
             const chatTools = [...this.buildInnerTools(params), ...this.tools];
@@ -33485,8 +33494,7 @@ request_help: Request assistance from the user; for instance, when an operation
         }
         try {
             let imageResult = (await screenshot.call(agentContext.agent, agentContext));
-            let rlm = new RetryLanguageModel(agentContext.context.config.llms, agentContext.agent.Llms);
-            rlm.setContext(agentContext);
+            let rlm = new RetryLanguageModel(agentContext.context.config.llms, agentContext.agent.Llms, agentContext.context.config.globalConfig?.streamFirstTimeout, agentContext.context.config.globalConfig?.streamTokenTimeout, agentContext);
             let image = toImage(imageResult.imageBase64);
             let request = {
                 messages: [
@@ -33734,8 +33742,7 @@ class WatchTriggerTool {
         const start = new Date().getTime();
         const timeout = (args.timeout || 5) * 60000;
         const frequency = Math.max(500, (args.frequency || 1) * 1000);
-        const rlm = new RetryLanguageModel(agentContext.context.config.llms, agentContext.agent.Llms);
-        rlm.setContext(agentContext);
+        const rlm = new RetryLanguageModel(agentContext.context.config.llms, agentContext.agent.Llms, agentContext.context.config.globalConfig?.streamFirstTimeout, agentContext.context.config.globalConfig?.streamTokenTimeout, agentContext);
         while (new Date().getTime() - start < timeout) {
             await agentContext.context.checkAborted();
             await new Promise((resolve) => setTimeout(resolve, frequency));
@@ -34267,8 +34274,7 @@ class Agent {
             },
         ];
         agentContext.messages = messages;
-        const rlm = new RetryLanguageModel(context.config.llms, this.llms);
-        rlm.setContext(agentContext);
+        const rlm = new RetryLanguageModel(context.config.llms, this.llms, context.config.globalConfig?.streamFirstTimeout, context.config.globalConfig?.streamTokenTimeout, agentContext);
         let agentTools = tools;
         while (loopNum < maxReactNum) {
             await context.checkAborted();