From 6aa60bfbd8c72e678fe3faf5e7f9dbd37dfd209f Mon Sep 17 00:00:00 2001
From: louistiti <louis.grenard@gmail.com>
Date: Sat, 26 Mar 2022 15:51:12 +0800
Subject: [PATCH] fix(server): correctly extract all spaCy entities

---
 bridges/python/tcp_server/lib/nlp.py | 11 +++++++----
 server/src/core/nlu.js               | 16 +++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bridges/python/tcp_server/lib/nlp.py b/bridges/python/tcp_server/lib/nlp.py
index 7b4933b51..788498c9d 100644
--- a/bridges/python/tcp_server/lib/nlp.py
+++ b/bridges/python/tcp_server/lib/nlp.py
@@ -2,6 +2,7 @@
 # -*- coding:utf-8 -*-
 
 from sys import argv
+from pathlib import Path
 import spacy
 import geonamescache
 
@@ -10,7 +11,7 @@
 spacy_model_mapping = {
 	'en': {
 		'model': 'en_core_web_trf',
-		'disable': ['tagger', 'parser', 'attribute_ruler', 'lemmatizer'],
+		'exclude': ['tagger', 'parser', 'attribute_ruler', 'lemmatizer'],
 		'entity_mapping': {
 			'PERSON': 'person',
 			'GPE': 'location',
@@ -19,7 +20,7 @@
 	},
 	'fr': {
 		'model': 'fr_core_news_md',
-		'disable': ['tok2vec', 'morphologizer', 'parser', 'senter', 'attribute_ruler', 'lemmatizer'],
+		'exclude': ['tok2vec', 'morphologizer', 'parser', 'senter', 'attribute_ruler', 'lemmatizer'],
 		'entity_mapping': {
 			'PER': 'person',
 			'LOC': 'location',
@@ -54,10 +55,12 @@ def load_spacy_model():
 	global spacy_nlp
 
 	model = spacy_model_mapping[lang]['model']
-	disable = spacy_model_mapping[lang]['disable']
+	exclude = spacy_model_mapping[lang]['exclude']
 
 	print(f'Loading {model} spaCy model...')
-	spacy_nlp = spacy.load(model, disable=disable)
+	spacy_nlp = spacy.load(model, exclude=exclude)
+	# spacy_nlp = spacy.load(Path('../models/spacy_en_core_web_trf-3.2.0'), disable=disable)
+	# spacy_nlp = spacy.load(Path('../models/spacy_en_core_web_trf-3.2.0'), disable=disable)
 	print('spaCy model loaded')
 
 def extract_spacy_entities(utterance):
diff --git a/server/src/core/nlu.js b/server/src/core/nlu.js
index a2d636365..4d1c396be 100644
--- a/server/src/core/nlu.js
+++ b/server/src/core/nlu.js
@@ -98,15 +98,17 @@ class Nlu {
       // Add spaCy entities
       const spacyEntities = await Ner.getSpacyEntities(utterance)
       if (spacyEntities.length > 0) {
-        const [{ entity, resolution }] = spacyEntities
-        const spacyEntity = {
-          [entity]: {
-            options: {
-              [resolution.value]: [resolution.value]
+        spacyEntities.forEach(({ entity, resolution }) => {
+          const spacyEntity = {
+            [entity]: {
+              options: {
+                [resolution.value]: [resolution.value]
+              }
             }
           }
-        }
-        this.nlp.addEntities(spacyEntity, this.brain.lang)
+
+          this.nlp.addEntities(spacyEntity, this.brain.lang)
+        })
       }
 
       const result = await this.nlp.process(utterance)