langchain 0.0.185 → 0.0.187

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/callbacks/handlers/llmonitor.cjs

@@ -19,8 +19,19 @@ const parseRole = (id) => {
         return "ai";
     if (roleHint.includes("Function"))
         return "function";
+    if (roleHint.includes("Tool"))
+        return "tool";
     return "ai";
 };
+const PARAMS_TO_CAPTURE = [
+    "stop",
+    "stop_sequences",
+    "function_call",
+    "functions",
+    "tools",
+    "tool_choice",
+    "response_format",
+];
 const convertToLLMonitorMessages = (input) => {
     const parseMessage = (raw) => {
         if (typeof raw === "string")
@@ -35,11 +46,10 @@ const convertToLLMonitorMessages = (input) => {
             const role = parseRole(message.id);
             const obj = message.kwargs;
             const text = message.text ?? obj.content;
-            const functionCall = obj.additional_kwargs?.function_call;
             return {
                 role,
                 text,
-                functionCall,
+                ...(obj.additional_kwargs ?? {}),
             };
         }
         catch (e) {
@@ -83,6 +93,21 @@ const parseOutput = (rawOutput) => {
         return result;
     return rawOutput;
 };
+const parseExtraAndName = (llm, extraParams, metadata) => {
+    const params = {
+        ...(extraParams?.invocation_params ?? {}),
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore this is a valid property
+        ...(llm?.kwargs ?? {}),
+        ...(metadata || {}),
+    };
+    const { model, model_name, modelName, model_id, userId, userProps, ...rest } = params;
+    const name = model || modelName || model_name || model_id || llm.id.at(-1);
+    // Filter rest to only include params we want to capture
+    const extra = Object.fromEntries(Object.entries(rest).filter(([key]) => PARAMS_TO_CAPTURE.includes(key) ||
+        ["string", "number", "boolean"].includes(typeof rest[key])));
+    return { name, extra, userId, userProps };
+};
 class LLMonitorHandler extends base_js_1.BaseCallbackHandler {
     constructor(fields = {}) {
         super(fields);
@@ -109,18 +134,13 @@ class LLMonitorHandler extends base_js_1.BaseCallbackHandler {
         }
     }
     async handleLLMStart(llm, prompts, runId, parentRunId, extraParams, tags, metadata) {
-        const params = {
-            ...(extraParams?.invocation_params || {}),
-            ...(metadata || {}),
-        };
-        const { model, model_name, modelName, userId, userProps, ...rest } = params;
-        const name = model || modelName || model_name || llm.id.at(-1);
+        const { name, extra, userId, userProps } = parseExtraAndName(llm, extraParams, metadata);
         await this.monitor.trackEvent("llm", "start", {
             runId,
             parentRunId,
             name,
             input: (0, exports.convertToLLMonitorMessages)(prompts),
-            extra: rest,
+            extra,
             userId,
             userProps,
             tags,
@@ -128,19 +148,13 @@ class LLMonitorHandler extends base_js_1.BaseCallbackHandler {
         });
     }
     async handleChatModelStart(llm, messages, runId, parentRunId, extraParams, tags, metadata) {
-        const params = {
-            ...(extraParams?.invocation_params || {}),
-            ...(metadata || {}),
-        };
-        // Expand them so they're excluded from the "extra" field
-        const { model, model_name, modelName, userId, userProps, ...rest } = params;
-        const name = model || modelName || model_name || llm.id.at(-1);
+        const { name, extra, userId, userProps } = parseExtraAndName(llm, extraParams, metadata);
         await this.monitor.trackEvent("llm", "start", {
             runId,
             parentRunId,
             name,
             input: (0, exports.convertToLLMonitorMessages)(messages),
-            extra: rest,
+            extra,
             userId,
             userProps,
             tags,

package/dist/callbacks/handlers/llmonitor.js

@@ -13,8 +13,19 @@ const parseRole = (id) => {
         return "ai";
     if (roleHint.includes("Function"))
         return "function";
+    if (roleHint.includes("Tool"))
+        return "tool";
     return "ai";
 };
+const PARAMS_TO_CAPTURE = [
+    "stop",
+    "stop_sequences",
+    "function_call",
+    "functions",
+    "tools",
+    "tool_choice",
+    "response_format",
+];
 export const convertToLLMonitorMessages = (input) => {
     const parseMessage = (raw) => {
         if (typeof raw === "string")
@@ -29,11 +40,10 @@ export const convertToLLMonitorMessages = (input) => {
             const role = parseRole(message.id);
             const obj = message.kwargs;
             const text = message.text ?? obj.content;
-            const functionCall = obj.additional_kwargs?.function_call;
             return {
                 role,
                 text,
-                functionCall,
+                ...(obj.additional_kwargs ?? {}),
             };
         }
         catch (e) {
@@ -76,6 +86,21 @@ const parseOutput = (rawOutput) => {
         return result;
     return rawOutput;
 };
+const parseExtraAndName = (llm, extraParams, metadata) => {
+    const params = {
+        ...(extraParams?.invocation_params ?? {}),
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore this is a valid property
+        ...(llm?.kwargs ?? {}),
+        ...(metadata || {}),
+    };
+    const { model, model_name, modelName, model_id, userId, userProps, ...rest } = params;
+    const name = model || modelName || model_name || model_id || llm.id.at(-1);
+    // Filter rest to only include params we want to capture
+    const extra = Object.fromEntries(Object.entries(rest).filter(([key]) => PARAMS_TO_CAPTURE.includes(key) ||
+        ["string", "number", "boolean"].includes(typeof rest[key])));
+    return { name, extra, userId, userProps };
+};
 export class LLMonitorHandler extends BaseCallbackHandler {
     constructor(fields = {}) {
         super(fields);
@@ -102,18 +127,13 @@ export class LLMonitorHandler extends BaseCallbackHandler {
         }
     }
     async handleLLMStart(llm, prompts, runId, parentRunId, extraParams, tags, metadata) {
-        const params = {
-            ...(extraParams?.invocation_params || {}),
-            ...(metadata || {}),
-        };
-        const { model, model_name, modelName, userId, userProps, ...rest } = params;
-        const name = model || modelName || model_name || llm.id.at(-1);
+        const { name, extra, userId, userProps } = parseExtraAndName(llm, extraParams, metadata);
         await this.monitor.trackEvent("llm", "start", {
             runId,
             parentRunId,
             name,
             input: convertToLLMonitorMessages(prompts),
-            extra: rest,
+            extra,
             userId,
             userProps,
             tags,
@@ -121,19 +141,13 @@ export class LLMonitorHandler extends BaseCallbackHandler {
         });
     }
     async handleChatModelStart(llm, messages, runId, parentRunId, extraParams, tags, metadata) {
-        const params = {
-            ...(extraParams?.invocation_params || {}),
-            ...(metadata || {}),
-        };
-        // Expand them so they're excluded from the "extra" field
-        const { model, model_name, modelName, userId, userProps, ...rest } = params;
-        const name = model || modelName || model_name || llm.id.at(-1);
+        const { name, extra, userId, userProps } = parseExtraAndName(llm, extraParams, metadata);
         await this.monitor.trackEvent("llm", "start", {
             runId,
             parentRunId,
             name,
             input: convertToLLMonitorMessages(messages),
-            extra: rest,
+            extra,
             userId,
             userProps,
             tags,

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.