partially update CC_flows to be consistent with yeeef_dev

CF_Code.py

@@ -6,3 +6,5 @@ from flows.application_flows import OpenAIChatAtomicFlow
 class CF_Code(OpenAIChatAtomicFlow):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
+    
+    

CF_Code.yaml

@@ -81,4 +81,5 @@ output_data_transformations:
     assert_unique: True
 
 output_keys:
+  - "api_output"
   - "code"

CF_CodeCollab.yaml

@@ -2,24 +2,20 @@ name: "CodeCollab_Flow"
 description: "ToDO: add description"
 
 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: []
 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-
@@ -38,33 +34,26 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
+      
       input_keys:
         - "code_feedback"
-      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
-
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          input_key: "api_output"
-          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:
-            api_output: "code_feedback"
-
-reset_every_round:
-  CodeGenerator: False # this is the name of the subflow, may be different for each config, needs to check !
-  CodeCritic: True
+early_exit_key: "end_of_interaction"

CF_CodeCritic.yaml

@@ -72,4 +72,4 @@ init_input_keys:
   - "output_description"
   - "io_examples_and_explanation"
   - "code"
-output_keys: []
+output_keys: ["api_output"]

CF_CodeCriticWrongAttempt.yaml

@@ -70,7 +70,6 @@ init_human_message_prompt_template:
     - "testing_results_summary"
   template_format: jinja2
 
-input_data_transformations: []
 init_input_keys:
   - "problem_description"
   - "input_description"

CF_CodeDebug.yaml

@@ -2,9 +2,7 @@ name: "CodeDebug_Flow"
 description: "ToDO: add description"
 
 max_rounds: 2 # ToDo: To increase to 4
-early_exit_key: "end_of_interaction"
 
-input_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
@@ -12,15 +10,12 @@ input_keys:
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      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,28 +34,20 @@ subflows_config:
           code_placeholder: "{{python_code}}"
       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: "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"
+  CodeTestingCritic:
+    _target_: .CF_CodeTesting.instantiate_from_default_config
 
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeTesting.instantiate_from_default_config
-    overrides:
-      name: "CodeTestingCritic"
+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"
 
-reset_every_round:
-  CodeGenerator: False # this is the name of the subflow, may be different for each config, needs to check !
-  CodeTestingCritic: True
+  - flow: CodeTestingCritic
+    reset_every_round: true
+
+early_exit_key: "end_of_interaction"

CF_CodeDebugCollab.yaml

@@ -2,9 +2,7 @@ name: "CodeDebugCollab_Flow"
 description: "ToDO: add description"
 
 max_rounds: 2 # ToDo: To increase to 4
-early_exit_key: "end_of_interaction"
 
-input_data_transformations: []
 input_keys:
   - "problem_description"
   - "input_description"
@@ -12,15 +10,12 @@ input_keys:
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      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"
@@ -42,29 +37,24 @@ subflows_config:
         partial_variables:
           code_placeholder: "{{python_code}}"
         template_format: jinja2
+
       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: "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"
+    
+  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
 
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeDebugCritic.instantiate_from_default_config
-
-
-reset_every_round:
-  CodeGenerator: False # this is the name of the subflow, may be different for each config, needs to check !
-  CodeDebugCritic_Flow: True
+early_exit_key: "end_of_interaction"

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:
-      testing_results_summary: "testing_results_summary"
-      all_tests_passed: "all_tests_passed"
-      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_CodeReflect.yaml

@@ -2,52 +2,36 @@ name: "CodeReflect_Flow"
 description: "ToDO: add description"
 
 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:
-      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]*?)(?=```)'
-          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"
+  CodeGenerator:
+    _target_: .CF_Code.instantiate_from_default_config
+  CodeReflectCritic:
+    _target_: .FixedReply_CodeReflect.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: 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
-
-
-reset_every_round:
-  CodeGenerator: False # this is the name of the subflow, may be different for each config, needs to check !
-  CodeReflectCritic: True
+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_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:
-      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__)