@langchain/core 0.1.55 → 0.1.57

package/dist/output_parsers/json.cjs

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsePartialJson = exports.parseJsonMarkdown = exports.JsonOutputParser = void 0;
+exports.parseJsonMarkdown = exports.parsePartialJson = exports.JsonOutputParser = void 0;
 const transform_js_1 = require("./transform.cjs");
 const json_patch_js_1 = require("../utils/json_patch.cjs");
+const json_js_1 = require("../utils/json.cjs");
+Object.defineProperty(exports, "parseJsonMarkdown", { enumerable: true, get: function () { return json_js_1.parseJsonMarkdown; } });
+Object.defineProperty(exports, "parsePartialJson", { enumerable: true, get: function () { return json_js_1.parsePartialJson; } });
 /**
  * Class for parsing the output of an LLM into a JSON object.
  */
@@ -37,103 +40,13 @@ class JsonOutputParser extends transform_js_1.BaseCumulativeTransformOutputParse
     // This should actually return Partial<T>, but there's no way
     // to specify emitted chunks as instances separate from the main output type.
     async parsePartialResult(generations) {
-        return parseJsonMarkdown(generations[0].text);
+        return (0, json_js_1.parseJsonMarkdown)(generations[0].text);
     }
     async parse(text) {
-        return parseJsonMarkdown(text, JSON.parse);
+        return (0, json_js_1.parseJsonMarkdown)(text, JSON.parse);
     }
     getFormatInstructions() {
         return "";
     }
 }
 exports.JsonOutputParser = JsonOutputParser;
-function parseJsonMarkdown(s, parser = parsePartialJson) {
-    // eslint-disable-next-line no-param-reassign
-    s = s.trim();
-    const match = /```(json)?(.*)```/s.exec(s);
-    if (!match) {
-        return parser(s);
-    }
-    else {
-        return parser(match[2]);
-    }
-}
-exports.parseJsonMarkdown = parseJsonMarkdown;
-// Adapted from https://github.com/KillianLucas/open-interpreter/blob/main/interpreter/core/llm/utils/parse_partial_json.py
-// MIT License
-function parsePartialJson(s) {
-    // If the input is undefined, return null to indicate failure.
-    if (typeof s === "undefined") {
-        return null;
-    }
-    // Attempt to parse the string as-is.
-    try {
-        return JSON.parse(s);
-    }
-    catch (error) {
-        // Pass
-    }
-    // Initialize variables.
-    let new_s = "";
-    const stack = [];
-    let isInsideString = false;
-    let escaped = false;
-    // Process each character in the string one at a time.
-    for (let char of s) {
-        if (isInsideString) {
-            if (char === '"' && !escaped) {
-                isInsideString = false;
-            }
-            else if (char === "\n" && !escaped) {
-                char = "\\n"; // Replace the newline character with the escape sequence.
-            }
-            else if (char === "\\") {
-                escaped = !escaped;
-            }
-            else {
-                escaped = false;
-            }
-        }
-        else {
-            if (char === '"') {
-                isInsideString = true;
-                escaped = false;
-            }
-            else if (char === "{") {
-                stack.push("}");
-            }
-            else if (char === "[") {
-                stack.push("]");
-            }
-            else if (char === "}" || char === "]") {
-                if (stack && stack[stack.length - 1] === char) {
-                    stack.pop();
-                }
-                else {
-                    // Mismatched closing character; the input is malformed.
-                    return null;
-                }
-            }
-        }
-        // Append the processed character to the new string.
-        new_s += char;
-    }
-    // If we're still inside a string at the end of processing,
-    // we need to close the string.
-    if (isInsideString) {
-        new_s += '"';
-    }
-    // Close any remaining open structures in the reverse order that they were opened.
-    for (let i = stack.length - 1; i >= 0; i -= 1) {
-        new_s += stack[i];
-    }
-    // Attempt to parse the modified string as JSON.
-    try {
-        return JSON.parse(new_s);
-    }
-    catch (error) {
-        // If we still can't parse the string as JSON, return null to indicate failure.
-        return null;
-    }
-}
-exports.parsePartialJson = parsePartialJson;

package/dist/output_parsers/json.d.ts

@@ -1,6 +1,7 @@
 import { BaseCumulativeTransformOutputParser } from "./transform.js";
 import { Operation } from "../utils/json_patch.js";
 import { ChatGeneration, Generation } from "../outputs.js";
+import { parseJsonMarkdown, parsePartialJson } from "../utils/json.js";
 /**
  * Class for parsing the output of an LLM into a JSON object.
  */
@@ -13,5 +14,4 @@ export declare class JsonOutputParser<T extends Record<string, any> = Record<str
     parse(text: string): Promise<T>;
     getFormatInstructions(): string;
 }
-export declare function parseJsonMarkdown(s: string, parser?: typeof parsePartialJson): any;
-export declare function parsePartialJson(s: string): any;
+export { parsePartialJson, parseJsonMarkdown };

package/dist/output_parsers/json.js

@@ -1,5 +1,6 @@
 import { BaseCumulativeTransformOutputParser } from "./transform.js";
 import { compare } from "../utils/json_patch.js";
+import { parseJsonMarkdown, parsePartialJson } from "../utils/json.js";
 /**
  * Class for parsing the output of an LLM into a JSON object.
  */
@@ -43,91 +44,4 @@ export class JsonOutputParser extends BaseCumulativeTransformOutputParser {
         return "";
     }
 }
-export function parseJsonMarkdown(s, parser = parsePartialJson) {
-    // eslint-disable-next-line no-param-reassign
-    s = s.trim();
-    const match = /```(json)?(.*)```/s.exec(s);
-    if (!match) {
-        return parser(s);
-    }
-    else {
-        return parser(match[2]);
-    }
-}
-// Adapted from https://github.com/KillianLucas/open-interpreter/blob/main/interpreter/core/llm/utils/parse_partial_json.py
-// MIT License
-export function parsePartialJson(s) {
-    // If the input is undefined, return null to indicate failure.
-    if (typeof s === "undefined") {
-        return null;
-    }
-    // Attempt to parse the string as-is.
-    try {
-        return JSON.parse(s);
-    }
-    catch (error) {
-        // Pass
-    }
-    // Initialize variables.
-    let new_s = "";
-    const stack = [];
-    let isInsideString = false;
-    let escaped = false;
-    // Process each character in the string one at a time.
-    for (let char of s) {
-        if (isInsideString) {
-            if (char === '"' && !escaped) {
-                isInsideString = false;
-            }
-            else if (char === "\n" && !escaped) {
-                char = "\\n"; // Replace the newline character with the escape sequence.
-            }
-            else if (char === "\\") {
-                escaped = !escaped;
-            }
-            else {
-                escaped = false;
-            }
-        }
-        else {
-            if (char === '"') {
-                isInsideString = true;
-                escaped = false;
-            }
-            else if (char === "{") {
-                stack.push("}");
-            }
-            else if (char === "[") {
-                stack.push("]");
-            }
-            else if (char === "}" || char === "]") {
-                if (stack && stack[stack.length - 1] === char) {
-                    stack.pop();
-                }
-                else {
-                    // Mismatched closing character; the input is malformed.
-                    return null;
-                }
-            }
-        }
-        // Append the processed character to the new string.
-        new_s += char;
-    }
-    // If we're still inside a string at the end of processing,
-    // we need to close the string.
-    if (isInsideString) {
-        new_s += '"';
-    }
-    // Close any remaining open structures in the reverse order that they were opened.
-    for (let i = stack.length - 1; i >= 0; i -= 1) {
-        new_s += stack[i];
-    }
-    // Attempt to parse the modified string as JSON.
-    try {
-        return JSON.parse(new_s);
-    }
-    catch (error) {
-        // If we still can't parse the string as JSON, return null to indicate failure.
-        return null;
-    }
-}
+export { parsePartialJson, parseJsonMarkdown };

