major bugs fixed

Author: melih-unsal

demogpt/chains/prompts/combine_v2.py

@@ -1,7 +1,7 @@
 system_template = """
 Regenerate the code by only combining the input parts into st.form.
 It is really important not to change other parts.
-Copy all the function definitions as is and don't modify or replace them.
+Copy all the function definitions and library imports as is and don't modify or replace them.
 Combine input-related parts under the st.form.
 If a function needs an input from user via st.text_input, put it between st.form and st.form_submit_button so that the state is preserved.
 Show the result when the form is submitted.
@@ -13,10 +13,9 @@
 """
 
 human_template = """
-BEFORE:
-import streamlit as st
-
-st.title("My Adv Game")
+=============================================================
+DRAFT CODE 1:
+# all imports
 
 def foo1():
     result = "res"
@@ -40,11 +39,9 @@ def foo2(half_story,user_choice):
 
 if continued_story:
     st.markdown(continued_story)
-################################################################################################
-AFTER:
-import streamlit as st
-
-st.title("My Adv Game")
+#############################################################
+FINAL CODE 1:
+# all imports
 
 def foo1():
     result = "res"
@@ -64,13 +61,16 @@ def foo2(half_story,user_choice):
     user_choice = st.selectbox("What would you like to do next?", ["Choice1", "Choice2"])
 	submit_button = st.form_submit_button(label='Submit Story')
     if submit_button:
-        if text_input and user_choice and :
+        if text_input and user_choice :
             continued_story = foo2(text_input,user_choice)
             st.markdown(continued_story)
-################################################################################################          
-BEFORE:
+#############################################################
+
+
+=============================================================
+DRAFT CODE 2:
 {code_snippets}
-################################################################################################
-AFTER:
+#############################################################
+FINAL CODE 2:
 
 """

demogpt/chains/prompts/task_definitions.py

@@ -26,7 +26,7 @@
         "name": "ui_output_text",
         "description": "Shows text output to the user.",
         "good_at": "Showing text to the user.",
-        "input_data_type": "string",
+        "input_data_type": "*",
         "output_data_type": "none",
         "purpose": "Displaying textual information to the user.",
     },
@@ -106,8 +106,8 @@
         "name": "python",
         "description": "Implement and call python function from given description.",
         "good_at": "Writing generic python code by AI",
