propagate change from https://github.com/epfl-dlab/flows/pull/91

CF_Code.py

@@ -1,11 +1,7 @@
 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):

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"

CF_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"
 
@@ -40,7 +38,7 @@ 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
@@ -66,3 +64,7 @@ subflows_config:
         - _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

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,7 +66,7 @@ query_message_prompt_template:
     - "code"
   template_format: jinja2
 
-input_keys:
+init_input_keys:
   - "problem_description"
   - "input_description"
   - "output_description"

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
@@ -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"

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"

CF_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"
 
@@ -39,7 +37,7 @@ 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:
@@ -62,3 +60,7 @@ subflows_config:
   - _target_: martinjosifoski.CC_flows.CF_CodeTesting.instantiate_from_default_config
     overrides:
       name: "CodeTestingCritic"
+
+reset_every_round:
+  CodeGenerator: False # this is the name of the subflow, may be different for each config, needs to check !
+  CodeTestingCritic: True

CF_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"
 
@@ -44,7 +42,7 @@ 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:
@@ -65,3 +63,8 @@ subflows_config:
         - "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

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"
 
@@ -45,7 +44,7 @@ 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:
@@ -66,3 +65,7 @@ subflows_config:
         - "code"
         - "end_of_interaction"
   - _target_: martinjosifoski.CC_flows.CF_CodeDebugCriticWithPlan.instantiate_from_default_config
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeDebugCriticWithPlan_Flow: True

CF_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"
 
@@ -48,3 +46,8 @@ subflows_config:
         - "end_of_interaction"
 
   - _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

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"

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"
@@ -57,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"
 
@@ -41,7 +39,7 @@ 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
@@ -68,3 +66,7 @@ subflows_config:
         - _target_: flows.data_transformations.KeyRename
           old_key2new_key:
             api_output: "plan_feedback"
+
+reset_every_round:
+  PlanGenerator: false
+  PlanCritic: true

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"
 
@@ -50,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

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"

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"
 
@@ -43,7 +41,7 @@ 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
@@ -69,3 +67,7 @@ subflows_config:
         - _target_: flows.data_transformations.KeyRename
           old_key2new_key:
             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"

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"

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"
 
@@ -39,7 +37,7 @@ 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:
@@ -62,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"
 
@@ -44,7 +42,7 @@ 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:
@@ -66,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"
 
@@ -45,7 +43,7 @@ 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:
@@ -66,3 +64,8 @@ subflows_config:
         - "code"
         - "end_of_interaction"
   - _target_: martinjosifoski.CC_flows.LC_CodeDebugCriticWithPlan.instantiate_from_default_config 
+
+
+reset_every_round: 
+  CodeGenerator: False
+  CodeDebugCriticWithPlan_Flow: True

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"
 
@@ -48,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_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"

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"
@@ -54,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

LC_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"
 
@@ -41,7 +39,7 @@ 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
@@ -68,3 +66,7 @@ subflows_config:
         - _target_: flows.data_transformations.KeyRename
           old_key2new_key:
             api_output: "plan_feedback"
+
+reset_every_round: 
+  PlanGenerator: False
+  PlanCritic: True

LC_PlanCritic.py

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

LC_PlanCritic.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
@@ -65,7 +65,7 @@ query_message_prompt_template:
     - "plan"
   template_format: jinja2
 
-input_keys:
+init_input_keys:
   - "problem_description"
   - "io_description"
   - "constraints"

LC_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"
 
@@ -62,3 +60,7 @@ subflows_config:
         {{conceptual_solution}}
         otherwise, reply:
         "Final answer."
+
+reset_every_round: 
+  PlanGenerator_Flow: False
+  PlanFixedReplyCritic: True

__init__.py

@@ -1,11 +1,6 @@
 import os
 from flows import flow_verse
 
-dependencies = [
-    {"url": "martinjosifoski/OpenAIChatAtomicFlow", "revision": "main"},
-]
-flow_verse.sync_dependencies(dependencies)
-
 # cf-code
 from .CF_Code import CF_Code
 # lc-code