@librechat/agents 2.4.41 → 2.4.43

package/dist/types/types/llm.d.ts

@@ -8,6 +8,7 @@ import type { BindToolsInput, BaseChatModelParams } from '@langchain/core/langua
 import type { OpenAIChatInput, ChatOpenAIFields, AzureOpenAIInput, ClientOptions as OAIClientOptions } from '@langchain/openai';
 import type { BedrockChatFields } from '@langchain/community/chat_models/bedrock/web';
 import type { GoogleGenerativeAIChatInput } from '@langchain/google-genai';
+import type { GeminiGenerationConfig } from '@langchain/google-common';
 import type { ChatVertexAIInput } from '@langchain/google-vertexai';
 import type { ChatDeepSeekCallOptions } from '@langchain/deepseek';
 import type { ChatOpenRouterCallOptions } from '@/llm/openrouter';
@@ -51,6 +52,7 @@ export type BedrockAnthropicInput = ChatBedrockConverseInput & {
 export type BedrockConverseClientOptions = ChatBedrockConverseInput;
 export type GoogleClientOptions = GoogleGenerativeAIChatInput & {
     customHeaders?: RequestOptions['customHeaders'];
+    thinkingConfig?: GeminiGenerationConfig['thinkingConfig'];
 };
 export type DeepSeekClientOptions = ChatDeepSeekCallOptions;
 export type XAIClientOptions = ChatXAIInput;

package/dist/types/types/run.d.ts

@@ -18,6 +18,7 @@ export type BaseGraphConfig = {
 export type StandardGraphConfig = BaseGraphConfig & Omit<g.StandardGraphInput, 'provider' | 'clientOptions'>;
 export type RunTitleOptions = {
     inputText: string;
+    provider: e.Providers;
     contentParts: (s.MessageContentComplex | undefined)[];
     titlePrompt?: string;
     skipLanguage?: boolean;

package/dist/types/types/stream.d.ts

@@ -191,6 +191,11 @@ export type ReasoningContentText = {
     type: ContentTypes.THINK;
     think: string;
 };
+/** Vertex AI / Google Common - Reasoning Content Block Format */
+export type GoogleReasoningContentText = {
+    type: ContentTypes.REASONING;
+    reasoning: string;
+};
 /** Anthropic's Reasoning Content Block Format */
 export type ThinkingContentText = {
     type: ContentTypes.THINKING;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "2.4.41",
+  "version": "2.4.43",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",

package/src/common/enum.ts

@@ -117,10 +117,12 @@ export enum ContentTypes {
   IMAGE_FILE = 'image_file',
   /** Anthropic */
   THINKING = 'thinking',
-  /** Bedrock */
-  REASONING_CONTENT = 'reasoning_content',
+  /** Vertex AI / Google Common */
+  REASONING = 'reasoning',
   /** Multi-Agent Switch */
   AGENT_UPDATE = 'agent_update',
+  /** Bedrock */
+  REASONING_CONTENT = 'reasoning_content',
 }
 
 export enum ToolCallTypes {

package/src/graphs/Graph.ts

@@ -417,21 +417,26 @@ 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
-      ? Object.fromEntries(
-        Object.entries(this.clientOptions).filter(
-          ([key]) => !omitOriginalOptions.has(key)
+    const ChatModelClass = getChatModelClass(provider);
+    const options =
+      omitOptions && clientOptions == null
+        ? Object.assign(
+          Object.fromEntries(
+            Object.entries(this.clientOptions).filter(
+              ([key]) => !omitOptions.has(key)
+            )
+          ),
+          clientOptions
         )
-      )
-      : this.clientOptions;
-    const options = Object.assign(_options, clientOptions);
+        : (clientOptions ?? this.clientOptions);
     return new ChatModelClass(options);
   }
 

package/src/llm/google/index.ts

@@ -1,15 +1,25 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
 import { getEnvironmentVariable } from '@langchain/core/utils/env';
 import { GoogleGenerativeAI as GenerativeAI } from '@google/generative-ai';
-import type { GoogleGenerativeAIChatInput } from '@langchain/google-genai';
-import type { RequestOptions, SafetySetting } from '@google/generative-ai';
+import type {
+  GenerateContentRequest,
+  SafetySetting,
+} from '@google/generative-ai';
+import type { CallbackManagerForLLMRun } from '@langchain/core/callbacks/manager';
+import type { BaseMessage, UsageMetadata } from '@langchain/core/messages';
+import type { GeminiGenerationConfig } from '@langchain/google-common';
+import type { ChatGenerationChunk } from '@langchain/core/outputs';
+import type { GeminiApiUsageMetadata } from './types';
+import type { GoogleClientOptions } from '@/types';
+import {
+  convertResponseContentToChatGenerationChunk,
+  convertBaseMessagesToContent,
+} from './utils/common';
 
 export class CustomChatGoogleGenerativeAI extends ChatGoogleGenerativeAI {
-  constructor(
-    fields: GoogleGenerativeAIChatInput & {
-      customHeaders?: RequestOptions['customHeaders'];
-    }
-  ) {
+  thinkingConfig?: GeminiGenerationConfig['thinkingConfig'];
+  constructor(fields: GoogleClientOptions) {
     super(fields);
 
     this.model = fields.model.replace(/^models\//, '');
@@ -66,10 +76,11 @@ export class CustomChatGoogleGenerativeAI extends ChatGoogleGenerativeAI {
       }
     }
 
+    this.thinkingConfig = fields.thinkingConfig ?? this.thinkingConfig;
+
     this.streaming = fields.streaming ?? this.streaming;
     this.json = fields.json;
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Accessing private property from parent class
     this.client = new GenerativeAI(this.apiKey).getGenerativeModel(
       {
@@ -94,4 +105,103 @@ export class CustomChatGoogleGenerativeAI extends ChatGoogleGenerativeAI {
     );
     this.streamUsage = fields.streamUsage ?? this.streamUsage;
   }
+
+  invocationParams(
+    options?: this['ParsedCallOptions']
+  ): Omit<GenerateContentRequest, 'contents'> {
+    const params = super.invocationParams(options);
+    return {
+      ...params,
+      generationConfig: {
+        ...params.generationConfig,
+
+        /** @ts-ignore */
+        thinkingConfig: this.thinkingConfig,
+      },
+    };
+  }
+
+  async *_streamResponseChunks(
+    messages: BaseMessage[],
+    options: this['ParsedCallOptions'],
+    runManager?: CallbackManagerForLLMRun
+  ): AsyncGenerator<ChatGenerationChunk> {
+    const prompt = convertBaseMessagesToContent(
+      messages,
+      this._isMultimodalModel,
+      this.useSystemInstruction
+    );
+    let actualPrompt = prompt;
+    if (prompt[0].role === 'system') {
+      const [systemInstruction] = prompt;
+      /** @ts-ignore */
+      this.client.systemInstruction = systemInstruction;
+      actualPrompt = prompt.slice(1);
+    }
+    const parameters = this.invocationParams(options);
+    const request = {
+      ...parameters,
+      contents: actualPrompt,
+    };
+    const stream = await this.caller.callWithOptions(
+      { signal: options.signal },
+      async () => {
+        /** @ts-ignore */
+        const { stream } = await this.client.generateContentStream(request);
+        return stream;
+      }
+    );
+
+    let usageMetadata: UsageMetadata | undefined;
+    let index = 0;
+    for await (const response of stream) {
+      if (
+        'usageMetadata' in response &&
+        this.streamUsage !== false &&
+        options.streamUsage !== false
+      ) {
+        const genAIUsageMetadata = response.usageMetadata as
+          | GeminiApiUsageMetadata
+          | undefined;
+        const output_tokens =
+          (genAIUsageMetadata?.candidatesTokenCount ?? 0) +
+          (genAIUsageMetadata?.thoughtsTokenCount ?? 0);
+        if (!usageMetadata) {
+          usageMetadata = {
+            input_tokens: genAIUsageMetadata?.promptTokenCount ?? 0,
+            output_tokens,
+            total_tokens: genAIUsageMetadata?.totalTokenCount ?? 0,
+          };
+        } else {
+          // Under the hood, LangChain combines the prompt tokens. Google returns the updated
+          // total each time, so we need to find the difference between the tokens.
+          const outputTokenDiff = output_tokens - usageMetadata.output_tokens;
+          usageMetadata = {
+            input_tokens: 0,
+            output_tokens: outputTokenDiff,
+            total_tokens: outputTokenDiff,
+          };
+        }
+      }
+
+      const chunk = convertResponseContentToChatGenerationChunk(response, {
+        usageMetadata,
+        index,
+      });
+      index += 1;
+      if (!chunk) {
+        continue;
+      }
+
+      yield chunk;
+      await runManager?.handleLLMNewToken(
+        chunk.text || '',
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        { chunk }
+      );
+    }
+  }
 }

package/src/llm/google/types.ts

@@ -0,0 +1,43 @@
+import {
+  CodeExecutionTool,
+  FunctionDeclarationsTool as GoogleGenerativeAIFunctionDeclarationsTool,
+  GoogleSearchRetrievalTool,
+} from '@google/generative-ai';
+import { BindToolsInput } from '@langchain/core/language_models/chat_models';
+
+export type GoogleGenerativeAIToolType =
+  | BindToolsInput
+  | GoogleGenerativeAIFunctionDeclarationsTool
+  | CodeExecutionTool
+  | GoogleSearchRetrievalTool;
+
+/** Enum for content modality types */
+enum Modality {
+  MODALITY_UNSPECIFIED = 'MODALITY_UNSPECIFIED',
+  TEXT = 'TEXT',
+  IMAGE = 'IMAGE',
+  VIDEO = 'VIDEO',
+  AUDIO = 'AUDIO',
+  DOCUMENT = 'DOCUMENT',
+}
+
+/** Interface for modality token count */
+interface ModalityTokenCount {
+  modality: Modality;
+  tokenCount: number;
+}
+
+/** Main interface for Gemini API usage metadata */
+export interface GeminiApiUsageMetadata {
+  promptTokenCount?: number;
+  totalTokenCount?: number;
+  thoughtsTokenCount?: number;
+  candidatesTokenCount?: number;
+  toolUsePromptTokenCount?: number;
+  cachedContentTokenCount?: number;
+  promptTokensDetails: ModalityTokenCount[];
+  candidatesTokensDetails?: ModalityTokenCount[];
+  cacheTokensDetails?: ModalityTokenCount[];
+  toolUsePromptTokensDetails?: ModalityTokenCount[];
+  trafficType?: string;
+}