Fix demos

app.py

@@ -1,7 +1,7 @@
 import gradio as gr
 
 import actions as a
-from examples import generate_ad, summarize_website
+from examples import best_clubs, generate_ad, summarize_website
 from components import all_tasks, Tasks
 
 
@@ -16,6 +16,7 @@ with gr.Blocks() as demo:
     <br>**AI Task**: Ask ChatGPT to do something for you. Eg, summarize a text.
     <br>**Code Task**: ChatGPT will create a python function to do something for you. Eg, get the text from a website.
     <br> Use this task for things that ChatGPT can't do on its own, like access the internet or iterate over 4K+ tokens.
+    <br> The code must be generated before executing the tasks.
     <br>
     <br>Output from previous tasks can be referenced in subsequen tasks with {tn}. Max 10 tasks allowed (for now).
     """
@@ -59,9 +60,10 @@ with gr.Blocks() as demo:
                 outputs=task.outputs + [error_message],
             )
             prev_tasks.append(task)
-    with gr.Tab("Example: Summarize website"):
-        summarize_website.render()
-    with gr.Tab("Example: Generate ad"):
-        generate_ad.render()
+
+    # Examples
+    summarize_website.render()
+    generate_ad.render()
+    best_clubs.render()
 
 demo.launch()

components.py

@@ -56,7 +56,7 @@ class TaskComponent(Component, ABC):
 
     def format_input(self, input: str, vars_in_scope: Dict[str, Any]) -> str:
         input = input.strip()
-        prompt_vars = [v for v in re.findall("{(.*?)}", input)]
+        prompt_vars = [v for v in re.findall("{(.*)}", input)]
         undefined_vars = prompt_vars - vars_in_scope.keys()
         if len(undefined_vars) > 0:
             raise KeyError(
@@ -174,6 +174,7 @@ class CodeTask(TaskComponent):
     @staticmethod
     def generate_code(code_prompt: str):
         import json
+        import traceback
 
         raw_output = ""
         packages = ""
@@ -196,9 +197,9 @@ class CodeTask(TaskComponent):
         print(f"Generating code.")
         try:
             raw_output = llm_call(
-                f"""Write one python function for the following request:
-{code_prompt}
+                f"""{code_prompt}
 
+Write one python function for the request above.
 Use pip packages where available.
 For example, if you wanted to make a google search, use the googlesearch-python package instead of scraping google.
 Include only the necessary imports.
@@ -215,7 +216,7 @@ Instead of printing or saving to disk, the function should return the data."""
 Find the pip packages that need to be installed and get their corresponsing names in pip.
 Package names in the imports and in pip might be different. Use the correct pip names.
                             
