@librechat/agents 2.4.40 → 2.4.42

package/src/graphs/Graph.ts

@@ -417,21 +417,22 @@ export class StandardGraph extends Graph<t.BaseGraphState, GraphNode> {
   }
 
   getNewModel({
-    clientOptions = {},
-    omitOriginalOptions,
+    provider,
+    clientOptions,
+    omitOptions,
   }: {
+    provider: Providers;
     clientOptions?: t.ClientOptions;
-    omitOriginalOptions?: Set<string>;
+    omitOptions?: Set<string>;
   }): t.ChatModelInstance {
-    const ChatModelClass = getChatModelClass(this.provider);
-    const _options = omitOriginalOptions
+    const ChatModelClass = getChatModelClass(provider);
+    const options = omitOptions
       ? Object.fromEntries(
-        Object.entries(this.clientOptions).filter(
-          ([key]) => !omitOriginalOptions.has(key)
+        Object.entries(clientOptions ?? this.clientOptions).filter(
+          ([key]) => !omitOptions.has(key)
         )
       )
-      : this.clientOptions;
-    const options = Object.assign(_options, clientOptions);
+      : (clientOptions ?? this.clientOptions);
     return new ChatModelClass(options);
   }
 

package/src/llm/openai/index.ts

@@ -277,6 +277,25 @@ export class ChatOpenAI extends OriginalChatOpenAI<t.ChatOpenAICallOptions> {
 }
 
 export class AzureChatOpenAI extends OriginalAzureChatOpenAI {
+  override bindTools(
+    tools: ChatOpenAIToolType[],
+    kwargs?: Partial<t.ChatOpenAICallOptions>
+  ): Runnable<BaseLanguageModelInput, AIMessageChunk, t.ChatOpenAICallOptions> {
+    let strict: boolean | undefined;
+    if (kwargs?.strict !== undefined) {
+      strict = kwargs.strict;
+    } else if (this.supportsStrictToolCalling !== undefined) {
+      strict = this.supportsStrictToolCalling;
+    }
+    return this.withConfig({
+      tools: tools.map((tool) =>
+        isBuiltInTool(tool)
+          ? tool
+          : _convertChatOpenAIToolTypeToOpenAITool(tool, { strict })
+      ),
+      ...kwargs,
+    } as Partial<t.ChatOpenAICallOptions>);
+  }
   public get exposedClient(): CustomOpenAIClient {
     return this.client;
   }

package/src/run.ts

@@ -235,6 +235,7 @@ export class Run<T extends t.BaseGraphState> {
   }
 
   async generateTitle({
+    provider,
     inputText,
     contentParts,
     titlePrompt,
@@ -255,8 +256,9 @@ export class Run<T extends t.BaseGraphState> {
       await convoTemplate.invoke({ input: inputText, output: response })
     ).value;
     const model = this.Graph?.getNewModel({
+      provider,
       clientOptions,
-      omitOriginalOptions: new Set([
+      omitOptions: new Set([
         'clientOptions',
         'streaming',
         'stream',
@@ -270,7 +272,7 @@ export class Run<T extends t.BaseGraphState> {
       return { language: '', title: '' };
     }
     if (
-      isOpenAILike(this.provider) &&
+      isOpenAILike(provider) &&
       (model instanceof ChatOpenAI || model instanceof AzureChatOpenAI)
     ) {
       model.temperature = (clientOptions as t.OpenAIClientOptions | undefined)

package/src/scripts/args.ts

@@ -4,41 +4,45 @@ import { hideBin } from 'yargs/helpers';
 import { llmConfigs } from '@/utils/llmConfig';
 import { Providers } from '@/common';
 
-export async function getArgs(): Promise<{ userName: string; location: string; provider: string; currentDate: string; }> {
+export async function getArgs(): Promise<{
+  userName: string;
+  location: string;
+  provider: Providers;
+  currentDate: string;
+}> {
   const argv = yargs(hideBin(process.argv))
     .option('name', {
       alias: 'n',
       type: 'string',
       description: 'User name',
-      default: 'Jo'
+      default: 'Jo',
     })
     .option('location', {
       alias: 'l',
       type: 'string',
       description: 'User location',
-      default: 'New York'
+      default: 'New York',
     })
     .option('provider', {
       alias: 'p',
       type: 'string',
       description: 'LLM provider',
       choices: Object.keys(llmConfigs),
-      default: Providers.OPENAI
+      default: Providers.OPENAI,
     })
     .help()
-    .alias('help', 'h')
-    .argv;
+    .alias('help', 'h').argv;
 
   const args = await argv;
   const userName = args.name as string;
   const location = args.location as string;
-  const provider = args.provider as string;
+  const provider = args.provider as Providers;
   const currentDate = new Date().toLocaleString();
 
   return {
     userName,
     location,
     provider,
-    currentDate
+    currentDate,
   };
 }

package/src/scripts/code_exec.ts

@@ -6,7 +6,11 @@ import { TavilySearchResults } from '@langchain/community/tools/tavily_search';
 import type { RunnableConfig } from '@langchain/core/runnables';
 import type * as t from '@/types';
 import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
-import { ToolEndHandler, ModelEndHandler, createMetadataAggregator } from '@/events';
+import {
+  ToolEndHandler,
+  ModelEndHandler,
+  createMetadataAggregator,
+} from '@/events';
 import { getLLMConfig } from '@/utils/llmConfig';
 import { getArgs } from '@/scripts/args';
 import { GraphEvents } from '@/common';
@@ -23,38 +27,57 @@ async function testCodeExecution(): Promise<void> {
     [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP_COMPLETED]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_COMPLETED, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_COMPLETED,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_COMPLETED ======');
         console.dir(data, { depth: null });
-        aggregateContent({ event, data: data as unknown as { result: t.ToolEndEvent } });
-      }
+        aggregateContent({
+          event,
+          data: data as unknown as { result: t.ToolEndEvent },
+        });
+      },
     },
     [GraphEvents.ON_RUN_STEP]: {
-      handle: (event: GraphEvents.ON_RUN_STEP, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStep });
-      }
+      },
     },
     [GraphEvents.ON_RUN_STEP_DELTA]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStepDeltaEvent });
-      }
+      },
     },
     [GraphEvents.ON_MESSAGE_DELTA]: {
-      handle: (event: GraphEvents.ON_MESSAGE_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_MESSAGE_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_MESSAGE_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.MessageDeltaEvent });
-      }
+      },
     },
     [GraphEvents.TOOL_START]: {
-      handle: (_event: string, data: t.StreamEventData, metadata?: Record<string, unknown>): void => {
+      handle: (
+        _event: string,
+        data: t.StreamEventData,
+        metadata?: Record<string, unknown>
+      ): void => {
         console.log('====== TOOL_START ======');
         console.dir(data, { depth: null });
-      }
+      },
     },
   };
 
