langchain 0.0.132 → 0.0.133

package/dist/agents/chat/outputParser.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatAgentOutputParser = exports.FINAL_ANSWER_ACTION = void 0;
 const types_js_1 = require("../types.cjs");
 const prompt_js_1 = require("./prompt.cjs");
+const output_parser_js_1 = require("../../schema/output_parser.cjs");
 exports.FINAL_ANSWER_ACTION = "Final Answer:";
 /**
  * A class that extends the AgentActionOutputParser to parse the output of
@@ -46,7 +47,7 @@ class ChatAgentOutputParser extends types_js_1.AgentActionOutputParser {
             };
         }
         catch {
-            throw new Error(`Unable to parse JSON response from chat agent.\n\n${text}`);
+            throw new output_parser_js_1.OutputParserException(`Unable to parse JSON response from chat agent.\n\n${text}`);
         }
     }
     /**

package/dist/agents/chat/outputParser.js

@@ -1,5 +1,6 @@
 import { AgentActionOutputParser } from "../types.js";
 import { FORMAT_INSTRUCTIONS } from "./prompt.js";
+import { OutputParserException } from "../../schema/output_parser.js";
 export const FINAL_ANSWER_ACTION = "Final Answer:";
 /**
  * A class that extends the AgentActionOutputParser to parse the output of
@@ -43,7 +44,7 @@ export class ChatAgentOutputParser extends AgentActionOutputParser {
             };
         }
         catch {
-            throw new Error(`Unable to parse JSON response from chat agent.\n\n${text}`);
+            throw new OutputParserException(`Unable to parse JSON response from chat agent.\n\n${text}`);
         }
     }
     /**

package/dist/agents/executor.cjs

@@ -1,7 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentExecutor = void 0;
+exports.AgentExecutor = exports.ExceptionTool = void 0;
 const base_js_1 = require("../chains/base.cjs");
+const output_parser_js_1 = require("../schema/output_parser.cjs");
+const base_js_2 = require("../tools/base.cjs");
+/**
+ * Tool that just returns the query.
+ * Used for exception tracking.
+ */
+class ExceptionTool extends base_js_2.Tool {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "_Exception"
+        });
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "Exception tool"
+        });
+    }
+    async _call(query) {
+        return query;
+    }
+}
+exports.ExceptionTool = ExceptionTool;
 /**
  * A chain managing an agent using tools.
  * @augments BaseChain
@@ -51,8 +78,26 @@ class AgentExecutor extends base_js_1.BaseChain {
             writable: true,
             value: "force"
         });
+        /**
+         * How to handle errors raised by the agent's output parser.
+          Defaults to `False`, which raises the error.
+      
+          If `true`, the error will be sent back to the LLM as an observation.
+          If a string, the string itself will be sent to the LLM as an observation.
+          If a callable function, the function will be called with the exception
+          as an argument, and the result of that function will be passed to the agent
+          as an observation.
+         */
+        Object.defineProperty(this, "handleParsingErrors", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.agent = input.agent;
         this.tools = input.tools;
+        this.handleParsingErrors =
+            input.handleParsingErrors ?? this.handleParsingErrors;
         if (this.agent._agentActionType() === "multi") {
             for (const tool of this.tools) {
                 if (tool.returnDirect) {
@@ -94,7 +139,36 @@ class AgentExecutor extends base_js_1.BaseChain {
             return { ...returnValues, ...additional };
         };
         while (this.shouldContinue(iterations)) {
-            const output = await this.agent.plan(steps, inputs, runManager?.getChild());
+            let output;
+            try {
+                output = await this.agent.plan(steps, inputs, runManager?.getChild());
+            }
+            catch (e) {
+                // eslint-disable-next-line no-instanceof/no-instanceof
+                if (e instanceof output_parser_js_1.OutputParserException) {
+                    let observation;
+                    if (this.handleParsingErrors === true) {
+                        observation = "Invalid or incomplete response";
+                    }
+                    else if (typeof this.handleParsingErrors === "string") {
+                        observation = this.handleParsingErrors;
+                    }
+                    else if (typeof this.handleParsingErrors === "function") {
+                        observation = this.handleParsingErrors(e);
+                    }
+                    else {
+                        throw e;
+                    }
+                    output = {
+                        tool: "_Exception",
+                        toolInput: observation,
+                        log: e.message,
+                    };
+                }
+                else {
+                    throw e;
+                }
+            }
             // Check if the agent has finished
             if ("returnValues" in output) {
                 return getOutput(output);
@@ -108,11 +182,36 @@ class AgentExecutor extends base_js_1.BaseChain {
             }
             const newSteps = await Promise.all(actions.map(async (action) => {
                 await runManager?.handleAgentAction(action);
-                const tool = toolsByName[action.tool?.toLowerCase()];
-                const observation = tool
-                    ? await tool.call(action.toolInput, runManager?.getChild())
-                    : `${action.tool} is not a valid tool, try another one.`;
-                return { action, observation };
+                const tool = action.tool === "_Exception"
+                    ? new ExceptionTool()
+                    : toolsByName[action.tool?.toLowerCase()];
+                let observation;
+                try {
+                    observation = tool
+                        ? await tool.call(action.toolInput, runManager?.getChild())
+                        : `${action.tool} is not a valid tool, try another one.`;
+                }
+                catch (e) {
+                    // eslint-disable-next-line no-instanceof/no-instanceof
+                    if (e instanceof base_js_2.ToolInputParsingException) {
+                        if (this.handleParsingErrors === true) {
+                            observation =
+                                "Invalid or incomplete tool input. Please try again.";
+                        }
+                        else if (typeof this.handleParsingErrors === "string") {
+                            observation = this.handleParsingErrors;
+                        }
+                        else if (typeof this.handleParsingErrors === "function") {
+                            observation = this.handleParsingErrors(e);
+                        }
+                        else {
+                            throw e;
+                        }
+                        observation = await new ExceptionTool().call(observation, runManager?.getChild());
+                        return { action, observation: observation ?? "" };
+                    }
+                }
+                return { action, observation: observation ?? "" };
             }));
             steps.push(...newSteps);
             const lastStep = steps[steps.length - 1];

package/dist/agents/executor.d.ts

@@ -4,6 +4,8 @@ import { StoppingMethod } from "./types.js";
 import { SerializedLLMChain } from "../chains/serde.js";
 import { ChainValues } from "../schema/index.js";
 import { CallbackManagerForChainRun } from "../callbacks/manager.js";
+import { OutputParserException } from "../schema/output_parser.js";
+import { Tool, ToolInputParsingException } from "../tools/base.js";
 /**
  * Interface defining the structure of input data for creating an
  * AgentExecutor. It extends ChainInputs and includes additional
@@ -15,6 +17,16 @@ export interface AgentExecutorInput extends ChainInputs {
     returnIntermediateSteps?: boolean;
     maxIterations?: number;
     earlyStoppingMethod?: StoppingMethod;
+    handleParsingErrors?: boolean | string | ((e: OutputParserException | ToolInputParsingException) => string);
+}
+/**
+ * Tool that just returns the query.
+ * Used for exception tracking.
+ */
+export declare class ExceptionTool extends Tool {
+    name: string;
+    description: string;
+    _call(query: string): Promise<string>;
 }
 /**
  * A chain managing an agent using tools.
@@ -28,6 +40,17 @@ export declare class AgentExecutor extends BaseChain {
     returnIntermediateSteps: boolean;
     maxIterations?: number;
     earlyStoppingMethod: StoppingMethod;
+    /**
+     * How to handle errors raised by the agent's output parser.
+      Defaults to `False`, which raises the error.
+  
+      If `true`, the error will be sent back to the LLM as an observation.
+      If a string, the string itself will be sent to the LLM as an observation.
+      If a callable function, the function will be called with the exception
+      as an argument, and the result of that function will be passed to the agent
+      as an observation.
+     */
+    handleParsingErrors: boolean | string | ((e: OutputParserException | ToolInputParsingException) => string);
     get inputKeys(): string[];
     get outputKeys(): string[];
     constructor(input: AgentExecutorInput);

package/dist/agents/executor.js

@@ -1,4 +1,30 @@
 import { BaseChain } from "../chains/base.js";
+import { OutputParserException } from "../schema/output_parser.js";
+import { Tool, ToolInputParsingException } from "../tools/base.js";
+/**
+ * Tool that just returns the query.
+ * Used for exception tracking.
+ */
+export class ExceptionTool extends Tool {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "_Exception"
+        });
+        Object.defineProperty(this, "description", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "Exception tool"
+        });
+    }
+    async _call(query) {
+        return query;
+    }
+}
 /**
  * A chain managing an agent using tools.
  * @augments BaseChain
@@ -48,8 +74,26 @@ export class AgentExecutor extends BaseChain {
             writable: true,
             value: "force"
         });
+        /**
+         * How to handle errors raised by the agent's output parser.
+          Defaults to `False`, which raises the error.
+      
+          If `true`, the error will be sent back to the LLM as an observation.
+          If a string, the string itself will be sent to the LLM as an observation.
+          If a callable function, the function will be called with the exception
+          as an argument, and the result of that function will be passed to the agent
+          as an observation.
+         */
+        Object.defineProperty(this, "handleParsingErrors", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         this.agent = input.agent;
         this.tools = input.tools;
+        this.handleParsingErrors =
+            input.handleParsingErrors ?? this.handleParsingErrors;
         if (this.agent._agentActionType() === "multi") {
             for (const tool of this.tools) {
                 if (tool.returnDirect) {
@@ -91,7 +135,36 @@ export class AgentExecutor extends BaseChain {
             return { ...returnValues, ...additional };
         };
         while (this.shouldContinue(iterations)) {
-            const output = await this.agent.plan(steps, inputs, runManager?.getChild());
+            let output;
+            try {
+                output = await this.agent.plan(steps, inputs, runManager?.getChild());
+            }
+            catch (e) {
+                // eslint-disable-next-line no-instanceof/no-instanceof
+                if (e instanceof OutputParserException) {
+                    let observation;
+                    if (this.handleParsingErrors === true) {
+                        observation = "Invalid or incomplete response";
+                    }
+                    else if (typeof this.handleParsingErrors === "string") {
+                        observation = this.handleParsingErrors;
+                    }
+                    else if (typeof this.handleParsingErrors === "function") {
+                        observation = this.handleParsingErrors(e);
+                    }
+                    else {
+                        throw e;
+                    }
+                    output = {
+                        tool: "_Exception",
+                        toolInput: observation,
+                        log: e.message,
+                    };
+                }
+                else {
+                    throw e;
+                }
+            }
             // Check if the agent has finished
             if ("returnValues" in output) {
                 return getOutput(output);
@@ -105,11 +178,36 @@ export class AgentExecutor extends BaseChain {
             }
             const newSteps = await Promise.all(actions.map(async (action) => {
                 await runManager?.handleAgentAction(action);
-                const tool = toolsByName[action.tool?.toLowerCase()];
-                const observation = tool
-                    ? await tool.call(action.toolInput, runManager?.getChild())
-                    : `${action.tool} is not a valid tool, try another one.`;
-                return { action, observation };
+                const tool = action.tool === "_Exception"
+                    ? new ExceptionTool()
+                    : toolsByName[action.tool?.toLowerCase()];
+                let observation;
+                try {
+                    observation = tool
+                        ? await tool.call(action.toolInput, runManager?.getChild())
+                        : `${action.tool} is not a valid tool, try another one.`;
+                }
+                catch (e) {
+                    // eslint-disable-next-line no-instanceof/no-instanceof
+                    if (e instanceof ToolInputParsingException) {
+                        if (this.handleParsingErrors === true) {
+                            observation =
+                                "Invalid or incomplete tool input. Please try again.";
+                        }
+                        else if (typeof this.handleParsingErrors === "string") {
+                            observation = this.handleParsingErrors;
+                        }
+                        else if (typeof this.handleParsingErrors === "function") {
+                            observation = this.handleParsingErrors(e);
+                        }
+                        else {
+                            throw e;
+                        }
+                        observation = await new ExceptionTool().call(observation, runManager?.getChild());
+                        return { action, observation: observation ?? "" };
+                    }
+                }
+                return { action, observation: observation ?? "" };
             }));
             steps.push(...newSteps);
             const lastStep = steps[steps.length - 1];

package/dist/agents/mrkl/outputParser.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZeroShotAgentOutputParser = exports.FINAL_ANSWER_ACTION = void 0;
+const output_parser_js_1 = require("../../schema/output_parser.cjs");
 const types_js_1 = require("../types.cjs");
 const prompt_js_1 = require("./prompt.cjs");
 exports.FINAL_ANSWER_ACTION = "Final Answer:";
@@ -42,7 +43,7 @@ class ZeroShotAgentOutputParser extends types_js_1.AgentActionOutputParser {
         }
         const match = /Action: ([\s\S]*?)(?:\nAction Input: ([\s\S]*?))?$/.exec(text);
         if (!match) {
-            throw new Error(`Could not parse LLM output: ${text}`);
+            throw new output_parser_js_1.OutputParserException(`Could not parse LLM output: ${text}`);
         }
         return {
             tool: match[1].trim(),

package/dist/agents/mrkl/outputParser.js

@@ -1,3 +1,4 @@
+import { OutputParserException } from "../../schema/output_parser.js";
 import { AgentActionOutputParser } from "../types.js";
 import { FORMAT_INSTRUCTIONS } from "./prompt.js";
 export const FINAL_ANSWER_ACTION = "Final Answer:";
@@ -39,7 +40,7 @@ export class ZeroShotAgentOutputParser extends AgentActionOutputParser {
         }
         const match = /Action: ([\s\S]*?)(?:\nAction Input: ([\s\S]*?))?$/.exec(text);
         if (!match) {
-            throw new Error(`Could not parse LLM output: ${text}`);
+            throw new OutputParserException(`Could not parse LLM output: ${text}`);
         }
         return {
             tool: match[1].trim(),

package/dist/chat_models/googlevertexai.cjs

@@ -158,7 +158,7 @@ class ChatGoogleVertexAI extends base_js_1.BaseChatModel {
         this.topP = fields?.topP ?? this.topP;
         this.topK = fields?.topK ?? this.topK;
         this.examples = fields?.examples ?? this.examples;
-        this.connection = new googlevertexai_connection_js_1.GoogleVertexAIConnection({
+        this.connection = new googlevertexai_connection_js_1.GoogleVertexAILLMConnection({
             ...fields,
             ...this,
         }, this.caller);

package/dist/chat_models/googlevertexai.d.ts

@@ -1,6 +1,6 @@
 import { BaseChatModel } from "./base.js";
 import { BaseMessage, ChatGeneration, ChatMessage, ChatResult, LLMResult } from "../schema/index.js";
-import { GoogleVertexAIConnection } from "../util/googlevertexai-connection.js";
+import { GoogleVertexAILLMConnection } from "../util/googlevertexai-connection.js";
 import { GoogleVertexAIBaseLLMInput, GoogleVertexAIBasePrediction } from "../types/googlevertexai-types.js";
 import { BaseLanguageModelCallOptions } from "../base_language/index.js";
 /**
@@ -105,7 +105,7 @@ export declare class ChatGoogleVertexAI extends BaseChatModel implements GoogleV
     topP: number;
     topK: number;
     examples: ChatExample[];
-    connection: GoogleVertexAIConnection<BaseLanguageModelCallOptions, GoogleVertexAIChatInstance, GoogleVertexAIChatPrediction>;
+    connection: GoogleVertexAILLMConnection<BaseLanguageModelCallOptions, GoogleVertexAIChatInstance, GoogleVertexAIChatPrediction>;
     constructor(fields?: GoogleVertexAIChatInput);
     _combineLLMOutput(): LLMResult["llmOutput"];
     _generate(messages: BaseMessage[], options: this["ParsedCallOptions"]): Promise<ChatResult>;

package/dist/chat_models/googlevertexai.js

@@ -1,6 +1,6 @@
 import { BaseChatModel } from "./base.js";
 import { AIMessage, ChatMessage, } from "../schema/index.js";
-import { GoogleVertexAIConnection } from "../util/googlevertexai-connection.js";
+import { GoogleVertexAILLMConnection } from "../util/googlevertexai-connection.js";
 /**
  * Represents a chat message in the Google Vertex AI chat model.
  */
@@ -154,7 +154,7 @@ export class ChatGoogleVertexAI extends BaseChatModel {
         this.topP = fields?.topP ?? this.topP;
         this.topK = fields?.topK ?? this.topK;
         this.examples = fields?.examples ?? this.examples;
-        this.connection = new GoogleVertexAIConnection({
+        this.connection = new GoogleVertexAILLMConnection({
             ...fields,
             ...this,
         }, this.caller);

package/dist/chat_models/ollama.cjs

@@ -177,27 +177,27 @@ class ChatOllama extends base_js_1.SimpleChatModel {
     _formatMessagesAsPrompt(messages) {
         const formattedMessages = messages
             .map((message) => {
-            let rolePrefix;
+            let messageText;
             if (message._getType() === "human") {
-                rolePrefix = "Human: ";
+                messageText = `[INST] ${message.content} [/INST]`;
             }
             else if (message._getType() === "ai") {
-                rolePrefix = "Assistant: ";
+                messageText = message.content;
             }
             else if (message._getType() === "system") {
-                rolePrefix = "";
+                messageText = `<<SYS>> ${message.content} <</SYS>>`;
             }
             else if (index_js_1.ChatMessage.isInstance(message)) {
-                rolePrefix = `${message.role}: `;
+                messageText = `\n\n${message.role[0].toUpperCase()}${message.role.slice(1)}: ${message.content}`;
             }
             else {
                 console.warn(`Unsupported message type passed to Ollama: "${message._getType()}"`);
-                rolePrefix = "";
+                messageText = "";
             }
-            return `${rolePrefix}${message.content}`;
+            return messageText;
         })
             .join("\n");
-        return `${formattedMessages}\nAssistant: `;
+        return formattedMessages;
     }
     /** @ignore */
     async _call(messages, options) {

package/dist/chat_models/ollama.js

@@ -174,27 +174,27 @@ export class ChatOllama extends SimpleChatModel {
     _formatMessagesAsPrompt(messages) {
         const formattedMessages = messages
             .map((message) => {
-            let rolePrefix;
+            let messageText;
             if (message._getType() === "human") {
-                rolePrefix = "Human: ";
+                messageText = `[INST] ${message.content} [/INST]`;
             }
             else if (message._getType() === "ai") {
-                rolePrefix = "Assistant: ";
+                messageText = message.content;
             }
             else if (message._getType() === "system") {
-                rolePrefix = "";
+                messageText = `<<SYS>> ${message.content} <</SYS>>`;
             }
             else if (ChatMessage.isInstance(message)) {
-                rolePrefix = `${message.role}: `;
+                messageText = `\n\n${message.role[0].toUpperCase()}${message.role.slice(1)}: ${message.content}`;
             }
             else {
                 console.warn(`Unsupported message type passed to Ollama: "${message._getType()}"`);
-                rolePrefix = "";
+                messageText = "";
             }
-            return `${rolePrefix}${message.content}`;
+            return messageText;
         })
             .join("\n");
-        return `${formattedMessages}\nAssistant: `;
+        return formattedMessages;
     }
     /** @ignore */
     async _call(messages, options) {