@langchain/core 0.1.47 → 0.1.49

package/dist/language_models/chat_models.cjs

@@ -80,8 +80,10 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
             let generationChunk;
             try {
                 for await (const chunk of this._streamResponseChunks(messages, callOptions, runManagers?.[0])) {
-                    chunk.message.response_metadata =
-                        _combineGenerationInfoAndMetadata(chunk);
+                    chunk.message.response_metadata = {
+                        ...chunk.generationInfo,
+                        ...chunk.message.response_metadata,
+                    };
                     yield chunk.message;
                     if (!generationChunk) {
                         generationChunk = chunk;
@@ -121,8 +123,16 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
             if (pResult.status === "fulfilled") {
                 const result = pResult.value;
                 for (const generation of result.generations) {
-                    generation.message.response_metadata =
-                        _combineGenerationInfoAndMetadata(generation);
+                    generation.message.response_metadata = {
+                        ...generation.generationInfo,
+                        ...generation.message.response_metadata,
+                    };
+                }
+                if (result.generations.length === 1) {
+                    result.generations[0].message.response_metadata = {
+                        ...result.llmOutput,
+                        ...result.generations[0].message.response_metadata,
+                    };
                 }
                 generations[i] = result.generations;
                 llmOutputs[i] = result.llmOutput;
@@ -371,9 +381,3 @@ class SimpleChatModel extends BaseChatModel {
     }
 }
 exports.SimpleChatModel = SimpleChatModel;
-function _combineGenerationInfoAndMetadata(generation) {
-    return {
-        ...generation.generationInfo,
-        ...generation.message.response_metadata,
-    };
-}

package/dist/language_models/chat_models.js

@@ -76,8 +76,10 @@ export class BaseChatModel extends BaseLanguageModel {
             let generationChunk;
             try {
                 for await (const chunk of this._streamResponseChunks(messages, callOptions, runManagers?.[0])) {
-                    chunk.message.response_metadata =
-                        _combineGenerationInfoAndMetadata(chunk);
+                    chunk.message.response_metadata = {
+                        ...chunk.generationInfo,
+                        ...chunk.message.response_metadata,
+                    };
                     yield chunk.message;
                     if (!generationChunk) {
                         generationChunk = chunk;
@@ -117,8 +119,16 @@ export class BaseChatModel extends BaseLanguageModel {
             if (pResult.status === "fulfilled") {
                 const result = pResult.value;
                 for (const generation of result.generations) {
-                    generation.message.response_metadata =
-                        _combineGenerationInfoAndMetadata(generation);
+                    generation.message.response_metadata = {
+                        ...generation.generationInfo,
+                        ...generation.message.response_metadata,
+                    };
+                }
+                if (result.generations.length === 1) {
+                    result.generations[0].message.response_metadata = {
+                        ...result.llmOutput,
+                        ...result.generations[0].message.response_metadata,
+                    };
                 }
                 generations[i] = result.generations;
                 llmOutputs[i] = result.llmOutput;
@@ -365,9 +375,3 @@ export class SimpleChatModel extends BaseChatModel {
         };
     }
 }
-function _combineGenerationInfoAndMetadata(generation) {
-    return {
-        ...generation.generationInfo,
-        ...generation.message.response_metadata,
-    };
-}

package/dist/prompts/chat.cjs

@@ -626,8 +626,7 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
      * @param promptMessages Messages to be passed to the chat model
      * @returns A new ChatPromptTemplate
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static fromMessages(promptMessages) {
+    static fromMessages(promptMessages, extra) {
         const flattenedMessages = promptMessages.reduce((acc, promptMessage) => acc.concat(
         // eslint-disable-next-line no-instanceof/no-instanceof
         promptMessage instanceof ChatPromptTemplate
@@ -650,7 +649,8 @@ class ChatPromptTemplate extends BaseChatPromptTemplate {
                 inputVariables.add(inputVariable);
             }
         }
-        return new ChatPromptTemplate({
+        return new this({
+            ...extra,
             inputVariables: [...inputVariables],
             promptMessages: flattenedMessages,
             partialVariables: flattenedPartialVariables,

package/dist/prompts/chat.d.ts

@@ -202,9 +202,7 @@ export type BaseMessagePromptTemplateLike = BaseMessagePromptTemplate | BaseMess
  */
 export declare class ChatPromptTemplate<RunInput extends InputValues = any, PartialVariableName extends string = any> extends BaseChatPromptTemplate<RunInput, PartialVariableName> implements ChatPromptTemplateInput<RunInput, PartialVariableName> {
     static lc_name(): string;
-    get lc_aliases(): {
-        promptMessages: string;
-    };
+    get lc_aliases(): Record<string, string>;
     promptMessages: Array<BaseMessagePromptTemplate | BaseMessage>;
     validateTemplate: boolean;
     constructor(input: ChatPromptTemplateInput<RunInput, PartialVariableName>);
@@ -222,7 +220,7 @@ export declare class ChatPromptTemplate<RunInput extends InputValues = any, Part
      * @param promptMessages Messages to be passed to the chat model
      * @returns A new ChatPromptTemplate
      */
-    static fromMessages<RunInput extends InputValues = any>(promptMessages: (ChatPromptTemplate<InputValues, string> | BaseMessagePromptTemplateLike)[]): ChatPromptTemplate<RunInput>;
+    static fromMessages<RunInput extends InputValues = any, Extra extends ChatPromptTemplateInput<RunInput> = ChatPromptTemplateInput<RunInput>>(promptMessages: (ChatPromptTemplate<InputValues, string> | BaseMessagePromptTemplateLike)[], extra?: Omit<Extra, "inputVariables" | "promptMessages" | "partialVariables">): ChatPromptTemplate<RunInput>;
     /** @deprecated Renamed to .fromMessages */
     static fromPromptMessages<RunInput extends InputValues = any>(promptMessages: (ChatPromptTemplate<InputValues, string> | BaseMessagePromptTemplateLike)[]): ChatPromptTemplate<RunInput>;
 }

package/dist/prompts/chat.js

@@ -615,8 +615,7 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
      * @param promptMessages Messages to be passed to the chat model
      * @returns A new ChatPromptTemplate
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static fromMessages(promptMessages) {
+    static fromMessages(promptMessages, extra) {
         const flattenedMessages = promptMessages.reduce((acc, promptMessage) => acc.concat(
         // eslint-disable-next-line no-instanceof/no-instanceof
         promptMessage instanceof ChatPromptTemplate
@@ -639,7 +638,8 @@ export class ChatPromptTemplate extends BaseChatPromptTemplate {
                 inputVariables.add(inputVariable);
             }
         }
-        return new ChatPromptTemplate({
+        return new this({
+            ...extra,
             inputVariables: [...inputVariables],
             promptMessages: flattenedMessages,
             partialVariables: flattenedPartialVariables,

package/dist/prompts/index.cjs

@@ -23,3 +23,4 @@ __exportStar(require("./serde.cjs"), exports);
 __exportStar(require("./string.cjs"), exports);
 __exportStar(require("./template.cjs"), exports);
 __exportStar(require("./image.cjs"), exports);
+__exportStar(require("./structured.cjs"), exports);

package/dist/prompts/index.d.ts

@@ -7,3 +7,4 @@ export * from "./serde.js";
 export * from "./string.js";
 export * from "./template.js";
 export * from "./image.js";
+export * from "./structured.js";

package/dist/prompts/index.js

@@ -7,3 +7,4 @@ export * from "./serde.js";
 export * from "./string.js";
 export * from "./template.js";
 export * from "./image.js";
+export * from "./structured.js";

package/dist/prompts/structured.cjs

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructuredPrompt = void 0;
+const chat_js_1 = require("./chat.cjs");
+class StructuredPrompt extends chat_js_1.ChatPromptTemplate {
+    get lc_aliases() {
+        return {
+            ...super.lc_aliases,
+            schema: "schema_",
+        };
+    }
+    constructor(input) {
+        super(input);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        Object.defineProperty(this, "schema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.schema = input.schema;
+    }
+    pipe(coerceable) {
+        if (typeof coerceable === "object" &&
+            "withStructuredOutput" in coerceable &&
+            typeof coerceable.withStructuredOutput === "function") {
+            return super.pipe(coerceable.withStructuredOutput(this.schema));
+        }
+        else {
+            throw new Error(`Structured prompts need to be piped to a language model that supports the "withStructuredOutput()" method.`);
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static fromMessagesAndSchema(promptMessages, schema
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        return StructuredPrompt.fromMessages(promptMessages, { schema });
+    }
+}
+exports.StructuredPrompt = StructuredPrompt;

package/dist/prompts/structured.d.ts

@@ -0,0 +1,18 @@
+import { ChatPromptValueInterface } from "../prompt_values.js";
+import { RunnableLike, Runnable } from "../runnables/base.js";
+import { RunnableConfig } from "../runnables/config.js";
+import { InputValues } from "../utils/types.js";
+import { BaseMessagePromptTemplateLike, ChatPromptTemplate, ChatPromptTemplateInput } from "./chat.js";
+/**
+ * Interface for the input of a ChatPromptTemplate.
+ */
+export interface StructuredPromptInput<RunInput extends InputValues = any, PartialVariableName extends string = any> extends ChatPromptTemplateInput<RunInput, PartialVariableName> {
+    schema: Record<string, any>;
+}
+export declare class StructuredPrompt<RunInput extends InputValues = any, PartialVariableName extends string = any> extends ChatPromptTemplate<RunInput, PartialVariableName> implements StructuredPromptInput<RunInput, PartialVariableName> {
+    schema: Record<string, any>;
+    get lc_aliases(): Record<string, string>;
+    constructor(input: StructuredPromptInput<RunInput, PartialVariableName>);
+    pipe<NewRunOutput>(coerceable: RunnableLike<ChatPromptValueInterface, NewRunOutput>): Runnable<RunInput, Exclude<NewRunOutput, Error>, RunnableConfig>;
+    static fromMessagesAndSchema<RunInput extends InputValues = any>(promptMessages: (ChatPromptTemplate<InputValues, string> | BaseMessagePromptTemplateLike)[], schema: StructuredPromptInput["schema"]): ChatPromptTemplate<RunInput, any>;
+}

package/dist/prompts/structured.js

@@ -0,0 +1,36 @@
+import { ChatPromptTemplate, } from "./chat.js";
+export class StructuredPrompt extends ChatPromptTemplate {
+    get lc_aliases() {
+        return {
+            ...super.lc_aliases,
+            schema: "schema_",
+        };
+    }
+    constructor(input) {
+        super(input);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        Object.defineProperty(this, "schema", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.schema = input.schema;
+    }
+    pipe(coerceable) {
+        if (typeof coerceable === "object" &&
+            "withStructuredOutput" in coerceable &&
+            typeof coerceable.withStructuredOutput === "function") {
+            return super.pipe(coerceable.withStructuredOutput(this.schema));
+        }
+        else {
+            throw new Error(`Structured prompts need to be piped to a language model that supports the "withStructuredOutput()" method.`);
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static fromMessagesAndSchema(promptMessages, schema
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ) {
+        return StructuredPrompt.fromMessages(promptMessages, { schema });
+    }
+}

package/dist/runnables/base.cjs

@@ -730,28 +730,28 @@ class RunnableBinding extends Runnable {
         });
     }
     async invoke(input, options) {
-        return this.bound.invoke(input, await this._mergeConfig(options, this.kwargs));
+        return this.bound.invoke(input, await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs));
     }
     async batch(inputs, options, batchOptions) {
         const mergedOptions = Array.isArray(options)
-            ? await Promise.all(options.map(async (individualOption) => this._mergeConfig(individualOption, this.kwargs)))
-            : await this._mergeConfig(options, this.kwargs);
+            ? await Promise.all(options.map(async (individualOption) => this._mergeConfig((0, config_js_1.ensureConfig)(individualOption), this.kwargs)))
+            : await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs);
         return this.bound.batch(inputs, mergedOptions, batchOptions);
     }
     async *_streamIterator(input, options) {
-        yield* this.bound._streamIterator(input, await this._mergeConfig(options, this.kwargs));
+        yield* this.bound._streamIterator(input, await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs));
     }
     async stream(input, options) {
-        return this.bound.stream(input, await this._mergeConfig(options, this.kwargs));
+        return this.bound.stream(input, await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs));
     }
     async *transform(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     generator, options) {
-        yield* this.bound.transform(generator, await this._mergeConfig(options, this.kwargs));
+        yield* this.bound.transform(generator, await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs));
     }
     async *streamEvents(input, options, streamOptions) {
         yield* this.bound.streamEvents(input, {
-            ...(await this._mergeConfig(options, this.kwargs)),
+            ...(await this._mergeConfig((0, config_js_1.ensureConfig)(options), this.kwargs)),
             version: options.version,
         }, streamOptions);
     }

package/dist/runnables/base.js

@@ -722,28 +722,28 @@ export class RunnableBinding extends Runnable {
         });
     }
     async invoke(input, options) {
-        return this.bound.invoke(input, await this._mergeConfig(options, this.kwargs));
+        return this.bound.invoke(input, await this._mergeConfig(ensureConfig(options), this.kwargs));
     }
     async batch(inputs, options, batchOptions) {
         const mergedOptions = Array.isArray(options)
-            ? await Promise.all(options.map(async (individualOption) => this._mergeConfig(individualOption, this.kwargs)))
-            : await this._mergeConfig(options, this.kwargs);
+            ? await Promise.all(options.map(async (individualOption) => this._mergeConfig(ensureConfig(individualOption), this.kwargs)))
+            : await this._mergeConfig(ensureConfig(options), this.kwargs);
         return this.bound.batch(inputs, mergedOptions, batchOptions);
     }
     async *_streamIterator(input, options) {
-        yield* this.bound._streamIterator(input, await this._mergeConfig(options, this.kwargs));
+        yield* this.bound._streamIterator(input, await this._mergeConfig(ensureConfig(options), this.kwargs));
     }
     async stream(input, options) {
-        return this.bound.stream(input, await this._mergeConfig(options, this.kwargs));
+        return this.bound.stream(input, await this._mergeConfig(ensureConfig(options), this.kwargs));
     }
     async *transform(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     generator, options) {
-        yield* this.bound.transform(generator, await this._mergeConfig(options, this.kwargs));
+        yield* this.bound.transform(generator, await this._mergeConfig(ensureConfig(options), this.kwargs));
     }
     async *streamEvents(input, options, streamOptions) {
         yield* this.bound.streamEvents(input, {
-            ...(await this._mergeConfig(options, this.kwargs)),
+            ...(await this._mergeConfig(ensureConfig(options), this.kwargs)),
             version: options.version,
         }, streamOptions);
     }

package/dist/runnables/config.cjs

@@ -9,15 +9,17 @@ async function getCallbackManagerForConfig(config) {
 }
 exports.getCallbackManagerForConfig = getCallbackManagerForConfig;
 function mergeConfigs(...configs) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const copy = ensureConfig();
+    // We do not want to call ensureConfig on the empty state here as this may cause
+    // double loading of callbacks if async local storage is being used.
+    const copy = {};
     for (const options of configs.filter((c) => !!c)) {
         for (const key of Object.keys(options)) {
             if (key === "metadata") {
                 copy[key] = { ...copy[key], ...options[key] };
             }
             else if (key === "tags") {
-                copy[key] = [...new Set(copy[key].concat(options[key] ?? []))];
+                const baseKeys = copy[key] ?? [];
+                copy[key] = [...new Set(baseKeys.concat(options[key] ?? []))];
             }
             else if (key === "configurable") {
                 copy[key] = { ...copy[key], ...options[key] };

package/dist/runnables/config.js

@@ -5,15 +5,17 @@ export async function getCallbackManagerForConfig(config) {
     return CallbackManager.configure(config?.callbacks, undefined, config?.tags, undefined, config?.metadata);
 }
 export function mergeConfigs(...configs) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const copy = ensureConfig();
+    // We do not want to call ensureConfig on the empty state here as this may cause
+    // double loading of callbacks if async local storage is being used.
+    const copy = {};
     for (const options of configs.filter((c) => !!c)) {
         for (const key of Object.keys(options)) {
             if (key === "metadata") {
                 copy[key] = { ...copy[key], ...options[key] };
             }
             else if (key === "tags") {
-                copy[key] = [...new Set(copy[key].concat(options[key] ?? []))];
+                const baseKeys = copy[key] ?? [];
+                copy[key] = [...new Set(baseKeys.concat(options[key] ?? []))];
             }
             else if (key === "configurable") {
                 copy[key] = { ...copy[key], ...options[key] };

package/package.json

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