run all models every time

handler.py

@@ -411,33 +411,37 @@ class EndpointHandler():
                     'talkMoveDemonstrations': [], 'transcript': []}
 
     
-        utterance_talk_moves = dict()
+        utterance_talk_moves_json = ""
         _, _, model_utterances_predictions = self.do_prediction(full_transcript, 'model_utterance')
+        
+        gi_utterances_list, gi_utterances_indexes, gi_predictions = self.do_prediction(full_transcript, 'eliciting')
+        gi_utterance_talk_moves = self.add_preds_to_list(dict(), gi_predictions, gi_utterances_indexes, full_transcript, model_utterances_predictions)
         if talk_move == 'getIdeas':
-            utterances_list, utterances_indexes, predictions = self.do_prediction(full_transcript, 'eliciting')
-            utterance_talk_moves = self.add_preds_to_list(utterance_talk_moves, predictions, utterances_indexes, full_transcript, model_utterances_predictions)
-        elif talk_move == 'orientIdeas':
-            utterances_list, utterances_indexes, predictions = self.do_prediction(full_transcript, 'connecting')
-            utterance_talk_moves = self.add_preds_to_list(utterance_talk_moves, predictions, utterances_indexes, full_transcript, model_utterances_predictions)
-        elif talk_move == 'buildIdeas':
-            utterances_list, utterances_indexes, predictions = self.do_prediction(full_transcript, 'probing')
-            utterance_talk_moves = self.add_preds_to_list(utterance_talk_moves, predictions, utterances_indexes, full_transcript, model_utterances_predictions)
-            utterances_list, utterances_indexes, predictions = self.do_prediction(full_transcript, 'adding_on')
-            utterance_talk_moves = self.add_preds_to_list(utterance_talk_moves, predictions, utterances_indexes, full_transcript, model_utterances_predictions)
-            utterances_list, utterances_indexes, predictions = self.do_prediction(full_transcript, 'revoicing')
-            utterance_talk_moves = self.add_preds_to_list(utterance_talk_moves, predictions, utterances_indexes, full_transcript, model_utterances_predictions)
-        else:
-            raise ValueError("no valid talk move provided")
-
+            utterance_talk_moves_json = json.dumps(self.talk_moves_list_to_json(gi_utterance_talk_moves), separators=(',', ':'))
+
+        oi_utterances_list, oi_utterances_indexes, oi_predictions = self.do_prediction(full_transcript, 'connecting')
+        oi_utterance_talk_moves = self.add_preds_to_list(dict(), oi_predictions, oi_utterances_indexes, full_transcript, model_utterances_predictions)
+        if talk_move == 'orientIdeas':
+            utterance_talk_moves_json = json.dumps(self.talk_moves_list_to_json(oi_utterance_talk_moves), separators=(',', ':'))
+
+        bi_utterances_list, bi_utterances_indexes, bi_predictions = self.do_prediction(full_transcript, 'probing')
+        bi_utterance_talk_moves = self.add_preds_to_list(dict(), bi_predictions, bi_utterances_indexes, full_transcript, model_utterances_predictions)
+        bi_utterances_list, bi_utterances_indexes, bi_predictions = self.do_prediction(full_transcript, 'adding_on')
+        bi_utterance_talk_moves = self.add_preds_to_list(bi_utterance_talk_moves, bi_predictions, bi_utterances_indexes, full_transcript, model_utterances_predictions)
+        bi_utterances_list, bi_utterances_indexes, bi_predictions = self.do_prediction(full_transcript, 'revoicing')
+        bi_utterance_talk_moves = self.add_preds_to_list(bi_utterance_talk_moves, bi_predictions, bi_utterances_indexes, full_transcript, model_utterances_predictions)
+        if talk_move == 'buildIdeas':
+            utterance_talk_moves_json = json.dumps(self.talk_moves_list_to_json(bi_utterance_talk_moves), separators=(',', ':'))
+        
         
         # json formating
         full_transcript_json = json.dumps(self.transcript_to_json(full_transcript), separators=(',', ':'))
-        utterance_talk_moves_json = json.dumps(self.talk_moves_list_to_json(utterance_talk_moves), separators=(',', ':'))
         
         sl_time, student_time, sl_name = self.get_talk_time(full_transcript)
         talk_time_json = json.dumps({'sl': sl_time, 'student': student_time}, separators=(',', ':'))
-                
-        return {'talkTime': talk_time_json, 'talkMove': talk_move, 'numberOfMoments': len(utterance_talk_moves),
-                'talkMoveDemonstrations': utterance_talk_moves_json, 'transcript': full_transcript_json, 'slName': sl_name}
 
+        num_moments_json = json.dumps({'getIdeas': len(gi_utterance_talk_moves), 'buildIdeas': len(bi_utterance_talk_moves), 'orientIdeas': len(oi_utterance_talk_moves)}, separators=(',', ':'))
+
+        return {'talkTime': talk_time_json, 'talkMove': talk_move, 'numberOfMoments': num_moments_json,
+                'talkMoveDemonstrations': utterance_talk_moves_json, 'transcript': full_transcript_json, 'slName': sl_name}