-        "input_data_type": "*string",
-        "output_data_type": "string",
+        "input_data_type": "*",
+        "output_data_type": "*",
         "purpose": "It generates python code from general purpose instructions",
     },
     {

demogpt/chains/prompts/task_list/python_coder.py

@@ -1,14 +1,20 @@
 system_template = """
-You are a python developer and good at writing and testing the function for the given arguments.
-You will also take the previous code segment so that you can continue on it by implementing the function and then calling that function
-with the given arguments and assigning the result to the variable.
+As a proficient Python developer, follow the guidelines below:
+1. Build upon the given "Previous Code".
+2. Ensure to import all required libraries. Do NOT use pandas.compat.StringIO as it's deprecated.
+3. Implement the specified function.
+4. Invoke the function using the provided arguments, and store the result in the indicated variable.
+5. Ensure the resultant code is error-free and fits naturally as a continuation of the "Previous Code".
+
+Let's get coding!
 """
 
 human_template = """
-Instruction:{instruction}
+Instruction: {instruction}
 Function Name: {function_name}
-Arguments:{argument}
-Variable:{variable}
-Previous Code:{code_snippets}
-Python Code:
+Arguments: {argument}
+Assigned Variable: {variable}
+Previous Code:
+{code_snippets}
+Python Code Continuation:
 """

demogpt/chains/prompts/task_list/ui_input_file.py

@@ -2,7 +2,7 @@
 Write a streamlit file uploader code and return the path of uploaded file as a string depending on the instruction given to you:
 Since st.file_uploader.name does not give full file path, you first need to save it then get a full file path like in the following:
 
-uploaded_file = st.file_uploader("Upload Txt File", type=["txt"])
+uploaded_file = st.file_uploader("Upload Txt File", type=["txt"], key='{variable}')
 if uploaded_file is not None:
     # Create a temporary file to store the uploaded content
     with tempfile.NamedTemporaryFile(delete=False) as temp_file:
@@ -12,12 +12,9 @@
     {variable} = ''
 
 Suppose that, streamlit has been imported by "import streamlit as st" so you don't need to import it.
-Here is the part of the code that you are supposed to continue:
-{code_snippets}
-
 Assign the file path to the variable called "{variable}"
 You will basically use file_uploader and get file path from it but nothing else.
-Not to loose the file path, please use st.session_state[<key>]
+Do not loose the file path and check if the file is uploaded. Otherwise, assign empty string to "{variable}"
 Don't read the file, only get the file path
 """
 

demogpt/chains/prompts/task_list/ui_output_text.py

@@ -28,7 +28,7 @@
 args: medium_article
 instruction: Display the generated Medium article to the user
 code:
-if submitted:
+if medium_article:
     st.markdown(medium_article)
         
 args: translated_text

demogpt/chains/task_chains.py

@@ -59,7 +59,7 @@ def uiOutputText(cls, task, code_snippets):
         code = cls.getChain(
             human_template=prompts.ui_output_text.human_template,
             instruction=instruction,
-            args=args,
+            args=args
         )
         return utils.refine(code)
 

demogpt/controllers.py

@@ -10,8 +10,7 @@ def refineKeyTypeCompatiblity(task):
     if task["output_data_type"] == "none":
         if task["output_key"] != "none":
             task["output_key"] = "none"
-    return task
-
+    return task           
 
 def checkDTypes(tasks):
 
@@ -37,6 +36,11 @@ def checkDTypes(tasks):
             if input_key != "none":
                 feedback += f"Since {name} is the first task, its input data type is supposed to be none but it is {input_key}.Please find another way.\n"
 
+        elif reference_input == "*":
+            continue
+        
+        elif reference_input.startswith("*") and input_data_type == "list":
+            continue
         # Check input data types
         elif reference_input.startswith("*"):
             reference_input = reference_input.replace("*", "")
@@ -45,6 +49,7 @@ def checkDTypes(tasks):
                     feedback += f"""
                     {name} expects all inputs as {reference_input} or none but the data type of {input_key} is {input_data_type} not {reference_input}. Please find another way.\n
                     """
+                    print("1:",)
             else:
                 for res, data_type in zip(input_key, input_data_type):
                     if data_type != reference_input:
@@ -56,11 +61,14 @@ def checkDTypes(tasks):
             {name} expects all inputs as {reference_input} but the data type of {input_key} is {input_data_type} not {reference_input}. Please find another way.\n
             """
 
+        if reference_output == "*":
+            continue
         # Check output data types
-        if output_data_type != reference_output:
-            feedback += f"""
-            {name} should output in {reference_output} data type but it is {output_data_type} not {reference_output}. Please find another way.\n
-            """
+        elif output_data_type != reference_output:
+            if not (reference_output.startswith("*") and output_data_type != "list"):
+                feedback += f"""
+                {name} should output in {reference_output} data type but it is {output_data_type} not {reference_output}. Please find another way.\n
+                """
 
     valid = len(feedback) == 0
 
@@ -82,23 +90,16 @@ def checkPromptTemplates(templates, task):
     feedback = ""
     for input_key in inputs:
         if f"{{{input_key}}}" not in templates:
-            feedback += f"{{{input_key}}} is not included in any of the templates. Please add it.\n"
+            feedback += f"'{{{input_key}}}' is not included in any of the templates. You must add '{{{input_key}}}' inside of at least one of the templates.\n"
 
     # now detect extras
 
     matches = set(re.findall(r"\{([^}]+)\}", templates))
 
     for match in matches:
         if match not in inputs:
-            feedback += f"{{{match}}} cannot be included in any of the templates. Please remove it.\n"
-
-    print("templates:" + templates)
-    print("matches:", matches)
-    print("inputs:", inputs)
-    print("feedback:", feedback)
+            feedback += f"'{{{match}}}' cannot be included nowhere in the templates. You must remove '{{{match}}}'.\n"
 
     valid = len(feedback) == 0
 
-    print("valid:", valid)
-
     return {"feedback": feedback, "valid": valid}

demogpt/utils.py

@@ -133,8 +133,6 @@ def getInputPosition(template, inputs):
     {variable} = ""
 """
     input_variables = ["chat_history"] + inputs
-    print("system_template:",system_template)
-    print("inputs:",inputs)
     human_input = getInputPosition(system_template, inputs)
     code = f"""