add publicpreviewapi annotations and clean up code

Author: David Motsonashvili

firebase-ai/api.txt

@@ -36,10 +36,10 @@ package com.google.firebase.ai {
     method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.ai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.ai.type.Tool>? tools = null);
     method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.ai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.ai.type.Tool>? tools = null, com.google.firebase.ai.type.Content? systemInstruction = null);
     method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.LiveGenerativeModel liveModel(String modelName, com.google.firebase.ai.type.LiveGenerationConfig? generationConfig = null, java.util.List<com.google.firebase.ai.type.Tool>? tools = null, com.google.firebase.ai.type.Content? systemInstruction = null, com.google.firebase.ai.type.RequestOptions requestOptions = com.google.firebase.ai.type.RequestOptions());
-    method public com.google.firebase.ai.TemplateGenerativeModel templateGenerativeModel();
-    method public com.google.firebase.ai.TemplateGenerativeModel templateGenerativeModel(com.google.firebase.ai.type.RequestOptions requestOptions = com.google.firebase.ai.type.RequestOptions());
-    method public com.google.firebase.ai.TemplateImagenModel templateImagenModel();
-    method public com.google.firebase.ai.TemplateImagenModel templateImagenModel(com.google.firebase.ai.type.RequestOptions requestOptions = com.google.firebase.ai.type.RequestOptions());
+    method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.TemplateGenerativeModel templateGenerativeModel();
+    method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.TemplateGenerativeModel templateGenerativeModel(com.google.firebase.ai.type.RequestOptions requestOptions = com.google.firebase.ai.type.RequestOptions());
+    method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.TemplateImagenModel templateImagenModel();
+    method @com.google.firebase.ai.type.PublicPreviewAPI public com.google.firebase.ai.TemplateImagenModel templateImagenModel(com.google.firebase.ai.type.RequestOptions requestOptions = com.google.firebase.ai.type.RequestOptions());
     property public static final com.google.firebase.ai.FirebaseAI instance;
     field public static final com.google.firebase.ai.FirebaseAI.Companion Companion;
   }
@@ -87,12 +87,12 @@ package com.google.firebase.ai {
     method public suspend Object? connect(kotlin.coroutines.Continuation<? super com.google.firebase.ai.type.LiveSession>);
   }
 
-  public final class TemplateGenerativeModel {
+  @com.google.firebase.ai.type.PublicPreviewAPI public final class TemplateGenerativeModel {
     method public suspend Object? generateContent(String templateId, java.util.Map<java.lang.String,?> inputs, kotlin.coroutines.Continuation<? super com.google.firebase.ai.type.GenerateContentResponse>);
     method public kotlinx.coroutines.flow.Flow<com.google.firebase.ai.type.GenerateContentResponse> generateContentStream(String templateId, java.util.Map<java.lang.String,?> inputs);
   }
 
-  public final class TemplateImagenModel {
+  @com.google.firebase.ai.type.PublicPreviewAPI public final class TemplateImagenModel {
     method public suspend Object? generateImages(String templateId, java.util.Map<java.lang.String,?> inputs, kotlin.coroutines.Continuation<? super com.google.firebase.ai.type.ImagenGenerationResponse<com.google.firebase.ai.type.ImagenInlineImage>>);
   }
 

firebase-ai/src/main/kotlin/com/google/firebase/ai/FirebaseAI.kt

@@ -113,15 +113,11 @@ internal constructor(
    * @return The initialized [TemplateGenerativeModel] instance.
    */
   @JvmOverloads
+  @PublicPreviewAPI
   public fun templateGenerativeModel(
     requestOptions: RequestOptions = RequestOptions(),
   ): TemplateGenerativeModel {
-    val templateUri =
-      when (backend.backend) {
-        GenerativeBackendEnum.VERTEX_AI ->
-          "projects/${firebaseApp.options.projectId}/locations/${backend.location}/templates/"
-        GenerativeBackendEnum.GOOGLE_AI -> "projects/${firebaseApp.options.projectId}/templates/"
-      }
+    val templateUri = getTemplateUri(backend)
     return TemplateGenerativeModel(
       templateUri,
       firebaseApp.options.apiKey,
@@ -233,21 +229,17 @@ internal constructor(
   }
 
   /**
-   * Instantiates a new [ImagenModel] given the provided parameters.
+   * Instantiates a new [TemplateImagenModel] given the provided parameters.
    *
    * @param requestOptions Configuration options for sending requests to the backend.
    * @return The initialized [TemplateImagenModel] instance.
    */
   @JvmOverloads
+  @PublicPreviewAPI
   public fun templateImagenModel(
     requestOptions: RequestOptions = RequestOptions(),
   ): TemplateImagenModel {
-    val templateUri =
-      when (backend.backend) {
-        GenerativeBackendEnum.VERTEX_AI ->
-          "projects/${firebaseApp.options.projectId}/locations/${backend.location}/templates/"
-        GenerativeBackendEnum.GOOGLE_AI -> "projects/${firebaseApp.options.projectId}/templates/"
-      }
+    val templateUri = getTemplateUri(backend)
     return TemplateImagenModel(
       templateUri,
       firebaseApp.options.apiKey,
@@ -312,6 +304,13 @@ internal constructor(
 
     private val TAG = FirebaseAI::class.java.simpleName
   }
+
+  private fun getTemplateUri(backend: GenerativeBackend): String =
+    when (backend.backend) {
+      GenerativeBackendEnum.VERTEX_AI ->
+        "projects/${firebaseApp.options.projectId}/locations/${backend.location}/templates/"
+      GenerativeBackendEnum.GOOGLE_AI -> "projects/${firebaseApp.options.projectId}/templates/"
+    }
 }
 
 /** The [FirebaseAI] instance for the default [FirebaseApp] using the Google AI Backend. */

firebase-ai/src/main/kotlin/com/google/firebase/ai/TemplateGenerativeModel.kt

@@ -24,6 +24,7 @@ import com.google.firebase.ai.type.FinishReason
 import com.google.firebase.ai.type.FirebaseAIException
 import com.google.firebase.ai.type.GenerateContentResponse
 import com.google.firebase.ai.type.PromptBlockedException
+import com.google.firebase.ai.type.PublicPreviewAPI
 import com.google.firebase.ai.type.RequestOptions
 import com.google.firebase.ai.type.ResponseStoppedException
 import com.google.firebase.ai.type.SerializationException
@@ -37,6 +38,7 @@ import kotlinx.coroutines.flow.map
  * Represents a multimodal model (like Gemini), capable of generating content based on various
  * templated input types.
  */
+@PublicPreviewAPI
 public class TemplateGenerativeModel
 internal constructor(
   private val templateUri: String,

firebase-ai/src/main/kotlin/com/google/firebase/ai/TemplateImagenModel.kt

@@ -23,6 +23,7 @@ import com.google.firebase.ai.common.TemplateGenerateImageRequest
 import com.google.firebase.ai.type.FirebaseAIException
 import com.google.firebase.ai.type.ImagenGenerationResponse
 import com.google.firebase.ai.type.ImagenInlineImage
+import com.google.firebase.ai.type.PublicPreviewAPI
 import com.google.firebase.ai.type.RequestOptions
 import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider
 import com.google.firebase.auth.internal.InternalAuthProvider
@@ -33,6 +34,7 @@ import com.google.firebase.auth.internal.InternalAuthProvider
  * See the documentation for a list of
  * [supported models](https://firebase.google.com/docs/ai-logic/models).
  */
+@PublicPreviewAPI
 public class TemplateImagenModel
 internal constructor(
   private val templateUri: String,