@langchain/google-common 0.0.1 → 0.0.2

package/dist/llms.d.ts

@@ -18,7 +18,7 @@ export declare abstract class GoogleBaseLLM<AuthOptions> extends LLM<BaseLanguag
     static lc_name(): string;
     originalFields?: GoogleBaseLLMInput<AuthOptions>;
     lc_serializable: boolean;
-    model: string;
+    modelName: string;
     temperature: number;
     maxOutputTokens: number;
     topP: number;

package/dist/llms.js

@@ -50,7 +50,7 @@ export class GoogleBaseLLM extends LLM {
             writable: true,
             value: true
         });
-        Object.defineProperty(this, "model", {
+        Object.defineProperty(this, "modelName", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -153,7 +153,7 @@ export class GoogleBaseLLM extends LLM {
      * in order to handle public APi calls to `generate()`.
      */
     async _call(prompt, options) {
-        const parameters = copyAIModelParams(this);
+        const parameters = copyAIModelParams(this, options);
         const result = await this.connection.request(prompt, parameters, options);
         const ret = safeResponseToString(result, this.safetyHandler);
         return ret;

package/dist/types.d.ts

@@ -1,4 +1,6 @@
 import type { BaseLLMParams } from "@langchain/core/language_models/llms";
+import { BaseLanguageModelCallOptions } from "@langchain/core/language_models/base";
+import { StructuredToolInterface } from "@langchain/core/tools";
 import type { JsonStream } from "./utils/stream.js";
 /**
  * Parameters needed to setup the client connection.
@@ -36,8 +38,10 @@ export interface GoogleAISafetySetting {
     threshold: string;
 }
 export interface GoogleAIModelParams {
-    /** Model to use */
+    /** @deprecated Prefer `modelName` */
     model?: string;
+    /** Model to use */
+    modelName?: string;
     /** Sampling temperature to use */
     temperature?: number;
     /**
@@ -67,8 +71,16 @@ export interface GoogleAIModelParams {
     stopSequences?: string[];
     safetySettings?: GoogleAISafetySetting[];
 }
+/**
+ * The params which can be passed to the API at request time.
+ */
+export interface GoogleAIModelRequestParams extends GoogleAIModelParams {
+    tools?: StructuredToolInterface[] | GeminiTool[];
+}
 export interface GoogleAIBaseLLMInput<AuthOptions> extends BaseLLMParams, GoogleConnectionParams<AuthOptions>, GoogleAIModelParams, GoogleAISafetyParams {
 }
+export interface GoogleAIBaseLanguageModelCallOptions extends BaseLanguageModelCallOptions, GoogleAIModelRequestParams, GoogleAISafetyParams {
+}
 /**
  * Input to LLM class.
  */
@@ -113,13 +125,30 @@ export interface GeminiSafetyRating {
     category: string;
     probability: string;
 }
-export type GeminiRole = "user" | "model";
+export type GeminiRole = "user" | "model" | "function";
 export interface GeminiContent {
     parts: GeminiPart[];
     role: GeminiRole;
 }
 export interface GeminiTool {
-}
+    functionDeclarations?: GeminiFunctionDeclaration[];
+}
+export interface GeminiFunctionDeclaration {
+    name: string;
+    description: string;
+    parameters?: GeminiFunctionSchema;
+}
+export interface GeminiFunctionSchema {
+    type: GeminiFunctionSchemaType;
+    format?: string;
+    description?: string;
+    nullable?: boolean;
+    enum?: string[];
+    properties?: Record<string, GeminiFunctionSchema>;
+    required?: string[];
+    items?: GeminiFunctionSchema;
+}
+export type GeminiFunctionSchemaType = "string" | "number" | "integer" | "boolean" | "array" | "object";
 export interface GeminiGenerationConfig {
     stopSequences?: string[];
     candidateCount?: number;

package/dist/utils/common.cjs

@@ -2,19 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyAndValidateModelParamsInto = exports.validateModelParams = exports.modelToFamily = exports.copyAIModelParamsInto = exports.copyAIModelParams = void 0;
 const gemini_js_1 = require("./gemini.cjs");
-function copyAIModelParams(params) {
-    return copyAIModelParamsInto(params, {});
+function copyAIModelParams(params, options) {
+    return copyAIModelParamsInto(params, options, {});
 }
 exports.copyAIModelParams = copyAIModelParams;
-function copyAIModelParamsInto(params, target) {
+function copyAIModelParamsInto(params, options, target) {
     const ret = target || {};
-    ret.model = params?.model ?? target.model;
-    ret.temperature = params?.temperature ?? target.temperature;
-    ret.maxOutputTokens = params?.maxOutputTokens ?? target.maxOutputTokens;
-    ret.topP = params?.topP ?? target.topP;
-    ret.topK = params?.topK ?? target.topK;
-    ret.stopSequences = params?.stopSequences ?? target.stopSequences;
-    ret.safetySettings = params?.safetySettings ?? target.safetySettings;
+    ret.modelName = options?.modelName ?? params?.modelName ?? target.modelName;
+    ret.temperature =
+        options?.temperature ?? params?.temperature ?? target.temperature;
+    ret.maxOutputTokens =
+        options?.maxOutputTokens ??
+            params?.maxOutputTokens ??
+            target.maxOutputTokens;
+    ret.topP = options?.topP ?? params?.topP ?? target.topP;
+    ret.topK = options?.topK ?? params?.topK ?? target.topK;
+    ret.stopSequences =
+        options?.stopSequences ?? params?.stopSequences ?? target.stopSequences;
+    ret.safetySettings =
+        options?.safetySettings ?? params?.safetySettings ?? target.safetySettings;
+    ret.tools = options?.tools;
     return ret;
 }
 exports.copyAIModelParamsInto = copyAIModelParamsInto;
@@ -32,7 +39,7 @@ function modelToFamily(modelName) {
 exports.modelToFamily = modelToFamily;
 function validateModelParams(params) {
     const testParams = params ?? {};
-    switch (modelToFamily(testParams.model)) {
+    switch (modelToFamily(testParams.modelName)) {
         case "gemini":
             return (0, gemini_js_1.validateGeminiParams)(testParams);
         default:
@@ -41,7 +48,7 @@ function validateModelParams(params) {
 }
 exports.validateModelParams = validateModelParams;
 function copyAndValidateModelParamsInto(params, target) {
-    copyAIModelParamsInto(params, target);
+    copyAIModelParamsInto(params, undefined, target);
     validateModelParams(target);
     return target;
 }

package/dist/utils/common.d.ts

@@ -1,6 +1,6 @@
-import type { GoogleAIModelParams, GoogleLLMModelFamily } from "../types.js";
-export declare function copyAIModelParams(params: GoogleAIModelParams | undefined): GoogleAIModelParams;
-export declare function copyAIModelParamsInto(params: GoogleAIModelParams | undefined, target: GoogleAIModelParams): GoogleAIModelParams;
+import type { GoogleAIBaseLanguageModelCallOptions, GoogleAIModelParams, GoogleAIModelRequestParams, GoogleLLMModelFamily } from "../types.js";
+export declare function copyAIModelParams(params: GoogleAIModelParams | undefined, options: GoogleAIBaseLanguageModelCallOptions | undefined): GoogleAIModelRequestParams;
+export declare function copyAIModelParamsInto(params: GoogleAIModelParams | undefined, options: GoogleAIBaseLanguageModelCallOptions | undefined, target: GoogleAIModelParams): GoogleAIModelRequestParams;
 export declare function modelToFamily(modelName: string | undefined): GoogleLLMModelFamily;
 export declare function validateModelParams(params: GoogleAIModelParams | undefined): void;
 export declare function copyAndValidateModelParamsInto(params: GoogleAIModelParams | undefined, target: GoogleAIModelParams): GoogleAIModelParams;

package/dist/utils/common.js

@@ -1,16 +1,23 @@
 import { isModelGemini, validateGeminiParams } from "./gemini.js";
-export function copyAIModelParams(params) {
-    return copyAIModelParamsInto(params, {});
+export function copyAIModelParams(params, options) {
+    return copyAIModelParamsInto(params, options, {});
 }
-export function copyAIModelParamsInto(params, target) {
+export function copyAIModelParamsInto(params, options, target) {
     const ret = target || {};
-    ret.model = params?.model ?? target.model;
-    ret.temperature = params?.temperature ?? target.temperature;
-    ret.maxOutputTokens = params?.maxOutputTokens ?? target.maxOutputTokens;
-    ret.topP = params?.topP ?? target.topP;
-    ret.topK = params?.topK ?? target.topK;
-    ret.stopSequences = params?.stopSequences ?? target.stopSequences;
-    ret.safetySettings = params?.safetySettings ?? target.safetySettings;
+    ret.modelName = options?.modelName ?? params?.modelName ?? target.modelName;
+    ret.temperature =
+        options?.temperature ?? params?.temperature ?? target.temperature;
+    ret.maxOutputTokens =
+        options?.maxOutputTokens ??
+            params?.maxOutputTokens ??
+            target.maxOutputTokens;
+    ret.topP = options?.topP ?? params?.topP ?? target.topP;
+    ret.topK = options?.topK ?? params?.topK ?? target.topK;
+    ret.stopSequences =
+        options?.stopSequences ?? params?.stopSequences ?? target.stopSequences;
+    ret.safetySettings =
+        options?.safetySettings ?? params?.safetySettings ?? target.safetySettings;
+    ret.tools = options?.tools;
     return ret;
 }
 export function modelToFamily(modelName) {
@@ -26,7 +33,7 @@ export function modelToFamily(modelName) {
 }
 export function validateModelParams(params) {
     const testParams = params ?? {};
-    switch (modelToFamily(testParams.model)) {
+    switch (modelToFamily(testParams.modelName)) {
         case "gemini":
             return validateGeminiParams(testParams);
         default:
@@ -34,7 +41,7 @@ export function validateModelParams(params) {
     }
 }
 export function copyAndValidateModelParamsInto(params, target) {
-    copyAIModelParamsInto(params, target);
+    copyAIModelParamsInto(params, undefined, target);
     validateModelParams(target);
     return target;
 }

package/dist/utils/gemini.cjs

@@ -1,13 +1,18 @@
 "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.responseToMessageContent = exports.responseToChatGenerations = exports.partToChatGeneration = exports.partToMessage = exports.chunkToString = exports.safeResponseToChatGeneration = exports.responseToChatGeneration = exports.safeResponseToGeneration = exports.responseToGeneration = exports.safeResponseToString = exports.responseToString = exports.partToText = exports.responseToParts = exports.responseToGenerateContentResponseData = 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.partToMessage = 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;
 const messages_1 = require("@langchain/core/messages");
 const outputs_1 = require("@langchain/core/outputs");
 const safety_js_1 = require("./safety.cjs");
 function messageContentText(content) {
-    return {
-        text: content.text,
-    };
+    if (content?.text && content?.text.length > 0) {
+        return {
+            text: content.text,
+        };
+    }
+    else {
+        return null;
+    }
 }
 function messageContentImageUrl(content) {
     const url = typeof content.image_url === "string"
@@ -45,23 +50,61 @@ function messageContentToParts(content) {
         ]
         : content;
     // eslint-disable-next-line array-callback-return
-    const parts = messageContent.map((content) => {
-        // eslint-disable-next-line default-case
+    const parts = messageContent
+        .map((content) => {
         switch (content.type) {
             case "text":
                 return messageContentText(content);
             case "image_url":
                 return messageContentImageUrl(content);
+            default:
+                throw new Error(`Unsupported type received while converting message to message parts`);
         }
-    });
+    })
+        .reduce((acc, val) => {
+        if (val) {
+            return [...acc, val];
+        }
+        else {
+            return acc;
+        }
+    }, []);
     return parts;
 }
 exports.messageContentToParts = messageContentToParts;
+function messageToolCallsToParts(toolCalls) {
+    if (!toolCalls || toolCalls.length === 0) {
+        return [];
+    }
+    return toolCalls.map((tool) => {
+        let args = {};
+        if (tool?.function?.arguments) {
+            const argStr = tool.function.arguments;
+            args = JSON.parse(argStr);
+        }
+        return {
+            functionCall: {
+                name: tool.function.name,
+                args,
+            },
+        };
+    });
+}
+function messageKwargsToParts(kwargs) {
+    const ret = [];
+    if (kwargs?.tool_calls) {
+        ret.push(...messageToolCallsToParts(kwargs.tool_calls));
+    }
+    return ret;
+}
 function roleMessageToContent(role, message) {
+    const contentParts = messageContentToParts(message.content);
+    const toolParts = messageKwargsToParts(message.additional_kwargs);
+    const parts = [...contentParts, ...toolParts];
     return [
         {
             role,
-            parts: messageContentToParts(message.content),
+            parts,
         },
     ];
 }
@@ -71,6 +114,32 @@ function systemMessageToContent(message) {
         ...roleMessageToContent("model", new messages_1.AIMessage("Ok")),
     ];
 }
+function toolMessageToContent(message) {
+    const contentStr = typeof message.content === "string"
+        ? message.content
+        : message.content.reduce((acc, content) => {
+            if (content.type === "text") {
+                return acc + content.text;
+            }
+            else {
+                return acc;
+            }
+        }, "");
+    const content = JSON.parse(contentStr);
+    return [
+        {
+            role: "function",
+            parts: [
+                {
+                    functionResponse: {
+                        name: message.tool_call_id,
+                        response: content,
+                    },
+                },
+            ],
+        },
+    ];
+}
 function baseMessageToContent(message) {
     const type = message._getType();
     switch (type) {
@@ -80,6 +149,8 @@ function baseMessageToContent(message) {
             return roleMessageToContent("user", message);
         case "ai":
             return roleMessageToContent("model", message);
+        case "tool":
+            return toolMessageToContent(message);
         default:
             console.log(`Unsupported message type: ${type}`);
             return [];
@@ -131,6 +202,51 @@ function partsToMessageContent(parts) {
     }, []);
 }
 exports.partsToMessageContent = partsToMessageContent;
+function toolRawToTool(raw) {
+    return {
+        id: raw.id,
+        type: raw.type,
+        function: {
+            name: raw.function.name,
+            arguments: JSON.stringify(raw.function.arguments),
+        },
+    };
+}
+function functionCallPartToToolRaw(part) {
+    return {
+        id: part?.functionCall?.name ?? "",
+        type: "function",
+        function: {
+            name: part.functionCall.name,
+            arguments: part.functionCall.args ?? {},
+        },
+    };
+}
+function partsToToolsRaw(parts) {
+    return parts
+        .map((part) => {
+        if (part === undefined || part === null) {
+            return null;
+        }
+        else if ("functionCall" in part) {
+            return functionCallPartToToolRaw(part);
+        }
+        else {
+            return null;
+        }
+    })
+        .reduce((acc, content) => {
+        if (content) {
+            acc.push(content);
+        }
+        return acc;
+    }, []);
+}
+exports.partsToToolsRaw = partsToToolsRaw;
+function toolsRawToTools(raws) {
+    return raws.map((raw) => toolRawToTool(raw));
+}
+exports.toolsRawToTools = toolsRawToTools;
 function responseToGenerateContentResponseData(response) {
     if ("nextChunk" in response.data) {
         throw new Error("Cannot convert Stream to GenerateContentResponseData");
@@ -231,8 +347,8 @@ function chunkToString(chunk) {
 }
 exports.chunkToString = chunkToString;
 function partToMessage(part) {
-    const content = partsToMessageContent([part]);
-    return new messages_1.AIMessageChunk({ content });
+    const fields = partsToBaseMessageFields([part]);
+    return new messages_1.AIMessageChunk(fields);
 }
 exports.partToMessage = partToMessage;
 function partToChatGeneration(part) {
@@ -250,15 +366,28 @@ function responseToChatGenerations(response) {
     return ret;
 }
 exports.responseToChatGenerations = responseToChatGenerations;
-function responseToMessageContent(response) {
+function responseToBaseMessageFields(response) {
     const parts = responseToParts(response);
-    return partsToMessageContent(parts);
+    return partsToBaseMessageFields(parts);
 }
-exports.responseToMessageContent = responseToMessageContent;
+exports.responseToBaseMessageFields = responseToBaseMessageFields;
+function partsToBaseMessageFields(parts) {
+    const fields = {
+        content: partsToMessageContent(parts),
+    };
+    const rawTools = partsToToolsRaw(parts);
+    if (rawTools.length > 0) {
+        const tools = toolsRawToTools(rawTools);
+        fields.additional_kwargs = {
+            tool_calls: tools,
+        };
+    }
+    return fields;
+}
+exports.partsToBaseMessageFields = partsToBaseMessageFields;
 function responseToBaseMessage(response) {
-    return new messages_1.AIMessage({
-        content: responseToMessageContent(response),
-    });
+    const fields = responseToBaseMessageFields(response);
+    return new messages_1.AIMessage(fields);
 }
 exports.responseToBaseMessage = responseToBaseMessage;
 function safeResponseToBaseMessage(response, safetyHandler) {

package/dist/utils/gemini.d.ts

@@ -1,9 +1,29 @@
-import { BaseMessage, BaseMessageChunk, MessageContent } from "@langchain/core/messages";
+import { BaseMessage, BaseMessageChunk, BaseMessageFields, MessageContent } from "@langchain/core/messages";
 import { ChatGeneration, ChatGenerationChunk, ChatResult, Generation } from "@langchain/core/outputs";
 import type { GoogleLLMResponse, GoogleAIModelParams, GeminiPart, GeminiContent, GenerateContentResponseData, GoogleAISafetyHandler } from "../types.js";
 export declare function messageContentToParts(content: MessageContent): GeminiPart[];
 export declare function baseMessageToContent(message: BaseMessage): GeminiContent[];
 export declare function partsToMessageContent(parts: GeminiPart[]): MessageContent;
+interface FunctionCall {
+    name: string;
+    arguments: string;
+}
+interface ToolCall {
+    id: string;
+    type: "function";
+    function: FunctionCall;
+}
+interface FunctionCallRaw {
+    name: string;
+    arguments: object;
+}
+interface ToolCallRaw {
+    id: string;
+    type: "function";
+    function: FunctionCallRaw;
+}
+export declare function partsToToolsRaw(parts: GeminiPart[]): ToolCallRaw[];
+export declare function toolsRawToTools(raws: ToolCallRaw[]): ToolCall[];
 export declare function responseToGenerateContentResponseData(response: GoogleLLMResponse): GenerateContentResponseData;
 export declare function responseToParts(response: GoogleLLMResponse): GeminiPart[];
 export declare function partToText(part: GeminiPart): string;
@@ -17,7 +37,8 @@ export declare function chunkToString(chunk: BaseMessageChunk): string;
 export declare function partToMessage(part: GeminiPart): BaseMessageChunk;
 export declare function partToChatGeneration(part: GeminiPart): ChatGeneration;
 export declare function responseToChatGenerations(response: GoogleLLMResponse): ChatGeneration[];
-export declare function responseToMessageContent(response: GoogleLLMResponse): MessageContent;
+export declare function responseToBaseMessageFields(response: GoogleLLMResponse): BaseMessageFields;
+export declare function partsToBaseMessageFields(parts: GeminiPart[]): BaseMessageFields;
 export declare function responseToBaseMessage(response: GoogleLLMResponse): BaseMessage;
 export declare function safeResponseToBaseMessage(response: GoogleLLMResponse, safetyHandler: GoogleAISafetyHandler): BaseMessage;
 export declare function responseToChatResult(response: GoogleLLMResponse): ChatResult;
@@ -46,3 +67,4 @@ export declare class MessageGeminiSafetyHandler extends DefaultGeminiSafetyHandl
     setMessage(data: GenerateContentResponseData): GenerateContentResponseData;
     handleData(response: GoogleLLMResponse, data: GenerateContentResponseData): GenerateContentResponseData;
 }
+export {};