feat: Add safety_filter_level and person_generation for Imagen upscaling

PiperOrigin-RevId: 825183839

Author: matthew29tang

src/main/java/com/google/genai/Models.java

@@ -4325,6 +4325,20 @@ ObjectNode upscaleImageAPIConfigToVertex(JsonNode fromObject, ObjectNode parentO
           Common.getValueByPath(fromObject, new String[] {"outputGcsUri"}));
     }
 
+    if (Common.getValueByPath(fromObject, new String[] {"safetyFilterLevel"}) != null) {
+      Common.setValueByPath(
+          parentObject,
+          new String[] {"parameters", "safetySetting"},
+          Common.getValueByPath(fromObject, new String[] {"safetyFilterLevel"}));
+    }
+
+    if (Common.getValueByPath(fromObject, new String[] {"personGeneration"}) != null) {
+      Common.setValueByPath(
+          parentObject,
+          new String[] {"parameters", "personGeneration"},
+          Common.getValueByPath(fromObject, new String[] {"personGeneration"}));
+    }
+
     if (Common.getValueByPath(fromObject, new String[] {"includeRaiReason"}) != null) {
       Common.setValueByPath(
           parentObject,
@@ -6290,6 +6304,12 @@ UpscaleImageAPIConfig preProcessUpscaleImageConfig(UpscaleImageConfig config) {
       if (config.outputCompressionQuality().isPresent()) {
         builder = builder.outputCompressionQuality(config.outputCompressionQuality().get());
       }
+      if (config.safetyFilterLevel().isPresent()) {
+        builder = builder.safetyFilterLevel(config.safetyFilterLevel().get());
+      }
+      if (config.personGeneration().isPresent()) {
+        builder = builder.personGeneration(config.personGeneration().get());
+      }
       if (config.includeRaiReason().isPresent()) {
         builder = builder.includeRaiReason(config.includeRaiReason().get());
       }

src/main/java/com/google/genai/types/UpscaleImageAPIConfig.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.api.core.InternalApi;
 import com.google.auto.value.AutoValue;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.genai.JsonSerializable;
 import java.util.Map;
 import java.util.Optional;
@@ -45,6 +46,14 @@ public abstract class UpscaleImageAPIConfig extends JsonSerializable {
   @JsonProperty("outputGcsUri")
   public abstract Optional<String> outputGcsUri();
 
+  /** Filter level for safety filtering. */
+  @JsonProperty("safetyFilterLevel")
+  public abstract Optional<SafetyFilterLevel> safetyFilterLevel();
+
+  /** Allows generation of people by the model. */
+  @JsonProperty("personGeneration")
+  public abstract Optional<PersonGeneration> personGeneration();
+
   /** Whether to include a reason for filtered-out images in the response. */
   @JsonProperty("includeRaiReason")
   public abstract Optional<Boolean> includeRaiReason();
@@ -127,6 +136,62 @@ public Builder httpOptions(HttpOptions.Builder httpOptionsBuilder) {
     @JsonProperty("outputGcsUri")
     public abstract Builder outputGcsUri(String outputGcsUri);
 
+    /**
+     * Setter for safetyFilterLevel.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @JsonProperty("safetyFilterLevel")
+    public abstract Builder safetyFilterLevel(SafetyFilterLevel safetyFilterLevel);
+
+    /**
+     * Setter for safetyFilterLevel given a known enum.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @CanIgnoreReturnValue
+    public Builder safetyFilterLevel(SafetyFilterLevel.Known knownType) {
+      return safetyFilterLevel(new SafetyFilterLevel(knownType));
+    }
+
+    /**
+     * Setter for safetyFilterLevel given a string.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @CanIgnoreReturnValue
+    public Builder safetyFilterLevel(String safetyFilterLevel) {
+      return safetyFilterLevel(new SafetyFilterLevel(safetyFilterLevel));
+    }
+
+    /**
+     * Setter for personGeneration.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @JsonProperty("personGeneration")
+    public abstract Builder personGeneration(PersonGeneration personGeneration);
+
+    /**
+     * Setter for personGeneration given a known enum.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @CanIgnoreReturnValue
+    public Builder personGeneration(PersonGeneration.Known knownType) {
+      return personGeneration(new PersonGeneration(knownType));
+    }
+
+    /**
+     * Setter for personGeneration given a string.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @CanIgnoreReturnValue
+    public Builder personGeneration(String personGeneration) {
+      return personGeneration(new PersonGeneration(personGeneration));
+    }
+
     /**
      * Setter for includeRaiReason.
      *

src/main/java/com/google/genai/types/UpscaleImageConfig.java

@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.google.auto.value.AutoValue;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.genai.JsonSerializable;
 import java.util.Map;
 import java.util.Optional;
@@ -43,6 +44,14 @@ public abstract class UpscaleImageConfig extends JsonSerializable {
   @JsonProperty("outputGcsUri")
   public abstract Optional<String> outputGcsUri();
 
+  /** Filter level for safety filtering. */
+  @JsonProperty("safetyFilterLevel")
+  public abstract Optional<SafetyFilterLevel> safetyFilterLevel();
+
+  /** Allows generation of people by the model. */
+  @JsonProperty("personGeneration")
+  public abstract Optional<PersonGeneration> personGeneration();
+
   /** Whether to include a reason for filtered-out images in the response. */
   @JsonProperty("includeRaiReason")
   public abstract Optional<Boolean> includeRaiReason();
@@ -117,6 +126,62 @@ public Builder httpOptions(HttpOptions.Builder httpOptionsBuilder) {
     @JsonProperty("outputGcsUri")
     public abstract Builder outputGcsUri(String outputGcsUri);
 
+    /**
+     * Setter for safetyFilterLevel.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @JsonProperty("safetyFilterLevel")
+    public abstract Builder safetyFilterLevel(SafetyFilterLevel safetyFilterLevel);
+
+    /**
+     * Setter for safetyFilterLevel given a known enum.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @CanIgnoreReturnValue
+    public Builder safetyFilterLevel(SafetyFilterLevel.Known knownType) {
+      return safetyFilterLevel(new SafetyFilterLevel(knownType));
+    }
+
+    /**
+     * Setter for safetyFilterLevel given a string.
+     *
+     * <p>safetyFilterLevel: Filter level for safety filtering.
+     */
+    @CanIgnoreReturnValue
+    public Builder safetyFilterLevel(String safetyFilterLevel) {
+      return safetyFilterLevel(new SafetyFilterLevel(safetyFilterLevel));
+    }
+
+    /**
+     * Setter for personGeneration.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @JsonProperty("personGeneration")
+    public abstract Builder personGeneration(PersonGeneration personGeneration);
+
+    /**
+     * Setter for personGeneration given a known enum.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @CanIgnoreReturnValue
+    public Builder personGeneration(PersonGeneration.Known knownType) {
+      return personGeneration(new PersonGeneration(knownType));
+    }
+
+    /**
+     * Setter for personGeneration given a string.
+     *
+     * <p>personGeneration: Allows generation of people by the model.
+     */
+    @CanIgnoreReturnValue
+    public Builder personGeneration(String personGeneration) {
+      return personGeneration(new PersonGeneration(personGeneration));
+    }
+
     /**
      * Setter for includeRaiReason.
      *

src/test/java/com/google/genai/AsyncModelsTest.java

@@ -47,10 +47,12 @@
 import com.google.genai.types.MaskReferenceImage;
 import com.google.genai.types.Model;
 import com.google.genai.types.Part;
+import com.google.genai.types.PersonGeneration;
 import com.google.genai.types.RagRetrievalConfig;
 import com.google.genai.types.RagRetrievalConfigFilter;
 import com.google.genai.types.RawReferenceImage;
 import com.google.genai.types.Retrieval;
+import com.google.genai.types.SafetyFilterLevel;
 import com.google.genai.types.Tool;
 import com.google.genai.types.ToolCodeExecution;
 import com.google.genai.types.UpdateModelConfig;
@@ -626,6 +628,8 @@ public void testUpscaleImageAsync(boolean vertexAI) throws Exception {
     UpscaleImageConfig config =
         UpscaleImageConfig.builder()
             .includeRaiReason(true)
+            .safetyFilterLevel(SafetyFilterLevel.Known.BLOCK_LOW_AND_ABOVE)
+            .personGeneration(PersonGeneration.Known.ALLOW_ADULT)
             .outputMimeType("image/jpeg")
             .outputCompressionQuality(80)
             .enhanceInputImage(true)