Merge pull request #83 from anandmali/java-sdk-update-0.4.0-genai-api-changes

pcoet · web-flow · commit 16520aea9a9f · 2025-04-22T10:53:10.000-07:00
Java sdk update 0.4.0 genai api changes
diff --git a/java/README.md b/java/README.md
@@ -4,7 +4,7 @@ This directory contains examples of working with the Gemini API using the
 [Google Gen AI SDK for Java](https://github.com/googleapis/java-genai).
 
 ## Install dependencies
-open the project in intellliJ IDEA, load the maven build script.
+open the project in intelliJ IDEA, load the maven build script.
 
 ## Run a test file
 Before running the tests, set GOOGLE_API_KEY as environment variable for run/debug configuration. 
diff --git a/java/pom.xml b/java/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.google.genai</groupId>
             <artifactId>google-genai</artifactId>
-            <version>0.2.0</version>
+            <version>0.4.0</version>
         </dependency>
 
         <dependency>
diff --git a/java/src/main/java/com/example/gemini/ChatSession.java b/java/src/main/java/com/example/gemini/ChatSession.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.gemini;
+
+import com.google.genai.Chat;
+import com.google.genai.Client;
+import com.google.genai.types.Content;
+import com.google.genai.types.GenerateContentConfig;
+import com.google.genai.types.GenerateContentResponse;
+import com.google.genai.types.Part;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ChatSession {
+    public static List<GenerateContentResponse> chat() {
+        // [START chat]
+        Client client = new Client();
+
+        Content userContent = Content.fromParts(Part.fromText("Hello"));
+        Content modelContent =
+                Content.builder()
+                        .role("model")
+                        .parts(
+                                Collections.singletonList(
+                                        Part.fromText("Great to meet you. What would you like to know?")
+                                )
+                        ).build();
+
+        Chat chat = client.chats.create(
+                "gemini-2.0-flash",
+                GenerateContentConfig.builder()
+                        .systemInstruction(userContent)
+                        .systemInstruction(modelContent)
+                        .build()
+        );
+
+        GenerateContentResponse response1 = chat.sendMessage("I have 2 dogs in my house.");
+        System.out.println(response1.text());
+
+        GenerateContentResponse response2 = chat.sendMessage("How many paws are in my house?");
+        System.out.println(response2.text());
+
+        // [END chat]
+        return List.of(response1, response2);
+    }
+}
diff --git a/java/src/main/java/com/example/gemini/CodeExecution.java b/java/src/main/java/com/example/gemini/CodeExecution.java
@@ -27,7 +27,7 @@
 
 @SuppressWarnings("resource")
 public class CodeExecution {
-    public static GenerateContentResponse codeExecutionBasic() throws Exception {
+    public static GenerateContentResponse codeExecutionBasic() {
         // [START code_execution_basic]
         Client client = new Client();
 
@@ -94,7 +94,7 @@ def is_prime(n):
         return response;
     }
 
-    public static GenerateContentResponse codeExecutionRequestOverride() throws Exception {
+    public static GenerateContentResponse codeExecutionRequestOverride() {
         // [START code_execution_request_override]
         Client client = new Client();
 
diff --git a/java/src/main/java/com/example/gemini/ConfigureModelParameters.java b/java/src/main/java/com/example/gemini/ConfigureModelParameters.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 public class ConfigureModelParameters {
-    public static @Nullable String configureModelParameters() throws Exception {
+    public static @Nullable String configureModelParameters() {
         // [START configure_model_parameters]
         Client client = new Client();
 
diff --git a/java/src/main/java/com/example/gemini/ControlledGeneration.java b/java/src/main/java/com/example/gemini/ControlledGeneration.java
@@ -16,9 +16,7 @@
 
 package com.example.gemini;
 
-import com.google.common.collect.ImmutableList;
 import com.google.genai.Client;
-import com.google.genai.types.Blob;
 import com.google.genai.types.Content;
 import com.google.genai.types.GenerateContentConfig;
 import com.google.genai.types.GenerateContentResponse;
@@ -30,14 +28,13 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 
 import static com.example.gemini.BuildConfig.media_path;
 
 public class ControlledGeneration {
-    public static @Nullable String jsonControlledGeneration() throws Exception {
+    public static @Nullable String jsonControlledGeneration() {
         // [START json_controlled_generation]
         Client client = new Client();
 
@@ -77,7 +74,7 @@ public class ControlledGeneration {
         return response.text();
     }
 
-    public static @Nullable String jsonNoSchema() throws Exception {
+    public static @Nullable String jsonNoSchema() {
         // [START json_no_schema]
         Client client = new Client();
 
@@ -116,14 +113,11 @@ public class ControlledGeneration {
 
         String path = media_path + "organ.jpg";
         byte[] imageData = Files.readAllBytes(Paths.get(path));
-        String base64Image = Base64.getEncoder().encodeToString(imageData);
-        Part imagePart = Part.builder()
-                .inlineData(Blob.builder().data(base64Image)
-                        .mimeType("image/jpeg").build()).build();
 
-        Part textPart = Part.builder().text("What kind of instrument is this:").build();
-
-        Content content = Content.builder().role("user").parts(ImmutableList.of(textPart, imagePart)).build();
+        Content content =
+                Content.fromParts(
+                        Part.fromText("What kind of instrument is this:"),
+                        Part.fromBytes(imageData, "image/jpeg"));
 
         GenerateContentConfig config =
                 GenerateContentConfig.builder()
@@ -193,14 +187,11 @@ public class ControlledGeneration {
 
         String path = media_path + "organ.jpg";
         byte[] imageData = Files.readAllBytes(Paths.get(path));
-        String base64Image = Base64.getEncoder().encodeToString(imageData);
-        Part imagePart = Part.builder()
-                .inlineData(Blob.builder().data(base64Image)
-                        .mimeType("image/jpeg").build()).build();
-
-        Part textPart = Part.builder().text("What kind of instrument is this:").build();
 
-        Content content = Content.builder().role("user").parts(ImmutableList.of(textPart, imagePart)).build();
+        Content content =
+                Content.fromParts(
+                        Part.fromText("What kind of instrument is this:"),
+                        Part.fromBytes(imageData, "image/jpeg"));
 
         GenerateContentConfig config =
                 GenerateContentConfig.builder()
diff --git a/java/src/main/java/com/example/gemini/FunctionCalling.java b/java/src/main/java/com/example/gemini/FunctionCalling.java
@@ -33,7 +33,7 @@
 import java.util.function.BiFunction;
 
 public class FunctionCalling {
-    public static Double functionCalling() throws Exception {
+    public static Double functionCalling() {
         // [START function_calling]
         Client client = new Client();
 
@@ -108,12 +108,12 @@ public static Double functionCalling() throws Exception {
                 )
                 .build();
 
-        GenerateContentResponse response;
-        try {
-            response = client.models.generateContent("gemini-2.0-flash", "I have 57 cats, each owns 44 mittens, how many mittens is that in total?", config);
-        } catch (HttpException e) {
-            throw new RuntimeException(e);
-        }
+        GenerateContentResponse response =
+                client.models.generateContent(
+                        "gemini-2.0-flash",
+                        "I have 57 cats, each owns 44 mittens, how many mittens is that in total?",
+                        config);
+
 
         if (response.functionCalls() == null || response.functionCalls().isEmpty()) {
             System.err.println("No function call received");
diff --git a/java/src/main/java/com/example/gemini/SafetySettings.java b/java/src/main/java/com/example/gemini/SafetySettings.java
@@ -25,7 +25,7 @@
 import java.util.Collections;
 
 public class SafetySettings {
-    public static GenerateContentResponse safetySettings() throws Exception {
+    public static GenerateContentResponse safetySettings() {
         // [START safety_settings]
         Client client = new Client();
 
diff --git a/java/src/main/java/com/example/gemini/SystemInstruction.java b/java/src/main/java/com/example/gemini/SystemInstruction.java
@@ -25,7 +25,7 @@
 import org.jspecify.annotations.Nullable;
 
 public class SystemInstruction {
-    public static @Nullable String systemInstruction() throws Exception {
+    public static @Nullable String systemInstruction() {
         // [START system_instruction]
         Client client = new Client();
 
diff --git a/java/src/main/java/com/example/gemini/TextGeneration.java b/java/src/main/java/com/example/gemini/TextGeneration.java
diff --git a/java/src/test/java/com/example/gemini/ChatSessionTest.java b/java/src/test/java/com/example/gemini/ChatSessionTest.java
