langchain 0.2.13 → 0.2.15

package/dist/agents/tool_calling/index.cjs

@@ -5,6 +5,11 @@ const runnables_1 = require("@langchain/core/runnables");
 const agent_js_1 = require("../agent.cjs");
 const output_parser_js_1 = require("./output_parser.cjs");
 const tool_calling_js_1 = require("../format_scratchpad/tool_calling.cjs");
+function _isBaseChatModel(x) {
+    const model = x;
+    return (typeof model._modelType === "function" &&
+        model._modelType() === "base_chat_model");
+}
 /**
  * Create an agent that uses tools.
  * @param params Params required to create the agent. Includes an LLM, tools, and prompt.
@@ -62,10 +67,16 @@ function createToolCallingAgent({ llm, tools, prompt, streamRunnable, }) {
             `Found ${JSON.stringify(prompt.inputVariables)} instead.`,
         ].join("\n"));
     }
-    if (llm.bindTools === undefined) {
-        throw new Error(`This agent requires that the "bind_tools()" method be implemented on the input model.`);
+    let modelWithTools;
+    if (_isBaseChatModel(llm)) {
+        if (llm.bindTools === undefined) {
+            throw new Error(`This agent requires that the "bind_tools()" method be implemented on the input model.`);
+        }
+        modelWithTools = llm.bindTools(tools);
+    }
+    else {
+        modelWithTools = llm;
     }
-    const modelWithTools = llm.bindTools(tools);
     const agent = agent_js_1.AgentRunnableSequence.fromRunnables([
         runnables_1.RunnablePassthrough.assign({
             agent_scratchpad: (input) => (0, tool_calling_js_1.formatToToolMessages)(input.steps),

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

@@ -1,7 +1,6 @@
-import { BaseChatModel } from "@langchain/core/language_models/chat_models";
 import { ChatPromptTemplate } from "@langchain/core/prompts";
 import { StructuredToolInterface } from "@langchain/core/tools";
-import { ToolDefinition } from "@langchain/core/language_models/base";
+import { LanguageModelLike, ToolDefinition } from "@langchain/core/language_models/base";
 import { AgentRunnableSequence } from "../agent.js";
 import { ToolsAgentStep } from "./output_parser.js";
 /**
@@ -13,7 +12,7 @@ export type CreateToolCallingAgentParams = {
      * so must either be an OpenAI model that supports that or a wrapper of
      * a different model that adds in equivalent support.
      */
-    llm: BaseChatModel;
+    llm: LanguageModelLike;
     /** Tools this agent has access to. */
     tools: StructuredToolInterface[] | ToolDefinition[];
     /** The prompt to use, must have an input key of `agent_scratchpad`. */

package/dist/agents/tool_calling/index.js

@@ -2,6 +2,11 @@ import { RunnablePassthrough } from "@langchain/core/runnables";
 import { AgentRunnableSequence } from "../agent.js";
 import { ToolCallingAgentOutputParser, } from "./output_parser.js";
 import { formatToToolMessages } from "../format_scratchpad/tool_calling.js";