package/dist/output_parsers/openai_tools/json_output_tools_parsers.cjs

@@ -1,7 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonOutputKeyToolsParser = exports.JsonOutputToolsParser = void 0;
+exports.JsonOutputKeyToolsParser = exports.JsonOutputToolsParser = exports.makeInvalidToolCall = exports.convertLangChainToolCallToOpenAI = exports.parseToolCall = void 0;
 const base_js_1 = require("../base.cjs");
+const json_js_1 = require("../json.cjs");
+function parseToolCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+rawToolCall, options) {
+    if (rawToolCall.function === undefined) {
+        return undefined;
+    }
+    let functionArgs;
+    if (options?.partial) {
+        try {
+            functionArgs = (0, json_js_1.parsePartialJson)(rawToolCall.function.arguments ?? "{}");
+        }
+        catch (e) {
+            return undefined;
+        }
+    }
+    else {
+        try {
+            functionArgs = JSON.parse(rawToolCall.function.arguments);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }
+        catch (e) {
+            throw new base_js_1.OutputParserException([
+                `Function "${rawToolCall.function.name}" arguments:`,
+                ``,
+                rawToolCall.function.arguments,
+                ``,
+                `are not valid JSON.`,
+                `Error: ${e.message}`,
+            ].join("\n"));
+        }
+    }
+    const parsedToolCall = {
+        name: rawToolCall.function.name,
+        args: functionArgs,
+    };
+    if (options?.returnId) {
+        parsedToolCall.id = rawToolCall.id;
+    }
+    return parsedToolCall;
+}
+exports.parseToolCall = parseToolCall;
+function convertLangChainToolCallToOpenAI(toolCall) {
+    if (toolCall.id === undefined) {
+        throw new Error(`All OpenAI tool calls must have an "id" field.`);
+    }
+    return {
+        id: toolCall.id,
+        type: "function",
+        function: {
+            name: toolCall.name,
+            arguments: JSON.stringify(toolCall.args),
+        },
+    };
+}
+exports.convertLangChainToolCallToOpenAI = convertLangChainToolCallToOpenAI;
+function makeInvalidToolCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+rawToolCall, errorMsg) {
+    return {
+        name: rawToolCall.function?.name,
+        args: rawToolCall.function?.arguments,
+        id: rawToolCall.id,
+        error: errorMsg,
+    };
+}
+exports.makeInvalidToolCall = makeInvalidToolCall;
 /**
  * Class for parsing the output of a tool-calling LLM into a JSON object.
  */
