@langchain/google-common 0.0.8 → 0.0.10

package/dist/connection.cjs

@@ -242,19 +242,13 @@ class AbstractGoogleLLMConnection extends GoogleAIConnection {
             return this.structuredToolsToGeminiTools(tools);
         }
         else {
+            if (tools.length === 1 && !tools[0].functionDeclarations?.length) {
+                return [];
+            }
             return tools;
         }
     }
     formatData(input, parameters) {
-        /*
-        const parts = messageContentToParts(input);
-        const contents: GeminiContent[] = [
-          {
-            role: "user",    // Required by Vertex AI
-            parts,
-          }
-        ]
-        */
         const contents = this.formatContents(input, parameters);
         const generationConfig = this.formatGenerationConfig(input, parameters);
         const tools = this.formatTools(input, parameters);

package/dist/connection.js

@@ -236,19 +236,13 @@ export class AbstractGoogleLLMConnection extends GoogleAIConnection {
             return this.structuredToolsToGeminiTools(tools);
         }
         else {
+            if (tools.length === 1 && !tools[0].functionDeclarations?.length) {
+                return [];
+            }
             return tools;
         }
     }
     formatData(input, parameters) {
-        /*
-        const parts = messageContentToParts(input);
-        const contents: GeminiContent[] = [
-          {
-            role: "user",    // Required by Vertex AI
-            parts,
-          }
-        ]
-        */
         const contents = this.formatContents(input, parameters);
         const generationConfig = this.formatGenerationConfig(input, parameters);
         const tools = this.formatTools(input, parameters);

package/dist/types.d.ts

@@ -124,10 +124,10 @@ export interface GeminiSafetySetting {
     category: string;
     threshold: string;
 }
-export interface GeminiSafetyRating {
+export type GeminiSafetyRating = {
     category: string;
     probability: string;
-}
+} & Record<string, unknown>;
 export type GeminiRole = "user" | "model" | "function";
 export interface GeminiContent {
     parts: GeminiPart[];
@@ -183,6 +183,7 @@ interface GeminiResponsePromptFeedback {
 export interface GenerateContentResponseData {
     candidates: GeminiResponseCandidate[];
     promptFeedback: GeminiResponsePromptFeedback;
+    usageMetadata: Record<string, unknown>;
 }
 export type GoogleLLMModelFamily = null | "palm" | "gemini";
 export type GoogleLLMResponseData = JsonStream | GenerateContentResponseData | GenerateContentResponseData[];

package/dist/utils/gemini.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageGeminiSafetyHandler = exports.DefaultGeminiSafetyHandler = exports.isModelGemini = exports.validateGeminiParams = exports.safeResponseToChatResult = exports.responseToChatResult = exports.safeResponseToBaseMessage = exports.responseToBaseMessage = exports.partsToBaseMessageFields = exports.responseToBaseMessageFields = exports.responseToChatGenerations = exports.partToChatGeneration = exports.partToMessageChunk = exports.chunkToString = exports.safeResponseToChatGeneration = exports.responseToChatGeneration = exports.safeResponseToGeneration = exports.responseToGeneration = exports.safeResponseToString = exports.responseToString = exports.partToText = exports.responseToParts = exports.responseToGenerateContentResponseData = exports.toolsRawToTools = exports.partsToToolsRaw = exports.partsToMessageContent = exports.baseMessageToContent = exports.messageContentToParts = void 0;
+exports.MessageGeminiSafetyHandler = exports.DefaultGeminiSafetyHandler = exports.isModelGemini = exports.validateGeminiParams = exports.safeResponseToChatResult = exports.responseToChatResult = exports.safeResponseToBaseMessage = exports.responseToBaseMessage = exports.partsToBaseMessageFields = exports.responseToBaseMessageFields = exports.responseToChatGenerations = exports.partToChatGeneration = exports.partToMessageChunk = exports.chunkToString = exports.safeResponseToChatGeneration = exports.responseToChatGeneration = exports.safeResponseToGeneration = exports.responseToGeneration = exports.responseToGenerationInfo = exports.safeResponseToString = exports.responseToString = exports.partToText = exports.responseToParts = exports.responseToGenerateContentResponseData = exports.toolsRawToTools = exports.partsToToolsRaw = exports.partsToMessageContent = exports.baseMessageToContent = exports.messageContentToParts = void 0;
 const uuid_1 = require("uuid");
 const messages_1 = require("@langchain/core/messages");
 const outputs_1 = require("@langchain/core/outputs");
@@ -379,10 +379,32 @@ function safeResponseToString(response, safetyHandler) {
     return safeResponseTo(response, safetyHandler, responseToString);
 }
 exports.safeResponseToString = safeResponseToString;
+function responseToGenerationInfo(response) {
+    if (!Array.isArray(response.data)) {
+        return {};
+    }
+    const data = response.data[0];
+    return {
+        usage_metadata: {
+            prompt_token_count: data.usageMetadata?.promptTokenCount,
+            candidates_token_count: data.usageMetadata?.candidatesTokenCount,
+            total_token_count: data.usageMetadata?.totalTokenCount,
+        },
+        safety_ratings: data.candidates[0]?.safetyRatings?.map((rating) => ({
+            category: rating.category,
+            probability: rating.probability,
+            probability_score: rating.probabilityScore,
+            severity: rating.severity,
+            severity_score: rating.severityScore,
+        })),
+        finish_reason: data.candidates[0]?.finishReason,
+    };
+}
+exports.responseToGenerationInfo = responseToGenerationInfo;
 function responseToGeneration(response) {
     return {
         text: responseToString(response),
-        generationInfo: response,
+        generationInfo: responseToGenerationInfo(response),
     };
 }
 exports.responseToGeneration = responseToGeneration;
@@ -394,7 +416,7 @@ function responseToChatGeneration(response) {
     return new outputs_1.ChatGenerationChunk({
         text: responseToString(response),
         message: partToMessageChunk(responseToParts(response)[0]),
-        generationInfo: response,
+        generationInfo: responseToGenerationInfo(response),
     });
 }
 exports.responseToChatGeneration = responseToChatGeneration;
@@ -452,7 +474,7 @@ function responseToChatGenerations(response) {
     if (ret.every((item) => typeof item.message.content === "string")) {
         const combinedContent = ret.map((item) => item.message.content).join("");
         const combinedText = ret.map((item) => item.text).join("");
-        const toolCallChunks = ret[ret.length - 1].message.additional_kwargs?.tool_calls?.map((toolCall, i) => ({
+        const toolCallChunks = ret[ret.length - 1]?.message.additional_kwargs?.tool_calls?.map((toolCall, i) => ({
             name: toolCall.function.name,
             args: toolCall.function.arguments,
             id: toolCall.id,
@@ -462,7 +484,7 @@ function responseToChatGenerations(response) {
             new outputs_1.ChatGenerationChunk({
                 message: new messages_1.AIMessageChunk({
                     content: combinedContent,
-                    additional_kwargs: ret[ret.length - 1].message.additional_kwargs,
+                    additional_kwargs: ret[ret.length - 1]?.message.additional_kwargs,
                     tool_call_chunks: toolCallChunks,
                 }),
                 text: combinedText,
@@ -525,7 +547,7 @@ function responseToChatResult(response) {
     const generations = responseToChatGenerations(response);
     return {
         generations,
-        llmOutput: response,
+        llmOutput: responseToGenerationInfo(response),
     };
 }
 exports.responseToChatResult = responseToChatResult;

package/dist/utils/gemini.d.ts

@@ -29,6 +29,25 @@ export declare function responseToParts(response: GoogleLLMResponse): GeminiPart
 export declare function partToText(part: GeminiPart): string;
 export declare function responseToString(response: GoogleLLMResponse): string;
 export declare function safeResponseToString(response: GoogleLLMResponse, safetyHandler: GoogleAISafetyHandler): string;
+export declare function responseToGenerationInfo(response: GoogleLLMResponse): {
+    usage_metadata?: undefined;
+    safety_ratings?: undefined;
+    finish_reason?: undefined;
+} | {
+    usage_metadata: {
+        prompt_token_count: unknown;
+        candidates_token_count: unknown;
+        total_token_count: unknown;
+    };
+    safety_ratings: {
+        category: string;
+        probability: string;
+        probability_score: unknown;
+        severity: unknown;
+        severity_score: unknown;
+    }[];
+    finish_reason: string;
+};
 export declare function responseToGeneration(response: GoogleLLMResponse): Generation;
 export declare function safeResponseToGeneration(response: GoogleLLMResponse, safetyHandler: GoogleAISafetyHandler): Generation;
 export declare function responseToChatGeneration(response: GoogleLLMResponse): ChatGenerationChunk;

package/dist/utils/gemini.js

@@ -366,10 +366,31 @@ function safeResponseTo(response, safetyHandler, responseTo) {
 export function safeResponseToString(response, safetyHandler) {
     return safeResponseTo(response, safetyHandler, responseToString);
 }
+export function responseToGenerationInfo(response) {
+    if (!Array.isArray(response.data)) {
+        return {};
+    }
+    const data = response.data[0];
+    return {
+        usage_metadata: {
+            prompt_token_count: data.usageMetadata?.promptTokenCount,
+            candidates_token_count: data.usageMetadata?.candidatesTokenCount,
+            total_token_count: data.usageMetadata?.totalTokenCount,
+        },
+        safety_ratings: data.candidates[0]?.safetyRatings?.map((rating) => ({
+            category: rating.category,
+            probability: rating.probability,
+            probability_score: rating.probabilityScore,
+            severity: rating.severity,
+            severity_score: rating.severityScore,
+        })),
+        finish_reason: data.candidates[0]?.finishReason,
+    };
+}
 export function responseToGeneration(response) {
     return {
         text: responseToString(response),
-        generationInfo: response,
+        generationInfo: responseToGenerationInfo(response),
     };
 }
 export function safeResponseToGeneration(response, safetyHandler) {
@@ -379,7 +400,7 @@ export function responseToChatGeneration(response) {
     return new ChatGenerationChunk({
         text: responseToString(response),
         message: partToMessageChunk(responseToParts(response)[0]),
-        generationInfo: response,
+        generationInfo: responseToGenerationInfo(response),
     });
 }
 export function safeResponseToChatGeneration(response, safetyHandler) {
@@ -432,7 +453,7 @@ export function responseToChatGenerations(response) {
     if (ret.every((item) => typeof item.message.content === "string")) {
         const combinedContent = ret.map((item) => item.message.content).join("");
         const combinedText = ret.map((item) => item.text).join("");
-        const toolCallChunks = ret[ret.length - 1].message.additional_kwargs?.tool_calls?.map((toolCall, i) => ({
+        const toolCallChunks = ret[ret.length - 1]?.message.additional_kwargs?.tool_calls?.map((toolCall, i) => ({
             name: toolCall.function.name,
             args: toolCall.function.arguments,
             id: toolCall.id,
@@ -442,7 +463,7 @@ export function responseToChatGenerations(response) {
             new ChatGenerationChunk({
                 message: new AIMessageChunk({
                     content: combinedContent,
-                    additional_kwargs: ret[ret.length - 1].message.additional_kwargs,
+                    additional_kwargs: ret[ret.length - 1]?.message.additional_kwargs,
                     tool_call_chunks: toolCallChunks,
                 }),
                 text: combinedText,
@@ -500,7 +521,7 @@ export function responseToChatResult(response) {
     const generations = responseToChatGenerations(response);
     return {
         generations,
-        llmOutput: response,
+        llmOutput: responseToGenerationInfo(response),
     };
 }
 export function safeResponseToChatResult(response, safetyHandler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {