bug fix

ChatWithDemonstrationsFlow.py

@@ -71,23 +71,35 @@ class ChatWithDemonstrationsFlow(CompositeFlow):
         
         # #~~~~~~~~~~~Solution 2 - Non-Blocking ~~~~~~~
         if self.flow_state["last_state"] is None:
-            self.flow_state["input_message"] = input_message
+            
+            self.flow_state["initial_message"] = input_message
+            
+            msg = self.package_input_message(
+                input_message.data
+            )
+            
             self.subflows["demonstration_flow"].get_reply(
-                input_message,
+                msg,
             )
             self.flow_state["last_state"] = "demonstration_flow"
         
         elif self.flow_state["last_state"] == "demonstration_flow":
+            
+            msg = self.package_input_message(
+                input_message.data
+            )
+            
             self.subflows["chat_flow"].get_reply(
-                input_message,
+                msg,
             )
+
             self.flow_state["last_state"] = "chat_flow"
 
         else:
             self.flow_state["last_state"] = None
-            
+
             reply = self.package_output_message(
-                self.flow_state["input_message"],
+                self.flow_state["initial_message"],
                 response = self.output_interface(input_message).data
             )
                 

ChatWithDemonstrationsFlow.yaml

@@ -1,17 +1,15 @@
 
 name: "ChatAtomic_Flow_with_Demonstrations"
 description: "A sequential flow that answers questions with demonstrations"
-
+_target_: flow_modules.aiflows.ChatWithDemonstrationsFlowModule.ChatWithDemonstrationsFlow.instantiate_from_default_config
 subflows_config:
   demonstration_flow:
-    _target_: flow_modules.aiflows.ChatWithDemonstrationsFlowModule.DemonstrationsAtomicFlow.instantiate_from_default_config
     flow_class_name: flow_modules.aiflows.ChatWithDemonstrationsFlowModule.DemonstrationsAtomicFlow
     flow_endpoint: DemonstrationsAtomicFlow
     user_id: local
     name: "DemonstrationsAtomicFlow"
     description: "A flow that answers questions with demonstrations"
   chat_flow:
-    _target_: flow_modules.aiflows.ChatFlowModule.ChatAtomicFlow.instantiate_from_default_config
     name: "ChatAtomicFlow"
     description: "A flow that answers questions"
     flow_class_name: flow_modules.aiflows.ChatFlowModule.ChatAtomicFlow

demo.yaml

@@ -9,10 +9,7 @@ output_interface: # Connector between the Flow's output and the caller
 
 subflows_config:
   demonstration_flow:
-    _target_:  flow_modules.aiflows.ChatWithDemonstrationsFlowModule.DemonstrationsAtomicFlow.instantiate_from_default_config
     name: "proxy of DemonstrationsAtomicFlow"
-    flow_endpoint: DemonstrationsAtomicFlow
-    user_id: local
     description: "A flow that answers questions with demonstrations"
     data: 
       - query_data:
@@ -35,11 +32,8 @@ subflows_config:
         - response
 
   chat_flow:
-    _target_: flow_modules.aiflows.ChatFlowModule.ChatAtomicFlow.instantiate_from_default_config
     name: "proxy SimpleQA_Flow"
     description: "A flow that answers questions"
-    flow_endpoint: ChatAtomicFlow
-    user_id: local
     # ~~~ Input interface specification ~~~
     input_interface_non_initialized:
       - "question"

run.py

@@ -79,13 +79,8 @@ if __name__ == "__main__":
     data = {"id": 0, "question": "What is the capital of France?"}  # This can be a list of samples
     # data = {"id": 0, "question": "Who was the NBA champion in 2023?"}  # This can be a list of samples
     
-    #option1: use the FlowMessage class
-    input_message = FlowMessage(
-        data=data,
-    )
 
-    #option2: use the proxy_flow
-    #input_message = proxy_flow.package_input_message(data = data)
+    input_message = proxy_flow.package_input_message(data = data)
     
     #7. ~~~ Run inference ~~~
     future = proxy_flow.get_reply_future(input_message)