Skip to content

Rename bidi exceptions to better match other exceptions #6818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Rename bidi exceptions to better match other exceptions #6818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/LiveGenerativeModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import com.google.firebase.vertexai.common.APIController
import com.google.firebase.vertexai.common.AppCheckHeaderProvider
import com.google.firebase.vertexai.type.BidiGenerateContentClientMessage
import com.google.firebase.vertexai.type.Content
import com.google.firebase.vertexai.type.GeminiConnectionHandshakeFailed
import com.google.firebase.vertexai.type.LiveGenerationConfig
import com.google.firebase.vertexai.type.LiveSession
import com.google.firebase.vertexai.type.RequestOptions
import com.google.firebase.vertexai.type.ServiceConnectionHandshakeFailedException
import com.google.firebase.vertexai.type.Tool
import io.ktor.websocket.Frame
import io.ktor.websocket.close
Expand Down Expand Up @@ -103,7 +103,7 @@ internal constructor(
LiveSession(session = webSession, backgroundDispatcher = backgroundDispatcher)
} else {
webSession.close()
throw GeminiConnectionHandshakeFailed()
throw ServiceConnectionHandshakeFailedException()
}
}

Expand Down
13 changes: 10 additions & 3 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/AudioHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

package com.google.firebase.vertexai.type

import android.Manifest
import android.media.AudioFormat
import android.media.AudioManager
import android.media.AudioRecord
import android.media.AudioTrack
import android.media.MediaRecorder
import android.media.audiofx.AcousticEchoCanceler
import androidx.annotation.RequiresPermission
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow

Expand Down Expand Up @@ -66,7 +68,8 @@ internal class AudioHelper {
}
}

suspend fun startRecording(): Flow<ByteArray> {
@RequiresPermission(Manifest.permission.RECORD_AUDIO)
fun startRecording(): Flow<ByteArray> {

val bufferSize =
AudioRecord.getMinBufferSize(
Expand All @@ -79,7 +82,9 @@ internal class AudioHelper {
bufferSize == AudioRecord.ERROR_BAD_VALUE ||
bufferSize <= 0
) {
throw AudioRecordInitializationFailedException("Audio Record buffer size is invalid")
throw AudioRecordInitializationFailedException(
"Audio Record buffer size is invalid (${bufferSize})"
)
}
audioRecord =
AudioRecord(
Expand All @@ -90,7 +95,9 @@ internal class AudioHelper {
bufferSize
)
if (audioRecord.state != AudioRecord.STATE_INITIALIZED) {
throw AudioRecordInitializationFailedException("Audio Record initialization has failed.")
throw AudioRecordInitializationFailedException(
"Audio Record initialization has failed. State: ${audioRecord.state}"
)
}
if (AcousticEchoCanceler.isAvailable()) {
val echoCanceler = AcousticEchoCanceler.create(audioRecord.audioSessionId)
Expand Down
2 changes: 1 addition & 1 deletion firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/Exceptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public class AudioRecordInitializationFailedException(message: String) :
FirebaseVertexAIException(message)

/** Handshake failed with the server */
public class GeminiConnectionHandshakeFailed :
public class ServiceConnectionHandshakeFailedException :
FirebaseVertexAIException("Handshake failed with the server.")

/** Catch all case for exceptions not explicitly expected. */
Expand Down
Loading