Update app.py

app.py

@@ -11,11 +11,9 @@ import gradio as gr
 import os
 
 from assistants import (
-    get_openai_client,
+    get_thread,
     set_openai_client,
-    get_assistant,
     set_assistant,
-    get_thread,
     set_thread,
     create_assistant,
     load_assistant,
@@ -35,29 +33,32 @@ def chat(message, history, openai_api_key):
     if not message:
         raise gr.Error("Message is required.")
 
-    if get_openai_client() == None:
-        set_openai_client(openai_api_key)
-    
-    if get_assistant() == None:
-        #set_assistant(create_assistant())
-        set_assistant(load_assistant())
-
-    if get_thread() == None or len(history) == 0:
-        set_thread(create_thread())
-        
-    create_message(get_thread(), message)
-    run = create_run(get_assistant(), get_thread())
-    run = wait_on_run(get_thread(), run)
-    run_steps = get_run_steps(get_thread(), run)
-    recurse_execute_tool_calls(get_thread(), run, run_steps, 0)
-    messages = get_messages(get_thread())
-    text_values, image_values = extract_content_values(messages)
-
+    text_values, image_values = [], []
     download_link = ""
 
-    # TODO: Handle multiple images and other file types
-    if len(image_values) > 0:
-        download_link = f"<hr>[Download](https://platform.openai.com/storage/files/{image_values[0]})"
+    try:
+        # TODO: Use Gradio session
+        if get_thread() == None or len(history) == 0:
+            set_openai_client(openai_api_key)
+            
+            #set_assistant(create_assistant()) # first run
+            set_assistant(load_assistant()) # subsequent runs
+    
+            set_thread(create_thread())
+            
+        create_message(get_thread(), message)
+        run = create_run(get_assistant(), get_thread())
+        run = wait_on_run(get_thread(), run)
+        run_steps = get_run_steps(get_thread(), run)
+        recurse_execute_tool_calls(get_thread(), run, run_steps, 0)
+        messages = get_messages(get_thread())
+        text_values, image_values = extract_content_values(messages)
+        
+        # TODO: Handle multiple images and other file types
+        if len(image_values) > 0:
+            download_link = f"<hr>[Download](https://platform.openai.com/storage/files/{image_values[0]})"
+    except Exception as e:
+        raise gr.Error(e)
 
     return f"{'<hr>'.join(list(reversed(text_values))[1:])}{download_link}"
     #return f"{text_values[0]}{download_link}"