Merge branch 'main' into dl/url-context

Author: dlarocque

firebase-ai/CHANGELOG.md

@@ -4,6 +4,7 @@
 - [changed] Added support for the URL context tool, which allows the model to access content from
   provided public web URLs to inform and enhance its responses. (#7382)
 - [changed] Added better error messages to `ServiceConnectionHandshakeFailedException` (#7412)
+- [changed] Marked the public constructor for `UsageMetadata` as deprecated (#7420)
 
 # 17.3.0
 

firebase-ai/api.txt

@@ -1257,7 +1257,7 @@ package com.google.firebase.ai.type {
   }
 
   public final class UsageMetadata {
-    ctor public UsageMetadata(int promptTokenCount, Integer? candidatesTokenCount, int totalTokenCount, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> candidatesTokensDetails, int thoughtsTokenCount, int toolUsePromptTokenCount, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> toolUsePromptTokensDetails);
+    ctor @Deprecated public UsageMetadata(int promptTokenCount, Integer? candidatesTokenCount, int totalTokenCount, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> candidatesTokensDetails, int thoughtsTokenCount, int toolUsePromptTokenCount, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> toolUsePromptTokensDetails);
     method public Integer? getCandidatesTokenCount();
     method public java.util.List<com.google.firebase.ai.type.ModalityTokenCount> getCandidatesTokensDetails();
     method public int getPromptTokenCount();

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/UsageMetadata.kt

@@ -33,7 +33,8 @@ import kotlinx.serialization.Serializable
  * @param thoughtsTokenCount The number of tokens used by the model's internal "thinking" process.
  * @param toolUsePromptTokenCount The number of tokens used by tools.
  */
-public class UsageMetadata(
+public class UsageMetadata
+internal constructor(
   public val promptTokenCount: Int,
   public val candidatesTokenCount: Int?,
   public val totalTokenCount: Int,
@@ -42,8 +43,31 @@ public class UsageMetadata(
   public val thoughtsTokenCount: Int,
   public val toolUsePromptTokenCount: Int,
   public val toolUsePromptTokensDetails: List<ModalityTokenCount>,
+  placeholder: Unit
 ) {
 
+  @Deprecated("Not intended for public use")
+  public constructor(
+    promptTokenCount: Int,
+    candidatesTokenCount: Int?,
+    totalTokenCount: Int,
+    promptTokensDetails: List<ModalityTokenCount>,
+    candidatesTokensDetails: List<ModalityTokenCount>,
+    thoughtsTokenCount: Int,
+    toolUsePromptTokenCount: Int,
+    toolUsePromptTokensDetails: List<ModalityTokenCount>
+  ) : this(
+    promptTokenCount,
+    candidatesTokenCount,
+    totalTokenCount,
+    promptTokensDetails,
+    candidatesTokensDetails,
+    thoughtsTokenCount,
+    toolUsePromptTokenCount,
+    toolUsePromptTokensDetails,
+    Unit
+  )
+
   @Serializable
   internal data class Internal(
     val promptTokenCount: Int? = null,