@langchain/google-common 0.2.6 → 0.2.7

package/dist/types.d.ts

@@ -451,10 +451,28 @@ interface GeminiResponsePromptFeedback {
     blockReason?: string;
     safetyRatings: GeminiSafetyRating[];
 }
+export type ModalityEnum = "TEXT" | "IMAGE" | "VIDEO" | "AUDIO" | "DOCUMENT" | string;
+export interface ModalityTokenCount {
+    modality: ModalityEnum;
+    tokenCount: number;
+}
+export interface GenerateContentResponseUsageMetadata {
+    promptTokenCount: number;
+    toolUsePromptTokenCount: number;
+    cachedContentTokenCount: number;
+    thoughtsTokenCount: number;
+    candidatesTokenCount: number;
+    totalTokenCount: number;
+    promptTokensDetails: ModalityTokenCount[];
+    toolUsePromptTokensDetails: ModalityTokenCount[];
+    cacheTokensDetails: ModalityTokenCount[];
+    candidatesTokensDetails: ModalityTokenCount[];
+    [key: string]: unknown;
+}
 export interface GenerateContentResponseData {
     candidates: GeminiResponseCandidate[];
     promptFeedback: GeminiResponsePromptFeedback;
-    usageMetadata: Record<string, unknown>;
+    usageMetadata: GenerateContentResponseUsageMetadata;
 }
 export type GoogleLLMModelFamily = null | "palm" | "gemini" | "gemma";
 export type VertexModelFamily = GoogleLLMModelFamily | "claude";

package/dist/utils/gemini.cjs

@@ -639,6 +639,42 @@ function getGeminiAPI(config) {
             content,
         };
     }
