Add found input value to expression to match

src/main/java/ai/labs/eddi/modules/behavior/impl/conditions/InputMatcher.java

@@ -16,6 +16,7 @@
 
 import static ai.labs.eddi.engine.memory.IConversationMemory.IConversationStepStack;
 import static ai.labs.eddi.modules.behavior.impl.conditions.IBehaviorCondition.ExecutionState.*;
+import static ai.labs.eddi.utils.StringUtilities.joinStrings;
 
 /**
  * @author ginccc
@@ -114,4 +115,4 @@ public IBehaviorCondition clone() {
         clone.setConfigs(getConfigs());
         return clone;
     }
-}
+}

src/main/java/ai/labs/eddi/modules/nlp/DictionaryUtilities.java

@@ -1,6 +1,7 @@
 package ai.labs.eddi.modules.nlp;
 
 
+import ai.labs.eddi.modules.nlp.expressions.Expression;
 import ai.labs.eddi.modules.nlp.expressions.Expressions;
 import ai.labs.eddi.modules.nlp.expressions.utilities.IExpressionProvider;
 import ai.labs.eddi.modules.nlp.extensions.dictionaries.IDictionary;
@@ -21,10 +22,13 @@ private static Expressions convertDictionaryEntriesToExpressions(List<IDictionar
                                                                              dictionaryEntries) {
         Expressions expressions = new Expressions();
 
-        for (IDictionary.IDictionaryEntry dictionaryEntry : dictionaryEntries) {
-            expressions.addAll(dictionaryEntry.getExpressions());
+        for (IDictionary.IFoundWord dictionaryEntry : dictionaryEntries) {
+            Expressions localExpressions = dictionaryEntry.getExpressions();
+            for (Expression expression : localExpressions) {
+                expression.setInputValue(dictionaryEntry.getFoundWord().getValue());
+            }
+            expressions.addAll(localExpressions);
         }
-
         return expressions;
     }
 

src/main/java/ai/labs/eddi/modules/nlp/InputParserTask.java

@@ -64,6 +64,8 @@ public class InputParserTask implements ILifecycleTask {
     private static final String KEY_EXPRESSIONS = "expressions";
     private static final String KEY_EXPRESSIONS_PARSED = KEY_EXPRESSIONS + ":parsed";
     private static final String KEY_INTENT = "intents";
+
+    private static final String KEY_EXPRESSIONS_WITH_INPUT = "nobehaviour:" + KEY_EXPRESSIONS + ":withinput";
     private static final String KEY_TYPE = "type";
     private static final String KEY_CONFIG = "config";
 
@@ -190,10 +192,16 @@ private void storeResultInMemory(IConversationMemory.IWritableConversationStep c
                 Data<List<String>> intentData = new Data<>(KEY_INTENT, intents);
                 currentStep.storeData(intentData);
                 currentStep.addConversationOutputList(KEY_INTENT, intents);
+
+                currentStep.addConversationOutputObject("withinputexpression", convertObjectToListOfMaps(newExpressions));
+
             }
         }
     }
 
+
+
+
     @Override
     public Object configure(Map<String, Object> configuration, Map<String, Object> extensions)
             throws PackageConfigurationException,
@@ -370,4 +378,5 @@ private static String getResourceType(Map<String, Object> resourceMap) {
         URI normalizerUri = URI.create(resourceMap.get(KEY_TYPE).toString());
         return normalizerUri.getHost();
     }
+
 }

src/main/java/ai/labs/eddi/modules/nlp/expressions/Expression.java

@@ -13,6 +13,9 @@
 public class Expression implements Cloneable {
     protected String domain;
     protected String expressionName;
+
+    protected String inputValue;
+
     protected Expressions subExpressions = new Expressions();
 
     protected Expression() {
@@ -136,6 +139,14 @@ public Boolean containsExpressionWithName(String expressionName) {
         return getAllExpressionsWithNames(expressionName).size() > 0;
     }
 
+    public String getInputValue() {
+        return inputValue;
+    }
+
+    public void setInputValue(String inputValue) {
+        this.inputValue = inputValue;
+    }
+
     /**
      * Returns a list of expressions that have the given expressionName.
      *

src/main/java/ai/labs/eddi/modules/properties/impl/PropertySetterTask.java

@@ -33,6 +33,7 @@
 import static ai.labs.eddi.models.Property.Scope.conversation;
 import static ai.labs.eddi.utils.RuntimeUtilities.checkNotNull;
 import static ai.labs.eddi.utils.RuntimeUtilities.isNullOrEmpty;
+import static ai.labs.eddi.utils.StringUtilities.joinStrings;
 import static java.lang.Boolean.parseBoolean;
 
 /**
@@ -111,7 +112,8 @@ public void execute(IConversationMemory memory, Object component) throws Lifecyc
         }
 
         if (expressionsData != null) {
-            aggregatedExpressions.addAll(expressionProvider.parseExpressions(expressionsData.getResult()));
+            String expressionString = joinStrings(", ", expressionsData.getResult());
+            aggregatedExpressions.addAll(expressionProvider.parseExpressions(expressionString));
         }
 
         var properties = propertySetter.extractProperties(aggregatedExpressions);