Merge 18da7b4 into a41af7d

Author: tanzimfh

.github/workflows/ci_tests.yml

@@ -59,9 +59,10 @@ jobs:
       - name: Pull genai-common
         if: matrix.module == ':firebase-vertexai'
         run: |
-          git clone https://github.com/google-gemini/generative-ai-android.git
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
           cd generative-ai-android
-          ./gradlew :common:updateVersion common:publishToMavenLocal
+          ./gradlew :common:updateVersion
+          ./gradlew :common:publishToMavenLocal
           cd ..
 
       - name: Clone mock responses
@@ -133,6 +134,15 @@ jobs:
           distribution: temurin
           cache: gradle
 
+      - name: Pull genai-common
+        if: matrix.module == ':firebase-vertexai'
+        run: |
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
+          cd generative-ai-android
+          ./gradlew :common:updateversion
+          ./gradlew :common:publishToMavenLocal
+          cd ..
+
       - name: Add google-services.json
         env:
           INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}

.github/workflows/diff-javadoc.yml

@@ -25,6 +25,14 @@ jobs:
           distribution: temurin
           cache: gradle
 
+      - name: Pull genai-common
+        run: |
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
+          cd generative-ai-android
+          ./gradlew :common:updateversion
+          ./gradlew :common:publishToMavenLocal
+          cd ..
+
       - name: Generate docs for PR branch
         run: ./gradlew kotlindoc
 

.github/workflows/health-metrics.yml

@@ -69,6 +69,13 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
+      - name: Pull genai-common
+        run: |
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
+          cd generative-ai-android
+          ./gradlew :common:updateversion
+          ./gradlew :common:publishToMavenLocal
+          cd ..
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
@@ -105,6 +112,13 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
+      - name: Pull genai-common
+        run: |
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
+          cd generative-ai-android
+          ./gradlew :common:updateversion
+          ./gradlew :common:publishToMavenLocal
+          cd ..
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:

.github/workflows/smoke-tests.yml

@@ -22,6 +22,14 @@ jobs:
           credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
       - uses: google-github-actions/setup-gcloud@v2
 
+      - name: Pull genai-common
+        run: |
+          git clone --branch tanzim/nullable https://github.com/google-gemini/generative-ai-android.git
+          cd generative-ai-android
+          ./gradlew :common:updateversion
+          ./gradlew :common:publishToMavenLocal
+          cd ..
+
       # TODO(yifany): make it a fireci plugin and remove the separately distributed jar file
       - name: Download smoke tests runner
         run: |

firebase-vertexai/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Made `FunctionCallPart.args` nullable
 
 # 16.0.0-beta03
 * [changed] Breaking Change: changed `Schema.int` to return 32 bit integers instead of 64 bit (long).

firebase-vertexai/firebase-vertexai.gradle.kts

@@ -61,7 +61,7 @@ dependencies {
   implementation("com.google.firebase:firebase-components:18.0.0")
   implementation("com.google.firebase:firebase-annotations:16.2.0")
   implementation("com.google.firebase:firebase-appcheck-interop:17.1.0")
-  implementation("com.google.ai.client.generativeai:common:0.9.0")
+  implementation("com.google.ai.client.generativeai:common:0.10.0")
   implementation(libs.androidx.annotation)
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
   implementation("androidx.core:core-ktx:1.12.0")

firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/conversions.kt

@@ -86,7 +86,7 @@ internal fun Part.toInternal(): com.google.ai.client.generativeai.common.shared.
         )
       )
     is com.google.firebase.vertexai.type.FunctionCallPart ->
-      FunctionCallPart(FunctionCall(name, args.orEmpty()))
+      FunctionCallPart(FunctionCall(name, args))
     is com.google.firebase.vertexai.type.FunctionResponsePart ->
       FunctionResponsePart(FunctionResponse(name, response.toInternal()))
     is FileDataPart ->
@@ -219,7 +219,7 @@ internal fun com.google.ai.client.generativeai.common.shared.Part.toPublic(): Pa
     is FunctionCallPart ->
       com.google.firebase.vertexai.type.FunctionCallPart(
         functionCall.name,
-        functionCall.args.orEmpty(),
+        functionCall.args,
       )
     is FunctionResponsePart ->
       com.google.firebase.vertexai.type.FunctionResponsePart(

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

@@ -368,7 +368,7 @@ fun <T, U, W, Z> defineFunction(
 ) = FourParameterFunction(name, description, arg1, arg2, arg3, arg4, function)
 
 private fun <T> FunctionCallPart.getArgOrThrow(param: Schema<T>): T {
-  return param.fromString(args[param.name])
+  return param.fromString(args?.get(param.name))
     ?: throw RuntimeException(
       "Missing argument for parameter \"${param.name}\" for function \"$name\""
     )

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.

firebase-vertexai/src/test/java/com/google/firebase/vertexai/UnarySnapshotTests.kt

@@ -272,7 +272,7 @@ internal class UnarySnapshotTests {
         val response = model.generateContent("prompt")
         val callPart = (response.candidates.first().content.parts.first() as FunctionCallPart)
 
-        callPart.args["season"] shouldBe null
+        callPart.args!!["seasons"] shouldBe null
       }
     }
 
@@ -289,7 +289,19 @@ internal class UnarySnapshotTests {
             it.parts.first().shouldBeInstanceOf<FunctionCallPart>()
           }
 
-        callPart.args["current"] shouldBe "true"
+        callPart.args!!["current"] shouldBe "true"
+      }
+    }
+
+  @Test
+  fun `function call has no arguments field`() =
+    goldenUnaryFile("success-function-call-empty-arguments.json") {
+      withTimeout(testTimeout) {
+        val response = model.generateContent("prompt")
+        val callPart = response.functionCalls.first()
+
+        callPart.name shouldBe "current_time"
+        callPart.args shouldBe null
       }
     }
 }