@langchain/core 0.2.18 → 0.2.20

package/dist/callbacks/manager.cjs

@@ -104,7 +104,30 @@ class BaseRunManager {
                 await handler.handleText?.(text, this.runId, this._parentRunId, this.tags);
             }
             catch (err) {
-                console.error(`Error in handler ${handler.constructor.name}, handleText: ${err}`);
+                const logFunction = handler.raiseError
+                    ? console.error
+                    : console.warn;
+                logFunction(`Error in handler ${handler.constructor.name}, handleText: ${err}`);
+                if (handler.raiseError) {
+                    throw err;
+                }
+            }
+        }, handler.awaitHandlers)));
+    }
+    async handleCustomEvent(eventName, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data, _runId, _tags, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _metadata) {
+        await Promise.all(this.handlers.map((handler) => (0, promises_js_1.consumeCallback)(async () => {
+            try {
+                await handler.handleCustomEvent?.(eventName, data, this.runId, this.tags, this.metadata);
+            }
+            catch (err) {
+                const logFunction = handler.raiseError
+                    ? console.error
+                    : console.warn;
+                logFunction(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
                 if (handler.raiseError) {
                     throw err;
                 }
@@ -135,7 +158,10 @@ class CallbackManagerForRetrieverRun extends BaseRunManager {
                     await handler.handleRetrieverEnd?.(documents, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetriever`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetriever`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -150,7 +176,10 @@ class CallbackManagerForRetrieverRun extends BaseRunManager {
                     await handler.handleRetrieverError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (error) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetrieverError: ${error}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetrieverError: ${error}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -168,7 +197,10 @@ class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMNewToken?.(token, idx ?? { prompt: 0, completion: 0 }, this.runId, this._parentRunId, this.tags, fields);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMNewToken: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMNewToken: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -183,7 +215,10 @@ class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -198,7 +233,10 @@ class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMEnd?.(output, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -227,7 +265,10 @@ class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleChainError?.(err, this.runId, this._parentRunId, this.tags, kwargs);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -242,7 +283,10 @@ class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleChainEnd?.(output, this.runId, this._parentRunId, this.tags, kwargs);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -257,7 +301,10 @@ class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleAgentAction?.(action, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleAgentAction: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleAgentAction: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -272,7 +319,10 @@ class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleAgentEnd?.(action, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleAgentEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleAgentEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -301,7 +351,10 @@ class CallbackManagerForToolRun extends BaseRunManager {
                     await handler.handleToolError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -317,7 +370,10 @@ class CallbackManagerForToolRun extends BaseRunManager {
                     await handler.handleToolEnd?.(output, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -433,7 +489,10 @@ class CallbackManager extends BaseCallbackManager {
                         await handler.handleLLMStart?.(llm, [prompt], runId_, this._parentRunId, extraParams, this.tags, this.metadata, runName);
                     }
                     catch (err) {
-                        console.error(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
+                        const logFunction = handler.raiseError
+                            ? console.error
+                            : console.warn;
+                        logFunction(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
                         if (handler.raiseError) {
                             throw err;
                         }
@@ -468,7 +527,10 @@ class CallbackManager extends BaseCallbackManager {
                         }
                     }
                     catch (err) {
-                        console.error(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
+                        const logFunction = handler.raiseError
+                            ? console.error
+                            : console.warn;
+                        logFunction(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
                         if (handler.raiseError) {
                             throw err;
                         }
@@ -494,7 +556,10 @@ class CallbackManager extends BaseCallbackManager {
                     await handler.handleChainStart?.(chain, inputs, runId, this._parentRunId, this.tags, this.metadata, runType, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -519,7 +584,10 @@ class CallbackManager extends BaseCallbackManager {
                     await handler.handleToolStart?.(tool, input, runId, this._parentRunId, this.tags, this.metadata, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -544,7 +612,10 @@ class CallbackManager extends BaseCallbackManager {
                     await handler.handleRetrieverStart?.(retriever, query, runId, this._parentRunId, this.tags, this.metadata, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetrieverStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetrieverStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -564,7 +635,10 @@ class CallbackManager extends BaseCallbackManager {
                     await handler.handleCustomEvent?.(eventName, data, runId, this.tags, this.metadata);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -751,7 +825,8 @@ exports.ensureHandler = ensureHandler;
  * ];
  *
  * // Run the example
- * processQuestions(questions).catch(console.error);
+const logFunction = handler.raiseError ? console.error : console.warn;
+* processQuestions(questions).catch(consolelogFunction;
  *
  * ```
  */

package/dist/callbacks/manager.d.ts

@@ -65,6 +65,7 @@ export declare class BaseRunManager {
     constructor(runId: string, handlers: BaseCallbackHandler[], inheritableHandlers: BaseCallbackHandler[], tags: string[], inheritableTags: string[], metadata: Record<string, unknown>, inheritableMetadata: Record<string, unknown>, _parentRunId?: string | undefined);
     get parentRunId(): string | undefined;
     handleText(text: string): Promise<void>;
+    handleCustomEvent(eventName: string, data: any, _runId?: string, _tags?: string[], _metadata?: Record<string, any>): Promise<void>;
 }
 /**
  * Manages callbacks for retriever runs.
@@ -182,7 +183,8 @@ export declare function ensureHandler(handler: BaseCallbackHandler | CallbackHan
  * ];
  *
  * // Run the example
- * processQuestions(questions).catch(console.error);
+const logFunction = handler.raiseError ? console.error : console.warn;
+* processQuestions(questions).catch(consolelogFunction;
  *
  * ```
  */

package/dist/callbacks/manager.js

@@ -99,7 +99,30 @@ export class BaseRunManager {
                 await handler.handleText?.(text, this.runId, this._parentRunId, this.tags);
             }
             catch (err) {
-                console.error(`Error in handler ${handler.constructor.name}, handleText: ${err}`);
+                const logFunction = handler.raiseError
+                    ? console.error
+                    : console.warn;
+                logFunction(`Error in handler ${handler.constructor.name}, handleText: ${err}`);
+                if (handler.raiseError) {
+                    throw err;
+                }
+            }
+        }, handler.awaitHandlers)));
+    }
+    async handleCustomEvent(eventName, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data, _runId, _tags, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _metadata) {
+        await Promise.all(this.handlers.map((handler) => consumeCallback(async () => {
+            try {
+                await handler.handleCustomEvent?.(eventName, data, this.runId, this.tags, this.metadata);
+            }
+            catch (err) {
+                const logFunction = handler.raiseError
+                    ? console.error
+                    : console.warn;
+                logFunction(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
                 if (handler.raiseError) {
                     throw err;
                 }
@@ -129,7 +152,10 @@ export class CallbackManagerForRetrieverRun extends BaseRunManager {
                     await handler.handleRetrieverEnd?.(documents, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetriever`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetriever`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -144,7 +170,10 @@ export class CallbackManagerForRetrieverRun extends BaseRunManager {
                     await handler.handleRetrieverError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (error) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetrieverError: ${error}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetrieverError: ${error}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -161,7 +190,10 @@ export class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMNewToken?.(token, idx ?? { prompt: 0, completion: 0 }, this.runId, this._parentRunId, this.tags, fields);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMNewToken: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMNewToken: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -176,7 +208,10 @@ export class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -191,7 +226,10 @@ export class CallbackManagerForLLMRun extends BaseRunManager {
                     await handler.handleLLMEnd?.(output, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleLLMEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleLLMEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -219,7 +257,10 @@ export class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleChainError?.(err, this.runId, this._parentRunId, this.tags, kwargs);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -234,7 +275,10 @@ export class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleChainEnd?.(output, this.runId, this._parentRunId, this.tags, kwargs);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -249,7 +293,10 @@ export class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleAgentAction?.(action, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleAgentAction: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleAgentAction: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -264,7 +311,10 @@ export class CallbackManagerForChainRun extends BaseRunManager {
                     await handler.handleAgentEnd?.(action, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleAgentEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleAgentEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -292,7 +342,10 @@ export class CallbackManagerForToolRun extends BaseRunManager {
                     await handler.handleToolError?.(err, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolError: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolError: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -308,7 +361,10 @@ export class CallbackManagerForToolRun extends BaseRunManager {
                     await handler.handleToolEnd?.(output, this.runId, this._parentRunId, this.tags);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolEnd: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolEnd: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -423,7 +479,10 @@ export class CallbackManager extends BaseCallbackManager {
                         await handler.handleLLMStart?.(llm, [prompt], runId_, this._parentRunId, extraParams, this.tags, this.metadata, runName);
                     }
                     catch (err) {
-                        console.error(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
+                        const logFunction = handler.raiseError
+                            ? console.error
+                            : console.warn;
+                        logFunction(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
                         if (handler.raiseError) {
                             throw err;
                         }
@@ -458,7 +517,10 @@ export class CallbackManager extends BaseCallbackManager {
                         }
                     }
                     catch (err) {
-                        console.error(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
+                        const logFunction = handler.raiseError
+                            ? console.error
+                            : console.warn;
+                        logFunction(`Error in handler ${handler.constructor.name}, handleLLMStart: ${err}`);
                         if (handler.raiseError) {
                             throw err;
                         }
@@ -484,7 +546,10 @@ export class CallbackManager extends BaseCallbackManager {
                     await handler.handleChainStart?.(chain, inputs, runId, this._parentRunId, this.tags, this.metadata, runType, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleChainStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleChainStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -509,7 +574,10 @@ export class CallbackManager extends BaseCallbackManager {
                     await handler.handleToolStart?.(tool, input, runId, this._parentRunId, this.tags, this.metadata, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleToolStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleToolStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -534,7 +602,10 @@ export class CallbackManager extends BaseCallbackManager {
                     await handler.handleRetrieverStart?.(retriever, query, runId, this._parentRunId, this.tags, this.metadata, runName);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleRetrieverStart: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleRetrieverStart: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -554,7 +625,10 @@ export class CallbackManager extends BaseCallbackManager {
                     await handler.handleCustomEvent?.(eventName, data, runId, this.tags, this.metadata);
                 }
                 catch (err) {
-                    console.error(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
+                    const logFunction = handler.raiseError
+                        ? console.error
+                        : console.warn;
+                    logFunction(`Error in handler ${handler.constructor.name}, handleCustomEvent: ${err}`);
                     if (handler.raiseError) {
                         throw err;
                     }
@@ -739,7 +813,8 @@ export function ensureHandler(handler) {
  * ];
  *
  * // Run the example
- * processQuestions(questions).catch(console.error);
+const logFunction = handler.raiseError ? console.error : console.warn;
+* processQuestions(questions).catch(consolelogFunction;
  *
  * ```
  */

package/dist/language_models/base.d.ts

@@ -66,16 +66,6 @@ export interface BaseLanguageModelCallOptions extends RunnableConfig {
      * If not provided, the default stop tokens for the model will be used.
      */
     stop?: string[];
-    /**
-     * Timeout for this call in milliseconds.
-     */
-    timeout?: number;
-    /**
-     * Abort signal for this call.
-     * If provided, the call will be aborted when the signal is aborted.
-     * @see https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal
-     */
-    signal?: AbortSignal;
 }
 export interface FunctionDefinition {
     /**

package/dist/language_models/chat_models.cjs

@@ -43,11 +43,10 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
             value: ["langchain", "chat_models", this._llmType()]
         });
     }
-    _separateRunnableConfigFromCallOptions(options) {
+    _separateRunnableConfigFromCallOptionsCompat(options) {
+        // For backwards compat, keep `signal` in both runnableConfig and callOptions
         const [runnableConfig, callOptions] = super._separateRunnableConfigFromCallOptions(options);
-        if (callOptions?.timeout && !callOptions.signal) {
-            callOptions.signal = AbortSignal.timeout(callOptions.timeout);
-        }
+        callOptions.signal = runnableConfig.signal;
         return [runnableConfig, callOptions];
     }
     /**
@@ -76,7 +75,7 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
         else {
             const prompt = BaseChatModel._convertInputToPromptValue(input);
             const messages = prompt.toChatMessages();
-            const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptions(options);
+            const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptionsCompat(options);
             const inheritableMetadata = {
                 ...runnableConfig.metadata,
                 ...this.getLsParams(callOptions),
@@ -303,7 +302,7 @@ class BaseChatModel extends base_js_1.BaseLanguageModel {
             parsedOptions = options;
         }
         const baseMessages = messages.map((messageList) => messageList.map(index_js_1.coerceMessageLikeToMessage));
-        const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptions(parsedOptions);
+        const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptionsCompat(parsedOptions);
         runnableConfig.callbacks = runnableConfig.callbacks ?? callbacks;
         if (!this.cache) {
             return this._generateUncached(baseMessages, callOptions, runnableConfig);

package/dist/language_models/chat_models.d.ts

@@ -61,23 +61,16 @@ export type LangSmithParams = {
     ls_max_tokens?: number;
     ls_stop?: Array<string>;
 };
-interface ChatModelGenerateCachedParameters<T extends BaseChatModel<CallOptions>, CallOptions extends BaseChatModelCallOptions = BaseChatModelCallOptions> {
-    messages: BaseMessageLike[][];
-    cache: BaseCache<Generation[]>;
-    llmStringKey: string;
-    parsedOptions: T["ParsedCallOptions"];
-    handledOptions: RunnableConfig;
-}
 /**
  * Base class for chat models. It extends the BaseLanguageModel class and
  * provides methods for generating chat based on input messages.
  */
 export declare abstract class BaseChatModel<CallOptions extends BaseChatModelCallOptions = BaseChatModelCallOptions, OutputMessageType extends BaseMessageChunk = BaseMessageChunk> extends BaseLanguageModel<OutputMessageType, CallOptions> {
-    ParsedCallOptions: Omit<CallOptions, keyof RunnableConfig & "timeout">;
+    ParsedCallOptions: Omit<CallOptions, Exclude<keyof RunnableConfig, "signal" | "timeout" | "maxConcurrency">>;
     lc_namespace: string[];
     constructor(fields: BaseChatModelParams);
     _combineLLMOutput?(...llmOutputs: LLMResult["llmOutput"][]): LLMResult["llmOutput"];
-    protected _separateRunnableConfigFromCallOptions(options?: Partial<CallOptions>): [RunnableConfig, this["ParsedCallOptions"]];
+    protected _separateRunnableConfigFromCallOptionsCompat(options?: Partial<CallOptions>): [RunnableConfig, this["ParsedCallOptions"]];
     /**
      * Bind tool-like objects to this chat model.
      *
@@ -99,7 +92,13 @@ export declare abstract class BaseChatModel<CallOptions extends BaseChatModelCal
     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 & {
+    _generateCached({ messages, cache, llmStringKey, parsedOptions, handledOptions, }: {
+        messages: BaseMessageLike[][];
+        cache: BaseCache<Generation[]>;
+        llmStringKey: string;
+        parsedOptions: any;
+        handledOptions: RunnableConfig;
+    }): Promise<LLMResult & {
         missingPromptIndices: number[];
     }>;
     /**

package/dist/language_models/chat_models.js

@@ -39,11 +39,10 @@ export class BaseChatModel extends BaseLanguageModel {
             value: ["langchain", "chat_models", this._llmType()]
         });
     }
-    _separateRunnableConfigFromCallOptions(options) {
+    _separateRunnableConfigFromCallOptionsCompat(options) {
+        // For backwards compat, keep `signal` in both runnableConfig and callOptions
         const [runnableConfig, callOptions] = super._separateRunnableConfigFromCallOptions(options);
-        if (callOptions?.timeout && !callOptions.signal) {
-            callOptions.signal = AbortSignal.timeout(callOptions.timeout);
-        }
+        callOptions.signal = runnableConfig.signal;
         return [runnableConfig, callOptions];
     }
     /**
@@ -72,7 +71,7 @@ export class BaseChatModel extends BaseLanguageModel {
         else {
             const prompt = BaseChatModel._convertInputToPromptValue(input);
             const messages = prompt.toChatMessages();
-            const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptions(options);
+            const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptionsCompat(options);
             const inheritableMetadata = {
                 ...runnableConfig.metadata,
                 ...this.getLsParams(callOptions),
@@ -299,7 +298,7 @@ export class BaseChatModel extends BaseLanguageModel {
             parsedOptions = options;
         }
         const baseMessages = messages.map((messageList) => messageList.map(coerceMessageLikeToMessage));
-        const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptions(parsedOptions);
+        const [runnableConfig, callOptions] = this._separateRunnableConfigFromCallOptionsCompat(parsedOptions);
         runnableConfig.callbacks = runnableConfig.callbacks ?? callbacks;
         if (!this.cache) {
             return this._generateUncached(baseMessages, callOptions, runnableConfig);