@@ -45,28 +112,27 @@ class JsonOutputToolsParser extends base_js_1.BaseLLMOutputParser {
         const clonedToolCalls = JSON.parse(JSON.stringify(toolCalls));
         const parsedToolCalls = [];
         for (const toolCall of clonedToolCalls) {
-            if (toolCall.function !== undefined) {
-                // @ts-expect-error name and arguemnts are defined by Object.defineProperty
-                const parsedToolCall = {
-                    type: toolCall.function.name,
-                    args: JSON.parse(toolCall.function.arguments),
-                };
-                if (this.returnId) {
-                    parsedToolCall.id = toolCall.id;
-                }
+            const parsedToolCall = parseToolCall(toolCall, { partial: true });
+            if (parsedToolCall !== undefined) {
                 // backward-compatibility with previous
                 // versions of Langchain JS, which uses `name` and `arguments`
-                Object.defineProperty(parsedToolCall, "name", {
+                // @ts-expect-error name and arguemnts are defined by Object.defineProperty
+                const backwardsCompatibleToolCall = {
+                    type: parsedToolCall.name,
+                    args: parsedToolCall.args,
+                    id: parsedToolCall.id,
+                };
+                Object.defineProperty(backwardsCompatibleToolCall, "name", {
                     get() {
                         return this.type;
                     },
                 });
-                Object.defineProperty(parsedToolCall, "arguments", {
+                Object.defineProperty(backwardsCompatibleToolCall, "arguments", {
                     get() {
                         return this.args;
                     },
                 });
-                parsedToolCalls.push(parsedToolCall);
+                parsedToolCalls.push(backwardsCompatibleToolCall);
             }
         }
         return parsedToolCalls;

package/dist/output_parsers/openai_tools/json_output_tools_parsers.d.ts

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { ChatGeneration } from "../../outputs.js";
 import { BaseLLMOutputParser } from "../base.js";
+import { InvalidToolCall, ToolCall } from "../../messages/tool.js";
 export type ParsedToolCall = {
     id?: string;
     type: string;
@@ -14,6 +15,23 @@ export type JsonOutputToolsParserParams = {
     /** Whether to return the tool call id. */
     returnId?: boolean;
 };
+export declare function parseToolCall(rawToolCall: Record<string, any>, options: {
+    returnId?: boolean;
+    partial: true;
+}): ToolCall | undefined;
+export declare function parseToolCall(rawToolCall: Record<string, any>, options?: {
+    returnId?: boolean;
+    partial?: false;
+}): ToolCall;
+export declare function convertLangChainToolCallToOpenAI(toolCall: ToolCall): {
+    id: string;
+    type: string;
+    function: {
+        name: string;
+        arguments: string;
+    };
+};
+export declare function makeInvalidToolCall(rawToolCall: Record<string, any>, errorMsg?: string): InvalidToolCall;
 /**
  * Class for parsing the output of a tool-calling LLM into a JSON object.
  */

package/dist/output_parsers/openai_tools/json_output_tools_parsers.js

@@ -1,4 +1,68 @@
 import { BaseLLMOutputParser, OutputParserException } from "../base.js";
+import { parsePartialJson } from "../json.js";
+export function parseToolCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+rawToolCall, options) {
+    if (rawToolCall.function === undefined) {
+        return undefined;
+    }
+    let functionArgs;
+    if (options?.partial) {
+        try {
+            functionArgs = parsePartialJson(rawToolCall.function.arguments ?? "{}");
+        }
+        catch (e) {
+            return undefined;
+        }
+    }
+    else {
+        try {
+            functionArgs = JSON.parse(rawToolCall.function.arguments);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }
+        catch (e) {
+            throw new OutputParserException([
+                `Function "${rawToolCall.function.name}" arguments:`,
+                ``,
+                rawToolCall.function.arguments,
+                ``,
+                `are not valid JSON.`,
+                `Error: ${e.message}`,
+            ].join("\n"));
+        }
+    }
+    const parsedToolCall = {
+        name: rawToolCall.function.name,
+        args: functionArgs,
+    };
+    if (options?.returnId) {
+        parsedToolCall.id = rawToolCall.id;
+    }
+    return parsedToolCall;
+}
+export function convertLangChainToolCallToOpenAI(toolCall) {
+    if (toolCall.id === undefined) {
+        throw new Error(`All OpenAI tool calls must have an "id" field.`);
+    }
+    return {
+        id: toolCall.id,
+        type: "function",
+        function: {
+            name: toolCall.name,
+            arguments: JSON.stringify(toolCall.args),
+        },
+    };
+}
+export function makeInvalidToolCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+rawToolCall, errorMsg) {
+    return {
+        name: rawToolCall.function?.name,
+        args: rawToolCall.function?.arguments,
+        id: rawToolCall.id,
+        error: errorMsg,
+    };
+}
 /**
  * Class for parsing the output of a tool-calling LLM into a JSON object.
  */
@@ -42,28 +106,27 @@ export class JsonOutputToolsParser extends BaseLLMOutputParser {
         const clonedToolCalls = JSON.parse(JSON.stringify(toolCalls));
         const parsedToolCalls = [];
         for (const toolCall of clonedToolCalls) {
-            if (toolCall.function !== undefined) {
-                // @ts-expect-error name and arguemnts are defined by Object.defineProperty
-                const parsedToolCall = {
-                    type: toolCall.function.name,
-                    args: JSON.parse(toolCall.function.arguments),
-                };
-                if (this.returnId) {
-                    parsedToolCall.id = toolCall.id;
-                }
+            const parsedToolCall = parseToolCall(toolCall, { partial: true });
+            if (parsedToolCall !== undefined) {
                 // backward-compatibility with previous
                 // versions of Langchain JS, which uses `name` and `arguments`
-                Object.defineProperty(parsedToolCall, "name", {
+                // @ts-expect-error name and arguemnts are defined by Object.defineProperty
+                const backwardsCompatibleToolCall = {
+                    type: parsedToolCall.name,
+                    args: parsedToolCall.args,
+                    id: parsedToolCall.id,
+                };
+                Object.defineProperty(backwardsCompatibleToolCall, "name", {
                     get() {
                         return this.type;
                     },
                 });
-                Object.defineProperty(parsedToolCall, "arguments", {
+                Object.defineProperty(backwardsCompatibleToolCall, "arguments", {
                     get() {
                         return this.args;
                     },
                 });
-                parsedToolCalls.push(parsedToolCall);
+                parsedToolCalls.push(backwardsCompatibleToolCall);
             }
         }
         return parsedToolCalls;

package/dist/output_parsers/transform.cjs

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCumulativeTransformOutputParser = exports.BaseTransformOutputParser = void 0;
 const base_js_1 = require("./base.cjs");
-const index_js_1 = require("../messages/index.cjs");
+const base_js_2 = require("../messages/base.cjs");
+const utils_js_1 = require("../messages/utils.cjs");
 const outputs_js_1 = require("../outputs.cjs");
-const index_js_2 = require("../utils/@cfworker/json-schema/index.cjs");
+const index_js_1 = require("../utils/@cfworker/json-schema/index.cjs");
 /**
  * Class to parse the output of an LLM call that also allows streaming inputs.
  */
@@ -63,7 +64,7 @@ class BaseCumulativeTransformOutputParser extends BaseTransformOutputParser {
                 throw new Error("Cannot handle non-string output.");
             }
             let chunkGen;
-            if ((0, index_js_1.isBaseMessageChunk)(chunk)) {
+            if ((0, base_js_2.isBaseMessageChunk)(chunk)) {
                 if (typeof chunk.content !== "string") {
                     throw new Error("Cannot handle non-string message output.");
                 }
@@ -72,12 +73,12 @@ class BaseCumulativeTransformOutputParser extends BaseTransformOutputParser {
                     text: chunk.content,
                 });
             }
-            else if ((0, index_js_1.isBaseMessage)(chunk)) {
+            else if ((0, base_js_2.isBaseMessage)(chunk)) {
                 if (typeof chunk.content !== "string") {
                     throw new Error("Cannot handle non-string message output.");
                 }
                 chunkGen = new outputs_js_1.ChatGenerationChunk({
-                    message: chunk.toChunk(),
+                    message: (0, utils_js_1.convertToChunk)(chunk),
                     text: chunk.content,
                 });
             }
@@ -93,7 +94,7 @@ class BaseCumulativeTransformOutputParser extends BaseTransformOutputParser {
             const parsed = await this.parsePartialResult([accGen]);
             if (parsed !== undefined &&
                 parsed !== null &&
-                !(0, index_js_2.deepCompareStrict)(parsed, prevParsed)) {
+                !(0, index_js_1.deepCompareStrict)(parsed, prevParsed)) {
                 if (this.diff) {
                     yield this._diff(prevParsed, parsed);
                 }

package/dist/output_parsers/transform.d.ts

@@ -1,5 +1,5 @@
 import { BaseOutputParser } from "./base.js";
-import { type BaseMessage } from "../messages/index.js";
+import { type BaseMessage } from "../messages/base.js";
 import type { BaseCallbackConfig } from "../callbacks/manager.js";
 import { type Generation, type ChatGeneration } from "../outputs.js";
 /**

package/dist/output_parsers/transform.js

@@ -1,5 +1,6 @@
 import { BaseOutputParser } from "./base.js";
-import { isBaseMessage, isBaseMessageChunk, } from "../messages/index.js";
+import { isBaseMessage, isBaseMessageChunk, } from "../messages/base.js";
+import { convertToChunk } from "../messages/utils.js";
 import { GenerationChunk, ChatGenerationChunk, } from "../outputs.js";
 import { deepCompareStrict } from "../utils/@cfworker/json-schema/index.js";
 /**
@@ -73,7 +74,7 @@ export class BaseCumulativeTransformOutputParser extends BaseTransformOutputPars
                     throw new Error("Cannot handle non-string message output.");
                 }
                 chunkGen = new ChatGenerationChunk({
-                    message: chunk.toChunk(),
+                    message: convertToChunk(chunk),
                     text: chunk.content,
                 });
             }

package/dist/prompts/chat.cjs

@@ -477,7 +477,7 @@ function _coerceMessagePromptTemplateLike(messagePromptTemplateLike) {
                 return { image_url: item.image_url };
             }
             else {
-                throw new Error("Invalid message content");
+                return item;
             }
         });
     }

package/dist/prompts/chat.js

@@ -466,7 +466,7 @@ function _coerceMessagePromptTemplateLike(messagePromptTemplateLike) {
                 return { image_url: item.image_url };
             }
             else {
-                throw new Error("Invalid message content");
+                return item;
             }
         });
     }

package/dist/utils/function_calling.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToOpenAITool = exports.convertToOpenAIFunction = void 0;
+exports.isStructuredTool = exports.convertToOpenAITool = exports.convertToOpenAIFunction = void 0;
 const zod_to_json_schema_1 = require("zod-to-json-schema");
 /**
  * Formats a `StructuredTool` instance into a format that is compatible
@@ -22,10 +22,22 @@ exports.convertToOpenAIFunction = convertToOpenAIFunction;
  * function to convert the schema of the `StructuredTool` into a JSON
  * schema, which is then used as the parameters for the OpenAI tool.
  */
-function convertToOpenAITool(tool) {
-    return {
-        type: "function",
-        function: convertToOpenAIFunction(tool),
-    };
+function convertToOpenAITool(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+tool) {
+    if (isStructuredTool(tool)) {
+        return {
+            type: "function",
+            function: convertToOpenAIFunction(tool),
+        };
+    }
+    return tool;
 }
 exports.convertToOpenAITool = convertToOpenAITool;
+function isStructuredTool(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+tool) {
+    return (tool !== undefined &&
+        Array.isArray(tool.lc_namespace));
+}
+exports.isStructuredTool = isStructuredTool;

package/dist/utils/function_calling.d.ts

@@ -13,4 +13,5 @@ export declare function convertToOpenAIFunction(tool: StructuredToolInterface):
  * function to convert the schema of the `StructuredTool` into a JSON
  * schema, which is then used as the parameters for the OpenAI tool.
  */
-export declare function convertToOpenAITool(tool: StructuredToolInterface): ToolDefinition;
+export declare function convertToOpenAITool(tool: StructuredToolInterface | Record<string, any>): ToolDefinition;
+export declare function isStructuredTool(tool?: StructuredToolInterface | Record<string, any>): tool is StructuredToolInterface;

package/dist/utils/function_calling.js

@@ -18,9 +18,20 @@ export function convertToOpenAIFunction(tool) {
  * function to convert the schema of the `StructuredTool` into a JSON
  * schema, which is then used as the parameters for the OpenAI tool.
  */
-export function convertToOpenAITool(tool) {
-    return {
-        type: "function",
-        function: convertToOpenAIFunction(tool),
-    };
+export function convertToOpenAITool(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+tool) {
+    if (isStructuredTool(tool)) {
+        return {
+            type: "function",
+            function: convertToOpenAIFunction(tool),
+        };
+    }
+    return tool;
+}
+export function isStructuredTool(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+tool) {
+    return (tool !== undefined &&
+        Array.isArray(tool.lc_namespace));
 }