Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ai-catalog/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dependencies {
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)
ksp(libs.hilt.compiler)

implementation(project(":samples:gemini-multimodal"))
Expand Down
4 changes: 2 additions & 2 deletions ai-catalog/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
agp = "8.8.0"
coilCompose = "3.1.0"
firebaseBom = "33.12.0"
firebaseBom = "33.14.0"
mlkitGenAi = "1.0.0-beta1"
kotlin = "2.1.0"
coreKtx = "1.15.0"
Expand Down Expand Up @@ -31,7 +31,7 @@ uiToolingPreviewAndroid = "1.8.1"
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
firebase-vertexai = { group = "com.google.firebase", name = "firebase-vertexai" }
firebase-ai = { module = "com.google.firebase:firebase-ai" }
firebase-common-ktx = { group = "com.google.firebase", name = "firebase-common-ktx", version.ref = "firebaseCommonKtx" }
genai-image-description = { module = "com.google.mlkit:genai-image-description", version.ref = "mlkitGenAi" }
genai-proofreading = { module = "com.google.mlkit:genai-proofreading", version.ref = "mlkitGenAi" }
Expand Down
2 changes: 1 addition & 1 deletion ai-catalog/samples/gemini-chatbot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.material.icons.extended)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
implementation(libs.androidx.runtime.livedata)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ package com.android.ai.samples.geminichatbot
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.firebase.Firebase
import com.google.firebase.vertexai.type.HarmBlockThreshold
import com.google.firebase.vertexai.type.HarmCategory
import com.google.firebase.vertexai.type.SafetySetting
import com.google.firebase.vertexai.type.content
import com.google.firebase.vertexai.type.generationConfig
import com.google.firebase.vertexai.vertexAI
import com.google.firebase.ai.ai
import com.google.firebase.ai.type.HarmBlockThreshold
import com.google.firebase.ai.type.HarmCategory
import com.google.firebase.ai.type.SafetySetting
import com.google.firebase.ai.type.content
import com.google.firebase.ai.type.generationConfig
import com.google.firebase.ai.type.GenerativeBackend
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand All @@ -37,7 +38,7 @@ class GeminiChatbotViewModel @Inject constructor(): ViewModel() {
val messageList: StateFlow<List<ChatMessage>> = _messageList

private val generativeModel by lazy {
Firebase.vertexAI.generativeModel(
Firebase.ai(backend = GenerativeBackend.vertexAI()).generativeModel(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use googleAI() as an API provider.

"gemini-2.0-flash",
generationConfig = generationConfig {
temperature = 0.9f
Expand Down
2 changes: 1 addition & 1 deletion ai-catalog/samples/gemini-multimodal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ dependencies {
implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.material.icons.extended)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
implementation(libs.androidx.runtime.livedata)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.firebase.Firebase
import com.google.firebase.vertexai.type.HarmBlockThreshold
import com.google.firebase.vertexai.type.HarmCategory
import com.google.firebase.vertexai.type.SafetySetting
import com.google.firebase.vertexai.type.content
import com.google.firebase.vertexai.type.generationConfig
import com.google.firebase.vertexai.vertexAI
import com.google.firebase.ai.ai
import com.google.firebase.ai.type.HarmBlockThreshold
import com.google.firebase.ai.type.HarmCategory
import com.google.firebase.ai.type.SafetySetting
import com.google.firebase.ai.type.content
import com.google.firebase.ai.type.generationConfig
import com.google.firebase.ai.type.GenerativeBackend
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand All @@ -41,7 +42,7 @@ class GeminiMultimodalViewModel @Inject constructor(): ViewModel() {
val isGenerating: LiveData<Boolean> = _isGenerating

private val generativeModel by lazy {
Firebase.vertexAI.generativeModel(
Firebase.ai(backend = GenerativeBackend.vertexAI()).generativeModel(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use googleAI() as an API provider.

"gemini-2.0-flash",
generationConfig = generationConfig {
temperature = 0.9f
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
implementation(libs.androidx.ui.tooling.preview.android)
ksp(libs.hilt.compiler)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)

// Media3 ExoPlayer
implementation(libs.androidx.media3.exoplayer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.firebase.Firebase
import com.google.firebase.vertexai.type.content
import com.google.firebase.vertexai.vertexAI
import com.google.firebase.ai.ai
import com.google.firebase.ai.type.content
import com.google.firebase.ai.type.GenerativeBackend
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand All @@ -50,7 +51,7 @@ class VideoSummarizationViewModel @Inject constructor() : ViewModel() {
_outputText.value = OutputTextState.Loading

try {
val generativeModel = Firebase.vertexAI.generativeModel("gemini-2.0-flash")
val generativeModel = Firebase.ai(backend = GenerativeBackend.vertexAI()).generativeModel("gemini-2.0-flash")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use googleAI() as an API provider.


val requestContent = content {
fileData(videoSource.toString(), "video/mp4")
Expand Down
2 changes: 1 addition & 1 deletion ai-catalog/samples/imagen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.material.icons.extended)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
implementation(libs.androidx.runtime.livedata)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.firebase.Firebase
import com.google.firebase.vertexai.type.ImagenAspectRatio
import com.google.firebase.vertexai.type.ImagenGenerationConfig
import com.google.firebase.vertexai.type.ImagenImageFormat
import com.google.firebase.vertexai.type.PublicPreviewAPI
import com.google.firebase.vertexai.vertexAI
import com.google.firebase.ai.ai
import com.google.firebase.ai.type.GenerativeBackend
import com.google.firebase.ai.type.ImagenAspectRatio
import com.google.firebase.ai.type.ImagenGenerationConfig
import com.google.firebase.ai.type.ImagenImageFormat
import com.google.firebase.ai.type.PublicPreviewAPI
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import javax.inject.Inject
Expand All @@ -41,7 +42,7 @@ class ImagenViewModel @Inject constructor(): ViewModel() {
val isGenerating: LiveData<Boolean> = _isGenerating

@OptIn(PublicPreviewAPI::class)
private val imagenModel = Firebase.vertexAI.imagenModel(
private val imagenModel = Firebase.ai(backend = GenerativeBackend.vertexAI()).imagenModel(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

googleAI() as an API provider.

modelName = "imagen-3.0-generate-002",
generationConfig = ImagenGenerationConfig(
numberOfImages = 1,
Expand Down
2 changes: 1 addition & 1 deletion ai-catalog/samples/magic-selfie/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.material.icons.extended)
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.vertexai)
implementation(libs.firebase.ai)
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
implementation(libs.androidx.runtime.livedata)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.google.firebase.Firebase
import com.google.firebase.vertexai.type.ImagenAspectRatio
import com.google.firebase.vertexai.type.ImagenGenerationConfig
import com.google.firebase.vertexai.type.ImagenImageFormat
import com.google.firebase.vertexai.type.PublicPreviewAPI
import com.google.firebase.vertexai.vertexAI
import com.google.firebase.ai.ai
import com.google.firebase.ai.type.GenerativeBackend
import com.google.firebase.ai.type.ImagenAspectRatio
import com.google.firebase.ai.type.ImagenGenerationConfig
import com.google.firebase.ai.type.ImagenImageFormat
import com.google.firebase.ai.type.PublicPreviewAPI
import com.google.mlkit.vision.common.InputImage
import com.google.mlkit.vision.segmentation.subject.SubjectSegmentation
import com.google.mlkit.vision.segmentation.subject.SubjectSegmenterOptions
Expand All @@ -48,7 +49,7 @@ class MagicSelfieViewModel @Inject constructor(): ViewModel() {
private val _progress = MutableLiveData<String?>(null)
val progress: LiveData<String?> = _progress

private val imagenModel = Firebase.vertexAI.imagenModel(
private val imagenModel = Firebase.ai(backend = GenerativeBackend.vertexAI()).imagenModel(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

googleAI() as an API provider.

modelName = "imagen-3.0-generate-002",
generationConfig = ImagenGenerationConfig(
numberOfImages = 1,
Expand Down