@@ -66,14 +89,19 @@ async function testCodeExecution(): Promise<void> {
       type: 'standard',
       llmConfig,
       tools: [new TavilySearchResults(), createCodeExecutionTool()],
-      instructions: 'You are a friendly AI assistant with coding capabilities. Always address the user by their name.',
+      instructions:
+        'You are a friendly AI assistant with coding capabilities. Always address the user by their name.',
       additional_instructions: `The user's name is ${userName} and they are located in ${location}.`,
     },
     returnContent: true,
     customHandlers,
   });
 
-  const config: Partial<RunnableConfig> & { version: 'v1' | 'v2'; run_id?: string; streamMode: string } = {
+  const config: Partial<RunnableConfig> & {
+    version: 'v1' | 'v2';
+    run_id?: string;
+    streamMode: string;
+  } = {
     configurable: {
       provider,
       thread_id: 'conversation-num-1',
@@ -152,12 +180,15 @@ async function testCodeExecution(): Promise<void> {
 
   const { handleLLMEnd, collected } = createMetadataAggregator();
   const titleResult = await run.generateTitle({
+    provider,
     inputText: userMessage2,
     contentParts,
     chainOptions: {
-      callbacks: [{
-        handleLLMEnd,
-      }],
+      callbacks: [
+        {
+          handleLLMEnd,
+        },
+      ],
     },
   });
   console.log('Generated Title:', titleResult);
@@ -180,4 +211,4 @@ testCodeExecution().catch((err) => {
   console.log('Conversation history:');
   console.dir(conversationHistory, { depth: null });
   process.exit(1);
-});
+});

package/src/scripts/code_exec_files.ts

@@ -5,7 +5,11 @@ import { HumanMessage, BaseMessage } from '@langchain/core/messages';
 import type { RunnableConfig } from '@langchain/core/runnables';
 import type * as t from '@/types';
 import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
-import { ToolEndHandler, ModelEndHandler, createMetadataAggregator } from '@/events';
+import {
+  ToolEndHandler,
+  ModelEndHandler,
+  createMetadataAggregator,
+} from '@/events';
 import { getLLMConfig } from '@/utils/llmConfig';
 import { getArgs } from '@/scripts/args';
 import { GraphEvents } from '@/common';
@@ -22,38 +26,57 @@ async function testCodeExecution(): Promise<void> {
     [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP_COMPLETED]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_COMPLETED, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_COMPLETED,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_COMPLETED ======');
         console.dir(data, { depth: null });
-        aggregateContent({ event, data: data as unknown as { result: t.ToolEndEvent } });
-      }
+        aggregateContent({
+          event,
+          data: data as unknown as { result: t.ToolEndEvent },
+        });
+      },
     },
     [GraphEvents.ON_RUN_STEP]: {
-      handle: (event: GraphEvents.ON_RUN_STEP, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStep });
-      }
+      },
     },
     [GraphEvents.ON_RUN_STEP_DELTA]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStepDeltaEvent });
