Skip to content

Commit 9c70217

Browse files
MarkDaoustcopybara-github
authored andcommitted
chore: remove references to flash-exp and unnecessary use of v1alpha
PiperOrigin-RevId: 745680746
1 parent 03442fc commit 9c70217

File tree

7 files changed

+34
-12
lines changed

7 files changed

+34
-12
lines changed

examples/src/main/java/com/google/genai/examples/LiveAudioConversationAsync.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public static void main(String[] args) throws LineUnavailableException {
135135

136136
// Instantiates the client.
137137
Client client =
138-
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1alpha").build()).build();
138+
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1beta").build()).build();
139139

140140
// --- Audio Line Setup ---
141141
microphoneLine = getMicrophoneLine();
@@ -195,8 +195,12 @@ public static void main(String[] args) throws LineUnavailableException {
195195
try {
196196
// --- Connect to Gemini Live API ---
197197
System.out.println("Connecting to Gemini Live API...");
198-
session =
199-
client.async.live.connect("gemini-2.0-flash-exp", config).get(); // Use appropriate model
198+
199+
if (client.vertexAi()) {
200+
session = client.async.live.connect("gemini-2.0-flash-live-preview-04-09", config).get();
201+
} else {
202+
session = client.async.live.connect("gemini-2.0-flash-live-001", config).get();
203+
}
200204
System.out.println("Connected.");
201205

202206
// --- Start Audio Lines ---

examples/src/main/java/com/google/genai/examples/LiveTextConversationAsync.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class LiveTextConversationAsync {
5858
public static void main(String[] args) {
5959
// Instantiates the client.
6060
Client client =
61-
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1alpha").build()).build();
61+
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1beta").build()).build();
6262

6363
LiveConnectConfig config =
6464
LiveConnectConfig.builder()
@@ -71,8 +71,12 @@ public static void main(String[] args) {
7171
CompletableFuture<Void> allDone = new CompletableFuture<>();
7272

7373
try {
74-
AsyncSession session = client.async.live.connect("gemini-2.0-flash-exp", config).get();
75-
74+
if (client.vertexAi()) {
75+
AsyncSession session =
76+
client.async.live.connect("gemini-2.0-flash-live-preview-04-09", config).get();
77+
} else {
78+
AsyncSession session = client.async.live.connect("gemini-2.0-flash-live-001", config).get();
79+
}
7680
// Start receiving messages.
7781
CompletableFuture<Void> receiveFuture =
7882
session.receive(message -> printLiveServerMessage(message, allDone));

examples/src/main/java/com/google/genai/examples/LiveTextToAudioTranscriptionAsync.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,17 @@ public static void main(String[] args) {
8181

8282
CompletableFuture<Void> allDone = new CompletableFuture<>();
8383

84+
String modelName;
85+
if (client.vertexAi()) {
86+
modelName = "gemini-2.0-flash-live-preview-04-09";
87+
} else {
88+
modelName = "gemini-2.0-flash-live-001";
89+
}
90+
8491
client
8592
.async
8693
.live
87-
.connect("gemini-2.0-flash-exp", config)
94+
.connect(modelName, config)
8895
.thenCompose(
8996
session -> {
9097
String inputText = "What is the weather like in Tokyo now?";

examples/src/main/java/com/google/genai/examples/LiveTextToTextGenerationAsync.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,24 @@ public class LiveTextToTextGenerationAsync {
5555
public static void main(String[] args) {
5656
// Instantiates the client.
5757
Client client =
58-
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1alpha").build()).build();
58+
Client.builder().httpOptions(HttpOptions.builder().apiVersion("v1beta").build()).build();
5959

6060
LiveConnectConfig config =
6161
LiveConnectConfig.builder().responseModalities(ImmutableList.of("TEXT")).build();
6262

6363
CompletableFuture<Void> allDone = new CompletableFuture<>();
6464

65+
String modelName;
66+
if (client.vertexAi()) {
67+
modelName = "gemini-2.0-flash-live-preview-04-09";
68+
} else {
69+
modelName = "gemini-2.0-flash-live-001";
70+
}
71+
6572
client
6673
.async
6774
.live
68-
.connect("gemini-2.0-flash-exp", config)
75+
.connect(modelName, config)
6976
.thenCompose(
7077
session -> {
7178
String inputText = "Write a short poem about a cat.";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testDefaultValues() throws Exception {
5151
apiClientField.set(client.models, httpClientSpy);
5252

5353
GenerateContentResponse response =
54-
client.models.generateContent("gemini-2.0-flash-exp", "What is your name?", null);
54+
client.models.generateContent("gemini-2.0-flash", "What is your name?", null);
5555

5656
ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
5757
verify(httpClientSpy).post(argumentCaptor.capture(), argumentCaptor.capture());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testForwardCompatibility() throws Exception {
5757
apiClientField.set(client.models, mockedClient);
5858

5959
GenerateContentResponse response =
60-
client.models.generateContent("gemini-2.0-flash-exp", "What is your name?", null);
60+
client.models.generateContent("gemini-2.0-flash", "What is your name?", null);
6161

6262
assertNotNull(response);
6363
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public void testProxySetup() throws Exception {
272272
Client client = Client.builder().httpOptions(httpOptions).build();
273273

274274
GenerateContentResponse response =
275-
client.models.generateContent("gemini-2.0-flash-exp", "What is your name?", null);
275+
client.models.generateContent("gemini-2.0-flash", "What is your name?", null);
276276

277277
assertEquals(response.text(), expectedText);
278278
} finally {

0 commit comments

Comments
 (0)