changed location of early exit

ControllerExecutorFlow.py

@@ -131,28 +131,15 @@ class ControllerExecutorFlow(CompositeFlow):
         self.subflows["Controller"].send_message_async(message, pipe_to= self.flow_config["flow_ref"])
         
     def call_executor(self):
-        
-        #detect and early exit
-        if self.flow_state["command"] == "finish":
-            
-            self._state_update_dict(
-                {
-                    "EARLY_EXIT": True,
-                    "answer": self.flow_state["command_args"]["answer"],
-                    "status": "finished"
-                }
-            )
-            self.generate_reply()
-            
+    
         #call executor
-        else:
-            executor_branch_to_call = self.flow_state["command"]
-            message = self._package_input_message(
-                data = self.flow_state["command_args"],
-                dst_flow = executor_branch_to_call
-            )
-            
-            self.subflows[executor_branch_to_call].send_message_async(message, pipe_to= self.flow_config["flow_ref"])
+        executor_branch_to_call = self.flow_state["command"]
+        message = self._package_input_message(
+            data = self.flow_state["command_args"],
+            dst_flow = executor_branch_to_call
+        )
+        
+        self.subflows[executor_branch_to_call].send_message_async(message, pipe_to= self.flow_config["flow_ref"])
             
             
     def register_data_to_state(self, input_message):
@@ -166,12 +153,27 @@ class ControllerExecutorFlow(CompositeFlow):
             self.flow_state["observation"] = input_message.data
         
         else:
+            
             self._state_update_dict(
                 {
                     "command": input_message.data["command"],
                     "command_args": input_message.data["command_args"]
                 }
             )
+            
+            #detect and early exit
+            if self.flow_state["command"] == "finish":
+                
+                self._state_update_dict(
+                    {
+                        "EARLY_EXIT": True,
+                        "answer": self.flow_state["command_args"]["answer"],
+                        "status": "finished"
+                    }
+                )
+                self.flow_state["early_exit_flag"] = True
+                
+            
         
     def run(self,input_message: FlowMessage):
         """ Runs the WikiSearch Atomic Flow. It's used to execute a Wikipedia search and get page summaries.
@@ -184,11 +186,16 @@ class ControllerExecutorFlow(CompositeFlow):
         
         flow_to_call = self.get_next_flow_to_call()
         
-        if flow_to_call == "Controller":
+        if self.flow_state.get("early_exit_flag",False):
+            self.generate_reply()
+        
+        elif flow_to_call == "Controller":
             self.call_controller()
+            
         elif flow_to_call == "Executor":
             self.call_executor()
             self.flow_state["current_round"] += 1
+            
         else:
             self._on_reach_max_round()
             self.generate_reply()