Skip to content

Rl.bidi.receiveddata #6815

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 5 commits into from
Mar 27, 2025
Merged

Rl.bidi.receiveddata #6815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0ae8c0
Restructured data parsing to reduce logging
rlazo Mar 27, 2025
d8dd0bf
Merge branch 'bidi' into rl.bidi.receiveddata
rlazo Mar 27, 2025
988242a
Don't create unnecessary buffers each time audio is received
rlazo Mar 27, 2025
2542e51
Fix format
rlazo Mar 27, 2025
0cd0bbc
Merge branch 'bidi' into rl.bidi.receiveddata
rlazo Mar 27, 2025
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 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 @@ -100,8 +100,8 @@ internal class AudioHelper {
audioRecord.startRecording()

return flow {
val buffer = ByteArray(bufferSize)
while (!stopRecording) {
val buffer = ByteArray(bufferSize)
val bytesRead = audioRecord.read(buffer, 0, buffer.size)
if (bytesRead > 0) {
emit(buffer.copyOf(bytesRead))
Expand Down
34 changes: 17 additions & 17 deletions firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/type/LiveSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,22 +276,6 @@ internal constructor(
continue
}
try {
val functionContent = Json.decodeFromString<ToolCallSetup.Internal>(receivedJson)
emit(
LiveContentResponse(
null,
LiveContentResponse.Status.NORMAL,
functionContent.toolCall.functionCalls.map {
FunctionCallPart(it.name, it.args.orEmpty().mapValues { x -> x.value ?: JsonNull })
}
)
)
continue
} catch (e: Exception) {
Log.w(TAG, "Failed to decode function calling: ${e.message}")
}
try {

val serverContent = Json.decodeFromString<ServerContentSetup.Internal>(receivedJson)
val data = serverContent.serverContent.modelTurn.toPublic()
if (outputModalities.contains(ContentModality.AUDIO)) {
Expand All @@ -304,8 +288,24 @@ internal constructor(
emit(LiveContentResponse(data, LiveContentResponse.Status.NORMAL, null))
}
}
continue
} catch (e: Exception) {
Log.i(TAG, "Failed to decode server content: ${e.message}")
}
try {
val functionContent = Json.decodeFromString<ToolCallSetup.Internal>(receivedJson)
emit(
LiveContentResponse(
null,
LiveContentResponse.Status.NORMAL,
functionContent.toolCall.functionCalls.map {
FunctionCallPart(it.name, it.args.orEmpty().mapValues { x -> x.value ?: JsonNull })
}
)
)
continue
} catch (e: Exception) {
Log.w(TAG, "Failed to decode server content: ${e.message}")
Log.w(TAG, "Failed to decode function calling: ${e.message}")
}
}
}
Expand Down
Loading