diff --git a/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeGatewayConfig.kt b/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeGatewayConfig.kt index 58208acc0bb..d0545b2baf0 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeGatewayConfig.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/voice/TalkModeGatewayConfig.kt @@ -4,116 +4,23 @@ import ai.openclaw.app.normalizeMainKey import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive -import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.booleanOrNull import kotlinx.serialization.json.contentOrNull -internal data class TalkProviderConfigSelection( - val provider: String, - val config: JsonObject, - val normalizedPayload: Boolean, -) - internal data class TalkModeGatewayConfigState( - val activeProvider: String, - val normalizedPayload: Boolean, - val missingResolvedPayload: Boolean, val mainSessionKey: String, - val defaultVoiceId: String?, - val voiceAliases: Map, - val defaultModelId: String, - val defaultOutputFormat: String, - val apiKey: String?, val interruptOnSpeech: Boolean?, val silenceTimeoutMs: Long, ) internal object TalkModeGatewayConfigParser { - private const val defaultTalkProvider = "elevenlabs" - - fun parse( - config: JsonObject?, - defaultProvider: String, - defaultModelIdFallback: String, - defaultOutputFormatFallback: String, - envVoice: String?, - sagVoice: String?, - envKey: String?, - ): TalkModeGatewayConfigState { + fun parse(config: JsonObject?): TalkModeGatewayConfigState { val talk = config?.get("talk").asObjectOrNull() - val selection = selectTalkProviderConfig(talk) - val activeProvider = selection?.provider ?: defaultProvider - val activeConfig = selection?.config val sessionCfg = config?.get("session").asObjectOrNull() - val mainKey = normalizeMainKey(sessionCfg?.get("mainKey").asStringOrNull()) - val voice = activeConfig?.get("voiceId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } - val aliases = - activeConfig?.get("voiceAliases").asObjectOrNull()?.entries?.mapNotNull { (key, value) -> - val id = value.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null - normalizeTalkAliasKey(key).takeIf { it.isNotEmpty() }?.let { it to id } - }?.toMap().orEmpty() - val model = activeConfig?.get("modelId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } - val outputFormat = - activeConfig?.get("outputFormat")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } - val key = activeConfig?.get("apiKey")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } - val interrupt = talk?.get("interruptOnSpeech")?.asBooleanOrNull() - val silenceTimeoutMs = resolvedSilenceTimeoutMs(talk) - return TalkModeGatewayConfigState( - activeProvider = activeProvider, - normalizedPayload = selection?.normalizedPayload == true, - missingResolvedPayload = talk != null && selection == null, - mainSessionKey = mainKey, - defaultVoiceId = - if (activeProvider == defaultProvider) { - voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() } - } else { - voice - }, - voiceAliases = aliases, - defaultModelId = model ?: defaultModelIdFallback, - defaultOutputFormat = outputFormat ?: defaultOutputFormatFallback, - apiKey = key ?: envKey?.takeIf { it.isNotEmpty() }, - interruptOnSpeech = interrupt, - silenceTimeoutMs = silenceTimeoutMs, - ) - } - - fun fallback( - defaultProvider: String, - defaultModelIdFallback: String, - defaultOutputFormatFallback: String, - envVoice: String?, - sagVoice: String?, - envKey: String?, - ): TalkModeGatewayConfigState = - TalkModeGatewayConfigState( - activeProvider = defaultProvider, - normalizedPayload = false, - missingResolvedPayload = false, - mainSessionKey = "main", - defaultVoiceId = envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }, - voiceAliases = emptyMap(), - defaultModelId = defaultModelIdFallback, - defaultOutputFormat = defaultOutputFormatFallback, - apiKey = envKey?.takeIf { it.isNotEmpty() }, - interruptOnSpeech = null, - silenceTimeoutMs = TalkDefaults.defaultSilenceTimeoutMs, - ) - - fun selectTalkProviderConfig(talk: JsonObject?): TalkProviderConfigSelection? { - if (talk == null) return null - selectResolvedTalkProviderConfig(talk)?.let { return it } - val rawProvider = talk["provider"].asStringOrNull() - val rawProviders = talk["providers"].asObjectOrNull() - val hasNormalizedPayload = rawProvider != null || rawProviders != null - if (hasNormalizedPayload) { - return null - } - return TalkProviderConfigSelection( - provider = defaultTalkProvider, - config = talk, - normalizedPayload = false, + mainSessionKey = normalizeMainKey(sessionCfg?.get("mainKey").asStringOrNull()), + interruptOnSpeech = talk?.get("interruptOnSpeech").asBooleanOrNull(), + silenceTimeoutMs = resolvedSilenceTimeoutMs(talk), ) } @@ -127,26 +34,8 @@ internal object TalkModeGatewayConfigParser { } return timeout.toLong() } - - private fun selectResolvedTalkProviderConfig(talk: JsonObject): TalkProviderConfigSelection? { - val resolved = talk["resolved"].asObjectOrNull() ?: return null - val providerId = normalizeTalkProviderId(resolved["provider"].asStringOrNull()) ?: return null - return TalkProviderConfigSelection( - provider = providerId, - config = resolved["config"].asObjectOrNull() ?: buildJsonObject {}, - normalizedPayload = true, - ) - } - - private fun normalizeTalkProviderId(raw: String?): String? { - val trimmed = raw?.trim()?.lowercase().orEmpty() - return trimmed.takeIf { it.isNotEmpty() } - } } -private fun normalizeTalkAliasKey(value: String): String = - value.trim().lowercase() - private fun JsonElement?.asStringOrNull(): String? = this?.let { element -> element as? JsonPrimitive diff --git a/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigContractTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigContractTest.kt deleted file mode 100644 index ca9be8b1280..00000000000 --- a/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigContractTest.kt +++ /dev/null @@ -1,100 +0,0 @@ -package ai.openclaw.app.voice - -import java.io.File -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonObject -import kotlinx.serialization.json.JsonPrimitive -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertNull -import org.junit.Test - -@Serializable -private data class TalkConfigContractFixture( - @SerialName("selectionCases") val selectionCases: List, - @SerialName("timeoutCases") val timeoutCases: List, -) { - @Serializable - data class SelectionCase( - val id: String, - val defaultProvider: String, - val payloadValid: Boolean, - val expectedSelection: ExpectedSelection? = null, - val talk: JsonObject, - ) - - @Serializable - data class ExpectedSelection( - val provider: String, - val normalizedPayload: Boolean, - val voiceId: String? = null, - val apiKey: String? = null, - ) - - @Serializable - data class TimeoutCase( - val id: String, - val fallback: Long, - val expectedTimeoutMs: Long, - val talk: JsonObject, - ) -} - -class TalkModeConfigContractTest { - private val json = Json { ignoreUnknownKeys = true } - - @Test - fun selectionFixtures() { - for (fixture in loadFixtures().selectionCases) { - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(fixture.talk) - val expected = fixture.expectedSelection - if (expected == null) { - assertNull(fixture.id, selection) - continue - } - assertNotNull(fixture.id, selection) - assertEquals(fixture.id, expected.provider, selection?.provider) - assertEquals(fixture.id, expected.normalizedPayload, selection?.normalizedPayload) - assertEquals( - fixture.id, - expected.voiceId, - (selection?.config?.get("voiceId") as? JsonPrimitive)?.content, - ) - assertEquals( - fixture.id, - expected.apiKey, - (selection?.config?.get("apiKey") as? JsonPrimitive)?.content, - ) - assertEquals(fixture.id, true, fixture.payloadValid) - } - } - - @Test - fun timeoutFixtures() { - for (fixture in loadFixtures().timeoutCases) { - val timeout = TalkModeGatewayConfigParser.resolvedSilenceTimeoutMs(fixture.talk) - assertEquals(fixture.id, fixture.expectedTimeoutMs, timeout) - assertEquals(fixture.id, TalkDefaults.defaultSilenceTimeoutMs, fixture.fallback) - } - } - - private fun loadFixtures(): TalkConfigContractFixture { - val fixturePath = findFixtureFile() - return json.decodeFromString(File(fixturePath).readText()) - } - - private fun findFixtureFile(): String { - val startDir = System.getProperty("user.dir") ?: error("user.dir unavailable") - var current = File(startDir).absoluteFile - while (true) { - val candidate = File(current, "test-fixtures/talk-config-contract.json") - if (candidate.exists()) { - return candidate.absolutePath - } - current = current.parentFile ?: break - } - error("talk-config-contract.json not found from $startDir") - } -} diff --git a/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigParsingTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigParsingTest.kt index e9c46231961..79f0cb94074 100644 --- a/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigParsingTest.kt +++ b/apps/android/app/src/test/java/ai/openclaw/app/voice/TalkModeConfigParsingTest.kt @@ -2,135 +2,37 @@ package ai.openclaw.app.voice import kotlinx.serialization.json.Json import kotlinx.serialization.json.buildJsonObject -import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.put import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertTrue import org.junit.Test class TalkModeConfigParsingTest { private val json = Json { ignoreUnknownKeys = true } @Test - fun prefersCanonicalResolvedTalkProviderPayload() { - val talk = + fun readsMainSessionKeyAndInterruptFlag() { + val config = json.parseToJsonElement( """ { - "resolved": { - "provider": "elevenlabs", - "config": { - "voiceId": "voice-resolved" - } + "talk": { + "interruptOnSpeech": true, + "silenceTimeoutMs": 1800 }, - "provider": "elevenlabs", - "providers": { - "elevenlabs": { - "voiceId": "voice-normalized" - } + "session": { + "mainKey": "voice-main" } } """.trimIndent(), ) .jsonObject - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(talk) - assertNotNull(selection) - assertEquals("elevenlabs", selection?.provider) - assertTrue(selection?.normalizedPayload == true) - assertEquals("voice-resolved", selection?.config?.get("voiceId")?.jsonPrimitive?.content) - } + val parsed = TalkModeGatewayConfigParser.parse(config) - @Test - fun prefersNormalizedTalkProviderPayload() { - val talk = - json.parseToJsonElement( - """ - { - "provider": "elevenlabs", - "providers": { - "elevenlabs": { - "voiceId": "voice-normalized" - } - }, - "voiceId": "voice-legacy" - } - """.trimIndent(), - ) - .jsonObject - - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(talk) - assertEquals(null, selection) - } - - @Test - fun rejectsNormalizedTalkProviderPayloadWhenProviderMissingFromProviders() { - val talk = - json.parseToJsonElement( - """ - { - "provider": "acme", - "providers": { - "elevenlabs": { - "voiceId": "voice-normalized" - } - } - } - """.trimIndent(), - ) - .jsonObject - - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(talk) - assertEquals(null, selection) - } - - @Test - fun rejectsNormalizedTalkProviderPayloadWhenProviderIsAmbiguous() { - val talk = - json.parseToJsonElement( - """ - { - "providers": { - "acme": { - "voiceId": "voice-acme" - }, - "elevenlabs": { - "voiceId": "voice-normalized" - } - } - } - """.trimIndent(), - ) - .jsonObject - - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(talk) - assertEquals(null, selection) - } - - @Test - fun fallsBackToLegacyTalkFieldsWhenNormalizedPayloadMissing() { - val legacyApiKey = "legacy-key" // pragma: allowlist secret - val talk = - buildJsonObject { - put("voiceId", "voice-legacy") - put("apiKey", legacyApiKey) // pragma: allowlist secret - } - - val selection = TalkModeGatewayConfigParser.selectTalkProviderConfig(talk) - assertNotNull(selection) - assertEquals("elevenlabs", selection?.provider) - assertTrue(selection?.normalizedPayload == false) - assertEquals("voice-legacy", selection?.config?.get("voiceId")?.jsonPrimitive?.content) - assertEquals("legacy-key", selection?.config?.get("apiKey")?.jsonPrimitive?.content) - } - - @Test - fun readsConfiguredSilenceTimeoutMs() { - val talk = buildJsonObject { put("silenceTimeoutMs", 1500) } - - assertEquals(1500L, TalkModeGatewayConfigParser.resolvedSilenceTimeoutMs(talk)) + assertEquals("voice-main", parsed.mainSessionKey) + assertEquals(true, parsed.interruptOnSpeech) + assertEquals(1800L, parsed.silenceTimeoutMs) } @Test