feat(server): support arrays on NER between conditions

leon-ai · Dec 28, 2021 · 7cf7f97 · 7cf7f97
1 parent 10f3132
commit 7cf7f97
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 115 deletions.
diff --git a/packages/calendar/data/expressions/en.json b/packages/calendar/data/expressions/en.json
@@ -12,23 +12,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "a",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "an",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "a", "an", "my"],
+              "to": ["list", "list", "list", "list"]
             }
           ]
         }
@@ -56,13 +41,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         }
@@ -80,13 +60,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         },
@@ -114,13 +89,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         }
@@ -149,13 +119,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         }
@@ -175,18 +140,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "check",
-              "to": "from"
-            },
-            {
-              "type": "between",
-              "from": "complete",
-              "to": "from"
-            },
-            {
-              "type": "between",
-              "from": "tick",
-              "to": "from"
+              "from": ["check", "complete", "tick"],
+              "to": ["from", "from", "from"]
             }
           ]
         },
@@ -196,13 +151,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         }
@@ -221,13 +171,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "uncheck",
-              "to": "from"
-            },
-            {
-              "type": "between",
-              "from": "untick",
-              "to": "from"
+              "from": ["uncheck", "untick"],
+              "to": ["from", "from"]
             }
           ]
         },
@@ -237,13 +182,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "the",
-              "to": "list"
-            },
-            {
-              "type": "between",
-              "from": "my",
-              "to": "list"
+              "from": ["the", "my"],
+              "to": ["list", "list"]
             }
           ]
         }

diff --git a/packages/calendar/data/expressions/fr.json b/packages/calendar/data/expressions/fr.json
@@ -105,13 +105,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "ajoute",
-              "to": "à"
-            },
-            {
-              "type": "between",
-              "from": "ajoute",
-              "to": "a"
+              "from": ["ajoute", "ajoute"],
+              "to": ["à", "a"]
             }
           ]
         },
@@ -140,18 +135,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "coche",
-              "to": "de"
-            },
-            {
-              "type": "between",
-              "from": "complète",
-              "to": "de"
-            },
-            {
-              "type": "between",
-              "from": "complete",
-              "to": "de"
+              "from": ["coche", "complète", "complete"],
+              "to": ["de", "de", "de"]
             }
           ]
         },
@@ -181,23 +166,8 @@
           "conditions": [
             {
               "type": "between",
-              "from": "décoche",
-              "to": "de"
-            },
-            {
-              "type": "between",
-              "from": "decoche",
-              "to": "de"
-            },
-            {
-              "type": "between",
-              "from": "invalide",
-              "to": "de"
-            },
-            {
-              "type": "between",
-              "from": "remet",
-              "to": "sur"
+              "from": ["décoche", "decoche", "invalide", "remet"],
+              "to": ["de", "de", "de", "sur"]
             }
           ]
         },

diff --git a/server/src/core/ner.js b/server/src/core/ner.js
@@ -86,7 +86,15 @@ class Ner {
 
         if (condition.type === 'between') {
           // e.g. list.addBetweenCondition('en', 'list', 'create a', 'list')
-          this.ner[conditionMethod](lang, entity.name, condition.from, condition.to)
+          if (Array.isArray(condition.from) && Array.isArray(condition.to)) {
+            const { from, to } = condition
+
+            from.forEach((word, index) => {
+              this.ner[conditionMethod](lang, entity.name, word, to[index])
+            })
+          } else {
+            this.ner[conditionMethod](lang, entity.name, condition.from, condition.to)
+          }
         } else if (condition.type.indexOf('after') !== -1) {
           this.ner[conditionMethod](lang, entity.name, condition.from)
         } else if (condition.type.indexOf('before') !== -1) {