langchain 0.0.84 → 0.0.86

package/cache/momento.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/cache/momento.cjs');

package/cache/momento.d.ts

@@ -0,0 +1 @@
+export * from '../dist/cache/momento.js'

package/cache/momento.js

@@ -0,0 +1 @@
+export * from '../dist/cache/momento.js'

package/dist/agents/initialize.cjs

@@ -84,10 +84,11 @@ async function initializeAgentExecutorWithOptions(tools, llm, options = {
             return executor;
         }
         case "structured-chat-zero-shot-react-description": {
-            const { agentArgs, ...rest } = options;
+            const { agentArgs, memory, ...rest } = options;
             const executor = executor_js_1.AgentExecutor.fromAgentAndTools({
                 agent: index_js_3.StructuredChatAgent.fromLLMAndTools(llm, tools, agentArgs),
                 tools,
+                memory,
                 ...rest,
             });
             return executor;

package/dist/agents/initialize.d.ts

@@ -32,7 +32,6 @@ export type InitializeAgentExecutorOptions = ({
 export type InitializeAgentExecutorOptionsStructured = {
     agentType: "structured-chat-zero-shot-react-description";
     agentArgs?: Parameters<typeof StructuredChatAgent.fromLLMAndTools>[2];
-    memory?: never;
 } & Omit<AgentExecutorInput, "agent" | "tools">;
 /**
  * Initialize an agent executor with options

package/dist/agents/initialize.js

@@ -80,10 +80,11 @@ export async function initializeAgentExecutorWithOptions(tools, llm, options = {
             return executor;
         }
         case "structured-chat-zero-shot-react-description": {
-            const { agentArgs, ...rest } = options;
+            const { agentArgs, memory, ...rest } = options;
             const executor = AgentExecutor.fromAgentAndTools({
                 agent: StructuredChatAgent.fromLLMAndTools(llm, tools, agentArgs),
                 tools,
+                memory,
                 ...rest,
             });
             return executor;

package/dist/agents/structured_chat/index.cjs

@@ -66,20 +66,27 @@ class StructuredChatAgent extends agent_js_1.Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.suffix - String to put after the list of tools.
      * @param args.prefix - String to put before the list of tools.
+     * @param args.inputVariables List of input variables the final prompt will expect.
+     * @param args.memoryPrompts List of historical prompts from memory.
      */
     static createPrompt(tools, args) {
-        const { prefix = prompt_js_2.PREFIX, suffix = prompt_js_2.SUFFIX } = args ?? {};
+        const { prefix = prompt_js_2.PREFIX, suffix = prompt_js_2.SUFFIX, inputVariables = ["input", "agent_scratchpad"], memoryPrompts = [], } = args ?? {};
         const template = [prefix, prompt_js_2.FORMAT_INSTRUCTIONS, suffix].join("\n\n");
+        const humanMessageTemplate = "{input}\n\n{agent_scratchpad}";
         const messages = [
             new chat_js_1.SystemMessagePromptTemplate(new prompt_js_1.PromptTemplate({
                 template,
-                inputVariables: [],
+                inputVariables,
                 partialVariables: {
                     tool_schemas: StructuredChatAgent.createToolSchemasString(tools),
                     tool_names: tools.map((tool) => tool.name).join(", "),
                 },
             })),
-            chat_js_1.HumanMessagePromptTemplate.fromTemplate("{input}\n\n{agent_scratchpad}"),
+            ...memoryPrompts,
+            new chat_js_1.HumanMessagePromptTemplate(new prompt_js_1.PromptTemplate({
+                template: humanMessageTemplate,
+                inputVariables,
+            })),
         ];
         return chat_js_1.ChatPromptTemplate.fromPromptMessages(messages);
     }

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

@@ -1,5 +1,5 @@
 import { BaseLanguageModel } from "../../base_language/index.js";
-import { ChatPromptTemplate } from "../../prompts/chat.js";
+import { BaseMessagePromptTemplate, ChatPromptTemplate } from "../../prompts/chat.js";
 import { AgentStep } from "../../schema/index.js";
 import { StructuredTool } from "../../tools/base.js";
 import { Optional } from "../../types/type-utils.js";
@@ -13,6 +13,8 @@ export interface StructuredChatCreatePromptArgs {
     prefix?: string;
     /** List of input variables the final prompt will expect. */
     inputVariables?: string[];
+    /** List of historical prompts from memory.  */
+    memoryPrompts?: BaseMessagePromptTemplate[];
 }
 export type StructuredChatAgentInput = Optional<AgentInput, "outputParser">;
 /**
@@ -38,6 +40,8 @@ export declare class StructuredChatAgent extends Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.suffix - String to put after the list of tools.
      * @param args.prefix - String to put before the list of tools.
+     * @param args.inputVariables List of input variables the final prompt will expect.
+     * @param args.memoryPrompts List of historical prompts from memory.
      */
     static createPrompt(tools: StructuredTool[], args?: StructuredChatCreatePromptArgs): ChatPromptTemplate;
     static fromLLMAndTools(llm: BaseLanguageModel, tools: StructuredTool[], args?: StructuredChatCreatePromptArgs & AgentArgs): StructuredChatAgent;

package/dist/agents/structured_chat/index.js

@@ -63,20 +63,27 @@ export class StructuredChatAgent extends Agent {
      * @param args - Arguments to create the prompt with.
      * @param args.suffix - String to put after the list of tools.
      * @param args.prefix - String to put before the list of tools.
+     * @param args.inputVariables List of input variables the final prompt will expect.
+     * @param args.memoryPrompts List of historical prompts from memory.
      */
     static createPrompt(tools, args) {
-        const { prefix = PREFIX, suffix = SUFFIX } = args ?? {};
+        const { prefix = PREFIX, suffix = SUFFIX, inputVariables = ["input", "agent_scratchpad"], memoryPrompts = [], } = args ?? {};
         const template = [prefix, FORMAT_INSTRUCTIONS, suffix].join("\n\n");
+        const humanMessageTemplate = "{input}\n\n{agent_scratchpad}";
         const messages = [
             new SystemMessagePromptTemplate(new PromptTemplate({
                 template,
-                inputVariables: [],
+                inputVariables,
                 partialVariables: {
                     tool_schemas: StructuredChatAgent.createToolSchemasString(tools),
                     tool_names: tools.map((tool) => tool.name).join(", "),
                 },
             })),
-            HumanMessagePromptTemplate.fromTemplate("{input}\n\n{agent_scratchpad}"),
+            ...memoryPrompts,
+            new HumanMessagePromptTemplate(new PromptTemplate({
+                template: humanMessageTemplate,
+                inputVariables,
+            })),
         ];
         return ChatPromptTemplate.fromPromptMessages(messages);
     }

package/dist/cache/momento.cjs

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MomentoCache = void 0;
+/* eslint-disable no-instanceof/no-instanceof */
+const sdk_1 = require("@gomomento/sdk");
+const index_js_1 = require("../schema/index.cjs");
+const base_js_1 = require("./base.cjs");
+const momento_js_1 = require("../util/momento.cjs");
+/**
+ * A cache that uses Momento as the backing store.
+ * See https://gomomento.com.
+ */
+class MomentoCache extends index_js_1.BaseCache {
+    constructor(props) {
+        super();
+        Object.defineProperty(this, "client", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cacheName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "ttlSeconds", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.client = props.client;
+        this.cacheName = props.cacheName;
+        this.validateTtlSeconds(props.ttlSeconds);
+        this.ttlSeconds = props.ttlSeconds;
+    }
+    /**
+     * Create a new standard cache backed by Momento.
+     *
+     * @param {MomentoCacheProps} props The settings to instantiate the cache.
+     * @param {ICacheClient} props.client The Momento cache client.
+     * @param {string} props.cacheName The name of the cache to use to store the data.
+     * @param {number} props.ttlSeconds The time to live for the cache items. If not specified,
+     * the cache client default is used.
+     * @param {boolean} props.ensureCacheExists If true, ensure that the cache exists before returning.
+     * If false, the cache is not checked for existence. Defaults to true.
+     * @throws {@link InvalidArgumentError} if {@link props.ttlSeconds} is not strictly positive.
+     * @returns The Momento-backed cache.
+     */
+    static async fromProps(props) {
+        const instance = new MomentoCache(props);
+        if (props.ensureCacheExists || props.ensureCacheExists === undefined) {
+            await (0, momento_js_1.ensureCacheExists)(props.client, props.cacheName);
+        }
+        return instance;
+    }
+    /**
+     * Validate the user-specified TTL, if provided, is strictly positive.
+     * @param ttlSeconds The TTL to validate.
+     */
+    validateTtlSeconds(ttlSeconds) {
+        if (ttlSeconds !== undefined && ttlSeconds <= 0) {
+            throw new sdk_1.InvalidArgumentError("ttlSeconds must be positive.");
+        }
+    }
+    /**
+     * Lookup LLM generations in cache by prompt and associated LLM key.
+     * @param prompt The prompt to lookup.
+     * @param llmKey The LLM key to lookup.
+     * @returns The generations associated with the prompt and LLM key, or null if not found.
+     */
+    async lookup(prompt, llmKey) {
+        const key = (0, base_js_1.getCacheKey)(prompt, llmKey);
+        const getResponse = await this.client.get(this.cacheName, key);
+        if (getResponse instanceof sdk_1.CacheGet.Hit) {
+            const value = getResponse.valueString();
+            return JSON.parse(value);
+        }
+        else if (getResponse instanceof sdk_1.CacheGet.Miss) {
+            return null;
+        }
+        else if (getResponse instanceof sdk_1.CacheGet.Error) {
+            throw getResponse.innerException();
+        }
+        else {
+            throw new Error(`Unknown response type: ${getResponse.toString()}`);
+        }
+    }
+    /**
+     * Update the cache with the given generations.
+     *
+     * Note this overwrites any existing generations for the given prompt and LLM key.
+     *
+     * @param prompt The prompt to update.
+     * @param llmKey The LLM key to update.
+     * @param value The generations to store.
+     */
+    async update(prompt, llmKey, value) {
+        const key = (0, base_js_1.getCacheKey)(prompt, llmKey);
+        const setResponse = await this.client.set(this.cacheName, key, JSON.stringify(value), { ttl: this.ttlSeconds });
+        if (setResponse instanceof sdk_1.CacheSet.Success) {
+            // pass
+        }
+        else if (setResponse instanceof sdk_1.CacheSet.Error) {
+            throw setResponse.innerException();
+        }
+        else {
+            throw new Error(`Unknown response type: ${setResponse.toString()}`);
+        }
+    }
+}
+exports.MomentoCache = MomentoCache;

package/dist/cache/momento.d.ts

@@ -0,0 +1,72 @@
+import { ICacheClient } from "@gomomento/sdk";
+import { BaseCache, Generation } from "../schema/index.js";
+/**
+ * The settings to instantiate the Momento standard cache.
+ */
+export interface MomentoCacheProps {
+    /**
+     * The Momento cache client.
+     */
+    client: ICacheClient;
+    /**
+     * The name of the cache to use to store the data.
+     */
+    cacheName: string;
+    /**
+     * The time to live for the cache items. If not specified,
+     * the cache client default is used.
+     */
+    ttlSeconds?: number;
+    /**
+     * If true, ensure that the cache exists before returning.
+     * If false, the cache is not checked for existence.
+     * Defaults to true.
+     */
+    ensureCacheExists?: true;
+}
+/**
+ * A cache that uses Momento as the backing store.
+ * See https://gomomento.com.
+ */
+export declare class MomentoCache extends BaseCache {
+    private client;
+    private readonly cacheName;
+    private readonly ttlSeconds?;
+    private constructor();
+    /**
+     * Create a new standard cache backed by Momento.
+     *
+     * @param {MomentoCacheProps} props The settings to instantiate the cache.
+     * @param {ICacheClient} props.client The Momento cache client.
+     * @param {string} props.cacheName The name of the cache to use to store the data.
+     * @param {number} props.ttlSeconds The time to live for the cache items. If not specified,
+     * the cache client default is used.
+     * @param {boolean} props.ensureCacheExists If true, ensure that the cache exists before returning.
+     * If false, the cache is not checked for existence. Defaults to true.
+     * @throws {@link InvalidArgumentError} if {@link props.ttlSeconds} is not strictly positive.
+     * @returns The Momento-backed cache.
+     */
+    static fromProps(props: MomentoCacheProps): Promise<MomentoCache>;
+    /**
+     * Validate the user-specified TTL, if provided, is strictly positive.
+     * @param ttlSeconds The TTL to validate.
+     */
+    private validateTtlSeconds;
+    /**
+     * Lookup LLM generations in cache by prompt and associated LLM key.
+     * @param prompt The prompt to lookup.
+     * @param llmKey The LLM key to lookup.
+     * @returns The generations associated with the prompt and LLM key, or null if not found.
+     */
+    lookup(prompt: string, llmKey: string): Promise<Generation[] | null>;
+    /**
+     * Update the cache with the given generations.
+     *
+     * Note this overwrites any existing generations for the given prompt and LLM key.
+     *
+     * @param prompt The prompt to update.
+     * @param llmKey The LLM key to update.
+     * @param value The generations to store.
+     */
+    update(prompt: string, llmKey: string, value: Generation[]): Promise<void>;
+}

package/dist/cache/momento.js

@@ -0,0 +1,110 @@
+/* eslint-disable no-instanceof/no-instanceof */
+import { CacheGet, CacheSet, InvalidArgumentError, } from "@gomomento/sdk";
+import { BaseCache } from "../schema/index.js";
+import { getCacheKey } from "./base.js";
+import { ensureCacheExists } from "../util/momento.js";
+/**
+ * A cache that uses Momento as the backing store.
+ * See https://gomomento.com.
+ */
+export class MomentoCache extends BaseCache {
+    constructor(props) {
+        super();
+        Object.defineProperty(this, "client", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cacheName", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "ttlSeconds", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.client = props.client;
+        this.cacheName = props.cacheName;
+        this.validateTtlSeconds(props.ttlSeconds);
+        this.ttlSeconds = props.ttlSeconds;
+    }
+    /**
+     * Create a new standard cache backed by Momento.
+     *
+     * @param {MomentoCacheProps} props The settings to instantiate the cache.
+     * @param {ICacheClient} props.client The Momento cache client.
+     * @param {string} props.cacheName The name of the cache to use to store the data.
+     * @param {number} props.ttlSeconds The time to live for the cache items. If not specified,
+     * the cache client default is used.
+     * @param {boolean} props.ensureCacheExists If true, ensure that the cache exists before returning.
+     * If false, the cache is not checked for existence. Defaults to true.
+     * @throws {@link InvalidArgumentError} if {@link props.ttlSeconds} is not strictly positive.
+     * @returns The Momento-backed cache.
+     */
+    static async fromProps(props) {
+        const instance = new MomentoCache(props);
+        if (props.ensureCacheExists || props.ensureCacheExists === undefined) {
+            await ensureCacheExists(props.client, props.cacheName);
+        }
+        return instance;
+    }
+    /**
+     * Validate the user-specified TTL, if provided, is strictly positive.
+     * @param ttlSeconds The TTL to validate.
+     */
+    validateTtlSeconds(ttlSeconds) {
+        if (ttlSeconds !== undefined && ttlSeconds <= 0) {
+            throw new InvalidArgumentError("ttlSeconds must be positive.");
+        }
+    }
+    /**
+     * Lookup LLM generations in cache by prompt and associated LLM key.
+     * @param prompt The prompt to lookup.
+     * @param llmKey The LLM key to lookup.
+     * @returns The generations associated with the prompt and LLM key, or null if not found.
+     */
+    async lookup(prompt, llmKey) {
+        const key = getCacheKey(prompt, llmKey);
+        const getResponse = await this.client.get(this.cacheName, key);
+        if (getResponse instanceof CacheGet.Hit) {
+            const value = getResponse.valueString();
+            return JSON.parse(value);
+        }
+        else if (getResponse instanceof CacheGet.Miss) {
+            return null;
+        }
+        else if (getResponse instanceof CacheGet.Error) {
+            throw getResponse.innerException();
+        }
+        else {
+            throw new Error(`Unknown response type: ${getResponse.toString()}`);
+        }
+    }
+    /**
+     * Update the cache with the given generations.
+     *
+     * Note this overwrites any existing generations for the given prompt and LLM key.
+     *
+     * @param prompt The prompt to update.
+     * @param llmKey The LLM key to update.
+     * @param value The generations to store.
+     */
+    async update(prompt, llmKey, value) {
+        const key = getCacheKey(prompt, llmKey);
+        const setResponse = await this.client.set(this.cacheName, key, JSON.stringify(value), { ttl: this.ttlSeconds });
+        if (setResponse instanceof CacheSet.Success) {
+            // pass
+        }
+        else if (setResponse instanceof CacheSet.Error) {
+            throw setResponse.innerException();
+        }
+        else {
+            throw new Error(`Unknown response type: ${setResponse.toString()}`);
+        }
+    }
+}

package/dist/chains/conversational_retrieval_chain.cjs

@@ -11,12 +11,6 @@ Chat History:
 {chat_history}
 Follow Up Input: {question}
 Standalone question:`;
-const qa_template = `Use the following pieces of context to answer the question at the end. If you don't know the answer, just say that you don't know, don't try to make up an answer.
-
-{context}
-
-Question: {question}
-Helpful Answer:`;
 class ConversationalRetrievalQAChain extends base_js_1.BaseChain {
     get inputKeys() {
         return [this.inputKey, this.chatHistoryKey];
@@ -69,16 +63,34 @@ class ConversationalRetrievalQAChain extends base_js_1.BaseChain {
         this.returnSourceDocuments =
             fields.returnSourceDocuments ?? this.returnSourceDocuments;
     }
+    static getChatHistoryString(chatHistory) {
+        if (Array.isArray(chatHistory)) {
+            return chatHistory
+                .map((chatMessage) => {
+                if (chatMessage._getType() === "human") {
+                    return `Human: ${chatMessage.text}`;
+                }
+                else if (chatMessage._getType() === "ai") {
+                    return `Assistant: ${chatMessage.text}`;
+                }
+                else {
+                    return `${chatMessage.text}`;
+                }
+            })
+                .join("\n");
+        }
+        return chatHistory;
+    }
     /** @ignore */
     async _call(values, runManager) {
         if (!(this.inputKey in values)) {
             throw new Error(`Question key ${this.inputKey} not found.`);
         }
         if (!(this.chatHistoryKey in values)) {
-            throw new Error(`chat history key ${this.inputKey} not found.`);
+            throw new Error(`Chat history key ${this.chatHistoryKey} not found.`);
         }
         const question = values[this.inputKey];
-        const chatHistory = values[this.chatHistoryKey];
+        const chatHistory = ConversationalRetrievalQAChain.getChatHistoryString(values[this.chatHistoryKey]);
         let newQuestion = question;
         if (chatHistory.length > 0) {
             const result = await this.questionGeneratorChain.call({
@@ -118,13 +130,19 @@ class ConversationalRetrievalQAChain extends base_js_1.BaseChain {
         throw new Error("Not implemented.");
     }
     static fromLLM(llm, retriever, options = {}) {
-        const { questionGeneratorTemplate, qaTemplate, verbose, ...rest } = options;
-        const question_generator_prompt = prompt_js_1.PromptTemplate.fromTemplate(questionGeneratorTemplate || question_generator_template);
-        const qa_prompt = prompt_js_1.PromptTemplate.fromTemplate(qaTemplate || qa_template);
-        const qaChain = (0, load_js_1.loadQAStuffChain)(llm, { prompt: qa_prompt, verbose });
+        const { questionGeneratorTemplate, qaTemplate, qaChainOptions = {
+            type: "stuff",
+            prompt: qaTemplate
+                ? prompt_js_1.PromptTemplate.fromTemplate(qaTemplate)
+                : undefined,
+        }, questionGeneratorChainOptions, verbose, ...rest } = options;
+        const qaChain = (0, load_js_1.loadQAChain)(llm, qaChainOptions);
+        const questionGeneratorChainPrompt = prompt_js_1.PromptTemplate.fromTemplate(questionGeneratorChainOptions?.template ??
+            questionGeneratorTemplate ??
+            question_generator_template);
         const questionGeneratorChain = new llm_chain_js_1.LLMChain({
-            prompt: question_generator_prompt,
-            llm,
+            prompt: questionGeneratorChainPrompt,
+            llm: questionGeneratorChainOptions?.llm ?? llm,
             verbose,
         });
         const instance = new this({

package/dist/chains/conversational_retrieval_chain.d.ts

@@ -1,11 +1,12 @@
 import { BaseLanguageModel } from "../base_language/index.js";
 import { SerializedChatVectorDBQAChain } from "./serde.js";
-import { ChainValues, BaseRetriever } from "../schema/index.js";
+import { ChainValues, BaseRetriever, BaseChatMessage } from "../schema/index.js";
 import { BaseChain, ChainInputs } from "./base.js";
 import { LLMChain } from "./llm_chain.js";
+import { QAChainParams } from "./question_answering/load.js";
 import { CallbackManagerForChainRun } from "../callbacks/manager.js";
 export type LoadValues = Record<string, any>;
-export interface ConversationalRetrievalQAChainInput extends Omit<ChainInputs, "memory"> {
+export interface ConversationalRetrievalQAChainInput extends ChainInputs {
     retriever: BaseRetriever;
     combineDocumentsChain: BaseChain;
     questionGeneratorChain: LLMChain;
@@ -22,6 +23,7 @@ export declare class ConversationalRetrievalQAChain extends BaseChain implements
     questionGeneratorChain: LLMChain;
     returnSourceDocuments: boolean;
     constructor(fields: ConversationalRetrievalQAChainInput);
+    static getChatHistoryString(chatHistory: string | BaseChatMessage[]): string;
     /** @ignore */
     _call(values: ChainValues, runManager?: CallbackManagerForChainRun): Promise<ChainValues>;
     _chainType(): string;
@@ -30,7 +32,14 @@ export declare class ConversationalRetrievalQAChain extends BaseChain implements
     static fromLLM(llm: BaseLanguageModel, retriever: BaseRetriever, options?: {
         outputKey?: string;
         returnSourceDocuments?: boolean;
+        /** @deprecated Pass in questionGeneratorChainOptions.template instead */
         questionGeneratorTemplate?: string;
+        /** @deprecated Pass in qaChainOptions.prompt instead */
         qaTemplate?: string;
+        qaChainOptions?: QAChainParams;
+        questionGeneratorChainOptions?: {
+            llm?: BaseLanguageModel;
+            template?: string;
+        };
     } & Omit<ConversationalRetrievalQAChainInput, "retriever" | "combineDocumentsChain" | "questionGeneratorChain">): ConversationalRetrievalQAChain;
 }

package/dist/chains/conversational_retrieval_chain.js

@@ -1,19 +1,13 @@
 import { PromptTemplate } from "../prompts/prompt.js";
 import { BaseChain } from "./base.js";
 import { LLMChain } from "./llm_chain.js";
-import { loadQAStuffChain } from "./question_answering/load.js";
+import { loadQAChain } from "./question_answering/load.js";
 const question_generator_template = `Given the following conversation and a follow up question, rephrase the follow up question to be a standalone question.
 
 Chat History:
 {chat_history}
 Follow Up Input: {question}
 Standalone question:`;
-const qa_template = `Use the following pieces of context to answer the question at the end. If you don't know the answer, just say that you don't know, don't try to make up an answer.
-
-{context}
-
-Question: {question}
-Helpful Answer:`;
 export class ConversationalRetrievalQAChain extends BaseChain {
     get inputKeys() {
         return [this.inputKey, this.chatHistoryKey];
@@ -66,16 +60,34 @@ export class ConversationalRetrievalQAChain extends BaseChain {
         this.returnSourceDocuments =
             fields.returnSourceDocuments ?? this.returnSourceDocuments;
     }
+    static getChatHistoryString(chatHistory) {
+        if (Array.isArray(chatHistory)) {
+            return chatHistory
+                .map((chatMessage) => {
+                if (chatMessage._getType() === "human") {
+                    return `Human: ${chatMessage.text}`;
+                }
+                else if (chatMessage._getType() === "ai") {
+                    return `Assistant: ${chatMessage.text}`;
+                }
+                else {
+                    return `${chatMessage.text}`;
+                }
+            })
+                .join("\n");
+        }
+        return chatHistory;
+    }
     /** @ignore */
     async _call(values, runManager) {
         if (!(this.inputKey in values)) {
             throw new Error(`Question key ${this.inputKey} not found.`);
         }
         if (!(this.chatHistoryKey in values)) {
-            throw new Error(`chat history key ${this.inputKey} not found.`);
+            throw new Error(`Chat history key ${this.chatHistoryKey} not found.`);
         }
         const question = values[this.inputKey];
-        const chatHistory = values[this.chatHistoryKey];
+        const chatHistory = ConversationalRetrievalQAChain.getChatHistoryString(values[this.chatHistoryKey]);
         let newQuestion = question;
         if (chatHistory.length > 0) {
             const result = await this.questionGeneratorChain.call({
@@ -115,13 +127,19 @@ export class ConversationalRetrievalQAChain extends BaseChain {
         throw new Error("Not implemented.");
     }
     static fromLLM(llm, retriever, options = {}) {
-        const { questionGeneratorTemplate, qaTemplate, verbose, ...rest } = options;
-        const question_generator_prompt = PromptTemplate.fromTemplate(questionGeneratorTemplate || question_generator_template);
-        const qa_prompt = PromptTemplate.fromTemplate(qaTemplate || qa_template);
-        const qaChain = loadQAStuffChain(llm, { prompt: qa_prompt, verbose });
+        const { questionGeneratorTemplate, qaTemplate, qaChainOptions = {
+            type: "stuff",
+            prompt: qaTemplate
+                ? PromptTemplate.fromTemplate(qaTemplate)
+                : undefined,
+        }, questionGeneratorChainOptions, verbose, ...rest } = options;
+        const qaChain = loadQAChain(llm, qaChainOptions);
+        const questionGeneratorChainPrompt = PromptTemplate.fromTemplate(questionGeneratorChainOptions?.template ??
+            questionGeneratorTemplate ??
+            question_generator_template);
         const questionGeneratorChain = new LLMChain({
-            prompt: question_generator_prompt,
-            llm,
+            prompt: questionGeneratorChainPrompt,
+            llm: questionGeneratorChainOptions?.llm ?? llm,
             verbose,
         });
         const instance = new this({