Merge branch 'main' into rl.kapt.functions

Author: rlazo

firebase-dataconnect/gradleplugin/plugin/src/main/resources/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableVersions.json

@@ -216,6 +216,42 @@
       "os": "linux",
       "size": 25129112,
       "sha512DigestHex": "6ae87788e55d3c79dc8558fe899c06aed21237b2ab332593d05c02d6db98fc94c3e7861dbb58af1fbb69a0dfa639c005539fe3006d4f001af69b8532a7f175b0"
+    },
+    {
+      "version": "1.5.1",
+      "os": "windows",
+      "size": 25720320,
+      "sha512DigestHex": "c53e7225186fa16b890992705a1aca49e63d6b910f2150c6a64a6ce62d56f01781a2f24a93058595e8eba84cd9bc68aa076b6197c6dacd7e9c04f808efa32172"
+    },
+    {
+      "version": "1.5.1",
+      "os": "macos",
+      "size": 25289472,
+      "sha512DigestHex": "1922e64aecfb70db1bf73a8b45e8eca08f0ff5e0bc49ef8ef386cfe5b3d92b3a8e54f9f296f991bf9dabedb90cfb3dc89e2f0d058818444f8b1f5f44dcae7ec9"
+    },
+    {
+      "version": "1.5.1",
+      "os": "linux",
+      "size": 25202840,
+      "sha512DigestHex": "23fc6ee16d70af1c9cff71ebd5a8b4c171cb2992f27bf8defb267701fb6b7e650ccf6745ad17aac14f6b9208929bac4c4a25d0b0b42437c1f91c474d779e20c4"
+    },
+    {
+      "version": "1.6.0",
+      "os": "windows",
+      "size": 25731072,
+      "sha512DigestHex": "33f59b28649eae190e8b54e181efb5d0db675f4dbd104cbd635302b6db7ebcedb430f99106a5181ec328a02cacc79dbf2e73aec878e74c3eb17b2e554cc24d27"
+    },
+    {
+      "version": "1.6.0",
+      "os": "macos",
+      "size": 25301760,
+      "sha512DigestHex": "ac147e24eee3611b186dd89e7b2829d843544552708d7fbce54cf340fa87fa073ae0c32332659519c16eabd0bf5d3e4fa85311aed5e2a5b7de1ee770f50a329b"
+    },
+    {
+      "version": "1.6.0",
+      "os": "linux",
+      "size": 25219224,
+      "sha512DigestHex": "1ac47fee5ef0a06f2f4acb9d464da21d9df1e17df5768cd73fdb69c839048c30fd57d330881ef6e1c78b5cc37e3fe92378dac22aed0d3d0a8d0a1fa77a045f0d"
     }
   ]
 }

