langchain 0.0.185 → 0.0.186

package/dist/agents/openai/index.cjs

@@ -143,7 +143,8 @@ class OpenAIAgent extends agent_js_1.Agent {
         const valuesForLLM = {
             functions: this.tools.map(convert_to_openai_js_1.formatToOpenAIFunction),
         };
-        for (const key of this.llmChain.llm.callKeys) {
+        const callKeys = "callKeys" in this.llmChain.llm ? this.llmChain.llm.callKeys : [];
+        for (const key of callKeys) {
             if (key in inputs) {
                 valuesForLLM[key] = inputs[key];
                 delete valuesForPrompt[key];

package/dist/agents/openai/index.js

@@ -139,7 +139,8 @@ export class OpenAIAgent extends Agent {
         const valuesForLLM = {
             functions: this.tools.map(formatToOpenAIFunction),
         };
-        for (const key of this.llmChain.llm.callKeys) {
+        const callKeys = "callKeys" in this.llmChain.llm ? this.llmChain.llm.callKeys : [];
+        for (const key of callKeys) {
             if (key in inputs) {
                 valuesForLLM[key] = inputs[key];
                 delete valuesForPrompt[key];

package/dist/chains/combine_docs_chain.cjs

@@ -177,7 +177,7 @@ class MapReduceDocumentsChain extends base_js_1.BaseChain {
                     [this.combineDocumentChain.inputKey]: currentDocs,
                     ...rest,
                 }));
-                const length = await this.combineDocumentChain.llmChain.llm.getNumTokens(formatted);
+                const length = await this.combineDocumentChain.llmChain._getNumTokens(formatted);
                 const withinTokenLimit = length < this.maxTokens;
                 // If we can skip the map step, and we're within the token limit, we don't
                 // need to run the map step, so just break out of the loop.

package/dist/chains/combine_docs_chain.js

@@ -173,7 +173,7 @@ export class MapReduceDocumentsChain extends BaseChain {
                     [this.combineDocumentChain.inputKey]: currentDocs,
                     ...rest,
                 }));
-                const length = await this.combineDocumentChain.llmChain.llm.getNumTokens(formatted);
+                const length = await this.combineDocumentChain.llmChain._getNumTokens(formatted);
                 const withinTokenLimit = length < this.maxTokens;
                 // If we can skip the map step, and we're within the token limit, we don't
                 // need to run the map step, so just break out of the loop.

package/dist/chains/llm_chain.cjs

@@ -5,6 +5,29 @@ const base_js_1 = require("./base.cjs");
 const base_js_2 = require("../prompts/base.cjs");
 const index_js_1 = require("../base_language/index.cjs");
 const noop_js_1 = require("../output_parsers/noop.cjs");
+const base_js_3 = require("../schema/runnable/base.cjs");
+function isBaseLanguageModel(llmLike) {
+    return typeof llmLike._llmType === "function";
+}
+function _getLanguageModel(llmLike) {
+    if (isBaseLanguageModel(llmLike)) {
+        return llmLike;
+    }
+    else if ("bound" in llmLike && base_js_3.Runnable.isRunnable(llmLike.bound)) {
+        return _getLanguageModel(llmLike.bound);
+    }
+    else if ("runnable" in llmLike &&
+        "fallbacks" in llmLike &&
+        base_js_3.Runnable.isRunnable(llmLike.runnable)) {
+        return _getLanguageModel(llmLike.runnable);
+    }
+    else if ("default" in llmLike && base_js_3.Runnable.isRunnable(llmLike.default)) {
+        return _getLanguageModel(llmLike.default);
+    }
+    else {
+        throw new Error("Unable to extract BaseLanguageModel from llmLike object.");
+    }
+}
 /**
  * Chain to run queries against LLMs.
  *
@@ -79,10 +102,15 @@ class LLMChain extends base_js_1.BaseChain {
             this.outputParser = this.prompt.outputParser;
         }
     }
+    getCallKeys() {
+        const callKeys = "callKeys" in this.llm ? this.llm.callKeys : [];
+        return callKeys;
+    }
     /** @ignore */
     _selectMemoryInputs(values) {
         const valuesForMemory = super._selectMemoryInputs(values);
-        for (const key of this.llm.callKeys) {
+        const callKeys = this.getCallKeys();
+        for (const key of callKeys) {
             if (key in values) {
                 delete valuesForMemory[key];
             }
@@ -114,16 +142,29 @@ class LLMChain extends base_js_1.BaseChain {
         const valuesForLLM = {
             ...this.llmKwargs,
         };
-        for (const key of this.llm.callKeys) {
+        const callKeys = this.getCallKeys();
+        for (const key of callKeys) {
             if (key in values) {
-                valuesForLLM[key] = values[key];
-                delete valuesForPrompt[key];
+                if (valuesForLLM) {
+                    valuesForLLM[key] =
+                        values[key];
+                    delete valuesForPrompt[key];
+                }
             }
         }
         const promptValue = await this.prompt.formatPromptValue(valuesForPrompt);
-        const { generations } = await this.llm.generatePrompt([promptValue], valuesForLLM, runManager?.getChild());
+        if ("generatePrompt" in this.llm) {
+            const { generations } = await this.llm.generatePrompt([promptValue], valuesForLLM, runManager?.getChild());
+            return {
+                [this.outputKey]: await this._getFinalOutput(generations[0], promptValue, runManager),
+            };
+        }
+        const modelWithParser = this.outputParser
+            ? this.llm.pipe(this.outputParser)
+            : this.llm;
+        const response = await modelWithParser.invoke(promptValue, runManager?.getChild());
         return {
-            [this.outputKey]: await this._getFinalOutput(generations[0], promptValue, runManager),
+            [this.outputKey]: response,
         };
     }
     /**
@@ -160,11 +201,15 @@ class LLMChain extends base_js_1.BaseChain {
     }
     /** @deprecated */
     serialize() {
+        const serialize = "serialize" in this.llm ? this.llm.serialize() : undefined;
         return {
             _type: `${this._chainType()}_chain`,
-            llm: this.llm.serialize(),
+            llm: serialize,
             prompt: this.prompt.serialize(),
         };
     }
+    _getNumTokens(text) {
+        return _getLanguageModel(this.llm).getNumTokens(text);
+    }
 }
 exports.LLMChain = LLMChain;

package/dist/chains/llm_chain.d.ts

@@ -1,21 +1,26 @@
 import { BaseChain, ChainInputs } from "./base.js";
 import { BasePromptTemplate } from "../prompts/base.js";
-import { BaseLanguageModel } from "../base_language/index.js";
-import { ChainValues, Generation, BasePromptValue } from "../schema/index.js";
+import { BaseLanguageModel, BaseLanguageModelInput } from "../base_language/index.js";
+import { ChainValues, Generation, BasePromptValue, BaseMessage } from "../schema/index.js";
 import { BaseLLMOutputParser } from "../schema/output_parser.js";
 import { SerializedLLMChain } from "./serde.js";
 import { CallbackManager } from "../callbacks/index.js";
 import { BaseCallbackConfig, CallbackManagerForChainRun, Callbacks } from "../callbacks/manager.js";
+import { Runnable } from "../schema/runnable/base.js";
+type LLMType = BaseLanguageModel | Runnable<BaseLanguageModelInput, string> | Runnable<BaseLanguageModelInput, BaseMessage>;
+type CallOptionsIfAvailable<T> = T extends {
+    CallOptions: infer CO;
+} ? CO : any;
 /**
  * Interface for the input parameters of the LLMChain class.
  */
-export interface LLMChainInput<T extends string | object = string, L extends BaseLanguageModel = BaseLanguageModel> extends ChainInputs {
+export interface LLMChainInput<T extends string | object = string, Model extends LLMType = LLMType> extends ChainInputs {
     /** Prompt object to use */
     prompt: BasePromptTemplate;
     /** LLM Wrapper to use */
-    llm: L;
+    llm: Model;
     /** Kwargs to pass to LLM */
-    llmKwargs?: this["llm"]["CallOptions"];
+    llmKwargs?: CallOptionsIfAvailable<Model>;
     /** OutputParser to use */
     outputParser?: BaseLLMOutputParser<T>;
     /** Key to use for output, defaults to `text` */
@@ -34,17 +39,18 @@ export interface LLMChainInput<T extends string | object = string, L extends Bas
  * const llm = new LLMChain({ llm: new OpenAI(), prompt });
  * ```
  */
-export declare class LLMChain<T extends string | object = string, L extends BaseLanguageModel = BaseLanguageModel> extends BaseChain implements LLMChainInput<T> {
+export declare class LLMChain<T extends string | object = string, Model extends LLMType = LLMType> extends BaseChain implements LLMChainInput<T> {
     static lc_name(): string;
     lc_serializable: boolean;
     prompt: BasePromptTemplate;
-    llm: L;
-    llmKwargs?: this["llm"]["CallOptions"];
+    llm: Model;
+    llmKwargs?: CallOptionsIfAvailable<Model>;
     outputKey: string;
     outputParser?: BaseLLMOutputParser<T>;
     get inputKeys(): string[];
     get outputKeys(): string[];
-    constructor(fields: LLMChainInput<T, L>);
+    constructor(fields: LLMChainInput<T, Model>);
+    private getCallKeys;
     /** @ignore */
     _selectMemoryInputs(values: ChainValues): ChainValues;
     /** @ignore */
@@ -54,9 +60,9 @@ export declare class LLMChain<T extends string | object = string, L extends Base
      *
      * Wraps _call and handles memory.
      */
-    call(values: ChainValues & this["llm"]["CallOptions"], config?: Callbacks | BaseCallbackConfig): Promise<ChainValues>;
+    call(values: ChainValues & CallOptionsIfAvailable<Model>, config?: Callbacks | BaseCallbackConfig): Promise<ChainValues>;
     /** @ignore */
-    _call(values: ChainValues & this["llm"]["CallOptions"], runManager?: CallbackManagerForChainRun): Promise<ChainValues>;
+    _call(values: ChainValues & CallOptionsIfAvailable<Model>, runManager?: CallbackManagerForChainRun): Promise<ChainValues>;
     /**
      * Format prompt with values and pass to LLM
      *
@@ -69,9 +75,11 @@ export declare class LLMChain<T extends string | object = string, L extends Base
      * llm.predict({ adjective: "funny" })
      * ```
      */
-    predict(values: ChainValues & this["llm"]["CallOptions"], callbackManager?: CallbackManager): Promise<T>;
+    predict(values: ChainValues & CallOptionsIfAvailable<Model>, callbackManager?: CallbackManager): Promise<T>;
     _chainType(): "llm";
     static deserialize(data: SerializedLLMChain): Promise<LLMChain<string, BaseLanguageModel<any, import("../base_language/index.js").BaseLanguageModelCallOptions>>>;
     /** @deprecated */
     serialize(): SerializedLLMChain;
+    _getNumTokens(text: string): Promise<number>;
 }
+export {};

package/dist/chains/llm_chain.js

@@ -1,7 +1,30 @@
 import { BaseChain } from "./base.js";
 import { BasePromptTemplate } from "../prompts/base.js";
-import { BaseLanguageModel } from "../base_language/index.js";
+import { BaseLanguageModel, } from "../base_language/index.js";
 import { NoOpOutputParser } from "../output_parsers/noop.js";
+import { Runnable } from "../schema/runnable/base.js";
+function isBaseLanguageModel(llmLike) {
+    return typeof llmLike._llmType === "function";
+}
+function _getLanguageModel(llmLike) {
+    if (isBaseLanguageModel(llmLike)) {
+        return llmLike;
+    }
+    else if ("bound" in llmLike && Runnable.isRunnable(llmLike.bound)) {
+        return _getLanguageModel(llmLike.bound);
+    }
+    else if ("runnable" in llmLike &&
+        "fallbacks" in llmLike &&
+        Runnable.isRunnable(llmLike.runnable)) {
+        return _getLanguageModel(llmLike.runnable);
+    }
+    else if ("default" in llmLike && Runnable.isRunnable(llmLike.default)) {
+        return _getLanguageModel(llmLike.default);
+    }
+    else {
+        throw new Error("Unable to extract BaseLanguageModel from llmLike object.");
+    }
+}
 /**
  * Chain to run queries against LLMs.
  *
@@ -76,10 +99,15 @@ export class LLMChain extends BaseChain {
             this.outputParser = this.prompt.outputParser;
         }
     }
+    getCallKeys() {
+        const callKeys = "callKeys" in this.llm ? this.llm.callKeys : [];
+        return callKeys;
+    }
     /** @ignore */
     _selectMemoryInputs(values) {
         const valuesForMemory = super._selectMemoryInputs(values);
-        for (const key of this.llm.callKeys) {
+        const callKeys = this.getCallKeys();
+        for (const key of callKeys) {
             if (key in values) {
                 delete valuesForMemory[key];
             }
@@ -111,16 +139,29 @@ export class LLMChain extends BaseChain {
         const valuesForLLM = {
             ...this.llmKwargs,
         };
-        for (const key of this.llm.callKeys) {
+        const callKeys = this.getCallKeys();
+        for (const key of callKeys) {
             if (key in values) {
-                valuesForLLM[key] = values[key];
-                delete valuesForPrompt[key];
+                if (valuesForLLM) {
+                    valuesForLLM[key] =
+                        values[key];
+                    delete valuesForPrompt[key];
+                }
             }
         }
         const promptValue = await this.prompt.formatPromptValue(valuesForPrompt);
-        const { generations } = await this.llm.generatePrompt([promptValue], valuesForLLM, runManager?.getChild());
+        if ("generatePrompt" in this.llm) {
+            const { generations } = await this.llm.generatePrompt([promptValue], valuesForLLM, runManager?.getChild());
+            return {
+                [this.outputKey]: await this._getFinalOutput(generations[0], promptValue, runManager),
+            };
+        }
+        const modelWithParser = this.outputParser
+            ? this.llm.pipe(this.outputParser)
+            : this.llm;
+        const response = await modelWithParser.invoke(promptValue, runManager?.getChild());
         return {
-            [this.outputKey]: await this._getFinalOutput(generations[0], promptValue, runManager),
+            [this.outputKey]: response,
         };
     }
     /**
@@ -157,10 +198,14 @@ export class LLMChain extends BaseChain {
     }
     /** @deprecated */
     serialize() {
+        const serialize = "serialize" in this.llm ? this.llm.serialize() : undefined;
         return {
             _type: `${this._chainType()}_chain`,
-            llm: this.llm.serialize(),
+            llm: serialize,
             prompt: this.prompt.serialize(),
         };
     }
+    _getNumTokens(text) {
+        return _getLanguageModel(this.llm).getNumTokens(text);
+    }
 }

package/dist/chat_models/ollama.cjs

@@ -213,6 +213,12 @@ class ChatOllama extends base_js_1.SimpleChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -247,6 +253,7 @@ class ChatOllama extends base_js_1.SimpleChatModel {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -260,6 +267,7 @@ class ChatOllama extends base_js_1.SimpleChatModel {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/chat_models/ollama.d.ts

@@ -3,6 +3,7 @@ import { BaseLanguageModelCallOptions } from "../base_language/index.js";
 import { OllamaInput } from "../util/ollama.js";
 import { CallbackManagerForLLMRun } from "../callbacks/manager.js";
 import { BaseMessage, ChatGenerationChunk } from "../schema/index.js";
+import type { StringWithAutocomplete } from "../util/types.js";
 /**
  * An interface defining the options for an Ollama API call. It extends
  * the BaseLanguageModelCallOptions interface.
@@ -49,6 +50,7 @@ export declare class ChatOllama extends SimpleChatModel<OllamaCallOptions> imple
     useMLock?: boolean;
     useMMap?: boolean;
     vocabOnly?: boolean;
+    format?: StringWithAutocomplete<"json">;
     constructor(fields: OllamaInput & BaseChatModelParams);
     _llmType(): string;
     /**
@@ -59,6 +61,7 @@ export declare class ChatOllama extends SimpleChatModel<OllamaCallOptions> imple
      */
     invocationParams(options?: this["ParsedCallOptions"]): {
         model: string;
+        format: StringWithAutocomplete<"json"> | undefined;
         options: {
             embedding_only: boolean | undefined;
             f16_kv: boolean | undefined;

package/dist/chat_models/ollama.js

@@ -210,6 +210,12 @@ export class ChatOllama extends SimpleChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -244,6 +250,7 @@ export class ChatOllama extends SimpleChatModel {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -257,6 +264,7 @@ export class ChatOllama extends SimpleChatModel {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/chat_models/openai.cjs

@@ -421,6 +421,9 @@ class ChatOpenAI extends base_js_1.BaseChatModel {
                 continue;
             }
             const { delta } = choice;
+            if (!delta) {
+                continue;
+            }
             const chunk = _convertDeltaToMessageChunk(delta, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {

package/dist/chat_models/openai.js

@@ -418,6 +418,9 @@ export class ChatOpenAI extends BaseChatModel {
                 continue;
             }
             const { delta } = choice;
+            if (!delta) {
+                continue;
+            }
             const chunk = _convertDeltaToMessageChunk(delta, defaultRole);
             defaultRole = delta.role ?? defaultRole;
             const newTokenIndices = {

package/dist/document_loaders/fs/unstructured.d.ts

@@ -5,6 +5,7 @@ import type { readFile as ReadFileT } from "node:fs/promises";
 import { DirectoryLoader, UnknownHandling } from "./directory.js";
 import { Document } from "../../document.js";
 import { BaseDocumentLoader } from "../base.js";
+import type { StringWithAutocomplete } from "../../util/types.js";
 /**
  * Represents an element returned by the Unstructured API. It has
  * properties for the element type, text content, and metadata.
@@ -40,11 +41,6 @@ export type SkipInferTableTypes = "txt" | "text" | "pdf" | "docx" | "doc" | "jpg
  * Set the chunking_strategy to chunk text into larger or smaller elements. Defaults to None with optional arg of by_title
  */
 type ChunkingStrategy = "None" | "by_title";
-/**
- * Represents a string value with autocomplete suggestions. It is used for
- * the `strategy` property in the UnstructuredLoaderOptions.
- */
-type StringWithAutocomplete<T> = T | (string & Record<never, never>);
 export type UnstructuredLoaderOptions = {
     apiKey?: string;
     apiUrl?: string;

package/dist/embeddings/ollama.d.ts

@@ -1,6 +1,6 @@
 import { OllamaInput, OllamaRequestParams } from "../util/ollama.js";
 import { Embeddings, EmbeddingsParams } from "./base.js";
-type CamelCasedRequestOptions = Omit<OllamaInput, "baseUrl" | "model">;
+type CamelCasedRequestOptions = Omit<OllamaInput, "baseUrl" | "model" | "format">;
 /**
  * Interface for OllamaEmbeddings parameters. Extends EmbeddingsParams and
  * defines additional parameters specific to the OllamaEmbeddings class.

package/dist/llms/ollama.cjs

@@ -212,6 +212,12 @@ class Ollama extends base_js_1.LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -246,6 +252,7 @@ class Ollama extends base_js_1.LLM {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -253,6 +260,7 @@ class Ollama extends base_js_1.LLM {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/llms/ollama.d.ts

@@ -2,6 +2,7 @@ import { LLM, BaseLLMParams } from "./base.js";
 import { OllamaInput, OllamaCallOptions } from "../util/ollama.js";
 import { CallbackManagerForLLMRun } from "../callbacks/manager.js";
 import { GenerationChunk } from "../schema/index.js";
+import type { StringWithAutocomplete } from "../util/types.js";
 /**
  * Class that represents the Ollama language model. It extends the base
  * LLM class and implements the OllamaInput interface.
@@ -41,10 +42,12 @@ export declare class Ollama extends LLM<OllamaCallOptions> implements OllamaInpu
     useMLock?: boolean;
     useMMap?: boolean;
     vocabOnly?: boolean;
+    format?: StringWithAutocomplete<"json">;
     constructor(fields: OllamaInput & BaseLLMParams);
     _llmType(): string;
     invocationParams(options?: this["ParsedCallOptions"]): {
         model: string;
+        format: StringWithAutocomplete<"json"> | undefined;
         options: {
             embedding_only: boolean | undefined;
             f16_kv: boolean | undefined;

package/dist/llms/ollama.js

@@ -209,6 +209,12 @@ export class Ollama extends LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "format", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.model = fields.model ?? this.model;
         this.baseUrl = fields.baseUrl?.endsWith("/")
             ? fields.baseUrl.slice(0, -1)
@@ -243,6 +249,7 @@ export class Ollama extends LLM {
         this.useMLock = fields.useMLock;
         this.useMMap = fields.useMMap;
         this.vocabOnly = fields.vocabOnly;
+        this.format = fields.format;
     }
     _llmType() {
         return "ollama";
@@ -250,6 +257,7 @@ export class Ollama extends LLM {
     invocationParams(options) {
         return {
             model: this.model,
+            format: this.format,
             options: {
                 embedding_only: this.embeddingOnly,
                 f16_kv: this.f16KV,

package/dist/llms/openai.cjs

@@ -121,7 +121,7 @@ class OpenAI extends base_js_1.BaseLLM {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: "text-davinci-003"
+            value: "gpt-3.5-turbo-instruct"
         });
         Object.defineProperty(this, "modelKwargs", {
             enumerable: true,

package/dist/llms/openai.js

@@ -118,7 +118,7 @@ export class OpenAI extends BaseLLM {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: "text-davinci-003"
+            value: "gpt-3.5-turbo-instruct"
         });
         Object.defineProperty(this, "modelKwargs", {
             enumerable: true,

package/dist/output_parsers/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonKeyOutputFunctionsParser = exports.JsonOutputFunctionsParser = exports.OutputFunctionsParser = exports.CustomListOutputParser = exports.RouterOutputParser = exports.CombiningOutputParser = exports.OutputFixingParser = exports.JsonMarkdownStructuredOutputParser = exports.AsymmetricStructuredOutputParser = exports.StructuredOutputParser = exports.RegexParser = exports.CommaSeparatedListOutputParser = exports.ListOutputParser = void 0;
+exports.JsonOutputToolsParser = exports.JsonKeyOutputFunctionsParser = exports.JsonOutputFunctionsParser = exports.OutputFunctionsParser = exports.CustomListOutputParser = exports.RouterOutputParser = exports.CombiningOutputParser = exports.OutputFixingParser = exports.JsonMarkdownStructuredOutputParser = exports.AsymmetricStructuredOutputParser = exports.StructuredOutputParser = exports.RegexParser = exports.CommaSeparatedListOutputParser = exports.ListOutputParser = void 0;
 var list_js_1 = require("./list.cjs");
 Object.defineProperty(exports, "ListOutputParser", { enumerable: true, get: function () { return list_js_1.ListOutputParser; } });
 Object.defineProperty(exports, "CommaSeparatedListOutputParser", { enumerable: true, get: function () { return list_js_1.CommaSeparatedListOutputParser; } });
@@ -22,3 +22,5 @@ var openai_functions_js_1 = require("../output_parsers/openai_functions.cjs");
 Object.defineProperty(exports, "OutputFunctionsParser", { enumerable: true, get: function () { return openai_functions_js_1.OutputFunctionsParser; } });
 Object.defineProperty(exports, "JsonOutputFunctionsParser", { enumerable: true, get: function () { return openai_functions_js_1.JsonOutputFunctionsParser; } });
 Object.defineProperty(exports, "JsonKeyOutputFunctionsParser", { enumerable: true, get: function () { return openai_functions_js_1.JsonKeyOutputFunctionsParser; } });
+var openai_tools_js_1 = require("../output_parsers/openai_tools.cjs");
+Object.defineProperty(exports, "JsonOutputToolsParser", { enumerable: true, get: function () { return openai_tools_js_1.JsonOutputToolsParser; } });

package/dist/output_parsers/index.d.ts

@@ -6,3 +6,4 @@ export { CombiningOutputParser } from "./combining.js";
 export { RouterOutputParser, type RouterOutputParserInput } from "./router.js";
 export { CustomListOutputParser } from "./list.js";
 export { type FunctionParameters, OutputFunctionsParser, JsonOutputFunctionsParser, JsonKeyOutputFunctionsParser, } from "../output_parsers/openai_functions.js";
+export { type ParsedToolCall, JsonOutputToolsParser, } from "../output_parsers/openai_tools.js";

package/dist/output_parsers/index.js

@@ -6,3 +6,4 @@ export { CombiningOutputParser } from "./combining.js";
 export { RouterOutputParser } from "./router.js";
 export { CustomListOutputParser } from "./list.js";
 export { OutputFunctionsParser, JsonOutputFunctionsParser, JsonKeyOutputFunctionsParser, } from "../output_parsers/openai_functions.js";
+export { JsonOutputToolsParser, } from "../output_parsers/openai_tools.js";

package/dist/output_parsers/openai_functions.cjs

@@ -18,7 +18,7 @@ class OutputFunctionsParser extends output_parser_js_1.BaseLLMOutputParser {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,
@@ -75,7 +75,7 @@ class JsonOutputFunctionsParser extends output_parser_js_1.BaseCumulativeTransfo
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,
@@ -166,7 +166,7 @@ class JsonKeyOutputFunctionsParser extends output_parser_js_1.BaseLLMOutputParse
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,

package/dist/output_parsers/openai_functions.js

@@ -15,7 +15,7 @@ export class OutputFunctionsParser extends BaseLLMOutputParser {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,
@@ -71,7 +71,7 @@ export class JsonOutputFunctionsParser extends BaseCumulativeTransformOutputPars
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,
@@ -161,7 +161,7 @@ export class JsonKeyOutputFunctionsParser extends BaseLLMOutputParser {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: ["langchain", "chains", "openai_functions"]
+            value: ["langchain", "output_parsers"]
         });
         Object.defineProperty(this, "lc_serializable", {
             enumerable: true,

package/dist/output_parsers/openai_tools.cjs

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonOutputToolsParser = void 0;
+const output_parser_js_1 = require("../schema/output_parser.cjs");
+/**
+ * Class for parsing the output of an LLM into a JSON object. Uses an
+ * instance of `OutputToolsParser` to parse the output.
+ */
+class JsonOutputToolsParser extends output_parser_js_1.BaseLLMOutputParser {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "lc_namespace", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ["langchain", "output_parsers"]
+        });
+        Object.defineProperty(this, "lc_serializable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    static lc_name() {
+        return "JsonOutputToolsParser";
+    }
+    /**
+     * Parses the output and returns a JSON object. If `argsOnly` is true,
+     * only the arguments of the function call are returned.
+     * @param generations The output of the LLM to parse.
+     * @returns A JSON object representation of the function call or its arguments.
+     */
+    async parseResult(generations) {
+        const toolCalls = generations[0].message.additional_kwargs.tool_calls;
+        if (!toolCalls) {
+            throw new Error(`No tools_call in message ${JSON.stringify(generations)}`);
+        }
+        const clonedToolCalls = JSON.parse(JSON.stringify(toolCalls));
+        const parsedToolCalls = [];
+        for (const toolCall of clonedToolCalls) {
+            if (toolCall.function !== undefined) {
+                const functionArgs = toolCall.function.arguments;
+                parsedToolCalls.push({
+                    name: toolCall.function.name,
+                    arguments: JSON.parse(functionArgs),
+                });
+            }
+        }
+        return parsedToolCalls;
+    }
+}
+exports.JsonOutputToolsParser = JsonOutputToolsParser;

package/dist/output_parsers/openai_tools.d.ts

@@ -0,0 +1,22 @@
+import { BaseLLMOutputParser } from "../schema/output_parser.js";
+import type { ChatGeneration } from "../schema/index.js";
+export type ParsedToolCall = {
+    name: string;
+    arguments: Record<string, any>;
+};
+/**
+ * Class for parsing the output of an LLM into a JSON object. Uses an
+ * instance of `OutputToolsParser` to parse the output.
+ */
+export declare class JsonOutputToolsParser extends BaseLLMOutputParser<ParsedToolCall[]> {
+    static lc_name(): string;
+    lc_namespace: string[];
+    lc_serializable: boolean;
+    /**
+     * Parses the output and returns a JSON object. If `argsOnly` is true,
+     * only the arguments of the function call are returned.
+     * @param generations The output of the LLM to parse.
+     * @returns A JSON object representation of the function call or its arguments.
+     */
+    parseResult(generations: ChatGeneration[]): Promise<ParsedToolCall[]>;
+}

package/dist/output_parsers/openai_tools.js

@@ -0,0 +1,49 @@
+import { BaseLLMOutputParser } from "../schema/output_parser.js";
+/**
+ * Class for parsing the output of an LLM into a JSON object. Uses an
+ * instance of `OutputToolsParser` to parse the output.
+ */
+export class JsonOutputToolsParser extends BaseLLMOutputParser {
+    constructor() {
+        super(...arguments);
+        Object.defineProperty(this, "lc_namespace", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ["langchain", "output_parsers"]
+        });
+        Object.defineProperty(this, "lc_serializable", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+    }
+    static lc_name() {
+        return "JsonOutputToolsParser";
+    }
+    /**
+     * Parses the output and returns a JSON object. If `argsOnly` is true,
+     * only the arguments of the function call are returned.
+     * @param generations The output of the LLM to parse.
+     * @returns A JSON object representation of the function call or its arguments.
+     */
+    async parseResult(generations) {
+        const toolCalls = generations[0].message.additional_kwargs.tool_calls;
+        if (!toolCalls) {
+            throw new Error(`No tools_call in message ${JSON.stringify(generations)}`);
+        }
+        const clonedToolCalls = JSON.parse(JSON.stringify(toolCalls));
+        const parsedToolCalls = [];
+        for (const toolCall of clonedToolCalls) {
+            if (toolCall.function !== undefined) {
+                const functionArgs = toolCall.function.arguments;
+                parsedToolCalls.push({
+                    name: toolCall.function.name,
+                    arguments: JSON.parse(functionArgs),
+                });
+            }
+        }
+        return parsedToolCalls;
+    }
+}

package/dist/prompts/base.d.ts

@@ -5,7 +5,8 @@ import { SerializedBasePromptTemplate } from "./serde.js";
 import { SerializedFields } from "../load/map_keys.js";
 import { Runnable } from "../schema/runnable/index.js";
 import { BaseCallbackConfig } from "../callbacks/manager.js";
-export type TypedPromptInputValues<RunInput> = InputValues<Extract<keyof RunInput, string> | (string & Record<never, never>)>;
+import type { StringWithAutocomplete } from "../util/types.js";
+export type TypedPromptInputValues<RunInput> = InputValues<StringWithAutocomplete<Extract<keyof RunInput, string>>>;
 /**
  * Represents a prompt value as a string. It extends the BasePromptValue
  * class and overrides the toString and toChatMessages methods.

package/dist/prompts/chat.cjs

@@ -53,7 +53,7 @@ class ChatPromptValue extends index_js_1.BasePromptValue {
             // eslint-disable-next-line no-param-reassign
             fields = { messages: fields };
         }
-        super(...arguments);
+        super(fields);
         Object.defineProperty(this, "lc_namespace", {
             enumerable: true,
             configurable: true,

package/dist/prompts/chat.js

@@ -49,7 +49,7 @@ export class ChatPromptValue extends BasePromptValue {
             // eslint-disable-next-line no-param-reassign
             fields = { messages: fields };
         }
-        super(...arguments);
+        super(fields);
         Object.defineProperty(this, "lc_namespace", {
             enumerable: true,
             configurable: true,

package/dist/schema/index.d.ts

@@ -1,6 +1,7 @@
 import type { OpenAI as OpenAIClient } from "openai";
 import { Document } from "../document.js";
 import { Serializable } from "../load/serializable.js";
+import type { StringWithAutocomplete } from "../util/types.js";
 export declare const RUN_KEY = "__run";
 export type Example = Record<string, string>;
 export type InputValues<K extends string = string> = Record<K, any>;
@@ -252,10 +253,7 @@ export declare class ChatMessage extends BaseMessage implements ChatMessageField
     _getType(): MessageType;
     static isInstance(message: BaseMessage): message is ChatMessage;
 }
-export type BaseMessageLike = BaseMessage | [
-    MessageType | "user" | "assistant" | (string & Record<never, never>),
-    string
-] | string;
+export type BaseMessageLike = BaseMessage | [StringWithAutocomplete<MessageType | "user" | "assistant">, string] | string;
 export declare function isBaseMessage(messageLike?: unknown): messageLike is BaseMessage;
 export declare function isBaseMessageChunk(messageLike?: unknown): messageLike is BaseMessageChunk;
 export declare function coerceMessageLikeToMessage(messageLike: BaseMessageLike): BaseMessage;

package/dist/schema/runnable/base.d.ts

@@ -317,8 +317,8 @@ export declare class RunnableWithFallbacks<RunInput, RunOutput> extends Runnable
     static lc_name(): string;
     lc_namespace: string[];
     lc_serializable: boolean;
-    protected runnable: Runnable<RunInput, RunOutput>;
-    protected fallbacks: Runnable<RunInput, RunOutput>[];
+    runnable: Runnable<RunInput, RunOutput>;
+    fallbacks: Runnable<RunInput, RunOutput>[];
     constructor(fields: {
         runnable: Runnable<RunInput, RunOutput>;
         fallbacks: Runnable<RunInput, RunOutput>[];

package/dist/util/ollama.d.ts

@@ -1,4 +1,5 @@
 import { BaseLanguageModelCallOptions } from "../base_language/index.js";
+import type { StringWithAutocomplete } from "./types.js";
 export interface OllamaInput {
     embeddingOnly?: boolean;
     f16KV?: boolean;
@@ -32,10 +33,12 @@ export interface OllamaInput {
     useMLock?: boolean;
     useMMap?: boolean;
     vocabOnly?: boolean;
+    format?: StringWithAutocomplete<"json">;
 }
 export interface OllamaRequestParams {
     model: string;
     prompt: string;
+    format?: StringWithAutocomplete<"json">;
     options: {
         embedding_only?: boolean;
         f16_kv?: boolean;

package/dist/util/types.cjs

@@ -0,0 +1,5 @@
+"use strict";
+/**
+ * Represents a string value with autocompleted, but not required, suggestions.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/util/types.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Represents a string value with autocompleted, but not required, suggestions.
+ */
+export type StringWithAutocomplete<T> = T | (string & Record<never, never>);

package/dist/util/types.js

@@ -0,0 +1,4 @@
+/**
+ * Represents a string value with autocompleted, but not required, suggestions.
+ */
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langchain",
-  "version": "0.0.185",
+  "version": "0.0.186",
   "description": "Typescript bindings for langchain",
   "type": "module",
   "engines": {