Propagate changes from refactoring.

CF_CodeCriticWrongAttempt.py

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

CF_CodeCriticWrongAttempt.yaml

@@ -70,7 +70,7 @@ init_human_message_prompt_template:
     - "testing_results_summary"
   template_format: jinja2
 
-init_input_keys:
+input_interface_non_initialized:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -78,9 +78,5 @@ init_input_keys:
   - "testing_results_summary"
   - "code"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      api_output: "code_feedback"
-output_keys:
-  - "code_feedback"
+output_interface:
+  - "api_output"

CF_CodeCriticWrongAttemptWithPlan.yaml

@@ -76,8 +76,7 @@ init_human_message_prompt_template:
     - "testing_results_summary"
   template_format: jinja2
 
-input_data_transformations: []
-init_input_keys:
+input_interface_non_initialized:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -86,9 +85,5 @@ init_input_keys:
   - "plan"
   - "code"
 
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      api_output: "code_feedback"
-output_keys:
-  - "code_feedback"
+output_interface:
+  - "api_output"

CF_CodeDebug.yaml

@@ -62,7 +62,7 @@ topology:
       keys_to_select:
         - "code"
 
-    reset_every_round: false
+    reset: false
 
   # ~~~ Code Testing Critic ~~~
   - goal: "Test the code on the public tests and provide a results summary."
@@ -144,3 +144,5 @@ topology:
           tests_separator: "\n\n"
 
           issue_title: "# Issue with the last proposed solution"
+
+    reset: true

CF_CodeDebugCollab.yaml

@@ -3,58 +3,82 @@ description: "ToDO: add description"
 
 max_rounds: 2 # ToDo: To increase to 4
 
-input_keys:
+input_interface:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
-
-output_keys:
+output_interface:
   - "code"
 
 subflows_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-
-          {{testing_results_summary}}
-        
-          {{code_feedback}}
-
-
-          Consider the problem statement, the last proposed solution, its issue and the provided feedback. Return a corrected version of the code that solves the original problem and resolves the issue, without any explanation, in the following format:
-          ```python
-          {{code_placeholder}}
-          ```
-        input_variables:
-          - code_feedback
-          - testing_results_summary
-        partial_variables:
-          code_placeholder: "{{python_code}}"
-        template_format: jinja2
-
-      input_keys:
-        - "code_feedback"
-        - "testing_results_summary"
-    
+    name: "CodeGenerator"
+    model_name: "gpt-4"
+    human_message_prompt_template:
+      _target_: langchain.PromptTemplate
+      template: |2-
+        {{testing_results_summary}}
+      
+        {{code_feedback}}
+
+
+        Consider the problem statement, the last proposed solution, its issue and the provided feedback. Return a corrected version of the code that solves the original problem and resolves the issue, without any explanation, in the following format:
+        ```python
+        {{code_placeholder}}
+        ```
+      input_variables:
+        - code_feedback
+        - testing_results_summary
+      partial_variables:
+        code_placeholder: "{{python_code}}"
+    input_interface_initialized:
+      - "code_feedback"
+      - "testing_results_summary"
   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
-
-early_exit_key: "end_of_interaction"
+  # ~~~ Code Generator ~~~
+  - goal: "Generate/refine a solution."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeGenerator
+
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_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
+      keys_to_select:
+        - "code"
+
+    reset: false
+
+  # ~~~ Code Critic Grounded in Tests ~~~
+  - goal: ""
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeDebugCritic
+
+    reset: true

CF_CodeDebugCollabWithPlan.yaml

@@ -1,53 +1,63 @@
 name: "CodeDebugCollabWithPlan_Flow"
 description: "ToDO: add description"
 
-
 max_rounds: 2 # ToDo: To increase to 4
-early_exit_key: "end_of_interaction"
 
-input_data_transformations: []
-input_keys:
+input_interface:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
   - "public_tests_individual_io"
   - "plan"