+function _isBaseChatModel(x) {
+    const model = x;
+    return (typeof model._modelType === "function" &&
+        model._modelType() === "base_chat_model");
+}
 /**
  * Create an agent that uses tools.
  * @param params Params required to create the agent. Includes an LLM, tools, and prompt.
@@ -59,10 +64,16 @@ export function createToolCallingAgent({ llm, tools, prompt, streamRunnable, })
             `Found ${JSON.stringify(prompt.inputVariables)} instead.`,
         ].join("\n"));
     }
-    if (llm.bindTools === undefined) {
-        throw new Error(`This agent requires that the "bind_tools()" method be implemented on the input model.`);
+    let modelWithTools;
+    if (_isBaseChatModel(llm)) {
+        if (llm.bindTools === undefined) {
+            throw new Error(`This agent requires that the "bind_tools()" method be implemented on the input model.`);
+        }
+        modelWithTools = llm.bindTools(tools);
+    }
+    else {
+        modelWithTools = llm;
     }
-    const modelWithTools = llm.bindTools(tools);
     const agent = AgentRunnableSequence.fromRunnables([
         RunnablePassthrough.assign({
             agent_scratchpad: (input) => formatToToolMessages(input.steps),

package/dist/chains/retrieval_qa.cjs

@@ -23,7 +23,7 @@ const load_js_1 = require("./question_answering/load.cjs");
  *   documents,
  *   embeddings
  * );
- * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input}`);
+ * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input} based on the following context {context}`);
  *
  * const combineDocsChain = await createStuffDocumentsChain({
  *   llm,

package/dist/chains/retrieval_qa.d.ts

@@ -35,7 +35,7 @@ export interface RetrievalQAChainInput extends Omit<ChainInputs, "memory"> {
  *   documents,
  *   embeddings
  * );
- * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input}`);
+ * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input} based on the following context {context}`);
  *
  * const combineDocsChain = await createStuffDocumentsChain({
  *   llm,

package/dist/chains/retrieval_qa.js

@@ -20,7 +20,7 @@ import { loadQAStuffChain, } from "./question_answering/load.js";
  *   documents,
  *   embeddings
  * );
- * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input}`);
+ * const prompt = ChatPromptTemplate.fromTemplate(`Answer the user's question: {input} based on the following context {context}`);
  *
  * const combineDocsChain = await createStuffDocumentsChain({
  *   llm,

package/dist/vectorstores/memory.cjs

@@ -4,6 +4,7 @@ exports.MemoryVectorStore = void 0;
 const vectorstores_1 = require("@langchain/core/vectorstores");
 const documents_1 = require("@langchain/core/documents");
 const similarities_js_1 = require("../util/ml-distance/similarities.cjs");
+const math_js_1 = require("../util/math.cjs");
 /**
  * Class that extends `VectorStore` to store vectors in memory. Provides
  * methods for adding documents, performing similarity searches, and
@@ -56,17 +57,7 @@ class MemoryVectorStore extends vectorstores_1.VectorStore {
         }));
         this.memoryVectors = this.memoryVectors.concat(memoryVectors);
     }
-    /**
-     * Method to perform a similarity search in the memory vector store. It
-     * calculates the similarity between the query vector and each vector in
-     * the store, sorts the results by similarity, and returns the top `k`
-     * results along with their scores.
-     * @param query Query vector to compare against the vectors in the store.
-     * @param k Number of top results to return.
-     * @param filter Optional filter function to apply to the vectors before performing the search.
-     * @returns Promise that resolves with an array of tuples, each containing a `Document` and its similarity score.
-     */
-    async similaritySearchVectorWithScore(query, k, filter) {
+    async _queryVectors(query, k, filter) {
         const filterFunction = (memoryVector) => {
             if (!filter) {
                 return true;
@@ -78,22 +69,48 @@ class MemoryVectorStore extends vectorstores_1.VectorStore {
             return filter(doc);
         };
         const filteredMemoryVectors = this.memoryVectors.filter(filterFunction);
-        const searches = filteredMemoryVectors
+        return filteredMemoryVectors
             .map((vector, index) => ({
             similarity: this.similarity(query, vector.embedding),
             index,
+            metadata: vector.metadata,
+            content: vector.content,
+            embedding: vector.embedding,
         }))
             .sort((a, b) => (a.similarity > b.similarity ? -1 : 0))
             .slice(0, k);
+    }
+    /**
+     * Method to perform a similarity search in the memory vector store. It
+     * calculates the similarity between the query vector and each vector in
+     * the store, sorts the results by similarity, and returns the top `k`
+     * results along with their scores.
+     * @param query Query vector to compare against the vectors in the store.
+     * @param k Number of top results to return.
+     * @param filter Optional filter function to apply to the vectors before performing the search.
+     * @returns Promise that resolves with an array of tuples, each containing a `Document` and its similarity score.
+     */
+    async similaritySearchVectorWithScore(query, k, filter) {
+        const searches = await this._queryVectors(query, k, filter);
         const result = searches.map((search) => [
             new documents_1.Document({
-                metadata: filteredMemoryVectors[search.index].metadata,
-                pageContent: filteredMemoryVectors[search.index].content,
+                metadata: search.metadata,
+                pageContent: search.content,
             }),
             search.similarity,
         ]);
         return result;
     }
+    async maxMarginalRelevanceSearch(query, options) {
+        const queryEmbedding = await this.embeddings.embedQuery(query);
+        const searches = await this._queryVectors(queryEmbedding, options.fetchK ?? 20, options.filter);
+        const embeddingList = searches.map((searchResp) => searchResp.embedding);
+        const mmrIndexes = (0, math_js_1.maximalMarginalRelevance)(queryEmbedding, embeddingList, options.lambda, options.k);
+        return mmrIndexes.map((idx) => new documents_1.Document({
+            metadata: searches[idx].metadata,
+            pageContent: searches[idx].content,
+        }));
+    }
     /**
      * Static method to create a `MemoryVectorStore` instance from an array of
      * texts. It creates a `Document` for each text and metadata pair, and

package/dist/vectorstores/memory.d.ts

@@ -1,6 +1,6 @@
-import { VectorStore } from "@langchain/core/vectorstores";
+import { MaxMarginalRelevanceSearchOptions, VectorStore } from "@langchain/core/vectorstores";
 import type { EmbeddingsInterface } from "@langchain/core/embeddings";
-import { Document } from "@langchain/core/documents";
+import { Document, DocumentInterface } from "@langchain/core/documents";
 import { cosine } from "../util/ml-distance/similarities.js";
 /**
  * Interface representing a vector in memory. It includes the content
@@ -48,6 +48,13 @@ export declare class MemoryVectorStore extends VectorStore {
      * @returns Promise that resolves when all vectors have been added.
      */
     addVectors(vectors: number[][], documents: Document[]): Promise<void>;
+    protected _queryVectors(query: number[], k: number, filter?: this["FilterType"]): Promise<{
+        similarity: number;
+        index: number;
+        metadata: Record<string, any>;
+        content: string;
+        embedding: number[];
+    }[]>;
     /**
      * Method to perform a similarity search in the memory vector store. It
      * calculates the similarity between the query vector and each vector in
@@ -59,6 +66,7 @@ export declare class MemoryVectorStore extends VectorStore {
      * @returns Promise that resolves with an array of tuples, each containing a `Document` and its similarity score.
      */
     similaritySearchVectorWithScore(query: number[], k: number, filter?: this["FilterType"]): Promise<[Document, number][]>;
+    maxMarginalRelevanceSearch(query: string, options: MaxMarginalRelevanceSearchOptions<this["FilterType"]>): Promise<DocumentInterface[]>;
     /**
      * Static method to create a `MemoryVectorStore` instance from an array of
      * texts. It creates a `Document` for each text and metadata pair, and

package/dist/vectorstores/memory.js

@@ -1,6 +1,7 @@
-import { VectorStore } from "@langchain/core/vectorstores";
+import { VectorStore, } from "@langchain/core/vectorstores";
 import { Document } from "@langchain/core/documents";
 import { cosine } from "../util/ml-distance/similarities.js";
+import { maximalMarginalRelevance } from "../util/math.js";
 /**
  * Class that extends `VectorStore` to store vectors in memory. Provides
  * methods for adding documents, performing similarity searches, and
@@ -53,17 +54,7 @@ export class MemoryVectorStore extends VectorStore {
         }));
         this.memoryVectors = this.memoryVectors.concat(memoryVectors);
     }
-    /**
-     * Method to perform a similarity search in the memory vector store. It
-     * calculates the similarity between the query vector and each vector in
-     * the store, sorts the results by similarity, and returns the top `k`
-     * results along with their scores.
-     * @param query Query vector to compare against the vectors in the store.
-     * @param k Number of top results to return.
-     * @param filter Optional filter function to apply to the vectors before performing the search.
-     * @returns Promise that resolves with an array of tuples, each containing a `Document` and its similarity score.
-     */
-    async similaritySearchVectorWithScore(query, k, filter) {
+    async _queryVectors(query, k, filter) {
         const filterFunction = (memoryVector) => {
             if (!filter) {
                 return true;
@@ -75,22 +66,48 @@ export class MemoryVectorStore extends VectorStore {
             return filter(doc);
         };
         const filteredMemoryVectors = this.memoryVectors.filter(filterFunction);
-        const searches = filteredMemoryVectors
+        return filteredMemoryVectors
             .map((vector, index) => ({
             similarity: this.similarity(query, vector.embedding),
             index,
+            metadata: vector.metadata,
+            content: vector.content,
+            embedding: vector.embedding,
         }))
             .sort((a, b) => (a.similarity > b.similarity ? -1 : 0))
             .slice(0, k);
+    }
+    /**
+     * Method to perform a similarity search in the memory vector store. It
+     * calculates the similarity between the query vector and each vector in
+     * the store, sorts the results by similarity, and returns the top `k`
+     * results along with their scores.
+     * @param query Query vector to compare against the vectors in the store.
+     * @param k Number of top results to return.
+     * @param filter Optional filter function to apply to the vectors before performing the search.
+     * @returns Promise that resolves with an array of tuples, each containing a `Document` and its similarity score.
+     */
+    async similaritySearchVectorWithScore(query, k, filter) {
+        const searches = await this._queryVectors(query, k, filter);
         const result = searches.map((search) => [
             new Document({
-                metadata: filteredMemoryVectors[search.index].metadata,
-                pageContent: filteredMemoryVectors[search.index].content,
+                metadata: search.metadata,
+                pageContent: search.content,
             }),
             search.similarity,
         ]);
         return result;
     }
+    async maxMarginalRelevanceSearch(query, options) {
+        const queryEmbedding = await this.embeddings.embedQuery(query);
+        const searches = await this._queryVectors(queryEmbedding, options.fetchK ?? 20, options.filter);
+        const embeddingList = searches.map((searchResp) => searchResp.embedding);
+        const mmrIndexes = maximalMarginalRelevance(queryEmbedding, embeddingList, options.lambda, options.k);
+        return mmrIndexes.map((idx) => new Document({
+            metadata: searches[idx].metadata,
+            pageContent: searches[idx].content,
+        }));
+    }
     /**
      * Static method to create a `MemoryVectorStore` instance from an array of
      * texts. It creates a `Document` for each text and metadata pair, and

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langchain",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "Typescript bindings for langchain",
   "type": "module",
   "engines": {
@@ -616,8 +616,8 @@
     "@langchain/anthropic": "^0.2.8",
     "@langchain/aws": "^0.0.5",
     "@langchain/cohere": "^0.2.1",
-    "@langchain/google-genai": "^0.0.23",
-    "@langchain/google-vertexai": "^0.0.21",
+    "@langchain/google-genai": "^0.0.25",
+    "@langchain/google-vertexai": "^0.0.25",
     "@langchain/groq": "^0.0.15",
     "@langchain/mistralai": "^0.0.26",
     "@langchain/ollama": "^0.0.2",