@firebase/ai 2.3.0-canary.7a7634f79 → 2.3.0-canary.ccbf7ba36

package/dist/esm/src/methods/live-session-helpers.d.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LiveServerToolCall, Part } from '../types';
+import { FunctionCall, FunctionResponse } from '../types';
 import { LiveSession } from './live-session';
 /**
  * A controller for managing an active audio conversation.
@@ -39,7 +39,7 @@ export interface StartAudioConversationOptions {
      * The handler should perform the function call and return the result as a `Part`,
      * which will then be sent back to the model.
      */
-    functionCallingHandler?: (functionCalls: LiveServerToolCall['functionCalls']) => Promise<Part>;
+    functionCallingHandler?: (functionCalls: FunctionCall[]) => Promise<FunctionResponse>;
 }
 /**
  * Dependencies needed by the {@link AudioConversationRunner}.

package/dist/esm/src/methods/live-session.d.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { GenerativeContentBlob, LiveServerContent, LiveServerToolCall, LiveServerToolCallCancellation, Part } from '../public-types';
+import { FunctionResponse, GenerativeContentBlob, LiveServerContent, LiveServerToolCall, LiveServerToolCallCancellation, Part } from '../public-types';
 import { WebSocketHandler } from '../websocket';
 /**
  * Represents an active, real-time, bidirectional conversation with the model.
@@ -61,6 +61,15 @@ export declare class LiveSession {
      * @beta
      */
     sendMediaChunks(mediaChunks: GenerativeContentBlob[]): Promise<void>;
+    /**
+     * Sends function responses to the server.
+     *
+     * @param functionResponses - The function responses to send.
+     * @throws If this session has been closed.
+     *
+     * @beta
+     */
+    sendFunctionResponses(functionResponses: FunctionResponse[]): Promise<void>;
     /**
      * Sends a stream of {@link GenerativeContentBlob}.
      *

package/dist/esm/src/types/live-responses.d.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Content, GenerativeContentBlob, Part } from './content';
+import { Content, FunctionResponse, GenerativeContentBlob, Part } from './content';
 import { LiveGenerationConfig, Tool, ToolConfig } from './requests';
 /**
  * User input that is sent to the model.
@@ -37,6 +37,14 @@ export interface _LiveClientRealtimeInput {
         mediaChunks: GenerativeContentBlob[];
     };
 }
+/**
+ * Function responses that are sent to the model in real time.
+ */
+export interface _LiveClientToolResponse {
+    toolResponse: {
+        functionResponses: FunctionResponse[];
+    };
+}
 /**
  * The first message in a Live session, used to configure generation options.
  *

package/dist/index.cjs.js

@@ -8,7 +8,7 @@ var util = require('@firebase/util');
 var logger$1 = require('@firebase/logger');
 
 var name = "@firebase/ai";
-var version = "2.3.0-canary.7a7634f79";
+var version = "2.3.0-canary.ccbf7ba36";
 
 /**
  * @license
@@ -1919,7 +1919,7 @@ function mapGenerateContentCandidates(candidates) {
             // videoMetadata is not supported.
             // Throw early since developers may send a long video as input and only expect to pay
             // for inference on a small portion of the video.
-            if (candidate.content?.parts.some(part => part?.videoMetadata)) {
+            if (candidate.content?.parts?.some(part => part?.videoMetadata)) {
                 throw new AIError(AIErrorCode.UNSUPPORTED, 'Part.videoMetadata is not supported in the Gemini Developer API. Please remove this property.');
             }
             const mappedCandidate = {
@@ -2021,6 +2021,14 @@ async function* generateResponseSequence(stream, apiSettings) {
         else {
             enhancedResponse = createEnhancedContentResponse(value);
         }
+        const firstCandidate = enhancedResponse.candidates?.[0];
+        // Don't yield a response with no useful data for the developer.
+        if (!firstCandidate?.content?.parts &&
+            !firstCandidate?.finishReason &&
+            !firstCandidate?.citationMetadata &&
+            !firstCandidate?.urlContextMetadata) {
+            continue;
+        }
         yield enhancedResponse;
     }
 }
@@ -2115,32 +2123,28 @@ function aggregateResponses(responses) {
                  * Candidates should always have content and parts, but this handles
                  * possible malformed responses.
                  */
-                if (candidate.content && candidate.content.parts) {
+                if (candidate.content) {
+                    // Skip a candidate without parts.
+                    if (!candidate.content.parts) {
+                        continue;
+                    }
                     if (!aggregatedResponse.candidates[i].content) {
                         aggregatedResponse.candidates[i].content = {
                             role: candidate.content.role || 'user',
                             parts: []
                         };
                     }
-                    const newPart = {};
                     for (const part of candidate.content.parts) {
-                        if (part.text !== undefined) {
-                            // The backend can send empty text parts. If these are sent back
-                            // (e.g. in chat history), the backend will respond with an error.
-                            // To prevent this, ignore empty text parts.
-                            if (part.text === '') {
-                                continue;
-                            }
-                            newPart.text = part.text;
+                        const newPart = { ...part };
+                        // The backend can send empty text parts. If these are sent back
+                        // (e.g. in chat history), the backend will respond with an error.
+                        // To prevent this, ignore empty text parts.
+                        if (part.text === '') {
+                            continue;
                         }
-                        if (part.functionCall) {
-                            newPart.functionCall = part.functionCall;
+                        if (Object.keys(newPart).length > 0) {
+                            aggregatedResponse.candidates[i].content.parts.push(newPart);
                         }
-                        if (Object.keys(newPart).length === 0) {
-                            throw new AIError(AIErrorCode.INVALID_CONTENT, 'Part should have at least one property, but there are none. This is likely caused ' +
-                                'by a malformed response from the backend.');
-                        }
-                        aggregatedResponse.candidates[i].content.parts.push(newPart);
                     }
                 }
             }
@@ -2846,6 +2850,25 @@ class LiveSession {
             this.webSocketHandler.send(JSON.stringify(message));
         });
     }
+    /**
+     * Sends function responses to the server.
+     *
+     * @param functionResponses - The function responses to send.
+     * @throws If this session has been closed.
+     *
+     * @beta
+     */
+    async sendFunctionResponses(functionResponses) {
+        if (this.isClosed) {
+            throw new AIError(AIErrorCode.REQUEST_ERROR, 'This LiveSession has been closed and cannot be used.');
+        }
+        const message = {
+            toolResponse: {
+                functionResponses
+            }
+        };
+        this.webSocketHandler.send(JSON.stringify(message));
+    }
     /**
      * Sends a stream of {@link GenerativeContentBlob}.
      *
@@ -3827,9 +3850,9 @@ class AudioConversationRunner {
                 }
                 else {
                     try {
-                        const resultPart = await this.options.functionCallingHandler(message.functionCalls);
+                        const functionResponse = await this.options.functionCallingHandler(message.functionCalls);
                         if (!this.isStopped) {
-                            void this.liveSession.send([resultPart]);
+                            void this.liveSession.sendFunctionResponses([functionResponse]);
                         }
                     }
                     catch (e) {