From 0de3128c276bdb2204671b358250958588aee5e7 Mon Sep 17 00:00:00 2001 From: Denire Date: Wed, 9 Sep 2020 11:02:59 +0300 Subject: [PATCH 1/2] 0.6.1 - fix CailaIntentActivator state recognition --- .../justai/jaicf/activator/caila/CailaIntentActivator.kt | 7 ++++++- build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt b/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt index cc464776..519b0f5f 100644 --- a/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt +++ b/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt @@ -12,6 +12,7 @@ import com.justai.jaicf.api.hasQuery import com.justai.jaicf.context.ActivatorContext import com.justai.jaicf.context.BotContext import com.justai.jaicf.model.scenario.ScenarioModel +import com.justai.jaicf.model.state.StatePath import com.justai.jaicf.reactions.Reactions import com.justai.jaicf.slotfilling.SlotFillingResult import com.justai.jaicf.slotfilling.SlotReactor @@ -53,7 +54,11 @@ class CailaIntentActivator( } } // Sort all predicted intents by context relevance - .sortedByDescending { botContext.dialogContext.currentState.commonPrefixWith(it.first) } + .sortedByDescending { + StatePath.parse(botContext.dialogContext.currentState) + .stepUp().toString() + .commonPrefixWith(it.first) + } .groupBy { it.first } // From most relevant by context take intent with maximum confidence. diff --git a/build.gradle.kts b/build.gradle.kts index 7f8542d6..0cc433d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ buildscript { allprojects { group = "com.justai.jaicf" - version = "0.6.0" + version = "0.6.1" repositories { google() From 9de6866327b39ea6b80ad6459edb20bfdf267980 Mon Sep 17 00:00:00 2001 From: Denire Date: Thu, 10 Sep 2020 14:51:25 +0300 Subject: [PATCH 2/2] fix state selection for child nodes --- .../justai/jaicf/activator/caila/CailaIntentActivator.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt b/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt index 519b0f5f..817b47c2 100644 --- a/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt +++ b/activators/caila/src/main/kotlin/com/justai/jaicf/activator/caila/CailaIntentActivator.kt @@ -55,9 +55,11 @@ class CailaIntentActivator( } // Sort all predicted intents by context relevance .sortedByDescending { - StatePath.parse(botContext.dialogContext.currentState) - .stepUp().toString() - .commonPrefixWith(it.first) + var currentState = botContext.dialogContext.currentState + if (currentState == it.first) { + currentState = StatePath.parse(currentState).stepUp().toString() + } + currentState.commonPrefixWith(it.first) } .groupBy { it.first }