@langchain/google-common 0.0.1 → 0.0.3

package/dist/utils/gemini.js

@@ -2,9 +2,14 @@ import { AIMessage, AIMessageChunk, } from "@langchain/core/messages";
 import { ChatGenerationChunk, } from "@langchain/core/outputs";
 import { GoogleAISafetyError } from "./safety.js";
 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"
@@ -42,22 +47,60 @@ export 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;
 }
+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,
         },
     ];
 }
@@ -67,6 +110,51 @@ function systemMessageToContent(message) {
         ...roleMessageToContent("model", new 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;
+            }
+        }, "");
+    try {
+        const content = JSON.parse(contentStr);
+        return [
+            {
+                role: "function",
+                parts: [
+                    {
+                        functionResponse: {
+                            name: message.tool_call_id,
+                            response: content,
+                        },
+                    },
+                ],
+            },
+        ];
+    }
+    catch (_) {
+        return [
+            {
+                role: "function",
+                parts: [
+                    {
+                        functionResponse: {
+                            name: message.tool_call_id,
+                            response: {
+                                response: contentStr,
+                            },
+                        },
+                    },
+                ],
+            },
+        ];
+    }
+}
 export function baseMessageToContent(message) {
     const type = message._getType();
     switch (type) {
@@ -76,6 +164,8 @@ export 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 [];
@@ -125,6 +215,49 @@ export function partsToMessageContent(parts) {
         return acc;
     }, []);
 }