firebase-vertexai/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Unreleased
 * [fixed] Fixed issue where Firebase App Check error tokens were unintentionally missing from the requests. (#6409)
-
+* [fixed] Clarified in the documentation that `Schema.integer` and `Schema.float` only provide hints to the model. (#6420)
 
 # 16.0.1
 * [fixed] Fixed issue where authorization headers weren't correctly formatted and were ignored by the backend. (#6400)

firebase-vertexai/firebase-vertexai.gradle.kts

@@ -86,7 +86,6 @@ dependencies {
   implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
   implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
   implementation("io.ktor:ktor-client-logging:$ktorVersion")
-  compileOnly("io.ktor:ktor-client-mock:$ktorVersion")
 
   api("com.google.firebase:firebase-common:21.0.0")
   implementation("com.google.firebase:firebase-components:18.0.0")

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

@@ -20,7 +20,16 @@ public abstract class StringFormat private constructor(internal val value: Strin
   public class Custom(value: String) : StringFormat(value)
 }
 
-/** Represents a schema */
+/**
+ * Definition of a data type.
+ *
+ * These types can be objects, but also primitives and arrays. Represents a select subset of an
+ * [OpenAPI 3.0 schema object](https://spec.openapis.org/oas/v3.0.3#schema).
+ *
+ * **Note:** While optional, including a `description` field in your `Schema` is strongly
+ * encouraged. The more information the model has about what it's expected to generate, the better
+ * the results.
+ */
 public class Schema
 internal constructor(
   public val type: String,
@@ -34,7 +43,12 @@ internal constructor(
 ) {
 
   public companion object {
-    /** Returns a schema for a boolean */
+    /**
+     * Returns a [Schema] representing a boolean value.
+     *
+     * @param description An optional description of what the boolean should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
+     */
     @JvmStatic
     @JvmOverloads
     public fun boolean(description: String? = null, nullable: Boolean = false): Schema =
@@ -45,10 +59,14 @@ internal constructor(
       )
 
     /**
-     * Returns a schema for a 32-bit integer number
+     * Returns a [Schema] for a 32-bit signed integer number.
      *
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * **Important:** This [Schema] provides a hint to the model that it should generate a 32-bit
+     * integer, but only guarantees that the value will be an integer. Therefore it's *possible*
+     * that decoding it as an `Int` variable (or `int` in Java) could overflow.
+     *
+     * @param description An optional description of what the integer should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmName("numInt")
@@ -62,10 +80,10 @@ internal constructor(
       )
 
     /**
-     * Returns a schema for a 64-bit integer number
+     * Returns a [Schema] for a 64-bit signed integer number.
      *
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * @param description An optional description of what the number should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmName("numLong")
@@ -78,10 +96,10 @@ internal constructor(
       )
 
     /**
-     * Returns a schema for a floating point number
+     * Returns a [Schema] for a double-precision floating-point number.
      *
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * @param description An optional description of what the number should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmName("numDouble")
@@ -90,10 +108,15 @@ internal constructor(
       Schema(description = description, nullable = nullable, type = "NUMBER", format = "double")
 
     /**
-     * Returns a schema for a floating point number
+     * Returns a [Schema] for a single-precision floating-point number.
+     *
+     * **Important:** This [Schema] provides a hint to the model that it should generate a
+     * single-precision floating-point number, but only guarantees that the value will be a number.
+     * Therefore it's *possible* that decoding it as a `Float` variable (or `float` in Java) could
+     * overflow.
      *
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * @param description An optional description of what the number should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmName("numFloat")
@@ -102,11 +125,11 @@ internal constructor(
       Schema(description = description, nullable = nullable, type = "NUMBER", format = "float")
 
     /**
-     * Returns a schema for a string
+     * Returns a [Schema] for a string.
      *
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
-     * @param format: The pattern that values need to adhere to
+     * @param description An optional description of what the string should contain or represent.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
+     * @param format An optional pattern that values need to adhere to.
      */
     @JvmStatic
     @JvmName("str")
@@ -124,11 +147,25 @@ internal constructor(
       )
 
     /**
-     * Returns a schema for a complex object. In a function, it will be returned as a [JSONObject].
+     * Returns a [Schema] for a complex data type.
+     *
+     * This schema instructs the model to produce data of type object, which has keys of type
+     * `String` and values of type [Schema].
      *
-     * @param properties: The map of the object's fields to their schema
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * **Example:** A `city` could be represented with the following object `Schema`.
+     * ```
+     * Schema.obj(mapOf(
+     *   "name"  to Schema.string(),
+     *   "population" to Schema.integer()
+     * ))
+     * ```
+     *
+     * @param properties The map of the object's property names to their [Schema]s.
+     * @param optionalProperties The list of optional properties. They must correspond to the keys
+     * provided in the `properties` map. By default it's empty, signaling the model that all
+     * properties are to be included.
+     * @param description An optional description of what the object represents.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmOverloads
@@ -153,11 +190,11 @@ internal constructor(
     }
 
     /**
-     * Returns a schema for an array.
+     * Returns a [Schema] for an array.
      *
-     * @param items: The schema of the elements of this array
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * @param items The [Schema] of the elements stored in the array.
+     * @param description An optional description of what the array represents.
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmOverloads
@@ -174,11 +211,17 @@ internal constructor(
       )
 
     /**
-     * Returns a schema for an enumeration
+     * Returns a [Schema] for an enumeration.
+     *
+     * For example, the cardinal directions can be represented as:
+     *
+     * ```
+     * Schema.enumeration(listOf("north", "east", "south", "west"), "Cardinal directions")
+     * ```
      *
-     * @param values: The list of valid values for this enumeration
-     * @param description: The description of what the parameter should contain or represent
-     * @param nullable: Whether null is a valid value for this schema
+     * @param values The list of valid values for this enumeration
+     * @param description The description of what the parameter should contain or represent
+     * @param nullable Indicates whether the value can be `null`. Defaults to `false`.
      */
     @JvmStatic
     @JvmOverloads