Make default schema objects explicitly non-nullable, and add helpers … (#6013)

…to arr and obj

---------

Co-authored-by: David Motsonashvili <[email protected]>

Author: davidmotson

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/FunctionDeclarations.kt

@@ -170,6 +170,7 @@ class Schema<T>(
   val name: String,
   val description: String,
   val format: String? = null,
+  val nullable: Boolean? = null,
   val enum: List<String>? = null,
   val properties: Map<String, Schema<out Any>>? = null,
   val required: List<String>? = null,
@@ -186,29 +187,64 @@ class Schema<T>(
   companion object {
     /** Registers a schema for an integer number */
     fun int(name: String, description: String) =
-      Schema<Long>(name = name, description = description, type = FunctionType.INTEGER)
+      Schema<Long>(
+        name = name,
+        description = description,
+        type = FunctionType.INTEGER,
+        nullable = false,
+      )
 
     /** Registers a schema for a string */
     fun str(name: String, description: String) =
-      Schema<String>(name = name, description = description, type = FunctionType.STRING)
+      Schema<String>(
+        name = name,
+        description = description,
+        type = FunctionType.STRING,
+        nullable = false,
+      )
 
     /** Registers a schema for a boolean */
     fun bool(name: String, description: String) =
-      Schema<Boolean>(name = name, description = description, type = FunctionType.BOOLEAN)
+      Schema<Boolean>(
+        name = name,
+        description = description,
+        type = FunctionType.BOOLEAN,
+        nullable = false,
+      )
 
     /** Registers a schema for a floating point number */
     fun num(name: String, description: String) =
-      Schema<Double>(name = name, description = description, type = FunctionType.NUMBER)
+      Schema<Double>(
+        name = name,
+        description = description,
+        type = FunctionType.NUMBER,
+        nullable = false,
+      )
 
     /**
      * Registers a schema for a complex object. In a function it will be returned as a [JSONObject]
      */
-    fun obj(name: String, description: String) =
-      Schema<JSONObject>(name = name, description = description, type = FunctionType.OBJECT)
+    fun obj(name: String, description: String, vararg contents: Schema<out Any>) =
+      Schema<JSONObject>(
+        name = name,
+        description = description,
+        type = FunctionType.OBJECT,
+        required = contents.map { it.name },
+        properties = contents.associateBy { it.name }.toMap(),
+      )
 
-    /** Registers a schema for an array */
-    fun arr(name: String, description: String) =
-      Schema<List<String>>(name = name, description = description, type = FunctionType.ARRAY)
+    /**
+     * Registers a schema for an array.
+     * @param items can be used to specify the type of the array
+     */
+    fun arr(name: String, description: String, items: Schema<out Any>? = null) =
+      Schema<List<String>>(
+        name = name,
+        description = description,
+        type = FunctionType.ARRAY,
+        items = items,
+        nullable = false,
+      )
 
     /** Registers a schema for an enum */
     fun enum(name: String, description: String, values: List<String>) =
@@ -218,6 +254,7 @@ class Schema<T>(
         format = "enum",
         enum = values,
         type = FunctionType.STRING,
+        nullable = false,
       )
   }
 }

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Part.kt

@@ -49,7 +49,7 @@ class BlobPart(val mimeType: String, val blob: ByteArray) : Part
  * @param name the name of the function to call
  * @param args the function parameters and values as a [Map]
  */
-class FunctionCallPart(val name: String, val args: Map<String, String>) : Part
+class FunctionCallPart(val name: String, val args: Map<String, String?>) : Part
 
 /**
  * Represents function call output to be returned to the model when it requests a function call.