@@ -551,7 +551,7 @@ public GenerateContentResponse generateContent(
551551 public GenerateContentResponse generateContent (
552552 List <Content > contents , GenerateContentConfig config ) throws IOException {
553553 GenerateContentRequest .Builder requestBuilder =
554- GenerateContentRequest .newBuilder ().addAllContents (contents );
554+ GenerateContentRequest .newBuilder ().setModel ( this . resourceName ). addAllContents (contents );
555555 if (config .getGenerationConfig () != null ) {
556556 requestBuilder .setGenerationConfig (config .getGenerationConfig ());
557557 } else if (this .generationConfig != null ) {
@@ -568,7 +568,7 @@ public GenerateContentResponse generateContent(
568568 requestBuilder .addAllTools (this .tools );
569569 }
570570
571- return generateContent (requestBuilder );
571+ return generateContent (requestBuilder . build () );
572572 }
573573
574574 /**
@@ -592,7 +592,7 @@ public GenerateContentResponse generateContent(
592592 List <Content > contents , GenerationConfig generationConfig , List <SafetySetting > safetySettings )
593593 throws IOException {
594594 GenerateContentRequest .Builder requestBuilder =
595- GenerateContentRequest .newBuilder ().addAllContents (contents );
595+ GenerateContentRequest .newBuilder ().setModel ( this . resourceName ). addAllContents (contents );
596596 if (generationConfig != null ) {
597597 requestBuilder .setGenerationConfig (generationConfig );
598598 } else if (this .generationConfig != null ) {
@@ -606,28 +606,24 @@ public GenerateContentResponse generateContent(
606606 if (this .tools != null ) {
607607 requestBuilder .addAllTools (this .tools );
608608 }
609- return generateContent (requestBuilder );
609+ return generateContent (requestBuilder . build () );
610610 }
611611
612612 /**
613613 * A base generateContent method that will be used internally.
614614 *
615- * @param requestBuilder a {@link com.google.cloud.vertexai.api.GenerateContentRequest.Builder}
616- * instance
615+ * @param request a {@link com.google.cloud.vertexai.api.GenerateContentRequest} instance
617616 * @return a {@link com.google.cloud.vertexai.api.GenerateContentResponse} instance that contains
618617 * response contents and other metadata
619618 * @throws IOException if an I/O error occurs while making the API call
620619 */
621- private GenerateContentResponse generateContent (GenerateContentRequest . Builder requestBuilder )
620+ private GenerateContentResponse generateContent (GenerateContentRequest request )
622621 throws IOException {
623- GenerateContentRequest request = requestBuilder .setModel (this .resourceName ).build ();
624- GenerateContentResponse response ;
625622 if (this .transport == Transport .REST ) {
626- response = vertexAi .getPredictionServiceRestClient ().generateContentCallable ().call (request );
623+ return vertexAi .getPredictionServiceRestClient ().generateContentCallable ().call (request );
627624 } else {
628- response = vertexAi .getPredictionServiceClient ().generateContentCallable ().call (request );
625+ return vertexAi .getPredictionServiceClient ().generateContentCallable ().call (request );
629626 }
630- return response ;
631627 }
632628
633629 /**
0 commit comments