-
-output_data_transformations:
-  - _target_: flows.data_transformations.KeyRename
-    old_key2new_key:
-      code: "code"
-output_keys:
+output_interface:
   - "code"
 
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_CodeWithPlan.instantiate_from_default_config
-    overrides:
-      name: "CodeGenerator"
-      model_name: "gpt-4"
-      human_message_prompt_template:
-        _target_: langchain.PromptTemplate
-        template: |2-
-          {{testing_results_summary}}
-        
-          {{code_feedback}}
+  CodeGenerator:
+    _target_: .CF_CodeWithPlan.instantiate_from_default_config
+    name: "CodeGenerator"
+    model_name: "gpt-4"
+    human_message_prompt_template:
+      _target_: langchain.PromptTemplate
+      template: |2-
+        {{testing_results_summary}}
+      
+        {{code_feedback}}
+
+
+        Consider the problem statement, the last proposed solution, its issue and the provided feedback. Return a corrected version of the code that solves the original problem and resolves the issue, without any explanation, in the following format:
+        ```python
+        {{code_placeholder}}
+        ```
+      input_variables:
+        - code_feedback
+        - testing_results_summary
+      partial_variables:
+        code_placeholder: "{{python_code}}"
+    input_interface_initialized:
+      - "code_feedback"
+      - "testing_results_summary"
+  CodeDebugCritic:
+    _target_: .CF_CodeDebugCriticWithPlan.instantiate_from_default_config
+
+topology:
+  # ~~~ Code Generator ~~~
+  - goal: "Generate/refine a solution."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
 
+    ### Flow Specification
+    flow: CodeGenerator
 
-          Consider the problem statement, the last proposed solution, its issue and the provided feedback. Return a corrected version of the code that solves the original problem and resolves the issue, without any explanation, in the following format:
-          ```python
-          {{code_placeholder}}
-          ```
-        input_variables:
-          - code_feedback
-          - testing_results_summary
-        partial_variables:
-          code_placeholder: "{{python_code}}"
-        template_format: jinja2
-      input_keys:
-        - "code_feedback"
-        - "testing_results_summary"
-      output_data_transformations:
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
         - _target_: flows.data_transformations.RegexFirstOccurrenceExtractor
           regex: '(?<=```python)([\s\S]*?)(?=```)'
           regex_fallback: '(?<=```)([\s\S]*?)(?=```)'
@@ -55,17 +65,21 @@ subflows_config:
           output_key: "code"
           strip: True
           assert_unique: True
+      keys_to_select:
+        - "code"
 
-        - _target_: flows.data_transformations.EndOfInteraction
-          end_of_interaction_string: "Final answer"
-          input_key: "api_output"
-          output_key: "end_of_interaction"
+    reset: false
 
-      output_keys:
-        - "code"
-        - "end_of_interaction"
-  - _target_: martinjosifoski.CC_flows.CF_CodeDebugCriticWithPlan.instantiate_from_default_config
+  # ~~~ Code Critic Grounded in Tests ~~~
+  - goal: ""
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeDebugCritic
 
-reset_every_round: 
-  CodeGenerator: False
-  CodeDebugCriticWithPlan_Flow: True
+    reset: true

CF_CodeDebugCritic.yaml

@@ -1,9 +1,7 @@
 name: "CodeDebugCritic_Flow"
 description: "ToDo: add description"
 
-early_exit_key: null
-
-input_keys:
+input_interface:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -11,11 +9,13 @@ input_keys:
   - "public_tests_individual_io"
   - "code"
 
-output_keys:
+output_interface:
   - "testing_results_summary"
   - "all_tests_passed"
   - "code_feedback"
 
+public_tests_key: "public_tests_individual_io"
+
 subflows_config:
   CodeTestingCritic:
     _target_: .CF_CodeTesting.instantiate_from_default_config
@@ -23,6 +23,106 @@ subflows_config:
     _target_: .CF_CodeCriticWrongAttempt.instantiate_from_default_config
 
 topology:
