partially propagate changes (#7)

- propagate changes (b697fc8b0f017ee7dc25121288ce9f9346cf8a86)
- propagate changes (0eae436a18d318ae17b1939a76d83b5b24ada13d)
- propagate change from https://github.com/epfl-dlab/flows/pull/91 (d9ef54ce605115d9672cc394a934115ec8d6ba2c)
- partially update CC_flows to be consistent with yeeef_dev (28b05f541f4fb9fc87c0f4307bd02ce51a28b602)


Co-authored-by: Yeeef <yeeef@users.noreply.huggingface.co>

CF_Code.py

@@ -1,12 +1,10 @@
 import importlib
 import os
 
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
-# flow_module = importlib.import_module(os.getenv("OpenAIChatAtomicFlow_module"))
-# OpenAIChatAtomicFlow = getattr(flow_module, "OpenAIChatAtomicFlow")
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class CF_Code(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
+    
+    

CF_Code.yaml

@@ -35,7 +35,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -65,7 +65,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -75,10 +75,11 @@ output_data_transformations:
   - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
     regex: '(?<=```python)([\s\S]*?)(?=```)'
     regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-    input_key: "raw_response"
+    input_key: "api_output"
     output_key: "code"
     strip: True
     assert_unique: True
 
 output_keys:
+  - "api_output"
   - "code"

CF_CodeCollab.yaml

@@ -1,30 +1,21 @@
 name: "CodeCollab_Flow"
 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_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.code: "code"
 output_keys:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_Code.instantiate_from_default_config
+  CodeGenerator:
+    _target_: .CF_Code.instantiate_from_default_config
     overrides:
-      name: "CodeGenerator"
-      model_name: "gpt-4"
       human_message_prompt_template:
         _target_: langchain.PromptTemplate
         template: |2-
@@ -43,28 +34,26 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+      
+      input_keys:
         - "code_feedback"
-      output_data_transformations:
-        - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
-          regex: '(?<=```python)([\s\S]*?)(?=```)'
-          regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
-          output_key: "code"
-          strip: True
-          assert_unique: True
-
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          output_key: "end_of_interaction"
+  CodeCritic:
+    _target_: .CF_CodeCritic.instantiate_from_default_config
+
+topology:
+  - flow: CodeGenerator
+    reset_every_round: false
+    output_transformations:
+      - _target_: flows.data_transformations.EndOfInteraction
+        end_of_interaction_string: "Final answer"
+        input_key: "api_output"
+        output_key: "end_of_interaction"
+
+  - flow: CodeCritic
+    reset_every_round: true
+    output_transformations:
+      - _target_: flows.data_transformations.KeyRename
+        old_key2new_key:
+          api_output: "code_feedback"
 
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeCritic.instantiate_from_default_config
-    overrides:
-      name: CodeCritic
-      output_data_transformations:
-        - _target_: flows.data_transformations.KeyRename
-          old_key2new_key:
-            raw_response: "code_feedback"
+early_exit_key: "end_of_interaction"

CF_CodeCritic.py

@@ -1,7 +1,4 @@
-import os
-import importlib
-
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
+from flows.application_flows import OpenAIChatAtomicFlow
 
 
 class CF_CodeCritic(OpenAIChatAtomicFlow):

CF_CodeCritic.yaml

@@ -37,7 +37,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -66,10 +66,10 @@ query_message_prompt_template:
     - "code"
   template_format: jinja2
 
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
   - "code"
-output_keys: []
+output_keys: ["api_output"]

CF_CodeCriticWrongAttempt.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class CF_CodeCriticWrongAttempt(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

CF_CodeCriticWrongAttempt.yaml

@@ -38,7 +38,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -70,8 +70,7 @@ query_message_prompt_template:
     - "testing_results_summary"
   template_format: jinja2
 
-input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -82,6 +81,6 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "code_feedback"
+      api_output: "code_feedback"
 output_keys:
   - "code_feedback"

CF_CodeCriticWrongAttemptWithPlan.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 
 class CF_CodeCriticWrongAttemptWithPlan(OpenAIChatAtomicFlow):

CF_CodeCriticWrongAttemptWithPlan.yaml

@@ -40,7 +40,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -77,7 +77,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -89,6 +89,6 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "code_feedback"
+      api_output: "code_feedback"
 output_keys:
   - "code_feedback"

CF_CodeDebug.yaml

@@ -1,12 +1,8 @@
 name: "CodeDebug_Flow"
 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_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
@@ -14,15 +10,12 @@ input_keys:
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.code: "code"
 output_keys:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_Code.instantiate_from_default_config
+  CodeGenerator:
+    _target_: .CF_Code.instantiate_from_default_config
     overrides:
       name: "CodeGenerator"
       model_name: "gpt-4"
@@ -39,25 +32,22 @@ subflows_config:
           - testing_results_summary
         partial_variables:
           code_placeholder: "{{python_code}}"
-      default_human_input_keys:
+      input_keys:
         - "testing_results_summary"
-        - "all_tests_passed"
-      output_data_transformations:
-        - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
-          regex: '(?<=```python)([\s\S]*?)(?=```)'
-          regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
-          output_key: "code"
-          strip: True
-          assert_unique: True
-
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          output_key: "end_of_interaction"
-
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeTesting.instantiate_from_default_config
-    overrides:
-      name: "CodeTestingCritic"
+
+  CodeTestingCritic:
+    _target_: .CF_CodeTesting.instantiate_from_default_config
+
+topology:
+  - flow: CodeGenerator
+    reset_every_round: false
+    output_transformations:
+      - _target_: flows.data_transformations.EndOfInteraction
+        end_of_interaction_string: "Final answer"
+        input_key: "api_output"
+        output_key: "end_of_interaction"
+
+  - flow: CodeTestingCritic
+    reset_every_round: true
+
+early_exit_key: "end_of_interaction"

CF_CodeDebugCollab.yaml

@@ -1,12 +1,8 @@
 name: "CodeDebugCollab_Flow"
 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_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
@@ -14,15 +10,12 @@ input_keys:
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.code: "code"
 output_keys:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_Code.instantiate_from_default_config
+  CodeGenerator:
+    _target_: .CF_Code.instantiate_from_default_config
     overrides:
       name: "CodeGenerator"
       model_name: "gpt-4"
@@ -44,23 +37,24 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+
+      input_keys:
         - "code_feedback"
         - "testing_results_summary"
-      output_data_transformations:
-        - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
-          regex: '(?<=```python)([\s\S]*?)(?=```)'
-          regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
-          output_key: "code"
-          strip: True
-          assert_unique: True
+    
+  CodeDebugCritic:
+    _target_: .CF_CodeDebugCritic.instantiate_from_default_config
+
+topology:
+  - flow: CodeGenerator
+    reset_every_round: false
+    output_transformations:
+      - _target_: flows.data_transformations.EndOfInteraction
+        end_of_interaction_string: "Final answer"
+        input_key: "api_output"
+        output_key: "end_of_interaction"
+
+  - flow: CodeDebugCritic
+    reset_every_round: true
 
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          output_key: "end_of_interaction"
-
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeDebugCritic.instantiate_from_default_config
+early_exit_key: "end_of_interaction"

CF_CodeDebugCollabWithPlan.yaml

@@ -1,8 +1,7 @@
 name: "CodeDebugCollabWithPlan_Flow"
 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"
 
@@ -18,7 +17,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -45,23 +44,28 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+      input_keys:
         - "code_feedback"
         - "testing_results_summary"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
         - "code"
         - "end_of_interaction"
   - _target_: martinjosifoski.CC_flows.CF_CodeDebugCriticWithPlan.instantiate_from_default_config
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeDebugCriticWithPlan_Flow: True

CF_CodeDebugCritic.yaml

@@ -3,7 +3,6 @@ description: "ToDo: add description"
 
 early_exit_key: null
 
-input_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
@@ -12,19 +11,18 @@ input_keys:
   - "public_tests_individual_io"
   - "code"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.testing_results_summary: "testing_results_summary"
-      raw_response.all_tests_passed: "all_tests_passed"
-      raw_response.code_feedback: "code_feedback"
 output_keys:
   - "testing_results_summary"
   - "all_tests_passed"
   - "code_feedback"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_CodeTesting.instantiate_from_default_config
-    overrides:
-      name: "CodeTestingCritic"
-  - _target_: martinjosifoski.CC_flows.CF_CodeCriticWrongAttempt.instantiate_from_default_config
+  CodeTestingCritic:
+    _target_: .CF_CodeTesting.instantiate_from_default_config
+  CodeCriticWrongAttempt:
+    _target_: .CF_CodeCriticWrongAttempt.instantiate_from_default_config
+
+topology:
+  - flow: CodeTestingCritic
+  - flow: CodeCriticWrongAttempt
+

CF_CodeDebugCriticWithPlan.yaml

@@ -16,9 +16,9 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.testing_results_summary: "testing_results_summary"
-      raw_response.all_tests_passed: "all_tests_passed"
-      raw_response.code_feedback: "code_feedback"
+      testing_results_summary: "testing_results_summary"
+      all_tests_passed: "all_tests_passed"
+      code_feedback: "code_feedback"
 output_keys:
   - "testing_results_summary"
   - "all_tests_passed"

CF_CodeReflect.yaml

@@ -1,48 +1,37 @@
 name: "CodeReflect_Flow"
 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_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.code: "code"
 output_keys:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_Code.instantiate_from_default_config
-    overrides:
-      name: "CodeGenerator"
-      model_name: "gpt-4"
-      input_data_transformations:
-        - _target_: flows.data_transformations.KeyRename
-          old_key2new_key:
-            code_reflect_message: "query"
-      output_data_transformations:
-        - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
-          regex: '(?<=```python)([\s\S]*?)(?=```)'
-          regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          output_key: "code"
-          strip: True
-          assert_unique: True
+  CodeGenerator:
+    _target_: .CF_Code.instantiate_from_default_config
+  CodeReflectCritic:
+    _target_: .FixedReply_CodeReflect.instantiate_from_default_config
 
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          output_key: "end_of_interaction"
+topology:
+  - flow: CodeGenerator
+    reset_every_round: false
+    output_transformations:
+      - _target_: flows.data_transformations.EndOfInteraction
+        end_of_interaction_string: "Final answer"
+        input_key: "api_output"
+        output_key: "end_of_interaction"
 
-      output_keys:
-        - "code"
-        - "end_of_interaction"
+  - flow: CodeReflectCritic
+    reset_every_round: true
+    output_transformations:
+      - _target_: flows.data_transformations.KeyRename
+        old_key2new_key:
+          code_reflect_message: "query"
 
-  - _target_: martinjosifoski.CC_flows.FixedReply_CodeReflect.instantiate_from_default_config
+early_exit_key: "end_of_interaction"

CF_CodeTesting.yaml

@@ -1,3 +1,4 @@
+name: "CF_CodeTesting"
 description: "ToDo: add description"
 
 input_data_transformations: []
@@ -10,7 +11,7 @@ output_keys:
   - "testing_results_summary"
 output_data_transformations:
   - _target_: martinjosifoski.CC_flows.src.data_transformations.CorrectnessFlag
-    input_key: "raw_response.public_tests_results"
+    input_key: "public_tests_results"
     output_key: "all_tests_passed"
   - _target_: martinjosifoski.CC_flows.src.data_transformations.TestingResultsSummaryGeneration
     output_key: "testing_results_summary"

CF_CodeWithPlan.py

@@ -1,6 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class CF_CodeWithPlan(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

CF_CodeWithPlan.yaml

@@ -37,7 +37,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -71,7 +71,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -82,6 +82,7 @@ output_data_transformations:
   - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
     regex: '(?<=```python)([\s\S]*?)(?=```)'
     regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
+    input_key: "api_output"
     output_key: "code"
     strip: True
     assert_unique: True

CF_Plan.py

@@ -1,4 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class CF_Plan(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

CF_Plan.yaml

@@ -13,7 +13,7 @@ generation_parameters:
     presence_penalty: 0
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -24,6 +24,7 @@ output_data_transformations:
     regex: '(?<=Conceptual solution)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
     regex_fallback:
       - '(?<=Conceptual solution:)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
+    input_key: "api_output"
     output_key: "plan"
     strip: True
     assert_unique: True
@@ -56,7 +57,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement

CF_PlanCollab.yaml

@@ -1,8 +1,6 @@
 name: "PlanCollab_Flow"
 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"
 
@@ -16,7 +14,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.plan: "plan"
+      plan: "plan"
 output_keys:
   - "plan"
 
@@ -41,19 +39,21 @@ subflows_config:
         partial_variables:
           plan_placeholder: "{{conceptual_solution}}"
         template_format: jinja2
-      default_human_input_keys:
+      input_keys:
         - "plan_feedback"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=Conceptual solution)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
           regex_fallback:
             - '(?<=Conceptual solution:)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
+          input_key: "api_output"
           output_key: "plan"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -65,4 +65,8 @@ subflows_config:
       output_data_transformations:
         - _target_: flows.data_transformations.KeyRename
           old_key2new_key:
-            raw_response: "plan_feedback"
+            api_output: "plan_feedback"
+
+reset_every_round:
+  PlanGenerator: false
+  PlanCritic: true

CF_PlanCollab_Code.yaml

@@ -13,7 +13,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 

CF_PlanCritic.py

@@ -1,4 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
+from flows.application_flows import OpenAIChatAtomicFlow
 
 
 class CF_PlanCritic(OpenAIChatAtomicFlow):

CF_PlanCritic.yaml

@@ -38,7 +38,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -65,7 +65,7 @@ query_message_prompt_template:
     - "plan"
   template_format: jinja2
 
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"

CF_PlanReflect.yaml

@@ -1,8 +1,6 @@
 name: "PlanReflect_Flow"
 description: "ToDO: add description"
 
-reset_generator_every_round: False
-reset_critic_every_round: True
 max_rounds: 2 # ToDo: increase to 4
 early_exit_key: "end_of_interaction"
 
@@ -16,7 +14,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.plan: "plan"
+      plan: "plan"
 output_keys:
   - "plan"
 
@@ -34,12 +32,14 @@ subflows_config:
           regex: '(?<=Conceptual solution)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
           regex_fallback:
             - '(?<=Conceptual solution:)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
+          input_key: "api_output"
           output_key: "plan"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -48,3 +48,7 @@ subflows_config:
 
   - _target_: martinjosifoski.CC_flows.FixedReply_PlanReflect.instantiate_from_default_config
 
+
+reset_every_round:
+  PlanGenerator_Flow: False # this is the name of the subflow, may be different for each config, needs to check !
+  PlanReflectCritic: True

CF_PlanReflect_Code.yaml

@@ -13,7 +13,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 

CF_Plan_Code.yaml

@@ -1,26 +1,25 @@
 name: "Plan_Code_Flow"
 description: "ToDO: add description"
 
-early_exit_key: null
-
-input_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      raw_response.code: "code"
 output_keys:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_Plan.instantiate_from_default_config
+  CF_Plan:
+    _target_: martinjosifoski.CC_flows.CF_Plan.instantiate_from_default_config
     overrides:
       model_name: "gpt-4"
-  - _target_: martinjosifoski.CC_flows.CF_CodeWithPlan.instantiate_from_default_config
+  CF_CodeWithPlan:
+    _target_: martinjosifoski.CC_flows.CF_CodeWithPlan.instantiate_from_default_config
     overrides:
       model_name: "gpt-4"
+
+topology:
+  - flow: CF_Plan
+  - flow: CF_CodeWithPlan

CodeTesting.py

@@ -2,7 +2,7 @@ from copy import deepcopy
 from typing import Optional, Any, List, Dict
 
 from flows import logging
-from flows.base_flows.abstract import AtomicFlow
+from flows.base_flows import AtomicFlow
 
 log = logging.get_logger(__name__)
 
@@ -33,14 +33,12 @@ class CodeTesting(AtomicFlow):
         return cls(**kwargs)
 
     def run(self,
-            input_data: Dict[str, Any],
-            private_keys: Optional[List[str]] = [],
-            keys_to_ignore_for_hash: Optional[List[str]] = []) -> Dict[str, Any]:
+            input_data: Dict[str, Any]) -> Dict[str, Any]:
 
         # ~~~ Retrieve the test data ~~~
         test_data = self._get_test_data(input_data)
 
         # ~~~ Run tests ~~~
-        response = self._run_tests(input_data, test_data)
+        response: Dict[str, Any] = self._run_tests(input_data, test_data)
 
         return response

FixedReply_CodeReflect.yaml

@@ -8,7 +8,7 @@ input_keys: []
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "code_reflect_message"
+      fixed_reply: "code_reflect_message"
 output_keys:
   - "code_reflect_message"
 

FixedReply_PlanReflect.yaml

@@ -8,7 +8,7 @@ input_keys: []
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "plan_reflect_message"
+      fixed_reply: "plan_reflect_message"
 output_keys:
   - "plan_reflect_message"
 

LC_Code.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_Code(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_Code.yaml

@@ -33,7 +33,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -64,7 +64,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
     - "problem_description"
     - "io_description"
     - "constraints"
@@ -74,7 +74,7 @@ output_data_transformations:
   - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
     regex: '(?<=```python)([\s\S]*?)(?=```)'
     regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-    input_key: "raw_response"
+    input_key: "api_output"
     output_key: "code"
     strip: True
     assert_unique: True

LC_CodeCollab.yaml

@@ -1,8 +1,6 @@
 name: "CodeCollab_Flow"
 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"
 
@@ -16,7 +14,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -43,19 +41,20 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+      input_keys:
         - "code_feedback"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -67,4 +66,8 @@ subflows_config:
       output_data_transformations:
         - _target_: flows.data_transformations.KeyRename
           old_key2new_key:
-            raw_response: "code_feedback"
+            api_output: "code_feedback"
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeCritic: True

LC_CodeCritic.py

@@ -1,6 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_CodeCritic(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_CodeCritic.yaml

@@ -36,7 +36,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -67,7 +67,7 @@ query_message_prompt_template:
     - "code"
   template_format: jinja2
 
-input_keys:
+init_input_keys:
   - "problem_description"
   - "io_description"
   - "constraints"

LC_CodeCriticWrongAttempt.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_CodeCriticWrongAttempt(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_CodeCriticWrongAttempt.yaml

@@ -37,7 +37,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -72,7 +72,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "io_description"
   - "constraints"
@@ -83,6 +83,6 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "code_feedback"
+      api_output: "code_feedback"
 output_keys:
   - "code_feedback"

LC_CodeCriticWrongAttemptWithPlan.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_CodeCriticWrongAttemptWithPlan(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_CodeCriticWrongAttemptWithPlan.yaml

@@ -39,7 +39,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -79,7 +79,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
     - "problem_description"
     - "io_description"
     - "constraints"
@@ -91,6 +91,6 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response: "code_feedback"
+      api_output: "code_feedback"
 output_keys:
   - "code_feedback"

LC_CodeDebug.yaml

@@ -1,8 +1,6 @@
 name: "CodeDebug_Flow"
 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"
 
@@ -17,7 +15,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -39,20 +37,21 @@ subflows_config:
           - testing_results_summary
         partial_variables:
           code_placeholder: "{{python_code}}"
-      default_human_input_keys:
+      input_keys:
         - "testing_results_summary"
         - "all_tests_passed"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -61,3 +60,7 @@ subflows_config:
   - _target_: martinjosifoski.CC_flows.LC_CodeTesting.instantiate_from_default_config
     overrides:
       name: "CodeTestingCritic"
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeTestingCritic: True

LC_CodeDebugCollab.yaml

@@ -1,8 +1,6 @@
 name: "CodeDebugCollab_Flow"
 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"
 
@@ -17,7 +15,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -44,20 +42,21 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+      input_keys:
         - "code_feedback"
         - "testing_results_summary"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -65,3 +64,7 @@ subflows_config:
         - "end_of_interaction"
   - _target_: martinjosifoski.CC_flows.LC_CodeDebugCritic.instantiate_from_default_config
 
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeDebugCritic_Flow: True

LC_CodeDebugCollabWithPlan.yaml

@@ -1,8 +1,6 @@
 name: "CodeDebugCollabWithPlan_Flow"
 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"
 
@@ -18,7 +16,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -45,23 +43,29 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
-      default_human_input_keys:
+      input_keys:
         - "code_feedback"
         - "testing_results_summary"
       output_data_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
-          input_key: "raw_response"
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
         - "code"
         - "end_of_interaction"
   - _target_: martinjosifoski.CC_flows.LC_CodeDebugCriticWithPlan.instantiate_from_default_config 
+
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeDebugCriticWithPlan_Flow: True

LC_CodeDebugCritic.yaml

@@ -15,9 +15,9 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.testing_results_summary: "testing_results_summary"
-      raw_response.all_tests_passed: "all_tests_passed"
-      raw_response.code_feedback: "code_feedback"
+      testing_results_summary: "testing_results_summary"
+      all_tests_passed: "all_tests_passed"
+      code_feedback: "code_feedback"
 output_keys:
   - "testing_results_summary"
   - "all_tests_passed"

LC_CodeDebugCriticWithPlan.yaml

@@ -16,9 +16,9 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.testing_results_summary: "testing_results_summary"
-      raw_response.all_tests_passed: "all_tests_passed"
-      raw_response.code_feedback: "code_feedback"
+      testing_results_summary: "testing_results_summary"
+      all_tests_passed: "all_tests_passed"
+      code_feedback: "code_feedback"
 output_keys:
   - "testing_results_summary"
   - "all_tests_passed"

LC_CodeReflect.yaml

@@ -1,8 +1,6 @@
 name: "CodeReflect_Flow"
 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"
 
@@ -16,7 +14,7 @@ input_keys:
 output_data_transformations:
   - _target_: flows.data_transformations.KeyRename
     old_key2new_key:
-      raw_response.code: "code"
+      code: "code"
 output_keys:
   - "code"
 
@@ -33,12 +31,14 @@ subflows_config:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
+          input_key: "api_output"
           output_key: "code"
           strip: True
           assert_unique: True
 
         - _target_: flows.data_transformations.EndOfInteraction
           end_of_interaction_string: "Final answer"
+          input_key: "api_output"
           output_key: "end_of_interaction"
 
       output_keys:
@@ -46,3 +46,7 @@ subflows_config:
         - "end_of_interaction"
 
   - _target_: martinjosifoski.CC_flows.FixedReply_CodeReflect.instantiate_from_default_config
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeReflectCritic: True

LC_CodeTesting.yaml

@@ -12,7 +12,7 @@ output_keys:
   - "testing_results_summary"
 output_data_transformations:
   - _target_: .src.data_transformations.CorrectnessFlag
-    input_key: "raw_response.public_tests_results"
+    input_key: "public_tests_results"
     output_key: "all_tests_passed"
   - _target_: .src.data_transformations.TestingResultsSummaryGeneration
     output_key: "testing_results_summary"

LC_CodeWithPlan.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_CodeWithPlan(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_CodeWithPlan.yaml

@@ -35,7 +35,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement
@@ -72,7 +72,7 @@ query_message_prompt_template:
   template_format: jinja2
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
   - "problem_description"
   - "io_description"
   - "constraints"
@@ -83,6 +83,7 @@ output_data_transformations:
   - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
     regex: '(?<=```python)([\s\S]*?)(?=```)'
     regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
+    input_key: "api_output"
     output_key: "code"
     strip: True
     assert_unique: True

LC_Plan.py

@@ -1,5 +1,4 @@
-from martinjosifoski.OpenAIChatAtomicFlow import OpenAIChatAtomicFlow
-
+from flows.application_flows import OpenAIChatAtomicFlow
 
 class LC_Plan(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):

LC_Plan.yaml

@@ -13,7 +13,7 @@ generation_parameters:
     presence_penalty: 0
 
 input_data_transformations: []
-input_keys:
+init_input_keys:
     - "problem_description"
     - "io_description"
     - "constraints"
@@ -23,6 +23,7 @@ output_data_transformations:
     regex: '(?<=Conceptual solution)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
     regex_fallback:
       - '(?<=Conceptual solution:)([\s\S]*?)(?=\n\n# [A-Z]|\Z)'
+    input_key: "api_output"
     output_key: "plan"
     strip: True
     assert_unique: True
@@ -53,7 +54,7 @@ human_message_prompt_template:
     - "query"
   template_format: jinja2
 
-query_message_prompt_template:
+init_human_message_prompt_template:
   _target_: langchain.PromptTemplate
   template: |2-
     # Problem statement