langchain 0.0.76 → 0.0.78

package/chains/query_constructor/ir.cjs

@@ -0,0 +1 @@
+module.exports = require('../../dist/chains/query_constructor/ir.cjs');

package/chains/query_constructor/ir.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/chains/query_constructor/ir.js'

package/chains/query_constructor/ir.js

@@ -0,0 +1 @@
+export * from '../../dist/chains/query_constructor/ir.js'

package/chains/query_constructor.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/chains/query_constructor/index.cjs');

package/chains/query_constructor.d.ts

@@ -0,0 +1 @@
+export * from '../dist/chains/query_constructor/index.js'

package/chains/query_constructor.js

@@ -0,0 +1 @@
+export * from '../dist/chains/query_constructor/index.js'

package/dist/agents/agent.d.ts

@@ -3,10 +3,11 @@ import { CallbackManager, Callbacks } from "../callbacks/manager.js";
 import { LLMChain } from "../chains/llm_chain.js";
 import { BasePromptTemplate } from "../prompts/base.js";
 import { AgentAction, AgentFinish, AgentStep, BaseChatMessage, ChainValues } from "../schema/index.js";
-import { Tool } from "../tools/base.js";
+import { StructuredTool, Tool } from "../tools/base.js";
 import { AgentActionOutputParser, AgentInput, SerializedAgent, StoppingMethod } from "./types.js";
 export type OutputParserArgs = Record<string, any>;
 export declare abstract class BaseAgent {
+    ToolType: StructuredTool;
     abstract get inputKeys(): string[];
     get returnValues(): string[];
     get allowedTools(): string[] | undefined;
@@ -121,13 +122,13 @@ export declare abstract class Agent extends BaseSingleActionAgent {
      *
      * @returns A PromptTemplate assembled from the given tools and fields.
      * */
-    static createPrompt(_tools: Tool[], _fields?: Record<string, any>): BasePromptTemplate;
+    static createPrompt(_tools: StructuredTool[], _fields?: Record<string, any>): BasePromptTemplate;
     /** Construct an agent from an LLM and a list of tools */
-    static fromLLMAndTools(_llm: BaseLanguageModel, _tools: Tool[], _args?: AgentArgs): Agent;
+    static fromLLMAndTools(_llm: BaseLanguageModel, _tools: StructuredTool[], _args?: AgentArgs): Agent;
     /**
      * Validate that appropriate tools are passed in
      */
-    static validateTools(_tools: Tool[]): void;
+    static validateTools(_tools: StructuredTool[]): void;
     _stop(): string[];
     /**
      * Name of tool to use to terminate the chain.

package/dist/agents/agent_toolkits/sql/sql.cjs

@@ -9,7 +9,7 @@ const llm_chain_js_1 = require("../../../chains/llm_chain.cjs");
 const index_js_1 = require("../../mrkl/index.cjs");
 const executor_js_1 = require("../../executor.cjs");
 class SqlToolkit extends base_js_1.Toolkit {
-    constructor(db) {
+    constructor(db, llm) {
         super();
         Object.defineProperty(this, "tools", {
             enumerable: true,
@@ -34,7 +34,7 @@ class SqlToolkit extends base_js_1.Toolkit {
             new sql_js_1.QuerySqlTool(db),
             new sql_js_1.InfoSqlTool(db),
             new sql_js_1.ListTablesSqlTool(db),
-            new sql_js_1.QueryCheckerTool(),
+            new sql_js_1.QueryCheckerTool({ llm }),
         ];
     }
 }

package/dist/agents/agent_toolkits/sql/sql.d.ts

@@ -12,6 +12,6 @@ export declare class SqlToolkit extends Toolkit {
     tools: Tool[];
     db: SqlDatabase;
     dialect: string;
-    constructor(db: SqlDatabase);
+    constructor(db: SqlDatabase, llm?: BaseLanguageModel);
 }
 export declare function createSqlAgent(llm: BaseLanguageModel, toolkit: SqlToolkit, args?: SqlCreatePromptArgs): AgentExecutor;

package/dist/agents/agent_toolkits/sql/sql.js

@@ -6,7 +6,7 @@ import { LLMChain } from "../../../chains/llm_chain.js";
 import { ZeroShotAgent } from "../../mrkl/index.js";
 import { AgentExecutor } from "../../executor.js";
 export class SqlToolkit extends Toolkit {
-    constructor(db) {
+    constructor(db, llm) {
         super();
         Object.defineProperty(this, "tools", {
             enumerable: true,
@@ -31,7 +31,7 @@ export class SqlToolkit extends Toolkit {
             new QuerySqlTool(db),
             new InfoSqlTool(db),
             new ListTablesSqlTool(db),
-            new QueryCheckerTool(),
+            new QueryCheckerTool({ llm }),
         ];
     }
 }

package/dist/agents/chat/index.cjs

@@ -29,9 +29,9 @@ class ChatAgent extends agent_js_1.Agent {
         return ["Observation:"];
     }
     static validateTools(tools) {
-        const invalidTool = tools.find((tool) => !tool.description);
-        if (invalidTool) {
-            const msg = `Got a tool ${invalidTool.name} without a description.` +
+        const descriptionlessTool = tools.find((tool) => !tool.description);
+        if (descriptionlessTool) {
+            const msg = `Got a tool ${descriptionlessTool.name} without a description.` +
                 ` This agent requires descriptions for all tools.`;
             throw new Error(msg);
         }

package/dist/agents/chat/index.d.ts

@@ -22,6 +22,7 @@ export type ChatAgentInput = Optional<AgentInput, "outputParser">;
  * @augments Agent
  */
 export declare class ChatAgent extends Agent {
+    ToolType: Tool;
     constructor(input: ChatAgentInput);
     _agentType(): "chat-zero-shot-react-description";
     observationPrefix(): string;

package/dist/agents/chat/index.js

@@ -26,9 +26,9 @@ export class ChatAgent extends Agent {
         return ["Observation:"];
     }
     static validateTools(tools) {
-        const invalidTool = tools.find((tool) => !tool.description);
-        if (invalidTool) {
-            const msg = `Got a tool ${invalidTool.name} without a description.` +
+        const descriptionlessTool = tools.find((tool) => !tool.description);
+        if (descriptionlessTool) {
+            const msg = `Got a tool ${descriptionlessTool.name} without a description.` +
                 ` This agent requires descriptions for all tools.`;
             throw new Error(msg);
         }

package/dist/agents/chat_convo/index.cjs

@@ -30,9 +30,9 @@ class ChatConversationalAgent extends agent_js_1.Agent {
         return ["Observation:"];
     }
     static validateTools(tools) {
-        const invalidTool = tools.find((tool) => !tool.description);
-        if (invalidTool) {
-            const msg = `Got a tool ${invalidTool.name} without a description.` +
+        const descriptionlessTool = tools.find((tool) => !tool.description);
+        if (descriptionlessTool) {
+            const msg = `Got a tool ${descriptionlessTool.name} without a description.` +
                 ` This agent requires descriptions for all tools.`;
             throw new Error(msg);
         }
@@ -47,8 +47,15 @@ class ChatConversationalAgent extends agent_js_1.Agent {
         }
         return thoughts;
     }
-    static getDefaultOutputParser(_fields) {
-        return new outputParser_js_1.ChatConversationalAgentOutputParser();
+    static getDefaultOutputParser(fields) {
+        if (fields?.llm) {
+            return outputParser_js_1.ChatConversationalAgentOutputParserWithRetries.fromLLM(fields.llm, {
+                toolNames: fields.toolNames,
+            });
+        }
+        return new outputParser_js_1.ChatConversationalAgentOutputParserWithRetries({
+            toolNames: fields?.toolNames,
+        });
     }
     /**
      * Create prompt in the style of the ChatConversationAgent.
@@ -57,39 +64,48 @@ class ChatConversationalAgent extends agent_js_1.Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.systemMessage - String to put before the list of tools.
      * @param args.humanMessage - String to put after the list of tools.
+     * @param args.outputParser - Output parser to use for formatting.
      */
     static createPrompt(tools, args) {
         const systemMessage = (args?.systemMessage ?? prompt_js_1.DEFAULT_PREFIX) + prompt_js_1.PREFIX_END;
         const humanMessage = args?.humanMessage ?? prompt_js_1.DEFAULT_SUFFIX;
-        const outputParser = args?.outputParser ?? new outputParser_js_1.ChatConversationalAgentOutputParser();
         const toolStrings = tools
             .map((tool) => `${tool.name}: ${tool.description}`)
             .join("\n");
-        const formatInstructions = (0, template_js_1.renderTemplate)(humanMessage, "f-string", {
-            format_instructions: outputParser.getFormatInstructions(),
+        const toolNames = tools.map((tool) => tool.name);
+        const outputParser = args?.outputParser ??
+            ChatConversationalAgent.getDefaultOutputParser({ toolNames });
+        const formatInstructions = outputParser.getFormatInstructions({
+            toolNames,
         });
-        const toolNames = tools.map((tool) => tool.name).join("\n");
-        const finalPrompt = (0, template_js_1.renderTemplate)(formatInstructions, "f-string", {
+        const renderedHumanMessage = (0, template_js_1.renderTemplate)(humanMessage, "f-string", {
+            format_instructions: formatInstructions,
             tools: toolStrings,
-            tool_names: toolNames,
         });
         const messages = [
             chat_js_1.SystemMessagePromptTemplate.fromTemplate(systemMessage),
             new chat_js_1.MessagesPlaceholder("chat_history"),
-            chat_js_1.HumanMessagePromptTemplate.fromTemplate(finalPrompt),
+            chat_js_1.HumanMessagePromptTemplate.fromTemplate(renderedHumanMessage),
             new chat_js_1.MessagesPlaceholder("agent_scratchpad"),
         ];
         return chat_js_1.ChatPromptTemplate.fromPromptMessages(messages);
     }
     static fromLLMAndTools(llm, tools, args) {
         ChatConversationalAgent.validateTools(tools);
-        const prompt = ChatConversationalAgent.createPrompt(tools, args);
+        const outputParser = args?.outputParser ??
+            ChatConversationalAgent.getDefaultOutputParser({
+                llm,
+                toolNames: tools.map((tool) => tool.name),
+            });
+        const prompt = ChatConversationalAgent.createPrompt(tools, {
+            ...args,
+            outputParser,
+        });
         const chain = new llm_chain_js_1.LLMChain({
             prompt,
             llm,
             callbacks: args?.callbacks ?? args?.callbackManager,
         });
-        const outputParser = args?.outputParser ?? ChatConversationalAgent.getDefaultOutputParser();
         return new ChatConversationalAgent({
             llmChain: chain,
             outputParser,

package/dist/agents/chat_convo/index.d.ts

@@ -21,6 +21,7 @@ export type ChatConversationalAgentInput = Optional<AgentInput, "outputParser">;
  * @augments Agent
  */
 export declare class ChatConversationalAgent extends Agent {
+    ToolType: Tool;
     constructor(input: ChatConversationalAgentInput);
     _agentType(): "chat-conversational-react-description";
     observationPrefix(): string;
@@ -28,7 +29,9 @@ export declare class ChatConversationalAgent extends Agent {
     _stop(): string[];
     static validateTools(tools: Tool[]): void;
     constructScratchPad(steps: AgentStep[]): Promise<BaseChatMessage[]>;
-    static getDefaultOutputParser(_fields?: OutputParserArgs): AgentActionOutputParser;
+    static getDefaultOutputParser(fields?: OutputParserArgs & {
+        toolNames: string[];
+    }): AgentActionOutputParser;
     /**
      * Create prompt in the style of the ChatConversationAgent.
      *
@@ -36,6 +39,7 @@ export declare class ChatConversationalAgent extends Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.systemMessage - String to put before the list of tools.
      * @param args.humanMessage - String to put after the list of tools.
+     * @param args.outputParser - Output parser to use for formatting.
      */
     static createPrompt(tools: Tool[], args?: ChatConversationalCreatePromptArgs): ChatPromptTemplate;
     static fromLLMAndTools(llm: BaseLanguageModel, tools: Tool[], args?: ChatConversationalCreatePromptArgs & AgentArgs): ChatConversationalAgent;

package/dist/agents/chat_convo/index.js

@@ -3,7 +3,7 @@ import { ChatPromptTemplate, HumanMessagePromptTemplate, MessagesPlaceholder, Sy
 import { renderTemplate } from "../../prompts/template.js";
 import { AIChatMessage, HumanChatMessage, } from "../../schema/index.js";
 import { Agent } from "../agent.js";
-import { ChatConversationalAgentOutputParser } from "./outputParser.js";
+import { ChatConversationalAgentOutputParserWithRetries } from "./outputParser.js";
 import { PREFIX_END, DEFAULT_PREFIX, DEFAULT_SUFFIX, TEMPLATE_TOOL_RESPONSE, } from "./prompt.js";
 /**
  * Agent for the MRKL chain.
@@ -27,9 +27,9 @@ export class ChatConversationalAgent extends Agent {
         return ["Observation:"];
     }
     static validateTools(tools) {
-        const invalidTool = tools.find((tool) => !tool.description);
-        if (invalidTool) {
-            const msg = `Got a tool ${invalidTool.name} without a description.` +
+        const descriptionlessTool = tools.find((tool) => !tool.description);
+        if (descriptionlessTool) {
+            const msg = `Got a tool ${descriptionlessTool.name} without a description.` +
                 ` This agent requires descriptions for all tools.`;
             throw new Error(msg);
         }
@@ -44,8 +44,15 @@ export class ChatConversationalAgent extends Agent {
         }
         return thoughts;
     }
-    static getDefaultOutputParser(_fields) {
-        return new ChatConversationalAgentOutputParser();
+    static getDefaultOutputParser(fields) {
+        if (fields?.llm) {
+            return ChatConversationalAgentOutputParserWithRetries.fromLLM(fields.llm, {
+                toolNames: fields.toolNames,
+            });
+        }
+        return new ChatConversationalAgentOutputParserWithRetries({
+            toolNames: fields?.toolNames,
+        });
     }
     /**
      * Create prompt in the style of the ChatConversationAgent.
@@ -54,39 +61,48 @@ export class ChatConversationalAgent extends Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.systemMessage - String to put before the list of tools.
      * @param args.humanMessage - String to put after the list of tools.
+     * @param args.outputParser - Output parser to use for formatting.
      */
     static createPrompt(tools, args) {
         const systemMessage = (args?.systemMessage ?? DEFAULT_PREFIX) + PREFIX_END;
         const humanMessage = args?.humanMessage ?? DEFAULT_SUFFIX;
-        const outputParser = args?.outputParser ?? new ChatConversationalAgentOutputParser();
         const toolStrings = tools
             .map((tool) => `${tool.name}: ${tool.description}`)
             .join("\n");
-        const formatInstructions = renderTemplate(humanMessage, "f-string", {
-            format_instructions: outputParser.getFormatInstructions(),
+        const toolNames = tools.map((tool) => tool.name);
+        const outputParser = args?.outputParser ??
+            ChatConversationalAgent.getDefaultOutputParser({ toolNames });
+        const formatInstructions = outputParser.getFormatInstructions({
+            toolNames,
         });
-        const toolNames = tools.map((tool) => tool.name).join("\n");
-        const finalPrompt = renderTemplate(formatInstructions, "f-string", {
+        const renderedHumanMessage = renderTemplate(humanMessage, "f-string", {
+            format_instructions: formatInstructions,
             tools: toolStrings,
-            tool_names: toolNames,
         });
         const messages = [
             SystemMessagePromptTemplate.fromTemplate(systemMessage),
             new MessagesPlaceholder("chat_history"),
-            HumanMessagePromptTemplate.fromTemplate(finalPrompt),
+            HumanMessagePromptTemplate.fromTemplate(renderedHumanMessage),
             new MessagesPlaceholder("agent_scratchpad"),
         ];
         return ChatPromptTemplate.fromPromptMessages(messages);
     }
     static fromLLMAndTools(llm, tools, args) {
         ChatConversationalAgent.validateTools(tools);
-        const prompt = ChatConversationalAgent.createPrompt(tools, args);
+        const outputParser = args?.outputParser ??
+            ChatConversationalAgent.getDefaultOutputParser({
+                llm,
+                toolNames: tools.map((tool) => tool.name),
+            });
+        const prompt = ChatConversationalAgent.createPrompt(tools, {
+            ...args,
+            outputParser,
+        });
         const chain = new LLMChain({
             prompt,
             llm,
             callbacks: args?.callbacks ?? args?.callbackManager,
         });
-        const outputParser = args?.outputParser ?? ChatConversationalAgent.getDefaultOutputParser();
         return new ChatConversationalAgent({
             llmChain: chain,
             outputParser,

package/dist/agents/chat_convo/outputParser.cjs

@@ -1,9 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatConversationalAgentOutputParser = void 0;
+exports.ChatConversationalAgentOutputParserWithRetries = exports.ChatConversationalAgentOutputParser = void 0;
+const output_parser_js_1 = require("../../schema/output_parser.cjs");
+const template_js_1 = require("../../prompts/template.cjs");
 const types_js_1 = require("../types.cjs");
 const prompt_js_1 = require("./prompt.cjs");
+const fix_js_1 = require("../../output_parsers/fix.cjs");
 class ChatConversationalAgentOutputParser extends types_js_1.AgentActionOutputParser {
+    constructor(toolNames) {
+        super();
+        Object.defineProperty(this, "toolNames", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: toolNames
+        });
+    }
     async parse(text) {
         let jsonOutput = text.trim();
         if (jsonOutput.includes("```json")) {
@@ -17,15 +29,75 @@ class ChatConversationalAgentOutputParser extends types_js_1.AgentActionOutputPa
         if (lastIndex !== -1) {
             jsonOutput = jsonOutput.slice(0, lastIndex).trimEnd();
         }
-        const response = JSON.parse(jsonOutput);
-        const { action, action_input } = response;
-        if (action === "Final Answer") {
-            return { returnValues: { output: action_input }, log: text };
+        try {
+            const response = JSON.parse(jsonOutput);
+            const { action, action_input } = response;
+            if (action === "Final Answer") {
+                return { returnValues: { output: action_input }, log: text };
+            }
+            return { tool: action, toolInput: action_input, log: text };
+        }
+        catch (e) {
+            throw new output_parser_js_1.OutputParserException(`Failed to parse. Text: "${text}". Error: ${e}`);
         }
-        return { tool: action, toolInput: action_input, log: text };
     }
     getFormatInstructions() {
-        return prompt_js_1.FORMAT_INSTRUCTIONS;
+        return (0, template_js_1.renderTemplate)(prompt_js_1.FORMAT_INSTRUCTIONS, "f-string", {
+            tool_names: this.toolNames.join(", "),
+        });
     }
 }
 exports.ChatConversationalAgentOutputParser = ChatConversationalAgentOutputParser;
+class ChatConversationalAgentOutputParserWithRetries extends types_js_1.AgentActionOutputParser {
+    constructor(fields) {
+        super();
+        Object.defineProperty(this, "baseParser", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "outputFixingParser", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "toolNames", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        this.toolNames = fields.toolNames ?? this.toolNames;
+        this.baseParser =
+            fields?.baseParser ??
+                new ChatConversationalAgentOutputParser(this.toolNames);
+        this.outputFixingParser = fields?.outputFixingParser;
+    }
+    getFormatInstructions(options) {
+        if (options.raw) {
+            return prompt_js_1.FORMAT_INSTRUCTIONS;
+        }
+        return (0, template_js_1.renderTemplate)(prompt_js_1.FORMAT_INSTRUCTIONS, "f-string", {
+            tool_names: options.toolNames.join(", "),
+        });
+    }
+    async parse(text) {
+        if (this.outputFixingParser !== undefined) {
+            return this.outputFixingParser.parse(text);
+        }
+        return this.baseParser.parse(text);
+    }
+    static fromLLM(llm, options) {
+        const baseParser = options.baseParser ??
+            new ChatConversationalAgentOutputParser(options.toolNames ?? []);
+        const outputFixingParser = fix_js_1.OutputFixingParser.fromLLM(llm, baseParser);
+        return new ChatConversationalAgentOutputParserWithRetries({
+            baseParser,
+            outputFixingParser,
+            toolNames: options.toolNames,
+        });
+    }
+}
+exports.ChatConversationalAgentOutputParserWithRetries = ChatConversationalAgentOutputParserWithRetries;

package/dist/agents/chat_convo/outputParser.d.ts

@@ -1,17 +1,29 @@
+import { FormatInstructionsOptions } from "../../schema/output_parser.js";
 import { AgentActionOutputParser } from "../types.js";
+import { AgentAction, AgentFinish } from "../../schema/index.js";
+import { OutputFixingParser } from "../../output_parsers/fix.js";
+import { BaseLanguageModel } from "../../base_language/index.js";
+export type ChatConversationalAgentOutputParserFormatInstructionsOptions = FormatInstructionsOptions & {
+    toolNames: string[];
+    raw?: boolean;
+};
 export declare class ChatConversationalAgentOutputParser extends AgentActionOutputParser {
-    parse(text: string): Promise<{
-        returnValues: {
-            output: any;
-        };
-        log: string;
-        tool?: undefined;
-        toolInput?: undefined;
-    } | {
-        tool: any;
-        toolInput: any;
-        log: string;
-        returnValues?: undefined;
-    }>;
+    private toolNames;
+    constructor(toolNames: string[]);
+    parse(text: string): Promise<AgentAction | AgentFinish>;
     getFormatInstructions(): string;
 }
+export type ChatConversationalAgentOutputParserArgs = {
+    baseParser?: ChatConversationalAgentOutputParser;
+    outputFixingParser?: OutputFixingParser<AgentAction | AgentFinish>;
+    toolNames?: string[];
+};
+export declare class ChatConversationalAgentOutputParserWithRetries extends AgentActionOutputParser {
+    private baseParser;
+    private outputFixingParser?;
+    private toolNames;
+    constructor(fields: ChatConversationalAgentOutputParserArgs);
+    getFormatInstructions(options: ChatConversationalAgentOutputParserFormatInstructionsOptions): string;
+    parse(text: string): Promise<AgentAction | AgentFinish>;
+    static fromLLM(llm: BaseLanguageModel, options: Omit<ChatConversationalAgentOutputParserArgs, "outputFixingParser">): ChatConversationalAgentOutputParserWithRetries;
+}

package/dist/agents/chat_convo/outputParser.js

@@ -1,6 +1,18 @@
+import { OutputParserException, } from "../../schema/output_parser.js";
+import { renderTemplate } from "../../prompts/template.js";
 import { AgentActionOutputParser } from "../types.js";
 import { FORMAT_INSTRUCTIONS } from "./prompt.js";
+import { OutputFixingParser } from "../../output_parsers/fix.js";
 export class ChatConversationalAgentOutputParser extends AgentActionOutputParser {
+    constructor(toolNames) {
+        super();
+        Object.defineProperty(this, "toolNames", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: toolNames
+        });
+    }
     async parse(text) {
         let jsonOutput = text.trim();
         if (jsonOutput.includes("```json")) {
@@ -14,14 +26,73 @@ export class ChatConversationalAgentOutputParser extends AgentActionOutputParser
         if (lastIndex !== -1) {
             jsonOutput = jsonOutput.slice(0, lastIndex).trimEnd();
         }
-        const response = JSON.parse(jsonOutput);
-        const { action, action_input } = response;
-        if (action === "Final Answer") {
-            return { returnValues: { output: action_input }, log: text };
+        try {
+            const response = JSON.parse(jsonOutput);
+            const { action, action_input } = response;
+            if (action === "Final Answer") {
+                return { returnValues: { output: action_input }, log: text };
+            }
+            return { tool: action, toolInput: action_input, log: text };
+        }
+        catch (e) {
+            throw new OutputParserException(`Failed to parse. Text: "${text}". Error: ${e}`);
         }
-        return { tool: action, toolInput: action_input, log: text };
     }
     getFormatInstructions() {
-        return FORMAT_INSTRUCTIONS;
+        return renderTemplate(FORMAT_INSTRUCTIONS, "f-string", {
+            tool_names: this.toolNames.join(", "),
+        });
+    }
+}
+export class ChatConversationalAgentOutputParserWithRetries extends AgentActionOutputParser {
+    constructor(fields) {
+        super();
+        Object.defineProperty(this, "baseParser", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "outputFixingParser", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "toolNames", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        this.toolNames = fields.toolNames ?? this.toolNames;
+        this.baseParser =
+            fields?.baseParser ??
+                new ChatConversationalAgentOutputParser(this.toolNames);
+        this.outputFixingParser = fields?.outputFixingParser;
+    }
+    getFormatInstructions(options) {
+        if (options.raw) {
+            return FORMAT_INSTRUCTIONS;
+        }
+        return renderTemplate(FORMAT_INSTRUCTIONS, "f-string", {
+            tool_names: options.toolNames.join(", "),
+        });
+    }
+    async parse(text) {
+        if (this.outputFixingParser !== undefined) {
+            return this.outputFixingParser.parse(text);
+        }
+        return this.baseParser.parse(text);
+    }
+    static fromLLM(llm, options) {
+        const baseParser = options.baseParser ??
+            new ChatConversationalAgentOutputParser(options.toolNames ?? []);
+        const outputFixingParser = OutputFixingParser.fromLLM(llm, baseParser);
+        return new ChatConversationalAgentOutputParserWithRetries({
+            baseParser,
+            outputFixingParser,
+            toolNames: options.toolNames,
+        });
     }
 }

package/dist/agents/chat_convo/prompt.cjs

@@ -12,7 +12,7 @@ exports.PREFIX_END = ` However, above all else, all responses must adhere to the
 exports.FORMAT_INSTRUCTIONS = `RESPONSE FORMAT INSTRUCTIONS
 ----------------------------
 
-When responding to me please, please output a response in one of two formats:
+Output a JSON markdown code snippet containing a valid JSON object in one of two formats:
 
 **Option 1:**
 Use this if you want the human to use a tool.
@@ -20,25 +20,28 @@ Markdown code snippet formatted in the following schema:
 
 \`\`\`json
 {{{{
-    "action": string \\ The action to take. Must be one of {tool_names}
-    "action_input": string \\ The input to the action
+    "action": string // The action to take. Must be one of [{tool_names}]
+    "action_input": string // The input to the action. May be a stringified object.
 }}}}
 \`\`\`
 
 **Option #2:**
-Use this if you want to respond directly to the human. Markdown code snippet formatted in the following schema:
+Use this if you want to respond directly and conversationally to the human. Markdown code snippet formatted in the following schema:
 
 \`\`\`json
 {{{{
     "action": "Final Answer",
-    "action_input": string \\ You should put what you want to return to use here and make sure to use valid json newline characters.
+    "action_input": string // You should put what you want to return to use here and make sure to use valid json newline characters.
 }}}}
-\`\`\``;
+\`\`\`
+
+For both options, remember to always include the surrounding markdown code snippet delimiters (begin with "\`\`\`json" and end with "\`\`\`")!
+`;
 exports.DEFAULT_SUFFIX = `TOOLS
 ------
 Assistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:
 
-{{tools}}
+{tools}
 
 {format_instructions}
 
@@ -46,7 +49,7 @@ USER'S INPUT
 --------------------
 Here is the user's input (remember to respond with a markdown code snippet of a json blob with a single action, and NOTHING else):
 
-{{{{input}}}}`;
+{{input}}`;
 exports.TEMPLATE_TOOL_RESPONSE = `TOOL RESPONSE:
 ---------------------
 {observation}