fix: remove defaulting value of candidates in unary api. remove unused variables and imports. remove throwing GoogleAIError when candidates undefined or empty.

yyyu-google · copybara-github · commit 6c0c31c2d798 · 2024-03-22T11:42:27.000-07:00
PiperOrigin-RevId: 618243333
diff --git a/src/functions/post_fetch_processing.ts b/src/functions/post_fetch_processing.ts
@@ -357,7 +357,7 @@ export async function processUnary(
   }
 
   return Promise.resolve({
-    response: {candidates: []},
+    response: {} as GenerateContentResponse,
   });
 }
 
diff --git a/src/functions/pre_fetch_processing.ts b/src/functions/pre_fetch_processing.ts
@@ -16,12 +16,10 @@
  */
 
 import {
-  Content,
   GenerateContentRequest,
   GenerationConfig,
   SafetySetting,
 } from '../types/content';
-import {ClientError} from '../types/errors';
 import * as constants from '../util/constants';
 
 export function formatContentRequest(
diff --git a/src/functions/test/functions_test.ts b/src/functions/test/functions_test.ts
@@ -31,7 +31,6 @@ import {
   StreamGenerateContentResult,
   Tool,
 } from '../../types';
-import {FunctionCall} from '../../types/content';
 import {constants} from '../../util';
 import {countTokens} from '../count_tokens';
 import {generateContent, generateContentStream} from '../generate_content';
@@ -157,25 +156,6 @@ const TEST_MODEL_RESPONSE_WITH_FUNCTION_CALL = {
   candidates: TEST_CANDIDATES_WITH_FUNCTION_CALL,
 };
 
-const TEST_FUNCTION_RESPONSE_PART = [
-  {
-    functionResponse: {
-      name: 'get_current_weather',
-      response: {name: 'get_current_weather', content: {weather: 'super nice'}},
-    },
-  },
-];
-
-const TEST_CANDIDATES_MISSING_ROLE = [
-  {
-    index: 1,
-    content: {parts: [{text: 'Im doing great! How are you?'}]},
-    finish_reason: 0,
-    finish_message: '',
-    safety_ratings: TEST_SAFETY_RATINGS,
-  },
-];
-
 const TEST_ENDPOINT_BASE_PATH = 'test.googleapis.com';
 const TEST_GCS_FILENAME = 'gs://test_bucket/test_image.jpeg';
 
@@ -311,8 +291,6 @@ describe('countTokens', () => {
       status: 'INTERNAL_SERVER_ERROR',
     };
     const response = new Response(JSON.stringify(body), fetch500Obj);
-    const expectedErrorMessage =
-      '[VertexAI.GoogleGenerativeAIError]: got status: 500 Internal Server Error. {"code":500,"message":"service is having downtime","status":"INTERNAL_SERVER_ERROR"}';
     spyOn(global, 'fetch').and.resolveTo(response);
 
     await expectAsync(
@@ -325,17 +303,6 @@ describe('countTokens', () => {
         TEST_API_ENDPOINT
       )
     ).toBeRejected();
-    // TODO: update jasmine version or use flush to uncomment
-    // await countTokens(
-    //   TEST_LOCATION,
-    //   TEST_PROJECT,
-    //   TEST_PUBLISHER_MODEL_ENDPOINT,
-    //   TEST_TOKEN_PROMISE,
-    //   req,
-    //   TEST_API_ENDPOINT
-    // ).catch(e => {
-    //   expect(e.message).toEqual(expectedErrorMessage);
-    // });
   });
 
   it('throw ClientError when not OK and 4XX', async () => {
@@ -350,8 +317,6 @@ describe('countTokens', () => {
       status: 'INVALID_ARGUMENT',
     };
     const response = new Response(JSON.stringify(body), fetch400Obj);
-    const expectedErrorMessage =
-      '[VertexAI.ClientError]: got status: 400 Bad Request. {"code":400,"message":"request is invalid","status":"INVALID_ARGUMENT"}';
     spyOn(global, 'fetch').and.resolveTo(response);
 
     await expectAsync(
@@ -364,17 +329,6 @@ describe('countTokens', () => {
         TEST_API_ENDPOINT
       )
     ).toBeRejected();
-    // TODO: update jasmine version or use flush to uncomment
-    // await countTokens(
-    //   TEST_LOCATION,
-    //   TEST_PROJECT,
-    //   TEST_PUBLISHER_MODEL_ENDPOINT,
-    //   TEST_TOKEN_PROMISE,
-    //   req,
-    //   TEST_API_ENDPOINT
-    // ).catch(e => {
-    //   expect(e.message).toEqual(expectedErrorMessage);
-    // });
   });
 });
 
@@ -503,9 +457,6 @@ describe('generateContent', () => {
     const req: GenerateContentRequest = {
       contents: TEST_USER_CHAT_MESSAGE,
     };
-    const expectedResult: GenerateContentResult = {
-      response: TEST_MODEL_RESPONSE,
-    };
     fetchSpy.and.resolveTo(buildFetchResponse(TEST_MODEL_RESPONSE));
     await generateContent(
       TEST_LOCATION,
@@ -526,9 +477,6 @@ describe('generateContent', () => {
       generationConfig: {topK: 0},
       safetySettings: [],
     };
-    const expectedResult: GenerateContentResult = {
-      response: TEST_MODEL_RESPONSE,
-    };
     fetchSpy.and.resolveTo(buildFetchResponse(TEST_MODEL_RESPONSE));
     await generateContent(
       TEST_LOCATION,
@@ -550,9 +498,6 @@ describe('generateContent', () => {
       generationConfig: {topK: 1},
       safetySettings: [],
     };
-    const expectedResult: GenerateContentResult = {
-      response: TEST_MODEL_RESPONSE,
-    };
     fetchSpy.and.resolveTo(buildFetchResponse(TEST_MODEL_RESPONSE));
     await generateContent(
       TEST_LOCATION,
@@ -572,9 +517,6 @@ describe('generateContent', () => {
     const req: GenerateContentRequest = {
       contents: TEST_USER_CHAT_MESSAGE,
     };
-    const expectedResult: GenerateContentResult = {
-      response: TEST_MODEL_RESPONSE,
-    };
     fetchSpy.and.resolveTo(buildFetchResponse(TEST_MODEL_RESPONSE));
     const resp = await generateContent(
       TEST_LOCATION,
diff --git a/src/models/chat_session.ts b/src/models/chat_session.ts
@@ -155,17 +155,6 @@ export class ChatSession {
       const contentFromAssistant =
         generateContentResponse.candidates[0].content;
       this.historyInternal.push(contentFromAssistant);
-    } else {
-      const promptFeedback = generateContentResponse.promptFeedback;
-      if (promptFeedback) {
-        errorMessage = `Model did not return candidate, but provided prompt feedback: ${JSON.stringify(
-          promptFeedback
-        )}`;
-      } else {
-        errorMessage =
-          'Model did not return candidate, could not find any prompt feedback from model as well';
-      }
-      throw new GoogleGenerativeAIError(errorMessage);
     }
 
     return Promise.resolve(generateContentResult);
@@ -189,17 +178,6 @@ export class ChatSession {
       const contentFromAssistant =
         streamGenerateContentResponse.candidates[0].content;
       this.historyInternal.push(contentFromAssistant);
-    } else {
-      const promptFeedback = streamGenerateContentResponse.promptFeedback;
-      if (promptFeedback) {
-        errorMessage = `Model did not return candidate, but provided prompt feedback: ${JSON.stringify(
-          promptFeedback
-        )}`;
-      } else {
-        errorMessage =
-          'Model did not return candidate, could not find any prompt feedback from model as well';
-      }
-      throw new GoogleGenerativeAIError(errorMessage);
     }
   }
 
@@ -325,7 +303,6 @@ export class ChatSessionPreview {
   async sendMessage(
     request: string | Array<string | Part>
   ): Promise<GenerateContentResult> {
-    let errorMessage: string;
     const newContent: Content[] =
       formulateNewContentFromSendMessageRequest(request);
     const generateContentrequest: GenerateContentRequest = {
@@ -359,17 +336,6 @@ export class ChatSessionPreview {
       const contentFromAssistant =
         generateContentResponse.candidates[0].content;
       this.historyInternal.push(contentFromAssistant);
-    } else {
-      const promptFeedback = generateContentResponse.promptFeedback;
-      if (promptFeedback) {
-        errorMessage = `Model did not return candidate, but provided prompt feedback: ${JSON.stringify(
-          promptFeedback
-        )}`;
-      } else {
-        errorMessage =
-          'Model did not return candidate, could not find any prompt feedback from model as well';
-      }
-      throw new GoogleGenerativeAIError(errorMessage);
     }
 
     return Promise.resolve(generateContentResult);
@@ -379,7 +345,6 @@ export class ChatSessionPreview {
     streamGenerateContentResultPromise: Promise<StreamGenerateContentResult>,
     newContent: Content[]
   ): Promise<void> {
-    let errorMessage: string;
     const streamGenerateContentResult =
       await streamGenerateContentResultPromise;
     const streamGenerateContentResponse =
@@ -393,16 +358,6 @@ export class ChatSessionPreview {
       const contentFromAssistant =
         streamGenerateContentResponse.candidates[0].content;
       this.historyInternal.push(contentFromAssistant);
-    } else {
-      const promptFeedback = streamGenerateContentResponse.promptFeedback;
-      if (promptFeedback) {
-        errorMessage = `Model did not return candidate, but provided prompt feedback: ${JSON.stringify(
-          promptFeedback
-        )}`;
-      } else {
-        errorMessage =
-          'Model did not return candidate, could not find any prompt feedback from model as well';
-      }
     }
   }
 
diff --git a/src/models/test/models_test.ts b/src/models/test/models_test.ts
@@ -216,9 +216,6 @@ const fetchResponseObj = {
   headers: {'Content-Type': 'application/json'},
   url: 'url',
 };
-const TEST_EMPTY_MODEL_RESPONSE = {
-  candidates: [],
-};
 const TEST_REQUEST_OPTIONS = {
   timeout: 0,
 };
@@ -1177,7 +1174,6 @@ describe('GenerativeModelPreview generateContentStream', () => {
 describe('ChatSession', () => {
   let chatSession: ChatSession;
   let chatSessionWithNoArgs: ChatSession;
-  let chatSessionWithEmptyResponse: ChatSession;
   let chatSessionWithFunctionCall: ChatSession;
   let model: GenerativeModel;
 
@@ -1193,7 +1189,6 @@ describe('ChatSession', () => {
     });
     expect(await chatSession.getHistory()).toEqual(TEST_USER_CHAT_MESSAGE);
     chatSessionWithNoArgs = model.startChat();
-    chatSessionWithEmptyResponse = model.startChat();
     chatSessionWithFunctionCall = model.startChat({
       tools: TEST_TOOLS_WITH_FUNCTION_DECLARATION,
     });
@@ -1252,19 +1247,6 @@ describe('ChatSession', () => {
       expect((await chatSessionWithNoArgs.getHistory()).length).toEqual(2);
     });
 
-    it('throws an error when the model returns an empty response', async () => {
-      const req = 'How are you doing today?';
-      const expectedResult: GenerateContentResult = {
-        response: TEST_EMPTY_MODEL_RESPONSE,
-      };
-      spyOn(PostFetchFunctions, 'processUnary').and.resolveTo(expectedResult);
-      await expectAsync(
-        chatSessionWithEmptyResponse.sendMessage(req)
-      ).toBeRejected();
-      expect((await chatSessionWithEmptyResponse.getHistory()).length).toEqual(
-        0
-      );
-    });
     it('returns a GenerateContentResponse when passed multi-part content', async () => {
       const req = TEST_MULTIPART_MESSAGE[0]['parts'];
       const expectedResult: GenerateContentResult = {
@@ -1484,7 +1466,6 @@ describe('ChatSession', () => {
 describe('ChatSessionPreview', () => {
   let chatSession: ChatSessionPreview;
   let chatSessionWithNoArgs: ChatSessionPreview;
-  let chatSessionWithEmptyResponse: ChatSessionPreview;
   let chatSessionWithFunctionCall: ChatSessionPreview;
   let model: GenerativeModelPreview;
   let expectedStreamResult: StreamGenerateContentResult;
@@ -1501,7 +1482,6 @@ describe('ChatSessionPreview', () => {
     });
     expect(await chatSession.getHistory()).toEqual(TEST_USER_CHAT_MESSAGE);
     chatSessionWithNoArgs = model.startChat();
-    chatSessionWithEmptyResponse = model.startChat();
     chatSessionWithFunctionCall = model.startChat({
       tools: TEST_TOOLS_WITH_FUNCTION_DECLARATION,
     });
@@ -1563,19 +1543,6 @@ describe('ChatSessionPreview', () => {
       expect((await chatSessionWithNoArgs.getHistory()).length).toEqual(2);
     });
 
-    it('throws an error when the model returns an empty response', async () => {
-      const req = 'How are you doing today?';
-      const expectedResult: GenerateContentResult = {
-        response: TEST_EMPTY_MODEL_RESPONSE,
-      };
-      spyOn(PostFetchFunctions, 'processUnary').and.resolveTo(expectedResult);
-      await expectAsync(
-        chatSessionWithEmptyResponse.sendMessage(req)
-      ).toBeRejected();
-      expect((await chatSessionWithEmptyResponse.getHistory()).length).toEqual(
-        0
-      );
-    });
     it('returns a GenerateContentResponse when passed multi-part content', async () => {
       const req = TEST_MULTIPART_MESSAGE[0]['parts'];
       const expectedResult: GenerateContentResult = {
@@ -2035,8 +2002,6 @@ describe('GenerativeModelPreview when response is undefined', () => {
 });
 
 describe('GeneratvieModel when response is 4XX', () => {
-  const expectedErrorMessage =
-    '[VertexAI.ClientError]: got status: 400 Bad Request. {"code":400,"message":"request is invalid","status":"INVALID_ARGUMENT"}';
   const req: GenerateContentRequest = {
     contents: TEST_USER_CHAT_MESSAGE,
   };
@@ -2100,8 +2065,6 @@ describe('GeneratvieModel when response is 4XX', () => {
 });
 
 describe('GeneratvieModelPreview when response is 4XX', () => {
-  const expectedErrorMessage =
-    '[VertexAI.ClientError]: got status: 400 Bad Request. {"code":400,"message":"request is invalid","status":"INVALID_ARGUMENT"}';
   const req: GenerateContentRequest = {
     contents: TEST_USER_CHAT_MESSAGE,
   };
@@ -2165,8 +2128,6 @@ describe('GeneratvieModelPreview when response is 4XX', () => {
 });
 
 describe('GenerativeModel when response is not OK and not 4XX', () => {
-  const expectedErrorMessage =
-    '[VertexAI.GoogleGenerativeAIError]: got status: 500 Internal Server Error. {"code":500,"message":"service is having downtime","status":"INTERNAL_SERVER_ERROR"}';
   const req: GenerateContentRequest = {
     contents: TEST_USER_CHAT_MESSAGE,
   };
@@ -2230,8 +2191,6 @@ describe('GenerativeModel when response is not OK and not 4XX', () => {
 });
 
 describe('GenerativeModelPreview when response is not OK and not 4XX', () => {
-  const expectedErrorMessage =
-    '[VertexAI.GoogleGenerativeAIError]: got status: 500 Internal Server Error. {"code":500,"message":"service is having downtime","status":"INTERNAL_SERVER_ERROR"}';
   const req: GenerateContentRequest = {
     contents: TEST_USER_CHAT_MESSAGE,
   };
diff --git a/system_test/end_to_end_sample_test.ts b/system_test/end_to_end_sample_test.ts
@@ -745,9 +745,6 @@ describe('generateContent', () => {
         resp
       )}`
     );
-    const functionCalls = resp.response
-      .candidates![0].content.parts.filter((part: Part) => !!part.functionCall)
-      .map((part: Part) => part.functionCall!);
     expect(
       resp.response.candidates![0].content.parts[0].text?.toLowerCase()
     ).toContain(

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ export async function processUnary(`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`return Promise.resolve({`
`360`		`- response: {candidates: []},`
	`360`	`+ response: {} as GenerateContentResponse,`
`361`	`361`	`});`
`362`	`362`	`}`
`363`	`363`