-  - flow: CodeTestingCritic
-  - flow: CodeCriticWrongAttempt
+  # ~~~ Code Testing Critic ~~~
+  - goal: "Test the code on the public tests and provide a results summary."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeTestingCritic
+
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: martinjosifoski.CC_flows.src.data_transformations.CorrectnessFlag
+          input_key: "public_tests_results"
+          output_key: "all_tests_passed"
+        - _target_: martinjosifoski.CC_flows.src.data_transformations.TestingResultsSummaryGeneration
+          output_key: "testing_results_summary"
+
+          single_test_error_message: True
+
+          no_error_template: |2-
+            ${.issue_title}
+            All of the executed tests passed.
+
+          compilation_error_template: |2-
+            ${.issue_title}
+            The execution resulted in a compilation error.
+            ## Compilation error message:
+            {{error_message}}
+          timeout_error_template: |2-
+            ${.issue_title}
+            The execution timed out, the solution is not efficient enough.
+          runtime_error_template: |2-
+            ${.issue_title}
+            The execution resulted in a runtime error on the following test.
+            ## [Failed test] Input
+            ```
+            {{test_input}}
+            ```
+            ## [Failed test] Runtime error message
+            {{error_message}}
+          single_test_error_template: |2-
+            ${.issue_title}
+            The Python code does not solve the problem in the problem description due to logical errors. It fails the following test:
+            ## [Failed test] Input
+            ```
+            {{test_input}}
+            ```
+            ## [Failed test] Expected output
+            ```
+            {{expected_output}}
+            ```
+            ## [Failed test] Generated output
+            ```
+            {{generated_output}}
+            ```
+          all_tests_header: |2-
+            ${.issue_title}
+            The Python code does not solve the problem in the problem description due to logical errors. It fails on the following tests.
+          test_error_template: |2-
+            ## [Failed test {{idx}}]
+            ### [Failed test {{idx}}] Input
+            ```
+            {{test_input}}
+            ```
+            ### [Failed test {{idx}}] Expected output
+            ```
+            {{expected_output}}
+            ```
+            ### [Failed test {{idx}}] Generated output
+            ```
+            {{generated_output}}
+            ```
+          tests_separator: "\n\n"
+
+          issue_title: "# Issue with the last proposed solution"
+
+  # ~~~ Feedback Generator ~~~
+  - goal: "Generate feedback grounded in the test results summary."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeCriticWrongAttempt
+
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyRename
+          old_key2new_key:
+            api_output: "code_feedback"
+    
+    reset: true
 

CF_CodeDebugCriticWithPlan.yaml

@@ -1,10 +1,7 @@
 name: "CodeDebugCriticWithPlan_Flow"
 description: "ToDo: add description"
 
-early_exit_key: null
-
-input_data_transformations: []
-input_keys:
+input_interface:
   - "problem_description"
   - "input_description"
   - "output_description"
@@ -13,19 +10,119 @@ input_keys:
   - "code"
   - "plan"
 
-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:
+output_interface:
   - "testing_results_summary"
   - "all_tests_passed"
   - "code_feedback"
 
+public_tests_key: "public_tests_individual_io"
+
 subflows_config:
-  - _target_: martinjosifoski.CC_flows.CF_CodeTesting.instantiate_from_default_config
-    overrides:
-      name: "CodeTestingCritic"
-  - _target_: martinjosifoski.CC_flows.CF_CodeCriticWrongAttemptWithPlan.instantiate_from_default_config
+  CodeTestingCritic:
+    _target_: .CF_CodeTesting.instantiate_from_default_config
+  CodeCriticWrongAttempt:
+    _target_: .CF_CodeCriticWrongAttemptWithPlan.instantiate_from_default_config
+
+topology:
+  # ~~~ Code Testing Critic ~~~
+  - goal: "Test the code on the public tests and provide a results summary."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeTestingCritic
+
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: martinjosifoski.CC_flows.src.data_transformations.CorrectnessFlag
+          input_key: "public_tests_results"
+          output_key: "all_tests_passed"
+        - _target_: martinjosifoski.CC_flows.src.data_transformations.TestingResultsSummaryGeneration
+          output_key: "testing_results_summary"
+
+          single_test_error_message: True
+
+          no_error_template: |2-
+            ${.issue_title}
+            All of the executed tests passed.
+
+          compilation_error_template: |2-
+            ${.issue_title}
+            The execution resulted in a compilation error.
+            ## Compilation error message:
+            {{error_message}}
+          timeout_error_template: |2-
+            ${.issue_title}
+            The execution timed out, the solution is not efficient enough.
+          runtime_error_template: |2-
+            ${.issue_title}
+            The execution resulted in a runtime error on the following test.
+            ## [Failed test] Input
+            ```
+            {{test_input}}
+            ```
+            ## [Failed test] Runtime error message
+            {{error_message}}
+          single_test_error_template: |2-
+            ${.issue_title}
+            The Python code does not solve the problem in the problem description due to logical errors. It fails the following test:
+            ## [Failed test] Input
+            ```
+            {{test_input}}
+            ```
+            ## [Failed test] Expected output
+            ```
+            {{expected_output}}
+            ```
+            ## [Failed test] Generated output
+            ```
+            {{generated_output}}
+            ```
+          all_tests_header: |2-
+            ${.issue_title}
+            The Python code does not solve the problem in the problem description due to logical errors. It fails on the following tests.
+          test_error_template: |2-
+            ## [Failed test {{idx}}]
+            ### [Failed test {{idx}}] Input
+            ```
+            {{test_input}}
+            ```
+            ### [Failed test {{idx}}] Expected output
+            ```
+            {{expected_output}}
+            ```
+            ### [Failed test {{idx}}] Generated output
+            ```
+            {{generated_output}}
+            ```
+          tests_separator: "\n\n"
+
+          issue_title: "# Issue with the last proposed solution"
+
+  # ~~~ Feedback Generator ~~~
+  - goal: "Generate feedback grounded in the test results summary."
+
+    ### Input Interface
+    input_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyMatchInput
+
+    ### Flow Specification
+    flow: CodeCriticWrongAttempt
+
+    ### Output Interface
+    output_interface:
+      _target_: flows.interfaces.KeyInterface
+      additional_transformations:
+        - _target_: flows.data_transformations.KeyRename
+          old_key2new_key:
+            api_output: "code_feedback"
+    
+    reset: true

