@langchain/google-genai 0.0.6 → 0.0.8

package/dist/chat_models.cjs

@@ -102,6 +102,12 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "streaming", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "client", {
             enumerable: true,
             configurable: true,
@@ -144,6 +150,7 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
                 throw new Error("The categories in `safetySettings` array must be unique");
             }
         }
+        this.streaming = fields?.streaming ?? this.streaming;
         this.client = new generative_ai_1.GoogleGenerativeAI(this.apiKey).getGenerativeModel({
             model: this.modelName,
             safetySettings: this.safetySettings,
@@ -165,6 +172,25 @@ class ChatGoogleGenerativeAI extends chat_models_1.BaseChatModel {
     }
     async _generate(messages, options, runManager) {
         const prompt = (0, utils_js_1.convertBaseMessagesToContent)(messages, this._isMultimodalModel);
+        // Handle streaming
+        if (this.streaming) {
+            const tokenUsage = {};
+            const stream = this._streamResponseChunks(messages, options, runManager);
+            const finalChunks = {};
+            for await (const chunk of stream) {
+                const index = chunk.generationInfo?.completion ?? 0;
+                if (finalChunks[index] === undefined) {
+                    finalChunks[index] = chunk;
+                }
+                else {
+                    finalChunks[index] = finalChunks[index].concat(chunk);
+                }
+            }
+            const generations = Object.entries(finalChunks)
+                .sort(([aKey], [bKey]) => parseInt(aKey, 10) - parseInt(bKey, 10))
+                .map(([_, value]) => value);
+            return { generations, llmOutput: { estimatedTokenUsage: tokenUsage } };
+        }
         const res = await this.caller.callWithOptions({ signal: options?.signal }, async () => {
             let output;
             try {

package/dist/chat_models.d.ts

@@ -76,6 +76,8 @@ export interface GoogleGenerativeAIChatInput extends BaseChatModelParams {
      * Google API key to use
      */
     apiKey?: string;
+    /** Whether to stream the results or not */
+    streaming?: boolean;
 }
 /**
  * A class that wraps the Google Palm chat model.
@@ -120,6 +122,7 @@ export declare class ChatGoogleGenerativeAI extends BaseChatModel implements Goo
     stopSequences: string[];
     safetySettings?: SafetySetting[];
     apiKey?: string;
+    streaming: boolean;
     private client;
     get _isMultimodalModel(): boolean;
     constructor(fields?: GoogleGenerativeAIChatInput);

package/dist/chat_models.js

@@ -99,6 +99,12 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "streaming", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "client", {
             enumerable: true,
             configurable: true,
@@ -141,6 +147,7 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
                 throw new Error("The categories in `safetySettings` array must be unique");
             }
         }
+        this.streaming = fields?.streaming ?? this.streaming;
         this.client = new GenerativeAI(this.apiKey).getGenerativeModel({
             model: this.modelName,
             safetySettings: this.safetySettings,
@@ -162,6 +169,25 @@ export class ChatGoogleGenerativeAI extends BaseChatModel {
     }
     async _generate(messages, options, runManager) {
         const prompt = convertBaseMessagesToContent(messages, this._isMultimodalModel);
+        // Handle streaming
+        if (this.streaming) {
+            const tokenUsage = {};
+            const stream = this._streamResponseChunks(messages, options, runManager);
+            const finalChunks = {};
+            for await (const chunk of stream) {
+                const index = chunk.generationInfo?.completion ?? 0;
+                if (finalChunks[index] === undefined) {
+                    finalChunks[index] = chunk;
+                }
+                else {
+                    finalChunks[index] = finalChunks[index].concat(chunk);
+                }
+            }
+            const generations = Object.entries(finalChunks)
+                .sort(([aKey], [bKey]) => parseInt(aKey, 10) - parseInt(bKey, 10))
+                .map(([_, value]) => value);
+            return { generations, llmOutput: { estimatedTokenUsage: tokenUsage } };
+        }
         const res = await this.caller.callWithOptions({ signal: options?.signal }, async () => {
             let output;
             try {

package/dist/utils.cjs

@@ -24,6 +24,7 @@ function convertAuthorToRole(author) {
          *  we will convert them to human messages and merge with following
          * */
         case "ai":
+        case "model": // getMessageAuthor returns message.name. code ex.: return message.name ?? type;
             return "model";
         case "system":
         case "human":
@@ -122,12 +123,12 @@ function mapGenerateContentResultToChatResult(response) {
     }
     const [candidate] = response.candidates;
     const { content, ...generationInfo } = candidate;
-    const text = content.parts[0]?.text ?? "";
+    const text = content?.parts[0]?.text ?? "";
     const generation = {
         text,
         message: new messages_1.AIMessage({
             content: text,
-            name: content === null ? undefined : content.role,
+            name: !content ? undefined : content.role,
             additional_kwargs: generationInfo,
         }),
         generationInfo,
@@ -143,12 +144,12 @@ function convertResponseContentToChatGenerationChunk(response) {
     }
     const [candidate] = response.candidates;
     const { content, ...generationInfo } = candidate;
-    const text = content.parts[0]?.text ?? "";
+    const text = content?.parts[0]?.text ?? "";
     return new outputs_1.ChatGenerationChunk({
         text,
         message: new messages_1.AIMessageChunk({
             content: text,
-            name: content === null ? undefined : content.role,
+            name: !content ? undefined : content.role,
             // Each chunk can have unique "generationInfo", and merging strategy is unclear,
             // so leave blank for now.
             additional_kwargs: {},

package/dist/utils.js

@@ -20,6 +20,7 @@ export function convertAuthorToRole(author) {
          *  we will convert them to human messages and merge with following
          * */
         case "ai":
+        case "model": // getMessageAuthor returns message.name. code ex.: return message.name ?? type;
             return "model";
         case "system":
         case "human":
@@ -115,12 +116,12 @@ export function mapGenerateContentResultToChatResult(response) {
     }
     const [candidate] = response.candidates;
     const { content, ...generationInfo } = candidate;
-    const text = content.parts[0]?.text ?? "";
+    const text = content?.parts[0]?.text ?? "";
     const generation = {
         text,
         message: new AIMessage({
             content: text,
-            name: content === null ? undefined : content.role,
+            name: !content ? undefined : content.role,
             additional_kwargs: generationInfo,
         }),
         generationInfo,
@@ -135,12 +136,12 @@ export function convertResponseContentToChatGenerationChunk(response) {
     }
     const [candidate] = response.candidates;
     const { content, ...generationInfo } = candidate;
-    const text = content.parts[0]?.text ?? "";
+    const text = content?.parts[0]?.text ?? "";
     return new ChatGenerationChunk({
         text,
         message: new AIMessageChunk({
             content: text,
-            name: content === null ? undefined : content.role,
+            name: !content ? undefined : content.role,
             // Each chunk can have unique "generationInfo", and merging strategy is unclear,
             // so leave blank for now.
             additional_kwargs: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@langchain/google-genai",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Sample integration for LangChain.js",
   "type": "module",
   "engines": {
@@ -19,21 +19,23 @@
     "build:cjs": "NODE_OPTIONS=--max-old-space-size=4096 tsc --outDir dist-cjs/ -p tsconfig.cjs.json && node scripts/move-cjs-to-dist.js && rm -rf dist-cjs",
     "build:watch": "node scripts/create-entrypoints.js && tsc --outDir dist/ --watch",
     "build:scripts": "node scripts/create-entrypoints.js && node scripts/check-tree-shaking.js",
-    "lint": "NODE_OPTIONS=--max-old-space-size=4096 eslint src && dpdm --exit-code circular:1 --no-warning --no-tree src/*.ts src/**/*.ts",
-    "lint:fix": "yarn lint --fix",
+    "lint:eslint": "NODE_OPTIONS=--max-old-space-size=4096 eslint --cache --ext .ts,.js src/",
+    "lint:dpdm": "dpdm --exit-code circular:1 --no-warning --no-tree src/*.ts src/**/*.ts",
+    "lint": "yarn lint:eslint && yarn lint:dpdm",
+    "lint:fix": "yarn lint:eslint --fix && yarn lint:dpdm",
     "clean": "rm -rf dist/ && NODE_OPTIONS=--max-old-space-size=4096 node scripts/create-entrypoints.js pre",
     "prepack": "yarn build",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --testPathIgnorePatterns=\\.int\\.test.ts --testTimeout 30000 --maxWorkers=50%",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --testPathIgnorePatterns=\\.int\\.test.ts",
     "test:single": "NODE_OPTIONS=--experimental-vm-modules yarn run jest --config jest.config.cjs --testTimeout 100000",
     "test:int": "NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=\\.int\\.test.ts --testTimeout 100000 --maxWorkers=50%",
-    "format": "prettier --write \"src\"",
-    "format:check": "prettier --check \"src\""
+    "format": "prettier --config .prettierrc --write \"src\" \"scripts\"",
+    "format:check": "prettier --config .prettierrc --check \"src\" \"scripts\""
   },
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@google/generative-ai": "^0.1.0",
+    "@google/generative-ai": "^0.1.3",
     "@langchain/core": "~0.1.5"
   },
   "devDependencies": {