+    function addModalityCounts(modalityTokenCounts, details) {
+        modalityTokenCounts?.forEach((modalityTokenCount) => {
+            const { modality, tokenCount } = modalityTokenCount;
+            const modalityLc = modality.toLowerCase();
+            const currentCount = details[modalityLc] ?? 0;
+            // eslint-disable-next-line no-param-reassign
+            details[modalityLc] = currentCount + tokenCount;
+        });
+    }
+    function responseToUsageMetadata(response) {
+        if ("usageMetadata" in response.data) {
+            const data = response?.data;
+            const usageMetadata = data?.usageMetadata;
+            const input_tokens = usageMetadata.promptTokenCount ?? 0;
+            const candidatesTokenCount = usageMetadata.candidatesTokenCount ?? 0;
+            const thoughtsTokenCount = usageMetadata.thoughtsTokenCount ?? 0;
+            const output_tokens = candidatesTokenCount + thoughtsTokenCount;
+            const total_tokens = usageMetadata.totalTokenCount ?? input_tokens + output_tokens;
+            const input_token_details = {};
+            addModalityCounts(usageMetadata.promptTokensDetails, input_token_details);
+            const output_token_details = {};
+            addModalityCounts(usageMetadata?.candidatesTokensDetails, output_token_details);
+            if (typeof usageMetadata?.thoughtsTokenCount === "number") {
+                output_token_details.reasoning = usageMetadata.thoughtsTokenCount;
+            }
+            const ret = {
+                input_tokens,
+                output_tokens,
+                total_tokens,
+                input_token_details,
+                output_token_details,
+            };
+            return ret;
+        }
+        return undefined;
+    }
     function responseToGenerationInfo(response) {
         const data = 
         // eslint-disable-next-line no-nested-ternary
@@ -671,11 +707,7 @@ function getGeminiAPI(config) {
         // Only add the usage_metadata on the last chunk
         // sent while streaming (see issue 8102).
         if (typeof finish_reason === "string") {
-            ret.usage_metadata = {
-                prompt_token_count: data.usageMetadata?.promptTokenCount,
-                candidates_token_count: data.usageMetadata?.candidatesTokenCount,
-                total_token_count: data.usageMetadata?.totalTokenCount,
-            };
+            ret.usage_metadata = responseToUsageMetadata(response);
         }
         return ret;
     }
@@ -852,15 +884,7 @@ function getGeminiAPI(config) {
         const kwargs = combineAdditionalKwargs(gen.content);
         const lastContent = gen.content[gen.content.length - 1];
         // Add usage metadata
-        let usageMetadata;
-        if ("usageMetadata" in response.data) {
-            usageMetadata = {
-                input_tokens: response.data.usageMetadata.promptTokenCount,
-                output_tokens: response.data.usageMetadata
-                    .candidatesTokenCount,
-                total_tokens: response.data.usageMetadata.totalTokenCount,
-            };
-        }
+        const usage_metadata = responseToUsageMetadata(response);
         // Add thinking / reasoning
         // if (gen.reasoning && gen.reasoning.length > 0) {
         //   kwargs.reasoning_content = combineContent(gen.reasoning, true);
@@ -869,7 +893,7 @@ function getGeminiAPI(config) {
         const message = new messages_1.AIMessageChunk({
             content: combinedContent,
             additional_kwargs: kwargs,
-            usage_metadata: usageMetadata,
+            usage_metadata,
             tool_calls: combinedToolCalls.tool_calls,
             invalid_tool_calls: combinedToolCalls.invalid_tool_calls,
         });
@@ -1064,10 +1088,12 @@ function getGeminiAPI(config) {
             }
         }
         // Add thinking configuration if explicitly set
-        if (typeof parameters.maxReasoningTokens !== "undefined") {
+        if (typeof parameters.maxReasoningTokens !== "undefined" &&
+            parameters.maxReasoningTokens !== 0) {
             ret.thinkingConfig = {
                 thinkingBudget: parameters.maxReasoningTokens,
-                includeThoughts: true,
+                // TODO: Expose this configuration to the user once google fully supports it
+                includeThoughts: false,
             };
         }
         // Remove any undefined properties, so we don't send them

package/dist/utils/gemini.js

@@ -634,6 +634,42 @@ export function getGeminiAPI(config) {
             content,
         };
     }
+    function addModalityCounts(modalityTokenCounts, details) {
+        modalityTokenCounts?.forEach((modalityTokenCount) => {
+            const { modality, tokenCount } = modalityTokenCount;
+            const modalityLc = modality.toLowerCase();
+            const currentCount = details[modalityLc] ?? 0;
+            // eslint-disable-next-line no-param-reassign
+            details[modalityLc] = currentCount + tokenCount;
+        });
+    }
+    function responseToUsageMetadata(response) {
+        if ("usageMetadata" in response.data) {
+            const data = response?.data;
+            const usageMetadata = data?.usageMetadata;
+            const input_tokens = usageMetadata.promptTokenCount ?? 0;
+            const candidatesTokenCount = usageMetadata.candidatesTokenCount ?? 0;
+            const thoughtsTokenCount = usageMetadata.thoughtsTokenCount ?? 0;
+            const output_tokens = candidatesTokenCount + thoughtsTokenCount;
+            const total_tokens = usageMetadata.totalTokenCount ?? input_tokens + output_tokens;
+            const input_token_details = {};
+            addModalityCounts(usageMetadata.promptTokensDetails, input_token_details);
+            const output_token_details = {};
+            addModalityCounts(usageMetadata?.candidatesTokensDetails, output_token_details);
+            if (typeof usageMetadata?.thoughtsTokenCount === "number") {
+                output_token_details.reasoning = usageMetadata.thoughtsTokenCount;
+            }
+            const ret = {
+                input_tokens,
+                output_tokens,
+                total_tokens,
+                input_token_details,
+                output_token_details,
+            };
+            return ret;
+        }
+        return undefined;
+    }
     function responseToGenerationInfo(response) {
         const data = 
         // eslint-disable-next-line no-nested-ternary
@@ -666,11 +702,7 @@ export function getGeminiAPI(config) {
         // Only add the usage_metadata on the last chunk
         // sent while streaming (see issue 8102).
         if (typeof finish_reason === "string") {
-            ret.usage_metadata = {
-                prompt_token_count: data.usageMetadata?.promptTokenCount,
-                candidates_token_count: data.usageMetadata?.candidatesTokenCount,
-                total_token_count: data.usageMetadata?.totalTokenCount,
-            };
+            ret.usage_metadata = responseToUsageMetadata(response);
         }
         return ret;
     }
@@ -847,15 +879,7 @@ export function getGeminiAPI(config) {
         const kwargs = combineAdditionalKwargs(gen.content);
         const lastContent = gen.content[gen.content.length - 1];
         // Add usage metadata
-        let usageMetadata;
-        if ("usageMetadata" in response.data) {
-            usageMetadata = {
-                input_tokens: response.data.usageMetadata.promptTokenCount,
-                output_tokens: response.data.usageMetadata
-                    .candidatesTokenCount,
-                total_tokens: response.data.usageMetadata.totalTokenCount,
-            };
-        }
+        const usage_metadata = responseToUsageMetadata(response);
         // Add thinking / reasoning
         // if (gen.reasoning && gen.reasoning.length > 0) {
         //   kwargs.reasoning_content = combineContent(gen.reasoning, true);
@@ -864,7 +888,7 @@ export function getGeminiAPI(config) {
         const message = new AIMessageChunk({
             content: combinedContent,
             additional_kwargs: kwargs,
-            usage_metadata: usageMetadata,
+            usage_metadata,
             tool_calls: combinedToolCalls.tool_calls,
             invalid_tool_calls: combinedToolCalls.invalid_tool_calls,
         });
@@ -1059,10 +1083,12 @@ export function getGeminiAPI(config) {
             }
         }
         // Add thinking configuration if explicitly set
-        if (typeof parameters.maxReasoningTokens !== "undefined") {
+        if (typeof parameters.maxReasoningTokens !== "undefined" &&
+            parameters.maxReasoningTokens !== 0) {
             ret.thinkingConfig = {
                 thinkingBudget: parameters.maxReasoningTokens,
-                includeThoughts: true,
+                // TODO: Expose this configuration to the user once google fully supports it
+                includeThoughts: false,
             };
         }
         // Remove any undefined properties, so we don't send them

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {
@@ -36,11 +36,11 @@
     "zod-to-json-schema": "^3.22.4"
   },
   "peerDependencies": {
-    "@langchain/core": ">=0.3.48 <0.4.0"
+    "@langchain/core": ">=0.3.55 <0.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@langchain/core": "0.3.53",
+    "@langchain/core": "0.3.55",
     "@langchain/scripts": ">=0.1.0 <0.2.0",
     "@swc/core": "^1.3.90",
     "@swc/jest": "^0.2.29",