From 9bd0df0e3d1351ade98c6d21578d70f11dc20060 Mon Sep 17 00:00:00 2001 From: marcus-daily <111281783+marcus-daily@users.noreply.github.com> Date: Tue, 10 Dec 2024 17:25:11 +0000 Subject: [PATCH 1/4] Rename to pipecat-client-android-transports --- .github/workflows/ci.yaml | 8 ++-- README.md | 14 +++--- gradle/libs.versions.toml | 6 +-- .../.gitignore | 0 .../build.gradle.kts | 32 ++++++------- .../proguard-rules.pro | 0 .../src/androidTest/AndroidManifest.xml | 2 +- .../java/ai/pipecat}/client/daily/.gitignore | 0 .../ai/pipecat}/client/daily/MainTests.kt | 47 ++++++++++--------- .../src/main/AndroidManifest.xml | 0 .../pipecat}/client/daily/DailyTransport.kt | 40 ++++++++-------- .../client/daily/DailyTransportAuthBundle.kt | 2 +- .../java/ai/pipecat}/client/daily/Utils.kt | 18 +++---- .../client/daily/VoiceClientVideoView.kt | 4 +- .../ai/rtvi/client/daily/DailyVoiceClient.kt | 24 ---------- settings.gradle.kts | 4 +- 16 files changed, 89 insertions(+), 112 deletions(-) rename {rtvi-client-android-daily => pipecat-client-android-daily}/.gitignore (100%) rename {rtvi-client-android-daily => pipecat-client-android-daily}/build.gradle.kts (67%) rename {rtvi-client-android-daily => pipecat-client-android-daily}/proguard-rules.pro (100%) rename {rtvi-client-android-daily => pipecat-client-android-daily}/src/androidTest/AndroidManifest.xml (91%) rename {rtvi-client-android-daily/src/androidTest/java/ai/rtvi => pipecat-client-android-daily/src/androidTest/java/ai/pipecat}/client/daily/.gitignore (100%) rename {rtvi-client-android-daily/src/androidTest/java/ai/rtvi => pipecat-client-android-daily/src/androidTest/java/ai/pipecat}/client/daily/MainTests.kt (87%) rename {rtvi-client-android-daily => pipecat-client-android-daily}/src/main/AndroidManifest.xml (100%) rename {rtvi-client-android-daily/src/main/java/ai/rtvi => pipecat-client-android-daily/src/main/java/ai/pipecat}/client/daily/DailyTransport.kt (94%) rename {rtvi-client-android-daily/src/main/java/ai/rtvi => pipecat-client-android-daily/src/main/java/ai/pipecat}/client/daily/DailyTransportAuthBundle.kt (87%) rename {rtvi-client-android-daily/src/main/java/ai/rtvi => pipecat-client-android-daily/src/main/java/ai/pipecat}/client/daily/Utils.kt (80%) rename {rtvi-client-android-daily/src/main/java/ai/rtvi => pipecat-client-android-daily/src/main/java/ai/pipecat}/client/daily/VoiceClientVideoView.kt (90%) delete mode 100644 rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyVoiceClient.kt diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 362c65b..011157c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,13 +37,13 @@ jobs: java-version: '17' - name: Build Daily transport - run: ./gradlew :rtvi-client-android-daily:assembleRelease + run: ./gradlew :pipecat-client-android-daily:assembleRelease - name: Generate Maven repo - run: ./gradlew :rtvi-client-android-daily:publishAllPublicationsToRTVILocalRepoRepository + run: ./gradlew :pipecat-client-android-daily:publishAllPublicationsToPipecatLocalRepoRepository - name: Upload Maven repo uses: actions/upload-artifact@v4 with: - name: RTVIClientAndroidDaily-Repo - path: build/RTVILocalRepo + name: PipecatClientAndroidDaily-Repo + path: build/PipecatLocalRepo diff --git a/README.md b/README.md index 79deb3f..b3a5740 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,19 @@ -# Real-Time Voice Inference Android Client SDK: Daily Transport +# Pipecat Android Client SDK: Transports [RTVI](https://github.com/rtvi-ai/) is an open standard for Real-Time Voice (and Video) Inference. -This Android library exposes the `DailyVoiceClient` class, to connect to a Daily Bots backend. - -## Usage +## Daily Websocket Transport Add the following dependency to your `build.gradle` file: ``` -implementation "ai.rtvi:rtvi-client-android-daily:0.2.1" +implementation "ai.pipecat:daily-transport:0.3.0" ``` Instantiate from your code: ```kotlin -val callbacks = object : VoiceEventCallbacks() { +val callbacks = object : RTVIEventCallbacks() { override fun onBackendError(message: String) { Log.e(TAG, "Error from backend: $message") @@ -24,7 +22,9 @@ val callbacks = object : VoiceEventCallbacks() { // ... } -val client = DailyVoiceClient(context, baseUrl, callbacks) +val transport = DailyTransport.Factory(context) + +val client = PipecatClient(transport, callbacks, options) client.start().withCallback { // ... diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f3533b0..8540872 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.5.2" -daily-android-client = "0.24.0" +daily-android-client = "0.27.0" kotlin = "2.0.20" coreKtx = "1.13.1" kotlinxCoroutinesTest = "1.8.1" @@ -8,7 +8,7 @@ kotlinxSerializationJson = "1.7.1" kotlinxSerializationPlugin = "2.0.20" dokka = "1.9.20" androidxTest = "1.6.1" -rtviClient = "0.2.1" +pipecatClient = "0.3.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -17,7 +17,7 @@ androidx-runner = { module = "androidx.test:runner", version.ref = "androidxTest daily-android-client = { module = "co.daily:client", version.ref = "daily-android-client" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } -rtvi-client = { module = "ai.rtvi:client", version.ref = "rtviClient" } +pipecat-client = { module = "ai.pipecat:client", version.ref = "pipecatClient" } [plugins] android-library = { id = "com.android.library", version.ref = "agp" } diff --git a/rtvi-client-android-daily/.gitignore b/pipecat-client-android-daily/.gitignore similarity index 100% rename from rtvi-client-android-daily/.gitignore rename to pipecat-client-android-daily/.gitignore diff --git a/rtvi-client-android-daily/build.gradle.kts b/pipecat-client-android-daily/build.gradle.kts similarity index 67% rename from rtvi-client-android-daily/build.gradle.kts rename to pipecat-client-android-daily/build.gradle.kts index 3455541..78e59d2 100644 --- a/rtvi-client-android-daily/build.gradle.kts +++ b/pipecat-client-android-daily/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - namespace = "ai.rtvi.client.daily" + namespace = "ai.pipecat.client.daily" compileSdk = 34 defaultConfig { @@ -45,7 +45,7 @@ dependencies { implementation(libs.kotlinx.serialization.json) api(libs.daily.android.client) - api(libs.rtvi.client) + api(libs.pipecat.client) androidTestImplementation(libs.androidx.runner) androidTestImplementation(libs.androidx.rules) @@ -55,40 +55,40 @@ dependencies { publishing { repositories { maven { - url = rootProject.layout.buildDirectory.dir("RTVILocalRepo").get().asFile.toURI() - name = "RTVILocalRepo" + url = rootProject.layout.buildDirectory.dir("PipecatLocalRepo").get().asFile.toURI() + name = "PipecatLocalRepo" } } publications { register("release") { - groupId = "ai.rtvi" - artifactId = "client-daily" - version = "0.2.1" + groupId = "ai.pipecat" + artifactId = "daily-transport" + version = "0.3.0" pom { - name.set("RTVI Client Daily Transport") - description.set("Daily RTVI client library for Android") - url.set("https://github.com/rtvi-ai/rtvi-client-android-daily") + name.set("Pipecat Client Daily Transport") + description.set("Daily Pipecat transport for Android") + url.set("https://github.com/pipecat-ai/pipecat-client-android-transports") developers { developer { - id.set("rtvi.ai") - name.set("rtvi.ai") + id.set("pipecat.ai") + name.set("pipecat.ai") } } licenses { license { name.set("BSD 2-Clause License") - url.set("https://github.com/rtvi-ai/rtvi-client-android-daily/blob/main/LICENSE") + url.set("https://github.com/pipecat-ai/pipecat-client-android-transports/blob/main/LICENSE") } } scm { - connection.set("scm:git:git://github.com/rtvi-ai/rtvi-client-android-daily.git") - developerConnection.set("scm:git:ssh://github.com:rtvi-ai/rtvi-client-android-daily.git") - url.set("https://github.com/rtvi-ai/rtvi-client-android-daily") + connection.set("scm:git:git://github.com/pipecat-ai/pipecat-client-android-transports.git") + developerConnection.set("scm:git:ssh://github.com:pipecat-ai/pipecat-client-android-transports.git") + url.set("https://github.com/pipecat-ai/pipecat-client-android-transports") } } diff --git a/rtvi-client-android-daily/proguard-rules.pro b/pipecat-client-android-daily/proguard-rules.pro similarity index 100% rename from rtvi-client-android-daily/proguard-rules.pro rename to pipecat-client-android-daily/proguard-rules.pro diff --git a/rtvi-client-android-daily/src/androidTest/AndroidManifest.xml b/pipecat-client-android-daily/src/androidTest/AndroidManifest.xml similarity index 91% rename from rtvi-client-android-daily/src/androidTest/AndroidManifest.xml rename to pipecat-client-android-daily/src/androidTest/AndroidManifest.xml index 3547ea0..1dfddb5 100644 --- a/rtvi-client-android-daily/src/androidTest/AndroidManifest.xml +++ b/pipecat-client-android-daily/src/androidTest/AndroidManifest.xml @@ -10,7 +10,7 @@ diff --git a/rtvi-client-android-daily/src/androidTest/java/ai/rtvi/client/daily/.gitignore b/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/.gitignore similarity index 100% rename from rtvi-client-android-daily/src/androidTest/java/ai/rtvi/client/daily/.gitignore rename to pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/.gitignore diff --git a/rtvi-client-android-daily/src/androidTest/java/ai/rtvi/client/daily/MainTests.kt b/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt similarity index 87% rename from rtvi-client-android-daily/src/androidTest/java/ai/rtvi/client/daily/MainTests.kt rename to pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt index 7f16eb4..9b89674 100644 --- a/rtvi-client-android-daily/src/androidTest/java/ai/rtvi/client/daily/MainTests.kt +++ b/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt @@ -1,23 +1,24 @@ -package ai.rtvi.client.daily - -import ai.rtvi.client.RTVIClientOptions -import ai.rtvi.client.RTVIClientParams -import ai.rtvi.client.RTVIEventCallbacks -import ai.rtvi.client.helper.LLMContext -import ai.rtvi.client.helper.LLMContextMessage -import ai.rtvi.client.helper.LLMHelper -import ai.rtvi.client.result.RTVIError -import ai.rtvi.client.result.Result -import ai.rtvi.client.types.ActionDescription -import ai.rtvi.client.types.Config -import ai.rtvi.client.types.Option -import ai.rtvi.client.types.OptionDescription -import ai.rtvi.client.types.ServiceConfig -import ai.rtvi.client.types.ServiceConfigDescription -import ai.rtvi.client.types.ServiceRegistration -import ai.rtvi.client.types.TransportState -import ai.rtvi.client.types.Type -import ai.rtvi.client.types.Value +package ai.pipecat.client.daily + +import ai.pipecat.client.PipecatClient +import ai.pipecat.client.RTVIClientOptions +import ai.pipecat.client.RTVIClientParams +import ai.pipecat.client.RTVIEventCallbacks +import ai.pipecat.client.helper.LLMContext +import ai.pipecat.client.helper.LLMContextMessage +import ai.pipecat.client.helper.LLMHelper +import ai.pipecat.client.result.RTVIError +import ai.pipecat.client.result.Result +import ai.pipecat.client.types.ActionDescription +import ai.pipecat.client.types.Config +import ai.pipecat.client.types.Option +import ai.pipecat.client.types.OptionDescription +import ai.pipecat.client.types.ServiceConfig +import ai.pipecat.client.types.ServiceConfigDescription +import ai.pipecat.client.types.ServiceRegistration +import ai.pipecat.client.types.TransportState +import ai.pipecat.client.types.Type +import ai.pipecat.client.types.Value import androidx.test.filters.LargeTest import androidx.test.platform.app.InstrumentationRegistry import kotlinx.coroutines.Dispatchers @@ -60,7 +61,7 @@ class MainTests { ) private class TestContext( - val client: DailyVoiceClient, + val client: PipecatClient, val llmHelper: LLMHelper ) @@ -69,8 +70,8 @@ class MainTests { ) = runBlocking(Dispatchers.Main) { val context = InstrumentationRegistry.getInstrumentation().context - val client = DailyVoiceClient( - context = context, + val client = PipecatClient( + transport = DailyTransport.Factory(context), callbacks = object : RTVIEventCallbacks() { override fun onBackendError(message: String) { throw Exception("onBackendError: $message") diff --git a/rtvi-client-android-daily/src/main/AndroidManifest.xml b/pipecat-client-android-daily/src/main/AndroidManifest.xml similarity index 100% rename from rtvi-client-android-daily/src/main/AndroidManifest.xml rename to pipecat-client-android-daily/src/main/AndroidManifest.xml diff --git a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransport.kt b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt similarity index 94% rename from rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransport.kt rename to pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt index 400cb93..f407c75 100644 --- a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransport.kt +++ b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt @@ -1,23 +1,23 @@ -package ai.rtvi.client.daily - -import ai.rtvi.client.result.Future -import ai.rtvi.client.result.RTVIError -import ai.rtvi.client.result.resolvedPromiseErr -import ai.rtvi.client.result.resolvedPromiseOk -import ai.rtvi.client.result.withPromise -import ai.rtvi.client.transport.AuthBundle -import ai.rtvi.client.transport.MsgClientToServer -import ai.rtvi.client.transport.MsgServerToClient -import ai.rtvi.client.transport.Transport -import ai.rtvi.client.transport.TransportContext -import ai.rtvi.client.transport.TransportFactory -import ai.rtvi.client.types.MediaDeviceId -import ai.rtvi.client.types.MediaDeviceInfo -import ai.rtvi.client.types.Participant -import ai.rtvi.client.types.ParticipantId -import ai.rtvi.client.types.ParticipantTracks -import ai.rtvi.client.types.Tracks -import ai.rtvi.client.types.TransportState +package ai.pipecat.client.daily + +import ai.pipecat.client.result.Future +import ai.pipecat.client.result.RTVIError +import ai.pipecat.client.result.resolvedPromiseErr +import ai.pipecat.client.result.resolvedPromiseOk +import ai.pipecat.client.result.withPromise +import ai.pipecat.client.transport.AuthBundle +import ai.pipecat.client.transport.MsgClientToServer +import ai.pipecat.client.transport.MsgServerToClient +import ai.pipecat.client.transport.Transport +import ai.pipecat.client.transport.TransportContext +import ai.pipecat.client.transport.TransportFactory +import ai.pipecat.client.types.MediaDeviceId +import ai.pipecat.client.types.MediaDeviceInfo +import ai.pipecat.client.types.Participant +import ai.pipecat.client.types.ParticipantId +import ai.pipecat.client.types.ParticipantTracks +import ai.pipecat.client.types.Tracks +import ai.pipecat.client.types.TransportState import android.content.Context import android.util.Log import co.daily.CallClient diff --git a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransportAuthBundle.kt b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransportAuthBundle.kt similarity index 87% rename from rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransportAuthBundle.kt rename to pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransportAuthBundle.kt index f965983..f9646ae 100644 --- a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyTransportAuthBundle.kt +++ b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransportAuthBundle.kt @@ -1,4 +1,4 @@ -package ai.rtvi.client.daily +package ai.pipecat.client.daily import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/Utils.kt b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/Utils.kt similarity index 80% rename from rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/Utils.kt rename to pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/Utils.kt index 5860cbf..8d12635 100644 --- a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/Utils.kt +++ b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/Utils.kt @@ -1,12 +1,12 @@ -package ai.rtvi.client.daily - -import ai.rtvi.client.result.Promise -import ai.rtvi.client.result.RTVIError -import ai.rtvi.client.types.MediaDeviceId -import ai.rtvi.client.types.MediaDeviceInfo -import ai.rtvi.client.types.MediaTrackId -import ai.rtvi.client.types.Participant -import ai.rtvi.client.types.ParticipantId +package ai.pipecat.client.daily + +import ai.pipecat.client.result.Promise +import ai.pipecat.client.result.RTVIError +import ai.pipecat.client.types.MediaDeviceId +import ai.pipecat.client.types.MediaDeviceInfo +import ai.pipecat.client.types.MediaTrackId +import ai.pipecat.client.types.Participant +import ai.pipecat.client.types.ParticipantId import co.daily.model.RequestError import co.daily.model.RequestResult import kotlinx.serialization.json.Json diff --git a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/VoiceClientVideoView.kt b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/VoiceClientVideoView.kt similarity index 90% rename from rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/VoiceClientVideoView.kt rename to pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/VoiceClientVideoView.kt index ad337ed..76392bc 100644 --- a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/VoiceClientVideoView.kt +++ b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/VoiceClientVideoView.kt @@ -1,6 +1,6 @@ -package ai.rtvi.client.daily +package ai.pipecat.client.daily -import ai.rtvi.client.types.MediaTrackId +import ai.pipecat.client.types.MediaTrackId import android.content.Context import android.util.AttributeSet import co.daily.model.MediaStreamTrack diff --git a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyVoiceClient.kt b/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyVoiceClient.kt deleted file mode 100644 index b0e66da..0000000 --- a/rtvi-client-android-daily/src/main/java/ai/rtvi/client/daily/DailyVoiceClient.kt +++ /dev/null @@ -1,24 +0,0 @@ -package ai.rtvi.client.daily - -import ai.rtvi.client.RTVIClient -import ai.rtvi.client.RTVIClientOptions -import ai.rtvi.client.RTVIEventCallbacks -import android.content.Context - -/** - * An RTVI client. Connects to a Daily Bots backend and handles bidirectional audio and video - * streaming. - * - * @param context The Android context object - * @param callbacks Callbacks invoked when changes occur in the voice session. - * @param options Additional options for configuring the client and backend. - */ -class DailyVoiceClient( - context: Context, - callbacks: RTVIEventCallbacks, - options: RTVIClientOptions -) : RTVIClient( - transport = DailyTransport.Factory(context), - callbacks = callbacks, - options = options -) \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index aa9be8f..23d8bed 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,5 +19,5 @@ dependencyResolutionManagement { } } -rootProject.name = "RTVI Daily Client Transport" -include(":rtvi-client-android-daily") +rootProject.name = "Pipecat Daily Client Transports" +include(":pipecat-client-android-daily") From e8cf7d811d444e5a3aeceff2fc89e62e5332c321 Mon Sep 17 00:00:00 2001 From: marcus-daily <111281783+marcus-daily@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:03:47 +0000 Subject: [PATCH 2/4] Renaming PipecatClient back to RTVIClient --- README.md | 2 +- .../androidTest/java/ai/pipecat/client/daily/MainTests.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b3a5740..8455cc6 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ val callbacks = object : RTVIEventCallbacks() { val transport = DailyTransport.Factory(context) -val client = PipecatClient(transport, callbacks, options) +val client = RTVIClient(transport, callbacks, options) client.start().withCallback { // ... diff --git a/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt b/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt index 9b89674..a4a3778 100644 --- a/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt +++ b/pipecat-client-android-daily/src/androidTest/java/ai/pipecat/client/daily/MainTests.kt @@ -1,6 +1,6 @@ package ai.pipecat.client.daily -import ai.pipecat.client.PipecatClient +import ai.pipecat.client.RTVIClient import ai.pipecat.client.RTVIClientOptions import ai.pipecat.client.RTVIClientParams import ai.pipecat.client.RTVIEventCallbacks @@ -61,7 +61,7 @@ class MainTests { ) private class TestContext( - val client: PipecatClient, + val client: RTVIClient, val llmHelper: LLMHelper ) @@ -70,7 +70,7 @@ class MainTests { ) = runBlocking(Dispatchers.Main) { val context = InstrumentationRegistry.getInstrumentation().context - val client = PipecatClient( + val client = RTVIClient( transport = DailyTransport.Factory(context), callbacks = object : RTVIEventCallbacks() { override fun onBackendError(message: String) { From a7e38f5822ab83afea89d0db33bc69a5890dbe5e Mon Sep 17 00:00:00 2001 From: marcus-daily <111281783+marcus-daily@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:33:23 +0000 Subject: [PATCH 3/4] Fixing root project name --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 23d8bed..ac2be89 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,5 +19,5 @@ dependencyResolutionManagement { } } -rootProject.name = "Pipecat Daily Client Transports" +rootProject.name = "Pipecat Client Transports" include(":pipecat-client-android-daily") From ec8d1e31d145077138aa2bf19422062a3a042ba3 Mon Sep 17 00:00:00 2001 From: marcus-daily <111281783+marcus-daily@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:59:36 +0000 Subject: [PATCH 4/4] Make AuthBundle nullable --- .../main/java/ai/pipecat/client/daily/DailyTransport.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt index f407c75..a7cd13f 100644 --- a/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt +++ b/pipecat-client-android-daily/src/main/java/ai/pipecat/client/daily/DailyTransport.kt @@ -237,9 +237,16 @@ class DailyTransport( } } - override fun connect(authBundle: AuthBundle): Future = + override fun connect(authBundle: AuthBundle?): Future = thread.runOnThreadReturningFuture { + if (authBundle == null) { + return@runOnThreadReturningFuture resolvedPromiseErr( + thread, + RTVIError.OtherError("Auth request cannot be skipped -- please ensure baseUrl and a connect endpoint are set") + ) + } + Log.i(TAG, "connect(${authBundle.data})") val dailyBundle = try {