Cancel ASR's Recognize event after ASR finished. #2506

* Even if finish ASR, async's response(directives) will be arrived on event channel. To cancel(close) this channel, add API at Request.
nugu-developers · Jul 10, 2024 · ad9e969 · ad9e969
1 parent ed15f5c
commit ad9e969
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/nugu-agent/src/main/java/com/skt/nugu/sdk/agent/DefaultASRAgent.kt b/nugu-agent/src/main/java/com/skt/nugu/sdk/agent/DefaultASRAgent.kt
@@ -416,6 +416,14 @@ class DefaultASRAgent(
                 }
             }
 
+            override fun onCancellableRetrieved(cancelable: ASRAgentInterface.StartRecognitionCallback.Cancellable) {
+                expectSpeechHandler?.startRecognitionCallback?.let {
+                    runCatching {
+                        it.onCancellableRetrieved(cancelable)
+                    }
+                }
+            }
+
             override fun onError(
                 dialogRequestId: String,
                 errorType: ASRAgentInterface.StartRecognitionCallback.ErrorType
@@ -868,6 +876,7 @@ class DefaultASRAgent(
             } else {
                 currentRequest = Pair(it, param)
                 param.callback?.onSuccess(it.eventMessage.dialogRequestId)
+                param.callback?.onCancellableRetrieved(createASRCancellable(it))
             }
         }
 
@@ -876,6 +885,17 @@ class DefaultASRAgent(
         }
     }
 
+    private fun createASRCancellable(request: SpeechRecognizer.Request) =
+        object : ASRAgentInterface.StartRecognitionCallback.Cancellable {
+            override fun cancel() {
+                if (currentRequest?.first == request && state.isRecognizing()) {
+                    stopRecognition(true, ASRAgentInterface.CancelCause.LOCAL_API)
+                } else {
+                    request.cancelRequest()
+                }
+            }
+        }
+
     override val configurations: Map<NamespaceAndName, BlockingPolicy> = HashMap<NamespaceAndName, BlockingPolicy>().apply {
         this[EXPECT_SPEECH] = BlockingPolicy.sharedInstanceFactory.get(
             BlockingPolicy.MEDIUM_AUDIO,

diff --git a/nugu-agent/src/main/java/com/skt/nugu/sdk/agent/asr/ASRAgentInterface.kt b/nugu-agent/src/main/java/com/skt/nugu/sdk/agent/asr/ASRAgentInterface.kt
@@ -217,6 +217,12 @@ interface ASRAgentInterface {
             ERROR_TAKE_TOO_LONG_START_RECOGNITION,
             ERROR_UNKNOWN
         }
+
+        interface Cancellable {
+            fun cancel()
+        }
+
+        fun onCancellableRetrieved(cancelable: Cancellable) = Unit
     }
 
     /**