Copybara import of the project:

--
2720367 by Shelly (6utt3rfly) <[email protected]>:

fix: aggregate text & functionCall(s) correctly

content parts should have either text or functionCall set, but never both. When aggregating, combine the text (as before), but add functionCall(s) as new parts. Then when done, if the text from part[0] is empty, that part can be removed.

fixes #494

--
b8eed9f by Shelly (6utt3rfly) <[email protected]>:

fix: aggregate text & functionCall(s) correctly

don't delete the text part, because it could just be added back again when working with multiple responses (and the end up as `"undefined\n"` for example). Leave the text part, and always push functions as new parts.

fixes #494

--
a4fc31e by Shelly (6utt3rfly) <[email protected]>:

fix: aggregate text & functionCall(s) correctly

the AI API gives an error for empty text, so the empty text has to be deleted after aggregating all responses

fixes #494

--
5ada9d4 by Shelly (6utt3rfly) <[email protected]>:

chore: fix style using script
COPYBARA_INTEGRATE_REVIEW=#497 from 6utt3rfly:main 5ada9d4
PiperOrigin-RevId: 746045519

Author: 6utt3rfly

src/functions/generate_content.ts

@@ -77,7 +77,6 @@ export async function generateContent(
     safetySettings: request.safetySettings ?? safetySettings,
     tools: request.tools ?? tools,
     toolConfig: request.toolConfig ?? toolConfig,
-    labels: request.labels,
   };
   const response: Response | undefined = await postRequest({
     region: location,
@@ -133,7 +132,6 @@ export async function generateContentStream(
     safetySettings: request.safetySettings ?? safetySettings,
     tools: request.tools ?? tools,
     toolConfig: request.toolConfig ?? toolConfig,
-    labels: request.labels,
   };
   const response = await postRequest({
     region: location,

src/functions/test/functions_test.ts

@@ -226,10 +226,6 @@ const TEST_TOOLS_WITH_RAG: Tool[] = [
   },
 ];
 
-const TEST_LABELS: Record<string, string> = {
-  test_key: 'test_value',
-};
-
 const fetchResponseObj = {
   status: 200,
   statusText: 'OK',
@@ -652,26 +648,6 @@ describe('generateContent', () => {
     const vertexEndpoint = fetchSpy.calls.allArgs()[0][0];
     expect(vertexEndpoint).toContain('/v1beta1/');
   });
-
-  it('provides labels to the vertex endpoint', async () => {
-    const request: GenerateContentRequest = {
-      contents: CONTENTS,
-      labels: TEST_LABELS,
-    };
-    fetchSpy.and.resolveTo(buildFetchResponse(TEST_MODEL_RESPONSE));
-
-    await generateContent(
-      TEST_LOCATION,
-      TEST_RESOURCE_PATH,
-      TEST_TOKEN_PROMISE,
-      request,
-      TEST_API_ENDPOINT
-    );
-
-    const httpRequest = fetchSpy.calls.allArgs()[0][1];
-    const body = JSON.parse(httpRequest.body);
-    expect(body.labels).toEqual(TEST_LABELS);
-  });
 });
 
 describe('generateContentStream', () => {
@@ -854,29 +830,4 @@ describe('generateContentStream', () => {
       )
     ).toHaveSize(0);
   });
-
-  it('provides labels to the vertex endpoint', async () => {
-    const request: GenerateContentRequest = {
-      contents: CONTENTS,
-      labels: TEST_LABELS,
-    };
-    const expectedStreamResult: StreamGenerateContentResult = {
-      response: Promise.resolve(TEST_MODEL_RESPONSE_WITH_INVALID_DATA),
-      stream: testGenerator(),
-    };
-    fetchSpy = spyOn(global, 'fetch').and.resolveTo(fetchResult);
-    spyOn(StreamFunctions, 'processStream').and.resolveTo(expectedStreamResult);
-
-    await generateContentStream(
-      TEST_LOCATION,
-      TEST_RESOURCE_PATH,
-      TEST_TOKEN_PROMISE,
-      request,
-      TEST_API_ENDPOINT
-    );
-
-    const httpRequest = fetchSpy.calls.allArgs()[0][1];
-    const body = JSON.parse(httpRequest.body);
-    expect(body.labels).toEqual(TEST_LABELS);
-  });
 });

src/types/content.ts

@@ -68,12 +68,6 @@ export declare interface GenerateContentRequest extends BaseModelParams {
    * This is the name of a `CachedContent` and not the cache object itself.
    */
   cachedContent?: string;
-
-  /**
-   * Optional. Custom metadata labels for organizing API calls and managing costs at scale. See
-   * https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/add-labels-to-api-calls
-   */
-  labels?: Record<string, string>;
 }
 
 /**