Clean Versions

AutoGPTFlow.py

@@ -105,11 +105,12 @@ class AutoGPTFlow(ControllerExecutorFlow):
         }
             
     def set_up_flow_state(self):
+        """ This method sets up the state of the flow. It's called at the beginning of the flow."""
         super().set_up_flow_state()
         self.flow_state["early_exit_flag"] = False
         
     def prepare_memory_read_output(self,data_dict: Dict[str, Any],**kwargs):
-        
+        """ This method prepares the output of the Memory Flow to be used by the Controller Flow."""
         retrieved_memories = data_dict["retrieved"][0][1:]
         return {"memory": "\n".join(retrieved_memories)}
     
@@ -153,7 +154,11 @@ class AutoGPTFlow(ControllerExecutorFlow):
         return current_context
 
     def prepare_memory_read_input(self) -> Dict[str, Any]:
-    
+        """ This method prepares the input of the Memory Flow to read memories
+        
+        :return: The input of the Memory Flow to read memories
+        :rtype: Dict[str, Any]
+        """
         query = self._get_memory_key()
 
         return {
@@ -162,6 +167,11 @@ class AutoGPTFlow(ControllerExecutorFlow):
         }
 
     def prepare_memory_write_input(self) -> Dict[str, Any]:
+        """ This method prepares the input of the Memory Flow to write memories
+        
+        :return: The input of the Memory Flow to write memories
+        :rtype: Dict[str, Any]
+        """
 
         query = self._get_memory_key()
 
@@ -172,6 +182,8 @@ class AutoGPTFlow(ControllerExecutorFlow):
 
     
     def call_memory_read(self):
+        """ This method calls the Memory Flow to read memories."""
+        
         memory_read_input = self.prepare_memory_read_input()
         
         message = self.package_input_message(
@@ -185,6 +197,7 @@ class AutoGPTFlow(ControllerExecutorFlow):
         )
 
     def call_memory_write(self):
+        """ This method calls the Memory Flow to write memories."""
         memory_write_input = self.prepare_memory_write_input()
         
         message = self.package_input_message(
@@ -198,6 +211,7 @@ class AutoGPTFlow(ControllerExecutorFlow):
         )
     
     def call_human_feedback(self):
+        """ This method calls the HumanFeedback Flow to get feedback from the user/human."""
             
         message = self.package_input_message(
             data = self.input_interface_human_feedback(self.flow_state),
@@ -210,6 +224,7 @@ class AutoGPTFlow(ControllerExecutorFlow):
         )
              
     def register_data_to_state(self, input_message):
+        """ This method registers the data from the input message to the state of the flow."""
         
         #Making this explicit so it's easier to understand
         #I'm also showing different ways of writing to the state
@@ -270,7 +285,11 @@ class AutoGPTFlow(ControllerExecutorFlow):
                 self.flow_state["early_exit_flag"] = True
         
     def run(self,input_message):
+        """ This method runs the flow. It's the main method of the flow. It's called when the flow is executed. It calls the subflows circularly.
         
+        :input_message: The input message of the flow
+        :type input_message: Message
+        """
         self.register_data_to_state(input_message)
         
         flow_to_call = self.get_next_flow_to_call()

AutoGPTFlow.yaml

@@ -13,6 +13,9 @@ output_interface:
 ### Subflows specification
 subflows_config:
   Controller:
+    flow_class_name: flow_modules.aiflows.ControllerExecutorFlowModule.ControllerAtomicFlow
+    flow_endpoint: ControllerAtomicFlow
+    user_id: local
     _target_: flow_modules.aiflows.ControllerExecutorFlowModule.ControllerAtomicFlow.instantiate_from_default_config
     finish:
       description: "Signal that the objective has been satisfied, and returns the answer to the user."
@@ -44,7 +47,13 @@ subflows_config:
       - "memory"
 
   
-  
+  wiki_search:
+    _target_: flow_modules.aiflows.ControllerExecutorFlowModule.WikiSearchAtomicFlow.instantiate_from_default_config
+    name: "proxy WikiSearchAtomicFlow"
+    flow_class_name: flow_modules.aiflows.ControllerExecutorFlowModule.WikiSearchAtomicFlow
+    description: "A flow that searches Wikipedia for information."
+    flow_endpoint: WikiSearchAtomicFlow
+    user_id: local
   # wiki_search:
   #   _target_: .WikiSearchAtomicFlow.instantiate_from_default_config
   # ddg_search:
@@ -55,6 +64,9 @@ subflows_config:
   HumanFeedback:
     name: HumanFeedbackFlow
     description: "A flow that requests feedback from a human."
+    flow_class_name: flow_modules.aiflows.HumanStandardInputFlowModule.HumanStandardInputFlow
+    user_id: local
+    flow_endpoint: HumanStandardInputFlow
     _target_: flow_modules.aiflows.HumanStandardInputFlowModule.HumanStandardInputFlow.instantiate_from_default_config
     request_multi_line_input_flag: False
     query_message_prompt_template:
@@ -87,4 +99,8 @@ subflows_config:
   Memory:
     _target_: flow_modules.aiflows.VectorStoreFlowModule.ChromaDBFlow.instantiate_from_default_config
     n_results: 2
+    flow_class_name: flow_modules.aiflows.VectorStoreFlowModule.ChromaDBFlow
+    flow_endpoint: MemoryFlow
+    user_id: local
+
 

demo.yaml

@@ -5,7 +5,11 @@ max_rounds: 30
 subflows_config:
   #ControllerFlow Configuration
   Controller:
-    _target_: flow_modules.aiflows.ControllerExecutorFlowModule.ControllerAtomicFlow.instantiate_from_default_config
+    _target_: aiflows.base_flows.AtomicFlow.instantiate_from_default_config
+    name: "Proxy Controller"
+    user_id: local
+    description: "A flow that acts as a proxy for the controller."
+    flow_endpoint: ControllerAtomicFlow
     commands:
       wiki_search:
         description: "Performs a search on Wikipedia."
@@ -34,12 +38,27 @@ subflows_config:
 
 
   wiki_search:
-    _target_: flow_modules.aiflows.ControllerExecutorFlowModule.WikiSearchAtomicFlow.instantiate_from_default_config
-
+    _target_: aiflows.base_flows.AtomicFlow.instantiate_from_default_config
+    name: "proxy WikiSearchAtomicFlow"
+    description: "A flow that searches Wikipedia for information."
+    flow_endpoint: WikiSearchAtomicFlow
+    user_id: local
 
   #MemoryFlow Configuration
   Memory:
+    name: "MemoryFlow"
+    description: "A flow that acts as a proxy for the memory."
+    _target_: flow_modules.aiflows.VectorStoreFlowModule.ChromaDBFlow.instantiate_from_default_config
+    flow_endpoint: MemoryFlow
+    user_id: local
     backend:
       model_name: none
       api_infos: ???
 
+  HumanFeedback:
+    name: Proxy HumanFeedbackFlow
+    description: "A proxy flow that requests feedback from a human."
+    _target_: flow_modules.aiflows.HumanStandardInputFlowModule.HumanStandardInputFlow.instantiate_from_default_config
+    user_id: local
+    flow_endpoint: HumanStandardInputFlow
+   

run.py

@@ -61,24 +61,21 @@ if __name__ == "__main__":
     #3. ~~~~ Serve The Flow ~~~~
     serve_utils.recursive_serve_flow(
         cl = cl,
-        flow_type="AutoGPTFlowModule",
-        default_config=cfg,
-        default_state=None,
-        default_dispatch_point="coflows_dispatch"
+        flow_class_name="flow_modules.aiflows.AutoGPTFlowModule.AutoGPTFlow",
+        flow_endpoint="AutoGPTFlow",
     )
     
     #4. ~~~~~Start A Worker Thread~~~~~
-    run_dispatch_worker_thread(cl, dispatch_point="coflows_dispatch", flow_modules_base_path=FLOW_MODULES_PATH)
+    run_dispatch_worker_thread(cl)
 
     #5. ~~~~~Mount the flow and get its proxy~~~~~~
-    proxy_flow = serve_utils.recursive_mount(
+    proxy_flow= serve_utils.get_flow_instance(
         cl=cl,
-        client_id="local",
-        flow_type="AutoGPTFlowModule",
-        config_overrides=None,
-        initial_state=None,
-        dispatch_point_override=None,
-    )   
+        flow_endpoint="AutoGPTFlow",
+        user_id="local",
+        config_overrides = cfg
+    )
+     
     
     #6. ~~~ Get the data ~~~
     data = {