chore: [vertexai] make GenerateContentConfig immutable (#10462)

copybara-service[bot] · jaycee-li · web-flow · commit d3110aeb6a97 · 2024-03-05T11:22:32.000-08:00
PiperOrigin-RevId: 612549622

Co-authored-by: Jaycee Li &lt;jayceeli@google.com&gt;
diff --git a/java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/generativeai/GenerateContentConfig.java b/java-vertexai/google-cloud-vertexai/src/main/java/com/google/cloud/vertexai/generativeai/GenerateContentConfig.java
@@ -25,9 +25,9 @@
 
 /** This class holds all the configs when making a generate content API call */
 public class GenerateContentConfig {
-  private GenerationConfig generationConfig;
-  private ImmutableList<SafetySetting> safetySettings;
-  private ImmutableList<Tool> tools;
+  private final GenerationConfig generationConfig;
+  private final ImmutableList<SafetySetting> safetySettings;
+  private final ImmutableList<Tool> tools;
 
   /** Creates a builder for the GenerateContentConfig. */
   public static Builder newBuilder() {
@@ -85,14 +85,7 @@ public Builder setGenerationConfig(GenerationConfig generationConfig) {
      */
     @BetaApi
     public Builder setSafetySettings(List<SafetySetting> safetySettings) {
-      ImmutableList.Builder builder = ImmutableList.builder();
-      for (SafetySetting safetySetting : safetySettings) {
-        if (safetySetting != null) {
-          builder.add(safetySetting);
-        }
-      }
-      this.safetySettings = builder.build();
-
+      this.safetySettings = ImmutableList.copyOf(safetySettings);
       return this;
     }
 
@@ -104,54 +97,11 @@ public Builder setSafetySettings(List<SafetySetting> safetySettings) {
      */
     @BetaApi
     public Builder setTools(List<Tool> tools) {
-      ImmutableList.Builder builder = ImmutableList.builder();
-      for (Tool tool : tools) {
-        if (tool != null) {
-          builder.add(tool);
-        }
-      }
-      this.tools = builder.build();
-
+      this.tools = ImmutableList.copyOf(tools);
       return this;
     }
   }
 
-  /**
-   * Sets the value for {@link #getGenerationConfig}, which will be used in the generate content API
-   * call.
-   */
-  @BetaApi
-  public void setGenerationConfig(GenerationConfig generationConfig) {
-    this.generationConfig = generationConfig;
-  }
-
-  /**
-   * Sets the value for {@link #getSafetySettings}, which will be used in the generate content API
-   * call.
-   */
-  @BetaApi("safetySettings is a preview feature.")
-  public void setSafetySettings(List<SafetySetting> safetySettings) {
-    ImmutableList.Builder builder = ImmutableList.builder();
-    for (SafetySetting safetySetting : safetySettings) {
-      if (safetySetting != null) {
-        builder.add(safetySetting);
-      }
-    }
-    this.safetySettings = builder.build();
-  }
-
-  /** Sets the value for {@link #getTools}, which will be used in the generate content API call. */
-  @BetaApi("tools is a preview feature.")
-  public void setTools(List<Tool> tools) {
-    ImmutableList.Builder builder = ImmutableList.builder();
-    for (Tool tool : tools) {
-      if (tool != null) {
-        builder.add(tool);
-      }
-    }
-    this.tools = builder.build();
-  }
-
   /** Returns the {@link com.google.cloud.vertexai.api.GenerationConfig} of this config. */
   @BetaApi
   public GenerationConfig getGenerationConfig() {
diff --git a/java-vertexai/google-cloud-vertexai/src/test/java/com/google/cloud/vertexai/generativeai/GenerateContentConfigTest.java b/java-vertexai/google-cloud-vertexai/src/test/java/com/google/cloud/vertexai/generativeai/GenerateContentConfigTest.java
@@ -76,21 +76,4 @@ public void testInstantiateGenerateContentConfigWithBuilder() {
     assertThat(config.getSafetySettings()).isEqualTo(safetySettings);
     assertThat(config.getTools()).isEqualTo(tools);
   }
-
-  @Test
-  public void testGenerateContentConfigSetters() {
-    config = GenerateContentConfig.newBuilder().build();
-
-    assertThat(config.getGenerationConfig()).isNull();
-    assertThat(config.getSafetySettings()).isEmpty();
-    assertThat(config.getTools()).isEmpty();
-
-    config.setGenerationConfig(GENERATION_CONFIG);
-    config.setSafetySettings(safetySettings);
-    config.setTools(tools);
-
-    assertThat(config.getGenerationConfig()).isEqualTo(GENERATION_CONFIG);
-    assertThat(config.getSafetySettings()).isEqualTo(safetySettings);
-    assertThat(config.getTools()).isEqualTo(tools);
-  }
 }