-      }
+      },
     },
     [GraphEvents.ON_MESSAGE_DELTA]: {
-      handle: (event: GraphEvents.ON_MESSAGE_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_MESSAGE_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_MESSAGE_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.MessageDeltaEvent });
-      }
+      },
     },
     [GraphEvents.TOOL_START]: {
-      handle: (_event: string, data: t.StreamEventData, metadata?: Record<string, unknown>): void => {
+      handle: (
+        _event: string,
+        data: t.StreamEventData,
+        metadata?: Record<string, unknown>
+      ): void => {
         console.log('====== TOOL_START ======');
         console.dir(data, { depth: null });
-      }
+      },
     },
   };
 
@@ -65,14 +88,19 @@ async function testCodeExecution(): Promise<void> {
       type: 'standard',
       llmConfig,
       tools: [createCodeExecutionTool()],
-      instructions: 'You are a friendly AI assistant with coding capabilities. Always address the user by their name.',
+      instructions:
+        'You are a friendly AI assistant with coding capabilities. Always address the user by their name.',
       additional_instructions: `The user's name is ${userName} and they are located in ${location}. The current date is ${currentDate}.`,
     },
     returnContent: true,
     customHandlers,
   });
 
-  const config: Partial<RunnableConfig> & { version: 'v1' | 'v2'; run_id?: string; streamMode: string } = {
+  const config: Partial<RunnableConfig> & {
+    version: 'v1' | 'v2';
+    run_id?: string;
+    streamMode: string;
+  } = {
     configurable: {
       provider,
       thread_id: 'conversation-num-1',
@@ -131,12 +159,15 @@ async function testCodeExecution(): Promise<void> {
 
   const { handleLLMEnd, collected } = createMetadataAggregator();
   const titleResult = await run.generateTitle({
+    provider,
     inputText: userMessage2,
     contentParts,
     chainOptions: {
-      callbacks: [{
-        handleLLMEnd,
-      }],
+      callbacks: [
+        {
+          handleLLMEnd,
+        },
+      ],
     },
   });
   console.log('Generated Title:', titleResult);

package/src/scripts/image.ts

@@ -5,14 +5,17 @@ import { HumanMessage, AIMessage, BaseMessage } from '@langchain/core/messages';
 import type { RunnableConfig } from '@langchain/core/runnables';
 import type * as t from '@/types';
 import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
-import { ToolEndHandler, ModelEndHandler, createMetadataAggregator } from '@/events';
+import {
+  ToolEndHandler,
+  ModelEndHandler,
+  createMetadataAggregator,
+} from '@/events';
 import { fetchRandomImageTool, fetchRandomImageURL } from '@/tools/example';
 import { getLLMConfig } from '@/utils/llmConfig';
 import { getArgs } from '@/scripts/args';
 import { GraphEvents } from '@/common';
 import { Run } from '@/run';
 
-
 const conversationHistory: BaseMessage[] = [];
 
 async function testCodeExecution(): Promise<void> {
@@ -23,38 +26,57 @@ async function testCodeExecution(): Promise<void> {
     [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP_COMPLETED]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_COMPLETED, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_COMPLETED,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_COMPLETED ======');
         console.dir(data, { depth: null });
-        aggregateContent({ event, data: data as unknown as { result: t.ToolEndEvent } });
-      }
+        aggregateContent({
+          event,
+          data: data as unknown as { result: t.ToolEndEvent },
+        });
+      },
     },
     [GraphEvents.ON_RUN_STEP]: {
-      handle: (event: GraphEvents.ON_RUN_STEP, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStep });
-      }
+      },
     },
     [GraphEvents.ON_RUN_STEP_DELTA]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_RUN_STEP_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.RunStepDeltaEvent });
