From 41ef277398f18426f7b87ff298de924fe0ce6725 Mon Sep 17 00:00:00 2001
From: RichaGadgil <gadgilricha@gmail.com>
Date: Sun, 31 May 2020 15:19:21 -0700
Subject: [PATCH] changing input data structure for multiple var extaction

---
 nimbus_nlp/variable_extractor.py | 51 ++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/nimbus_nlp/variable_extractor.py b/nimbus_nlp/variable_extractor.py
index ad7fa55..a159deb 100644
--- a/nimbus_nlp/variable_extractor.py
+++ b/nimbus_nlp/variable_extractor.py
@@ -71,25 +71,46 @@ def extract_variables(self, sent):
         # Make the prediction
         request = self.get_prediction(sent)
 
-        # Obtain the entity in the sentence
-        entity = request.payload[0].text_extraction.text_segment.content
+        # Create entity dictionary
+        e = {"entities": [], "normalized question": None, "input question": None}
 
-        # Obtain the predicted tag
-        tag = request.payload[0].display_name
+        normalized_question = sent
+
+        for n in range(0, len(request.payload)):
+
+            # Obtain the entity in the sentence
+            entity = request.payload[n].text_extraction.text_segment.content
+
+            # Obtain the predicted tag
+            tag = request.payload[n].display_name
+
+            # Removes excessive words from the entity
+            normalized_entity = VariableExtractor.excess_word_removal(entity, tag)
+
+            # Replaces the entity of input question with its corresponding tag
+            normalized_entity_question = sent.replace(entity, "[" + tag + "]")
+
+            # Replaces the entity of input question with its corresponding tag along with previous tags
+            normalized_question = normalized_question.replace(entity, "[" + tag + "]")
+
+            e['entities'].append({
+                "entity": entity,
+                "tag": tag,
+                "normalized entity": normalized_entity,
+                #"input question": sent,
+                "normalized entity question": normalized_entity_question
+            })
+
+        # Add the raw question
+        e['input question'] = sent
+
+        # Add the question with all its corresponding tags replaced
+        e['normalized question'] = normalized_question
+
+        return e
 
-        # Removes excessive words from the entity
-        normalized_entity = VariableExtractor.excess_word_removal(entity, tag)
 
-        # Replaces the entity of input question with its corresponding tag
-        normalized_question = sent.replace(entity, "[" + tag + "]")
 
-        return {
-            "entity": entity,
-            "tag": tag,
-            "normalized entity": normalized_entity,
-            "input question": sent,
-            "normalized question": normalized_question,
-        }
 
     @staticmethod
     def excess_word_removal(entity, tag):