-Put them in a JSON:
+Put them in a valid JSON:
 ```
 {{
     "packages": Python list to be used with eval(). If no packages, empty list.
@@ -228,11 +229,15 @@ Extract it. Remove anything after the function definition.""",
                         ],
                     )
                 )
-            packages = json.loads(re.search("({.*})", packages, re.DOTALL).group(0))
-            packages = packages["packages"]
+            for packages in re.findall("{.*}", packages, re.DOTALL):
+                try:
+                    packages = json.loads(packages)
+                    packages = packages["packages"]
+                except:
+                    print(packages)
+                    traceback.print_exc()
+                    packages = "ERROR"
         except Exception as e:
-            import traceback
-
             traceback.print_exc()
             error_message = gr.HighlightedText.update(
                 value=[(str(e), "ERROR")], visible=True

examples/__init__.py

@@ -19,7 +19,7 @@ def demo_buttons(demo_id, tasks: List[TaskComponent]):
     for task in tasks:
         if isinstance(task, CodeTask):
             execution_event = execution_event.then(
-                task.generate_code,
+                generate_code,
                 inputs=[task.code_prompt],
                 outputs=[
                     task.raw_output,
@@ -80,3 +80,8 @@ def execute_task(demo_id: str, task_id: int, error_value, *args):
                 visible=True,
             ),
         ]
+
+
+def generate_code(code_prompt: str, error_value):
+    if not error_value and code_prompt:
+        return CodeTask.generate_code(code_prompt)

examples/best_clubs.py

@@ -8,37 +8,23 @@ DEMO_ID = __name__
 tasks = [
     CodeTask(
         0,
-        "https://openai.com/",
+        "nightlife in NYC",
         visible=True,
         code_value="Make a google search.",
     ),
-    AITask(
-        1,
-        """Your goal is to create an ad for a website.
-You will use an AI image generator to generate an image for your ad.
-
-Here is the text from the website:
-{t0}
-
-Create a prompt for the AI image generator.
-Avoid logos.""",
-        visible=True,
-    ),
     CodeTask(
-        2,
-        "{t1}",
+        1,
+        "{t0}",
         visible=True,
-        code_value="Use openai key <put_your_key_in_here>. Generate an image from a prompt. Return the url.",
+        code_value="Get the main content from a list of urls. Top 5. No html. No empty lines. Include only the first 3000 characters. Use the correct headers.",
     ),
     AITask(
-        1,
-        """Here is the text from a website:
-{t0}
-
-Here is a prompt that was used by an AI image generator to generate an image for an ad:
+        2,
+        """Here is the content from a list of websites:
 {t1}
 
-Consider the website content and the prompt to create a headline for an ad.""",
+What is the overal topic?
+Extract the most relevant points.""",
         visible=True,
     ),
 ]
@@ -46,9 +32,9 @@ demo_tasks[DEMO_ID] = tasks
 
 
 def render():
-    demo_id = gr.Textbox(DEMO_ID, visible=False)
-    tasks[0].render()
-    tasks[1].render()
-    tasks[2].render()
-    tasks[3].render()
-    demo_buttons(demo_id, tasks)
+    with gr.Tab("Example: Nightlife in NYC"):
+        demo_id = gr.Textbox(DEMO_ID, visible=False)
+        tasks[0].render()
+        tasks[1].render()
+        tasks[2].render()
+        demo_buttons(demo_id, tasks)

examples/generate_ad.py

@@ -10,7 +10,7 @@ tasks = [
         0,
         "https://openai.com/",
         visible=True,
-        code_value="Get text from a website. No html. No empty lines.",
+        code_value="Get text from a website. No html. No empty lines. Use the correct headers.",
     ),
     AITask(
         1,
@@ -28,7 +28,7 @@ Avoid logos.""",
         2,
         "{t1}",
         visible=True,
-        code_value="Use openai key <put_your_key_in_here>. Generate an image from a prompt. Return the url.",
+        code_value="Use openai key <put_your_openai_key_here>. Generate an image from a prompt. Return the url. (not the content)",
     ),
     AITask(
         1,
@@ -46,9 +46,10 @@ demo_tasks[DEMO_ID] = tasks
 
 
 def render():
-    demo_id = gr.Textbox(DEMO_ID, visible=False)
-    tasks[0].render()
-    tasks[1].render()
-    tasks[2].render()
-    tasks[3].render()
-    demo_buttons(demo_id, tasks)
+    with gr.Tab("Example: Generate an ad"):
+        demo_id = gr.Textbox(DEMO_ID, visible=False)
+        tasks[0].render()
+        tasks[1].render()
+        tasks[2].render()
+        tasks[3].render()
+        demo_buttons(demo_id, tasks)

examples/summarize_website.py

@@ -18,7 +18,8 @@ demo_tasks[DEMO_ID] = tasks
 
 
 def render():
-    demo_id = gr.Textbox(DEMO_ID, visible=False)
-    tasks[0].render()
-    tasks[1].render()
-    demo_buttons(demo_id, tasks)
+    with gr.Tab("Example: Summarize a website"):
+        demo_id = gr.Textbox(DEMO_ID, visible=False)
+        tasks[0].render()
+        tasks[1].render()
+        demo_buttons(demo_id, tasks)