Skip to content

Commit 44b8e35

Browse files
MarkDaoustcopybara-github
authored andcommitted
fix: Fix service_tier enums.
FUTURE_COPYBARA_INTEGRATE_REVIEW=#904 from googleapis:release-please--branches--main 4d7573e PiperOrigin-RevId: 888287753
1 parent f3dcf87 commit 44b8e35

4 files changed

Lines changed: 60 additions & 19 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,8 +1871,11 @@ ObjectNode generateContentConfigToVertex(
18711871
Common.getValueByPath(fromObject, new String[] {"modelArmorConfig"}));
18721872
}
18731873

1874-
if (!Common.isZero(Common.getValueByPath(fromObject, new String[] {"serviceTier"}))) {
1875-
throw new IllegalArgumentException("serviceTier parameter is not supported in Vertex AI.");
1874+
if (Common.getValueByPath(fromObject, new String[] {"serviceTier"}) != null) {
1875+
Common.setValueByPath(
1876+
parentObject,
1877+
new String[] {"serviceTier"},
1878+
Common.getValueByPath(fromObject, new String[] {"serviceTier"}));
18761879
}
18771880

18781881
return toObject;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public abstract class GenerateContentConfig extends JsonSerializable {
239239
@JsonProperty("modelArmorConfig")
240240
public abstract Optional<ModelArmorConfig> modelArmorConfig();
241241

242-
/** The service tier to use for the request. For example, SERVICE_TIER_FLEX. */
242+
/** The service tier to use for the request. For example, ServiceTier.FLEX. */
243243
@JsonProperty("serviceTier")
244244
public abstract Optional<ServiceTier> serviceTier();
245245

@@ -1110,7 +1110,7 @@ public Builder clearModelArmorConfig() {
11101110
/**
11111111
* Setter for serviceTier.
11121112
*
1113-
* <p>serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX.
1113+
* <p>serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX.
11141114
*/
11151115
@JsonProperty("serviceTier")
11161116
public abstract Builder serviceTier(ServiceTier serviceTier);
@@ -1128,7 +1128,7 @@ public Builder clearServiceTier() {
11281128
/**
11291129
* Setter for serviceTier given a known enum.
11301130
*
1131-
* <p>serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX.
1131+
* <p>serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX.
11321132
*/
11331133
@CanIgnoreReturnValue
11341134
public Builder serviceTier(ServiceTier.Known knownType) {
@@ -1138,7 +1138,7 @@ public Builder serviceTier(ServiceTier.Known knownType) {
11381138
/**
11391139
* Setter for serviceTier given a string.
11401140
*
1141-
* <p>serviceTier: The service tier to use for the request. For example, SERVICE_TIER_FLEX.
1141+
* <p>serviceTier: The service tier to use for the request. For example, ServiceTier.FLEX.
11421142
*/
11431143
@CanIgnoreReturnValue
11441144
public Builder serviceTier(String serviceTier) {

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,48 @@ public class ImagePromptLanguage {
2929
/** Enum representing the known values for ImagePromptLanguage. */
3030
public enum Known {
3131
/** Auto-detect the language. */
32-
AUTO,
32+
AUTO("auto"),
3333

3434
/** English */
35-
EN,
35+
EN("en"),
3636

3737
/** Japanese */
38-
JA,
38+
JA("ja"),
3939

4040
/** Korean */
41-
KO,
41+
KO("ko"),
4242

4343
/** Hindi */
44-
HI,
44+
HI("hi"),
4545

4646
/** Chinese */
47-
ZH,
47+
ZH("zh"),
4848

4949
/** Portuguese */
50-
PT,
50+
PT("pt"),
5151

5252
/** Spanish */
53-
ES,
53+
ES("es"),
5454

55-
IMAGE_PROMPT_LANGUAGE_UNSPECIFIED
55+
IMAGE_PROMPT_LANGUAGE_UNSPECIFIED;
56+
private final String value;
57+
58+
Known() {
59+
this.value = this.name();
60+
}
61+
62+
Known(String value) {
63+
this.value = value;
64+
}
65+
66+
public String value() {
67+
return value;
68+
}
69+
70+
@Override
71+
public String toString() {
72+
return value;
73+
}
5674
}
5775

5876
private Known imagePromptLanguageEnum;

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,36 @@ public class ServiceTier {
2929
/** Enum representing the known values for ServiceTier. */
3030
public enum Known {
3131
/** Default service tier, which is standard. */
32-
SERVICE_TIER_UNSPECIFIED,
32+
UNSPECIFIED("unspecified"),
3333

3434
/** Flex service tier. */
35-
SERVICE_TIER_FLEX,
35+
FLEX("flex"),
3636

3737
/** Standard service tier. */
38-
SERVICE_TIER_STANDARD,
38+
STANDARD("standard"),
3939

4040
/** Priority service tier. */
41-
SERVICE_TIER_PRIORITY
41+
PRIORITY("priority"),
42+
43+
SERVICE_TIER_UNSPECIFIED;
44+
private final String value;
45+
46+
Known() {
47+
this.value = this.name();
48+
}
49+
50+
Known(String value) {
51+
this.value = value;
52+
}
53+
54+
public String value() {
55+
return value;
56+
}
57+
58+
@Override
59+
public String toString() {
60+
return value;
61+
}
4262
}
4363

4464
private Known serviceTierEnum;

0 commit comments

Comments
 (0)