Merge branch 'feat/stream-realtime' of github.com:nakasyou/generative…

…-ai-js into feat/stream-realtime
google-gemini · Dec 14, 2024 · 8d05413 · 8d05413
2 parents bc5a651 + e37b359
commit 8d05413
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/models/generative-model.ts b/src/models/generative-model.ts
@@ -288,23 +288,25 @@ export class GenerativeModel {
    * ```
    */
   connectLive(config: Omit<BidiGenerateContentSetup, 'model'> = {}, connectionOptions: LiveConnectionOptions = {}): Promise<LiveSession> {
-    return connect({
-      requestOptions: this._requestOptions,
-      apiKey: this.apiKey,
-      setup: {
-        ...config,
-        generationConfig: {
-          ...(config.generationConfig ?? {}),
-          ...(this.generationConfig as LiveGenerationConfig)
+    return connect(
+      {
+        requestOptions: this._requestOptions,
+        apiKey: this.apiKey,
+        setup: {
+          ...config,
+          generationConfig: {
+            ...config.generationConfig,
+            ...(this.generationConfig as LiveGenerationConfig),
+          },
+          model: `models/${this.model}`,
+          ...(config.tools || this.tools
+            ? {
+                tools: [...config.tools, ...this.tools],
+              }
+            : {}),
         },
-        model: `models/${this.model}`,
-        ...((config.tools || this.tools) ? {
-          tools: [
-            ...(config.tools ?? []),
-            ...(this.tools ?? [])
-          ]
-        } : {})
-      }
-    }, connectionOptions);
+      },
+      connectionOptions,
+    );
   }
 }