-      }
+      },
     },
     [GraphEvents.ON_MESSAGE_DELTA]: {
-      handle: (event: GraphEvents.ON_MESSAGE_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_MESSAGE_DELTA,
+        data: t.StreamEventData
+      ): void => {
         console.log('====== ON_MESSAGE_DELTA ======');
         console.dir(data, { depth: null });
         aggregateContent({ event, data: data as t.MessageDeltaEvent });
-      }
+      },
     },
     [GraphEvents.TOOL_START]: {
-      handle: (_event: string, data: t.StreamEventData, metadata?: Record<string, unknown>): void => {
+      handle: (
+        _event: string,
+        data: t.StreamEventData,
+        metadata?: Record<string, unknown>
+      ): void => {
         console.log('====== TOOL_START ======');
         console.dir(data, { depth: null });
-      }
+      },
     },
   };
 
@@ -67,14 +89,19 @@ async function testCodeExecution(): Promise<void> {
       llmConfig,
       tools: [fetchRandomImageTool],
       // tools: [fetchRandomImageURL],
-      instructions: 'You are a friendly AI assistant with internet capabilities. Always address the user by their name.',
+      instructions:
+        'You are a friendly AI assistant with internet capabilities. Always address the user by their name.',
       additional_instructions: `The user's name is ${userName} and they are located in ${location}.`,
     },
     returnContent: true,
     customHandlers,
   });
 
-  const config: Partial<RunnableConfig> & { version: 'v1' | 'v2'; run_id?: string; streamMode: string } = {
+  const config: Partial<RunnableConfig> & {
+    version: 'v1' | 'v2';
+    run_id?: string;
+    streamMode: string;
+  } = {
     configurable: {
       provider,
       thread_id: 'conversation-num-1',
@@ -109,7 +136,9 @@ async function testCodeExecution(): Promise<void> {
   inputs = {
     messages: conversationHistory,
   };
-  const finalContentParts2 = await run.processStream(inputs, config, { keepContent: true });
+  const finalContentParts2 = await run.processStream(inputs, config, {
+    keepContent: true,
+  });
   const finalMessages2 = run.getRunMessages();
   if (finalMessages2) {
     conversationHistory.push(...finalMessages2);
@@ -119,12 +148,15 @@ async function testCodeExecution(): Promise<void> {
 
   const { handleLLMEnd, collected } = createMetadataAggregator();
   const titleResult = await run.generateTitle({
+    provider,
     inputText: userMessage2,
     contentParts,
     chainOptions: {
-      callbacks: [{
-        handleLLMEnd,
-      }],
+      callbacks: [
+        {
+          handleLLMEnd,
+        },
+      ],
     },
   });
   console.log('Generated Title:', titleResult);
@@ -143,4 +175,4 @@ testCodeExecution().catch((err) => {
   console.log('Conversation history:');
   console.dir(conversationHistory, { depth: null });
   process.exit(1);
-});
+});

package/src/scripts/simple.ts

@@ -160,6 +160,7 @@ async function testStandardStreaming(): Promise<void> {
   console.dir(contentParts, { depth: null });
   const { handleLLMEnd, collected } = createMetadataAggregator();
   const titleOptions: t.RunTitleOptions = {
+    provider,
     inputText: userMessage,
     contentParts,
     chainOptions: {