From d4641e422c4dff90fc6a62cdbbe3e0d634b64740 Mon Sep 17 00:00:00 2001 From: Mark Daoust Date: Tue, 31 Mar 2026 16:37:41 -0700 Subject: [PATCH] fix: Fix service_tier enums. PiperOrigin-RevId: 892604542 --- src/main/java/com/google/genai/Models.java | 7 ++-- .../genai/types/GenerateContentConfig.java | 8 ++--- .../genai/types/ImagePromptLanguage.java | 36 ++++++++++++++----- .../com/google/genai/types/ServiceTier.java | 28 ++++++++++++--- 4 files changed, 60 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/google/genai/Models.java b/src/main/java/com/google/genai/Models.java index e910c3dadba..25941bd75a8 100644 --- a/src/main/java/com/google/genai/Models.java +++ b/src/main/java/com/google/genai/Models.java @@ -1871,8 +1871,11 @@ ObjectNode generateContentConfigToVertex( Common.getValueByPath(fromObject, new String[] {"modelArmorConfig"})); } - if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"serviceTier"}))) { - throw new IllegalArgumentException("serviceTier parameter is not supported in Vertex AI."); + if (Common.getValueByPath(fromObject, new String[] {"serviceTier"}) != null) { + Common.setValueByPath( + parentObject, + new String[] {"serviceTier"}, + Common.getValueByPath(fromObject, new String[] {"serviceTier"})); } return toObject; diff --git a/src/main/java/com/google/genai/types/GenerateContentConfig.java b/src/main/java/com/google/genai/types/GenerateContentConfig.java index fc6b08d433e..af64f1dee6b 100644 --- a/src/main/java/com/google/genai/types/GenerateContentConfig.java +++ b/src/main/java/com/google/genai/types/GenerateContentConfig.java @@ -239,7 +239,7 @@ public abstract class GenerateContentConfig extends JsonSerializable { @JsonProperty("modelArmorConfig") public abstract Optional modelArmorConfig(); - /** The service tier to use for the request. For example, SERVICE_TIER_FLEX. */ + /** The service tier to use for the request. For example, ServiceTier.FLEX. */ @JsonProperty("serviceTier") public abstract Optional serviceTier(); @@ -1110,7 +1110,7 @@ public Builder clearModelArmorConfig() { /** * Setter for serviceTier. * - *

serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX. + *

serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX. */ @JsonProperty("serviceTier") public abstract Builder serviceTier(ServiceTier serviceTier); @@ -1128,7 +1128,7 @@ public Builder clearServiceTier() { /** * Setter for serviceTier given a known enum. * - *

serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX. + *

serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX. */ @CanIgnoreReturnValue public Builder serviceTier(ServiceTier.Known knownType) { @@ -1138,7 +1138,7 @@ public Builder serviceTier(ServiceTier.Known knownType) { /** * Setter for serviceTier given a string. * - *

serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX. + *

serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX. */ @CanIgnoreReturnValue public Builder serviceTier(String serviceTier) { diff --git a/src/main/java/com/google/genai/types/ImagePromptLanguage.java b/src/main/java/com/google/genai/types/ImagePromptLanguage.java index 0aab1b13aba..be52abbf094 100644 --- a/src/main/java/com/google/genai/types/ImagePromptLanguage.java +++ b/src/main/java/com/google/genai/types/ImagePromptLanguage.java @@ -29,30 +29,48 @@ public class ImagePromptLanguage { /** Enum representing the known values for ImagePromptLanguage. */ public enum Known { /** Auto-detect the language. */ - AUTO, + AUTO("auto"), /** English */ - EN, + EN("en"), /** Japanese */ - JA, + JA("ja"), /** Korean */ - KO, + KO("ko"), /** Hindi */ - HI, + HI("hi"), /** Chinese */ - ZH, + ZH("zh"), /** Portuguese */ - PT, + PT("pt"), /** Spanish */ - ES, + ES("es"), - IMAGE_PROMPT_LANGUAGE_UNSPECIFIED + IMAGE_PROMPT_LANGUAGE_UNSPECIFIED; + private final String value; + + Known() { + this.value = this.name(); + } + + Known(String value) { + this.value = value; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return value; + } } private Known imagePromptLanguageEnum; diff --git a/src/main/java/com/google/genai/types/ServiceTier.java b/src/main/java/com/google/genai/types/ServiceTier.java index 0fe220cf4d2..690d012cee4 100644 --- a/src/main/java/com/google/genai/types/ServiceTier.java +++ b/src/main/java/com/google/genai/types/ServiceTier.java @@ -29,16 +29,36 @@ public class ServiceTier { /** Enum representing the known values for ServiceTier. */ public enum Known { /** Default service tier, which is standard. */ - SERVICE_TIER_UNSPECIFIED, + UNSPECIFIED("unspecified"), /** Flex service tier. */ - SERVICE_TIER_FLEX, + FLEX("flex"), /** Standard service tier. */ - SERVICE_TIER_STANDARD, + STANDARD("standard"), /** Priority service tier. */ - SERVICE_TIER_PRIORITY + PRIORITY("priority"), + + SERVICE_TIER_UNSPECIFIED; + private final String value; + + Known() { + this.value = this.name(); + } + + Known(String value) { + this.value = value; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return value; + } } private Known serviceTierEnum;