@langchain/core 0.2.5 → 0.2.6

package/README.md

@@ -1,6 +1,6 @@
 # 🦜🍎️ @langchain/core
 
-[![CI](https://github.com/langchain-ai/langchainjs/actions/workflows/ci.yml/badge.svg)](https://github.com/langchain-ai/langchainjs/actions/workflows/ci.yml) ![npm](https://img.shields.io/npm/dw/@langchain/core) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/langchainai.svg?style=social&label=Follow%20%40LangChainAI)](https://twitter.com/langchainai) [![](https://dcbadge.vercel.app/api/server/6adMQxSpJS?compact=true&style=flat)](https://discord.gg/6adMQxSpJS)
+[![CI](https://github.com/langchain-ai/langchainjs/actions/workflows/ci.yml/badge.svg)](https://github.com/langchain-ai/langchainjs/actions/workflows/ci.yml) ![npm](https://img.shields.io/npm/dm/@langchain/core) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/langchainai.svg?style=social&label=Follow%20%40LangChainAI)](https://twitter.com/langchainai) [![](https://dcbadge.vercel.app/api/server/6adMQxSpJS?compact=true&style=flat)](https://discord.gg/6adMQxSpJS)
 
 `@langchain/core` contains the core abstractions and schemas of LangChain.js, including base classes for language models,
 chat models, vectorstores, retrievers, and runnables.

package/dist/callbacks/promises.cjs

@@ -20,7 +20,7 @@ function createQueue() {
 }
 /**
  * Consume a promise, either adding it to the queue or waiting for it to resolve
- * @param promise Promise to consume
+ * @param promiseFn Promise to consume
  * @param wait Whether to wait for the promise to resolve or resolve immediately
  */
 async function consumeCallback(promiseFn, wait) {

package/dist/callbacks/promises.d.ts

@@ -1,6 +1,6 @@
 /**
  * Consume a promise, either adding it to the queue or waiting for it to resolve
- * @param promise Promise to consume
+ * @param promiseFn Promise to consume
  * @param wait Whether to wait for the promise to resolve or resolve immediately
  */
 export declare function consumeCallback<T>(promiseFn: () => Promise<T> | T | void, wait: boolean): Promise<void>;

package/dist/callbacks/promises.js

@@ -14,7 +14,7 @@ function createQueue() {
 }
 /**
  * Consume a promise, either adding it to the queue or waiting for it to resolve
- * @param promise Promise to consume
+ * @param promiseFn Promise to consume
  * @param wait Whether to wait for the promise to resolve or resolve immediately
  */
 export async function consumeCallback(promiseFn, wait) {

package/dist/language_models/chat_models.d.ts

@@ -78,7 +78,7 @@ export declare abstract class BaseChatModel<CallOptions extends BaseChatModelCal
     invoke(input: BaseLanguageModelInput, options?: CallOptions): Promise<OutputMessageType>;
     _streamResponseChunks(_messages: BaseMessage[], _options: this["ParsedCallOptions"], _runManager?: CallbackManagerForLLMRun): AsyncGenerator<ChatGenerationChunk>;
     _streamIterator(input: BaseLanguageModelInput, options?: CallOptions): AsyncGenerator<OutputMessageType>;
-    protected getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
+    getLsParams(options: this["ParsedCallOptions"]): LangSmithParams;
     /** @ignore */
     _generateUncached(messages: BaseMessageLike[][], parsedOptions: this["ParsedCallOptions"], handledOptions: RunnableConfig): Promise<LLMResult>;
     _generateCached({ messages, cache, llmStringKey, parsedOptions, handledOptions, }: ChatModelGenerateCachedParameters<typeof this>): Promise<LLMResult & {

package/dist/prompts/chat.cjs

@@ -301,14 +301,20 @@ class _StringImageMessagePromptTemplate extends BaseMessagePromptTemplate {
                 else if (typeof item.text === "string") {
                     text = item.text ?? "";
                 }
-                prompt.push(prompt_js_1.PromptTemplate.fromTemplate(text));
+                prompt.push(prompt_js_1.PromptTemplate.fromTemplate(text, additionalOptions));
             }
             else if (typeof item === "object" && "image_url" in item) {
                 let imgTemplate = item.image_url ?? "";
                 let imgTemplateObject;
                 let inputVariables = [];
                 if (typeof imgTemplate === "string") {
-                    const parsedTemplate = (0, template_js_1.parseFString)(imgTemplate);
+                    let parsedTemplate;
+                    if (additionalOptions?.templateFormat === "mustache") {
+                        parsedTemplate = (0, template_js_1.parseMustache)(imgTemplate);
+                    }
+                    else {
+                        parsedTemplate = (0, template_js_1.parseFString)(imgTemplate);
+                    }
                     const variables = parsedTemplate.flatMap((item) => item.type === "variable" ? [item.name] : []);
                     if ((variables?.length ?? 0) > 0) {
                         if (variables.length > 1) {
@@ -327,7 +333,13 @@ class _StringImageMessagePromptTemplate extends BaseMessagePromptTemplate {
                 }
                 else if (typeof imgTemplate === "object") {
                     if ("url" in imgTemplate) {
-                        const parsedTemplate = (0, template_js_1.parseFString)(imgTemplate.url);
+                        let parsedTemplate;
+                        if (additionalOptions?.templateFormat === "mustache") {
+                            parsedTemplate = (0, template_js_1.parseMustache)(imgTemplate.url);
+                        }
+                        else {
+                            parsedTemplate = (0, template_js_1.parseFString)(imgTemplate.url);
+                        }
                         inputVariables = parsedTemplate.flatMap((item) => item.type === "variable" ? [item.name] : []);
                     }
                     else {
@@ -600,7 +612,9 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
             else {
                 imageUrl = item.image_url.url;
             }
-            const promptTemplatePlaceholder = prompt_js_1.PromptTemplate.fromTemplate(imageUrl);
+            const promptTemplatePlaceholder = prompt_js_1.PromptTemplate.fromTemplate(imageUrl, {
+                templateFormat: this.templateFormat,
+            });
             const formattedUrl = await promptTemplatePlaceholder.format(inputValues);
             if (typeof item.image_url !== "string" && "url" in item.image_url) {
                 // eslint-disable-next-line no-param-reassign

package/dist/prompts/chat.js

@@ -7,7 +7,7 @@ import { BaseStringPromptTemplate } from "./string.js";
 import { BasePromptTemplate, } from "./base.js";
 import { PromptTemplate, } from "./prompt.js";
 import { ImagePromptTemplate } from "./image.js";
-import { parseFString } from "./template.js";
+import { parseFString, parseMustache, } from "./template.js";
 /**
  * Abstract class that serves as a base for creating message prompt
  * templates. It defines how to format messages for different roles in a
@@ -293,14 +293,20 @@ class _StringImageMessagePromptTemplate extends BaseMessagePromptTemplate {
                 else if (typeof item.text === "string") {
                     text = item.text ?? "";
                 }
-                prompt.push(PromptTemplate.fromTemplate(text));
+                prompt.push(PromptTemplate.fromTemplate(text, additionalOptions));
             }
             else if (typeof item === "object" && "image_url" in item) {
                 let imgTemplate = item.image_url ?? "";
                 let imgTemplateObject;
                 let inputVariables = [];
                 if (typeof imgTemplate === "string") {
-                    const parsedTemplate = parseFString(imgTemplate);
+                    let parsedTemplate;
+                    if (additionalOptions?.templateFormat === "mustache") {
+                        parsedTemplate = parseMustache(imgTemplate);
+                    }
+                    else {
+                        parsedTemplate = parseFString(imgTemplate);
+                    }
                     const variables = parsedTemplate.flatMap((item) => item.type === "variable" ? [item.name] : []);
                     if ((variables?.length ?? 0) > 0) {
                         if (variables.length > 1) {
@@ -319,7 +325,13 @@ class _StringImageMessagePromptTemplate extends BaseMessagePromptTemplate {
                 }
                 else if (typeof imgTemplate === "object") {
                     if ("url" in imgTemplate) {
-                        const parsedTemplate = parseFString(imgTemplate.url);
+                        let parsedTemplate;
+                        if (additionalOptions?.templateFormat === "mustache") {
+                            parsedTemplate = parseMustache(imgTemplate.url);
+                        }
+                        else {
+                            parsedTemplate = parseFString(imgTemplate.url);
+                        }
                         inputVariables = parsedTemplate.flatMap((item) => item.type === "variable" ? [item.name] : []);
                     }
                     else {
@@ -589,7 +601,9 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
             else {
                 imageUrl = item.image_url.url;
             }
-            const promptTemplatePlaceholder = PromptTemplate.fromTemplate(imageUrl);
+            const promptTemplatePlaceholder = PromptTemplate.fromTemplate(imageUrl, {
+                templateFormat: this.templateFormat,
+            });
             const formattedUrl = await promptTemplatePlaceholder.format(inputValues);
             if (typeof item.image_url !== "string" && "url" in item.image_url) {
                 // eslint-disable-next-line no-param-reassign

package/dist/prompts/tests/chat.mustache.test.js

@@ -2,7 +2,7 @@ import { test, expect } from "@jest/globals";
 import { AIMessage } from "../../messages/ai.js";
 import { HumanMessage } from "../../messages/human.js";
 import { SystemMessage } from "../../messages/system.js";
-import { ChatPromptTemplate } from "../chat.js";
+import { ChatPromptTemplate, HumanMessagePromptTemplate } from "../chat.js";
 test("Test creating a chat prompt template from role string messages", async () => {
     const template = ChatPromptTemplate.fromMessages([
         ["system", "You are a helpful AI bot. Your name is {{name}}."],
@@ -59,3 +59,43 @@ test("Ignores f-string inputs input variables with repeats.", async () => {
         new HumanMessage("This {bar} is a {foo} test {foo}."),
     ]);
 });
+test("Mustache template with image and chat prompts inside one template (fromMessages)", async () => {
+    const template = ChatPromptTemplate.fromMessages([
+        [
+            "human",
+            [
+                {
+                    type: "image_url",
+                    image_url: "{{image_url}}",
+                },
+                {
+                    type: "text",
+                    text: "{{other_var}}",
+                },
+            ],
+        ],
+        ["human", "hello {{name}}"],
+    ], {
+        templateFormat: "mustache",
+    });
+    expect(template.inputVariables.sort()).toEqual([
+        "image_url",
+        "name",
+        "other_var",
+    ]);
+});
+test("Mustache image template with nested URL and chat prompts HumanMessagePromptTemplate.fromTemplate", async () => {
+    const template = HumanMessagePromptTemplate.fromTemplate([
+        {
+            text: "{{name}}",
+        },
+        {
+            image_url: {
+                url: "{{image_url}}",
+            },
+        },
+    ], {
+        templateFormat: "mustache",
+    });
+    expect(template.inputVariables.sort()).toEqual(["image_url", "name"]);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/core",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Core LangChain.js abstractions and schemas",
   "type": "module",
   "engines": {