Formatting changes and changelog

google-gemini · Jul 16, 2024 · faea6a2 · faea6a2
1 parent 7fd4a8b
commit faea6a2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/.changes/generativeai/club-bite-carpenter-country.json b/.changes/generativeai/club-bite-carpenter-country.json
@@ -0,0 +1 @@
+{"type":"MAJOR","changes":["Improve usability of the Schema type in Java"]}
diff --git a/samples/src/main/java/com/google/ai/client/generative/samples/controlled_generation.kt b/samples/src/main/java/com/google/ai/client/generative/samples/controlled_generation.kt
@@ -30,26 +30,6 @@ import com.google.ai.client.generativeai.type.generationConfig
 
 suspend fun json_controlled_generation() {
     // [START json_controlled_generation]
-    val jsonSchema = Schema(
-        name = "recipes",
-        description = "List of recipes",
-        type = FunctionType.ARRAY,
-        items = Schema(
-            name = "recipe",
-            description = "A recipe",
-            type = FunctionType.OBJECT,
-            properties = mapOf(
-                "recipeName" to Schema(
-                    name = "recipeName",
-                    description = "Name of the recipe",
-                    type = FunctionType.STRING,
-                    nullable = false
-                ),
-            ),
-            required = listOf("recipeName")
-        ),
-    )
-
     val generativeModel =
         GenerativeModel(
             // Specify a Gemini model appropriate for your use case
@@ -58,13 +38,30 @@ suspend fun json_controlled_generation() {
             apiKey = BuildConfig.apiKey,
             generationConfig = generationConfig {
                 responseMimeType = "application/json"
-                responseSchema = jsonSchema
+                responseSchema = Schema(
+                    name = "recipes",
+                    description = "List of recipes",
+                    type = FunctionType.ARRAY,
+                    items = Schema(
+                        name = "recipe",
+                        description = "A recipe",
+                        type = FunctionType.OBJECT,
+                        properties = mapOf(
+                            "recipeName" to Schema(
+                                name = "recipeName",
+                                description = "Name of the recipe",
+                                type = FunctionType.STRING,
+                                nullable = false
+                            ),
+                        ),
+                        required = listOf("recipeName")
+                    ),
+                )
             })
 
     val prompt = "List a few popular cookie recipes."
     val response = generativeModel.generateContent(prompt)
     print(response.text)
-
     // [END json_controlled_generation]
 }
 
@@ -87,6 +84,5 @@ suspend fun json_no_schema() {
     """.trimIndent()
     val response = generativeModel.generateContent(prompt)
     print(response.text)
-
     // [END json_no_schema]
 }
diff --git a/...les/src/main/java/com/google/ai/client/generative/samples/java/controlled_generation.java b/...les/src/main/java/com/google/ai/client/generative/samples/java/controlled_generation.java
@@ -39,7 +39,6 @@
 class ControlledGeneration {
   void jsonControlledGeneration() {
     // [START json_controlled_generation]
-
     Schema<List<String>> schema =
         new Schema(
             /* name */ "recipes",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"type":"MAJOR","changes":["Improve usability of the Schema type in Java"]}