+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 ?? {},
+        },
+    };
+}
+export 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;
+    }, []);
+}
+export function toolsRawToTools(raws) {
+    return raws.map((raw) => toolRawToTool(raw));
+}
 export function responseToGenerateContentResponseData(response) {
     if ("nextChunk" in response.data) {
         throw new Error("Cannot convert Stream to GenerateContentResponseData");
@@ -215,8 +348,20 @@ export function chunkToString(chunk) {
     }
 }
 export function partToMessage(part) {
-    const content = partsToMessageContent([part]);
-    return new AIMessageChunk({ content });
+    const fields = partsToBaseMessageFields([part]);
+    if (typeof fields.content === "string") {
+        return new AIMessageChunk(fields);
+    }
+    else if (fields.content.every((item) => item.type === "text")) {
+        const newContent = fields.content
+            .map((item) => ("text" in item ? item.text : ""))
+            .join("");
+        return new AIMessageChunk({
+            ...fields,
+            content: newContent,
+        });
+    }
+    return new AIMessageChunk(fields);
 }
 export function partToChatGeneration(part) {
     const message = partToMessage(part);
@@ -231,14 +376,26 @@ export function responseToChatGenerations(response) {
     const ret = parts.map((part) => partToChatGeneration(part));
     return ret;
 }
-export function responseToMessageContent(response) {
+export function responseToBaseMessageFields(response) {
     const parts = responseToParts(response);
-    return partsToMessageContent(parts);
+    return partsToBaseMessageFields(parts);
+}
+export 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;
 }
 export function responseToBaseMessage(response) {
-    return new AIMessage({
-        content: responseToMessageContent(response),
-    });
+    const fields = responseToBaseMessageFields(response);
+    return new AIMessage(fields);
 }
 export function safeResponseToBaseMessage(response, safetyHandler) {
     return safeResponseTo(response, safetyHandler, responseToBaseMessage);

package/dist/utils/index.cjs

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./common.cjs"), exports);
+__exportStar(require("./failed_handler.cjs"), exports);
+__exportStar(require("./gemini.cjs"), exports);
+__exportStar(require("./zod_to_gemini_parameters.cjs"), exports);
+__exportStar(require("./palm.cjs"), exports);
+__exportStar(require("./safety.cjs"), exports);
+__exportStar(require("./stream.cjs"), exports);

package/dist/utils/index.d.ts

@@ -0,0 +1,7 @@
+export * from "./common.js";
+export * from "./failed_handler.js";
+export * from "./gemini.js";
+export * from "./zod_to_gemini_parameters.js";
+export * from "./palm.js";
+export * from "./safety.js";
+export * from "./stream.js";

package/dist/utils/index.js

@@ -0,0 +1,7 @@
+export * from "./common.js";
+export * from "./failed_handler.js";
+export * from "./gemini.js";
+export * from "./zod_to_gemini_parameters.js";
+export * from "./palm.js";
+export * from "./safety.js";
+export * from "./stream.js";

package/dist/utils/zod_to_gemini_parameters.cjs

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.zodToGeminiParameters = void 0;
+const zod_to_json_schema_1 = require("zod-to-json-schema");
+function zodToGeminiParameters(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+zodObj) {
+    // Gemini doesn't accept either the $schema or additionalProperties
+    // attributes, so we need to explicitly remove them.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const jsonSchema = (0, zod_to_json_schema_1.zodToJsonSchema)(zodObj);
+    const { $schema, additionalProperties, ...rest } = jsonSchema;
+    return rest;
+}
+exports.zodToGeminiParameters = zodToGeminiParameters;

package/dist/utils/zod_to_gemini_parameters.d.ts

@@ -0,0 +1,3 @@
+import type { z } from "zod";
+import { GeminiFunctionSchema } from "../types.js";
+export declare function zodToGeminiParameters(zodObj: z.ZodType<any>): GeminiFunctionSchema;

package/dist/utils/zod_to_gemini_parameters.js

@@ -0,0 +1,11 @@
+import { zodToJsonSchema } from "zod-to-json-schema";
+export function zodToGeminiParameters(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+zodObj) {
+    // Gemini doesn't accept either the $schema or additionalProperties
+    // attributes, so we need to explicitly remove them.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const jsonSchema = zodToJsonSchema(zodObj);
+    const { $schema, additionalProperties, ...rest } = jsonSchema;
+    return rest;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-common",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Core types and classes for Google services.",
   "type": "module",
   "engines": {
@@ -39,7 +39,8 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@langchain/core": "~0.1.1"
+    "@langchain/core": "~0.1.1",
+    "zod-to-json-schema": "^3.22.4"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
@@ -63,7 +64,8 @@
     "release-it": "^15.10.1",
     "rollup": "^4.5.2",
     "ts-jest": "^29.1.0",
-    "typescript": "<5.2.0"
+    "typescript": "<5.2.0",
+    "zod": "^3.22.4"
   },
   "publishConfig": {
     "access": "public"
@@ -78,6 +80,24 @@
       "import": "./index.js",
       "require": "./index.cjs"
     },
+    "./utils": {
+      "types": {
+        "import": "./utils.d.ts",
+        "require": "./utils.d.cts",
+        "default": "./utils.d.ts"
+      },
+      "import": "./utils.js",
+      "require": "./utils.cjs"
+    },
+    "./types": {
+      "types": {
+        "import": "./types.d.ts",
+        "require": "./types.d.cts",
+        "default": "./types.d.ts"
+      },
+      "import": "./types.js",
+      "require": "./types.cjs"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -85,6 +105,14 @@
     "index.cjs",
     "index.js",
     "index.d.ts",
-    "index.d.cts"
+    "index.d.cts",
+    "utils.cjs",
+    "utils.js",
+    "utils.d.ts",
+    "utils.d.cts",
+    "types.cjs",
+    "types.js",
+    "types.d.ts",
+    "types.d.cts"
   ]
 }

package/types.cjs

@@ -0,0 +1 @@
+module.exports = require('./dist/types.cjs');

package/types.d.cts

@@ -0,0 +1 @@
+export * from './dist/types.js'

package/types.d.ts

@@ -0,0 +1 @@
+export * from './dist/types.js'

package/types.js

@@ -0,0 +1 @@
+export * from './dist/types.js'

package/utils.cjs

@@ -0,0 +1 @@
+module.exports = require('./dist/utils/index.cjs');

package/utils.d.cts

@@ -0,0 +1 @@
+export * from './dist/utils/index.js'

package/utils.d.ts

@@ -0,0 +1 @@
+export * from './dist/utils/index.js'

package/utils.js

@@ -0,0 +1 @@
+export * from './dist/utils/index.js'