Bring CF flows up-to-date with library.

CF_Code.py

@@ -1,7 +1,8 @@
-from flows.flow_verse import load_class
-OpenAIChatAtomicFlow = load_class("martinjosifoski/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
-# OpenAIChatAtomicFlow = load_class("/Users/josifosk/Documents/PhD/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
+import os
 
+from flows.flow_verse import load_class
+OpenAIChatAtomicFlow_repository_id = os.environ.get("OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow = load_class(OpenAIChatAtomicFlow_repository_id, "OpenAIChatAtomicFlow")
 
 class CF_Code(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

CF_CodeCollab.yaml

@@ -2,6 +2,16 @@ name: "CodeCollab_Flow"
 verbose: True
 description: "ToDO: add description"
 
+input_keys:
+  - "problem_description"
+  - "input_description"
+  - "output_description"
+  - "io_examples_and_explanation"
+
+output_keys:
+  - "code"
+  - "end_of_interaction"
+
 reset_generator_every_round: False
 reset_critic_every_round: True
 max_rounds: 2 # ToDO: To increase to 4
@@ -9,8 +19,7 @@ early_exit_key: "end_of_interaction"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
-    repository_id: "martinjosifoski/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_Code
     overrides:
       name: "CodeGenerator"
@@ -42,8 +51,11 @@ subflows_config:
         - "code"
         - "end_of_interaction"
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_CodeCritic
     overrides:
       name: CodeCritic
+      outputs_transformations:
+        - _target_: flows.outputs_transformations.Rename
+          old_key2new_key:
+            raw_response: "query"

CF_CodeCritic.py

@@ -1,6 +1,9 @@
+import os
+
 from flows.flow_verse import load_class
-OpenAIChatAtomicFlow = load_class("martinjosifoski/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
-# OpenAIChatAtomicFlow = load_class("/Users/josifosk/Documents/PhD/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow_repository_id = os.environ.get("OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow = load_class(OpenAIChatAtomicFlow_repository_id, "OpenAIChatAtomicFlow")
+
 
 
 class CF_CodeCritic(OpenAIChatAtomicFlow):

CF_CodeCritic.yaml

@@ -73,7 +73,3 @@ input_keys:
   - "output_description"
   - "io_examples_and_explanation"
   - "code"
-  - "api_key"
-
-output_keys:
-  - "query"

CF_CodeReflect.yaml

@@ -2,6 +2,11 @@ name: "CodeReflect_Flow"
 verbose: True
 description: "ToDO: add description"
 
+reset_generator_every_round: False
+reset_critic_every_round: True
+max_rounds: 2 # ToDo: To increase to 4
+early_exit_key: "end_of_interaction"
+
 input_keys:
   - "problem_description"
   - "input_description"
@@ -10,37 +15,32 @@ input_keys:
 
 output_keys:
   - "code"
-  - "end_of_interaction"
-
-reset_generator_every_round: False
-reset_critic_every_round: True
-max_rounds: 2 # ToDo: To increase to 4
-early_exit_key: "end_of_interaction"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_Code
     overrides:
       name: "CodeGenerator"
       model_name: "gpt-4"
-      output_keys:
-        - "code"
-        - "end_of_interaction"
       response_annotators:
         end_of_interaction_annotator:
           _target_: flows.message_annotators.EndOfInteraction
           end_of_interaction_message: "Final answer"
           key: "end_of_interaction"
           verbose: True
+      output_keys:
+        - "code"
+        - "end_of_interaction"
   - _target_: flows.base_flows.FixedReplyAtomicFlow.instantiate_with_overrides
     overrides:
       name: "CodeFixedReplyCritic"
       description: "ToDo: Add description"
       input_keys: []
-      output_keys:
-        - "query"
+      outputs_transformations:
+        - _target_: flows.outputs_transformations.Rename
+          old_key2new_key:
+            raw_response: "query"
       fixed_reply: |2-
         Consider the problem statement and the last proposed solution. Are you sure that the solution is provided in the requested format, and crucially, solves the problem?
         If that is not the case, provide the corrected version of the code in the following format:

CF_CodeWithPlan.py

@@ -1,6 +1,8 @@
+import os
+
 from flows.flow_verse import load_class
-OpenAIChatAtomicFlow = load_class("martinjosifoski/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
-# OpenAIChatAtomicFlow = load_class("/Users/josifosk/Documents/PhD/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow_repository_id = os.environ.get("OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow = load_class(OpenAIChatAtomicFlow_repository_id, "OpenAIChatAtomicFlow")
 
 
 class CF_CodeWithPlan(OpenAIChatAtomicFlow):

CF_CodeWithPlan.yaml

@@ -77,7 +77,6 @@ input_keys:
   - "output_description"
   - "io_examples_and_explanation"
   - "plan"
-  - "api_key"
 
 output_keys:
   - "code"

CF_Plan.py

@@ -1,6 +1,7 @@
+import os
 from flows.flow_verse import load_class
-OpenAIChatAtomicFlow = load_class("martinjosifoski/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
-# OpenAIChatAtomicFlow = load_class("/Users/josifosk/Documents/PhD/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow_repository_id = os.environ.get("OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow = load_class(OpenAIChatAtomicFlow_repository_id, "OpenAIChatAtomicFlow")
 
 
 class CF_Plan(OpenAIChatAtomicFlow):

CF_Plan.yaml

@@ -71,7 +71,6 @@ input_keys:
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
-  - "api_key"
 
 output_keys:
   - "plan"

CF_PlanCollab.yaml

@@ -2,25 +2,24 @@ name: "PlanCollab_Flow"
 verbose: True
 description: "ToDO: add description"
 
-reset_generator_every_round: False
-reset_critic_every_round: True
-max_rounds: 2 # ToDo: To increase to 4
-early_exit_key: "end_of_interaction"
-
 input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
-  - "api_key"
 
 output_keys:
   - "plan"
+  - "end_of_interaction"
+
+reset_generator_every_round: False
+reset_critic_every_round: True
+max_rounds: 2 # ToDo: To increase to 4
+early_exit_key: "end_of_interaction"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_Plan
     overrides:
       name: "PlanGenerator"
@@ -51,8 +50,11 @@ subflows_config:
         - "plan"
         - "end_of_interaction"
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_PlanCritic
     overrides:
       name: PlanCritic
+      outputs_transformations:
+        - _target_: flows.outputs_transformations.Rename
+          old_key2new_key:
+            raw_response: "query"

CF_PlanCollab_Code.yaml

@@ -1,14 +1,19 @@
 name: "PlanCollab_Code"
 description: "ToDO: add description"
 
-early_exit_key: null
+input_keys:
+  - "problem_description"
+  - "input_description"
+  - "output_description"
+  - "io_examples_and_explanation"
+
+output_keys:
+  - "code"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_PlanCollab
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_CodeWithPlan

CF_PlanCritic.py

@@ -1,6 +1,8 @@
+import os
+
 from flows.flow_verse import load_class
-OpenAIChatAtomicFlow = load_class("martinjosifoski/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
-# OpenAIChatAtomicFlow = load_class("/Users/josifosk/Documents/PhD/OpenAIChatAtomicFlow", "OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow_repository_id = os.environ.get("OpenAIChatAtomicFlow")
+OpenAIChatAtomicFlow = load_class(OpenAIChatAtomicFlow_repository_id, "OpenAIChatAtomicFlow")
 
 
 class CF_PlanCritic(OpenAIChatAtomicFlow):

CF_PlanCritic.yaml

@@ -72,7 +72,6 @@ input_keys:
   - "output_description"
   - "io_examples_and_explanation"
   - "plan"
-  - "api_key"
 
 output_keys:
   - "query"

CF_PlanReflect.yaml

@@ -4,7 +4,7 @@ description: "ToDO: add description"
 
 reset_generator_every_round: False
 reset_critic_every_round: True
-max_rounds: 2 # To increase to 4
+max_rounds: 2 # ToDo: increase to 4
 early_exit_key: "end_of_interaction"
 
 input_keys:
@@ -12,15 +12,13 @@ input_keys:
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
-  - "api_key"
 
 output_keys:
   - "plan"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_Plan
     overrides:
       name: "PlanGenerator"
@@ -36,10 +34,13 @@ subflows_config:
         - "end_of_interaction"
   - _target_: flows.base_flows.FixedReplyAtomicFlow.instantiate_with_overrides
     overrides:
-      name: "PlanCritic"
+      name: "PlanFixedReplyCritic"
       description: "ToDo: Add description"
-      output_keys:
-        - "query"
+      input_keys: []
+      outputs_transformations:
+        - _target_: flows.outputs_transformations.Rename
+          old_key2new_key:
+            raw_response: "query"
       fixed_reply: |2-
         Consider the problem statement and the last proposed solution. Are you sure that the solution is provided in the requested format, and crucially, solves the problem?
         If that is not the case, provide the corrected version of the conceptual solution in the following format:

CF_PlanReflect_Code.yaml

@@ -1,14 +1,19 @@
 name: "PlanReflect_Code_Flow"
 description: "ToDO: add description"
 
-early_exit_key: null
+input_keys:
+  - "problem_description"
+  - "input_description"
+  - "output_description"
+  - "io_examples_and_explanation"
+
+output_keys:
+  - "code"
 
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_PlanReflect
   - _target_: flows.flow_verse.instantiate_flow
-    repository_id: "martinjosifoski/CC_flows"
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_CodeWithPlan

CF_Plan_Code.yaml

@@ -3,16 +3,25 @@ description: "ToDO: add description"
 
 early_exit_key: null
 
+
+
 subflows_config:
   - _target_: flows.flow_verse.instantiate_flow
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
-    repository_id: "martinjosifoski/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_Plan
     overrides:
       model_name: "gpt-4"
   - _target_: flows.flow_verse.instantiate_flow
-    # repository_id: "/Users/josifosk/Documents/PhD/CC_flows" 
-    repository_id: "martinjosifoski/CC_flows"
+    repository_id: ${oc.env:CC_FLOWS}
     class_name: CF_CodeWithPlan
     overrides:
       model_name: "gpt-4"
+
+input_keys:
+  - "problem_description"
+  - "input_description"
+  - "output_description"
+  - "io_examples_and_explanation"
+
+output_keys:
+  - "code"

__init__.py

@@ -1,12 +1,16 @@
 from .CF_Code import CF_Code
-# from .CF_CodeWithPlan import CF_CodeWithPlan
 from .CF_CodeReflect import CF_CodeReflect
-# from .CF_Plan import CF_Plan
-# from .CF_Plan_Code import CF_Plan_Code
-# from .CF_CodeCritic import CF_CodeCritic
-# from .CF_CodeCollab import CF_CodeCollab
-# from .CF_PlanReflect import CF_PlanReflect
-# from .CF_PlanReflect_Code import CF_PlanReflect_Code
-# from .CF_PlanCritic import CF_PlanCritic
-# from .CF_PlanCollab import CF_PlanCollab
-# from .CF_PlanCollab_Code import CF_PlanCollab_Code
+
+from .CF_CodeCritic import CF_CodeCritic
+from .CF_CodeCollab import CF_CodeCollab
+
+from .CF_Plan import CF_Plan
+from .CF_CodeWithPlan import CF_CodeWithPlan
+from .CF_Plan_Code import CF_Plan_Code
+
+from .CF_PlanReflect import CF_PlanReflect
+from .CF_PlanReflect_Code import CF_PlanReflect_Code
+
+from .CF_PlanCritic import CF_PlanCritic
+from .CF_PlanCollab import CF_PlanCollab
+from .CF_PlanCollab_Code import CF_PlanCollab_Code