add list params to setAsrProperties

just-ai · Oct 16, 2024 · 757cba5 · 757cba5
1 parent cc076db
commit 757cba5
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 4 deletions.
diff --git a/...nels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/reactions/TelephonyReactions.kt b/...nels/jaicp/src/main/kotlin/com/justai/jaicf/channel/jaicp/reactions/TelephonyReactions.kt
@@ -229,9 +229,9 @@ class TelephonyReactions(private val bargeInDefaultProps: BargeInProperties) : J
      *    }
      * }
      * ```
-     * @param properties map of properties names with its assigned values.
+     * @param properties map of properties names with its assigned values (String or List).
      * */
-    fun setAsrProperties(properties: Map<String, String>) {
+    fun setAsrProperties(properties: Map<String, Any>) {
         asrConfig = setAsrPropertiesHandler.handle(
             properties,
             mergeAsrConfigs(asrConfig, (executionContext.request as TelephonyBotRequest).asrConfig)

diff --git a/.../main/kotlin/com/justai/jaicf/channel/jaicp/reactions/handlers/SetAsrPropertiesHandler.kt b/.../main/kotlin/com/justai/jaicf/channel/jaicp/reactions/handlers/SetAsrPropertiesHandler.kt
@@ -1,15 +1,22 @@
 package com.justai.jaicf.channel.jaicp.reactions.handlers
 
 import com.justai.jaicf.channel.jaicp.dto.config.*
+import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 
 class SetAsrPropertiesHandler(
     private val listOfActualHandlers: List<SetAsrPropertiesHandlerAbstract>
 ) {
 
-    fun handle(properties: Map<String, String>, asrConfig: AsrConfig): AsrConfig {
-        val propertiesJson = JsonObject(properties.toMutableMap().mapValues { entry -> JsonPrimitive(entry.value) })
+    fun handle(properties: Map<String, Any>, asrConfig: AsrConfig): AsrConfig {
+        val propertiesJson = JsonObject(properties.mapValues { entry ->
+            when (val value = entry.value) {
+                is List<*> -> JsonArray(value.map { JsonPrimitive(it.toString()) })
+                is String -> JsonPrimitive(value)
+                else -> throw IllegalArgumentException("Unsupported property type: ${value::class.simpleName}")
+            }
+        })
         return listOfActualHandlers.first { it.canHandle(checkNotNull(asrConfig.type)) }
             .handle(asrConfig, propertiesJson)
     }

diff --git a/channels/jaicp/src/test/kotlin/com/justai/jaicf/channel/jaicp/config/ProviderConfigTest.kt b/channels/jaicp/src/test/kotlin/com/justai/jaicf/channel/jaicp/config/ProviderConfigTest.kt
@@ -38,4 +38,17 @@ internal class ProviderConfigTest : JaicpBaseTest() {
         val response = channel.process(requestFromResources)
         assertEquals(responseFromResources, response.jaicp)
     }
+
+    @Test
+    fun `003 config asr properties`() {
+        val scenario = echoWithAction {
+            reactions.telephony?.setAsrProperties(mapOf(
+                "hints.eou_timeout" to "4s",
+                "insight_models" to listOf("call_features")
+            ))
+        }
+        val channel = JaicpTestChannel(scenario, TelephonyChannel)
+        val response = channel.process(requestFromResources)
+        assertEquals(responseFromResources, response.jaicp)
+    }
 }
diff --git a/channels/jaicp/src/test/resources/config/003/req.json b/channels/jaicp/src/test/resources/config/003/req.json
@@ -0,0 +1,44 @@
+{
+  "data": {
+    "livechatStatus": {
+      "enabled": false
+    }
+  },
+  "version": 1,
+  "botId": "jaicf_project",
+  "channelType": "resterisk",
+  "channelBotId": "jaicf_project",
+  "channelUserId": "chatapi-jaicf_project-puga",
+  "questionId": "aaa99bea-aae1-41d2-aede-76e4f13b0ccc",
+  "query": "/start",
+  "timestamp": 1583767519.497000000,
+  "rawRequest": {
+    "token": "GNVXJdeo:718e36f7005fbba3e2a9696784b83dc3bd0f3d9a",
+    "clientId": "test",
+    "questionId": "aaa99bea-aae1-41d2-aede-76e4f13b0ccc",
+    "query": "/start",
+    "timestamp": "2020-03-09T15:25:19.497",
+    "userId": "puga",
+    "asrTtsProviderData": {
+      "asr": {
+        "type": "sber",
+        "internal": true,
+        "sber": {
+          "model": "callcenter",
+          "language": "ru-RU"
+        }
+      },
+      "tts": {
+        "type": "aimyvoice",
+        "internal": true,
+        "aimyvoice": {
+          "voice": "Татьяна"
+        }
+      }
+    }
+  },
+  "userFrom": {
+    "id": "test",
+    "firstName": "test"
+  }
+}
diff --git a/channels/jaicp/src/test/resources/config/003/resp.json b/channels/jaicp/src/test/resources/config/003/resp.json
@@ -0,0 +1,57 @@
+{
+  "data": {
+    "replies": [],
+    "answer": "",
+    "dialer": {},
+    "asrConfig": {
+      "type": "sber",
+      "sber": {
+        "language": "ru-RU",
+        "model": "callcenter",
+        "asrProperties": {
+          "hints.eou_timeout": "4s",
+          "insight_models": ["call_features"]
+        }
+      },
+      "asrProperties": {
+        "hints.eou_timeout": "4s",
+        "insight_models": ["call_features"]
+      }
+    }
+  },
+  "botId": "jaicf_project",
+  "accountId": "jaicf_project",
+  "channelType": "resterisk",
+  "channelBotId": "jaicf_project",
+  "channelUserId": "chatapi-jaicf_project-puga",
+  "questionId": "aaa99bea-aae1-41d2-aede-76e4f13b0ccc",
+  "query": "/start",
+  "timestamp": 0,
+  "currentState": "/fallback",
+  "processingTime": 0,
+  "requestData": {
+    "token": "GNVXJdeo:718e36f7005fbba3e2a9696784b83dc3bd0f3d9a",
+    "clientId": "test",
+    "questionId": "aaa99bea-aae1-41d2-aede-76e4f13b0ccc",
+    "query": "/start",
+    "timestamp": "2020-03-09T15:25:19.497",
+    "userId": "puga",
+    "asrTtsProviderData": {
+      "asr": {
+        "type": "sber",
+        "internal": true,
+        "sber": {
+          "model": "callcenter",
+          "language": "ru-RU"
+        }
+      },
+      "tts": {
+        "type": "aimyvoice",
+        "internal": true,
+        "aimyvoice": {
+          "voice": "Татьяна"
+        }
+      }
+    }
+  }
+}