CF_CodeWithPlan.py

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

CF_CodeWithPlan.yaml

@@ -70,22 +70,15 @@ init_human_message_prompt_template:
     code_placeholder: "{{python_code}}"
   template_format: jinja2
 
-input_data_transformations: []
-init_input_keys:
+input_interface_non_initialized:
   - "problem_description"
   - "input_description"
   - "output_description"
   - "io_examples_and_explanation"
   - "plan"
 
-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
-
-output_keys:
-  - "code"
+input_interface_initialized:
+  - "query"
+
+output_interface:
+  - "api_output"

__init__.py

@@ -16,7 +16,7 @@ from .CF_Code import CF_Code
 
 # cf-plan-code (and cf-plan_oracle-code)
 # from .CF_Plan import CF_Plan
-# from .CF_CodeWithPlan import CF_CodeWithPlan
+from .CF_CodeWithPlan import CF_CodeWithPlan
 # from .CF_Plan_Code import CF_Plan_Code
 
 # # cf-plan_reflect-code
@@ -33,16 +33,15 @@ from .CF_Code import CF_Code
 from .CF_CodeTesting import CF_CodeTesting
 from .CF_CodeDebug import CF_CodeDebug
 
-# # # cf-code_debug_collab
-# from .CF_CodeCriticWrongAttempt import CF_CodeCriticWrongAttempt
-# from .CF_CodeDebugCritic import CF_CodeDebugCritic
-# from .CF_CodeDebugCollab import CF_CodeDebugCollab
-# #
-# # # cf-plan_oracle-code_debug_collab
-# from .CF_CodeCriticWrongAttemptWithPlan import CF_CodeCriticWrongAttemptWithPlan
-# from .CF_CodeDebugCriticWithPlan import CF_CodeDebugCriticWithPlan
-# from .CF_CodeDebugCollabWithPlan import CF_CodeDebugCollabWithPlan
+# cf-code_debug_collab
+from .CF_CodeCriticWrongAttempt import CF_CodeCriticWrongAttempt
+from .CF_CodeDebugCritic import CF_CodeDebugCritic
+from .CF_CodeDebugCollab import CF_CodeDebugCollab
 
+# cf-plan_oracle-code_debug_collab
+from .CF_CodeCriticWrongAttemptWithPlan import CF_CodeCriticWrongAttemptWithPlan
+from .CF_CodeDebugCriticWithPlan import CF_CodeDebugCriticWithPlan
+from .CF_CodeDebugCollabWithPlan import CF_CodeDebugCollabWithPlan
 
 ########################## LC ##########################
 
@@ -83,5 +82,3 @@ from .CF_CodeDebug import CF_CodeDebug
 # from .LC_CodeCriticWrongAttemptWithPlan import LC_CodeCriticWrongAttemptWithPlan
 # from .LC_CodeDebugCriticWithPlan import LC_CodeDebugCriticWithPlan
 # from .LC_CodeDebugCollabWithPlan import LC_CodeDebugCollabWithPlan
-
-