@eko-ai/eko 4.1.1 → 4.1.3

package/dist/index.cjs

@@ -29813,7 +29813,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
 }
 
 // src/version.ts
-var VERSION$1 = "1.5.3";
+var VERSION$1 = "1.5.4";
 
 // src/provider.ts
 function createOpenRouter(options = {}) {
@@ -37133,15 +37133,15 @@ async function doCompressAgentMessages(agentContext, messages, tools) {
         content: toolResult.content.filter((s) => s.type == "text"),
     });
 }
-function compressLargeContextMessages(messages) {
+function compressLargeContextMessages(messages, largeTextLength = config$1.largeTextLength) {
     for (let r = 2; r < messages.length; r++) {
         const message = messages[r];
         if (message.role == "assistant") {
             message.content = message.content.map((c) => {
-                if (c.type == "text" && c.text.length > config$1.largeTextLength) {
+                if (c.type == "text" && c.text.length > largeTextLength) {
                     return {
                         ...c,
-                        text: sub(c.text, config$1.largeTextLength, true),
+                        text: sub(c.text, largeTextLength, true),
                     };
                 }
                 return c;
@@ -37149,10 +37149,10 @@ function compressLargeContextMessages(messages) {
         }
         else if (message.role == "user") {
             message.content = message.content.map((c) => {
-                if (c.type == "text" && c.text.length > config$1.largeTextLength) {
+                if (c.type == "text" && c.text.length > largeTextLength) {
                     return {
                         ...c,
-                        text: sub(c.text, config$1.largeTextLength, true),
+                        text: sub(c.text, largeTextLength, true),
                     };
                 }
                 return c;
@@ -37163,18 +37163,18 @@ function compressLargeContextMessages(messages) {
                 if (c.type == "tool-result" && c.output) {
                     const output = c.output;
                     if ((output.type == "text" || output.type == "error-text") &&
-                        output.value.length > config$1.largeTextLength) {
+                        output.value.length > largeTextLength) {
                         return {
                             ...c,
                             output: {
                                 ...output,
-                                value: sub(output.value, config$1.largeTextLength, true),
+                                value: sub(output.value, largeTextLength, true),
                             },
                         };
                     }
                     else if ((output.type == "json" || output.type == "error-json") &&
-                        JSON.stringify(output.value).length > config$1.largeTextLength) {
-                        const json_str = sub(JSON.stringify(output.value), config$1.largeTextLength, false);
+                        JSON.stringify(output.value).length > largeTextLength) {
+                        const json_str = sub(JSON.stringify(output.value), largeTextLength, false);
                         const json_obj = fixJson(json_str);
                         if (JSON.stringify(json_obj).length < 10) {
                             return {
@@ -37200,8 +37200,8 @@ function compressLargeContextMessages(messages) {
                         for (let i = 0; i < output.value.length; i++) {
                             const content = output.value[i];
                             if (content.type == "text" &&
-                                content.text.length > config$1.largeTextLength) {
-                                content.text = sub(content.text, config$1.largeTextLength, true);
+                                content.text.length > largeTextLength) {
+                                content.text = sub(content.text, largeTextLength, true);
                             }
                         }
                     }
@@ -37211,7 +37211,7 @@ function compressLargeContextMessages(messages) {
         }
     }
 }
-function handleLargeContextMessages(messages) {
+function handleLargeContextMessages(messages, largeTextLength = config$1.largeTextLength) {
     let imageNum = 0;
     let fileNum = 0;
     let maxNum = config$1.maxDialogueImgFileNum;
@@ -37267,7 +37267,7 @@ function handleLargeContextMessages(messages) {
                 for (let r = 0; r < toolContent.value.length; r++) {
                     let _content = toolContent.value[r];
                     if (_content.type == "text" &&
-                        _content.text?.length > config$1.largeTextLength) {
+                        _content.text?.length > largeTextLength) {
                         if (!longTextTools[toolResult.toolName]) {
                             longTextTools[toolResult.toolName] = 1;
                             break;
@@ -37277,7 +37277,7 @@ function handleLargeContextMessages(messages) {
                         }
                         _content = {
                             type: "text",
-                            text: sub(_content.text, config$1.largeTextLength, true),
+                            text: sub(_content.text, largeTextLength, true),
                         };
                         toolContent.value[r] = _content;
                     }
@@ -37707,7 +37707,7 @@ class RetryLanguageModel {
         this.llms = llms;
         this.names = names || [];
         context && this.setContext(context);
-        this.stream_first_timeout = stream_first_timeout || 30000;
+        this.stream_first_timeout = stream_first_timeout || 45000;
         this.stream_token_timeout = stream_token_timeout || 180000;
         if (this.names.indexOf("default") == -1) {
             this.names.push("default");
@@ -37755,7 +37755,13 @@ class RetryLanguageModel {
             if (!providerOptions) {
                 options.providerOptions = defaultLLMProviderOptions();
                 if (llmConfig.options && Object.keys(llmConfig.options).length > 0) {
-                    options.providerOptions[llm.provider] = llmConfig.options;
+                    // Filter out keys that start with 'stream_'
+                    options.providerOptions[llm.provider] = Object.entries(llmConfig.options).reduce((acc, [key, value]) => {
+                        if (!key.startsWith("stream_")) {
+                            acc[key] = value;
+                        }
+                        return acc;
+                    }, {});
                 }
             }
             let _options = options;
@@ -37868,12 +37874,11 @@ class RetryLanguageModel {
                 }
                 lastError = e;
                 if (Log.isEnableInfo()) {
-                    Log.info(`LLM stream request, name: ${name} => `, {
-                        tools: _options.tools,
+                    Log.info(`LLM stream request, name: ${name} => `, e, {
                         messages: _options.prompt,
+                        tools: _options.tools,
                     });
                 }
-                Log.error(`LLM error, name: ${name} => `, e);
             }
         }
         return Promise.reject(lastError ? lastError : new Error("No LLM available"));
@@ -38377,14 +38382,28 @@ async function callLLM(rlm, request, streamCallback, errorHandler, finishHandler
         }
     }
     catch (e) {
-        if (retryNum < config$1.maxRetryNum) {
-            await sleep(200 * (retryNum + 1) * (retryNum + 1));
+        if (e instanceof Error && e.name === "AbortError") {
             if (errorHandler) {
                 await errorHandler(request, e, retryNum);
             }
-            return callLLM(rlm, request, streamCallback, errorHandler, finishHandler, ++retryNum);
+            Log.warn("callLLM abort error: ", e);
+            return streamText
+                ? [
+                    { type: "text", text: streamText },
+                    ...toolParts,
+                ]
+                : toolParts;
+        }
+        else {
+            if (retryNum < config$1.maxRetryNum) {
+                await sleep(200 * (retryNum + 1) * (retryNum + 1));
+                if (errorHandler) {
+                    await errorHandler(request, e, retryNum);
+                }
+                return callLLM(rlm, request, streamCallback, errorHandler, finishHandler, ++retryNum);
+            }
+            throw e;
         }
-        throw e;
     }
     finally {
         reader && reader.releaseLock();
@@ -44985,11 +45004,14 @@ exports.callLLM = callLLM;
 exports.callWithReAct = callWithReAct;
 exports.call_timeout = call_timeout;
 exports.compressImageData = compressImageData;
+exports.compressLargeContextMessages = compressLargeContextMessages;
 exports.config = config$1;
 exports.convertToolSchema = convertToolSchema;
 exports.default = Eko;
 exports.extract_page_content = extract_page_content;
+exports.fixJson = fixJson;
 exports.global = global;
+exports.handleLargeContextMessages = handleLargeContextMessages;
 exports.mergeTools = mergeTools;
 exports.parseWorkflow = parseWorkflow;
 exports.resetWorkflowXml = resetWorkflowXml;