Update app.py

app.py

@@ -8,10 +8,9 @@
 
 import gradio as gr
 
-import json, os
+import os
 
 from assistants import (
-    openai_client,
     assistant,
     thread,
     create_assistant,
@@ -21,7 +20,6 @@ from assistants import (
     create_run,
     wait_on_run,
     get_run_steps,
-    execute_tool_calls,
     get_messages,
     recurse_execute_tool_calls,
     extract_content_values,
@@ -39,80 +37,24 @@ def chat(message, history):
     # see https://platform.openai.com/playground/assistants.
     # On subsequent runs, load assistant.
     if assistant == None:
-        #assistant = create_assistant(openai_client)
-        assistant = load_assistant(openai_client)
+        #assistant = create_assistant()
+        assistant = load_assistant()
 
     # TODO: Use Gradio session to support multiple users
     if thread == None or len(history) == 0:
-        thread = create_thread(openai_client)
+        thread = create_thread()
         
-    create_message(openai_client, thread, message)
+    create_message(thread, message)
 
-    run = create_run(openai_client, assistant, thread)
+    run = create_run(assistant, thread)
 
-    run = wait_on_run(openai_client, thread, run)
-    run_steps = get_run_steps(openai_client, thread, run)
+    run = wait_on_run(thread, run)
+    
+    run_steps = get_run_steps(thread, run)
 
-    ### TODO
     recurse_execute_tool_calls(thread, run, run_steps, 0)
-    """
-    tool_call_ids, tool_call_results = execute_tool_calls(run_steps)
-    
-    if len(tool_call_ids) > 0:
-        # https://platform.openai.com/docs/api-reference/runs/submitToolOutputs
-        tool_output = {}
-        
-        try:
-            tool_output = {
-                "tool_call_id": tool_call_ids[0],
-                "output": tool_call_results[0].to_json()
-            }
-        except AttributeError:
-            tool_output = {
-                "tool_call_id": tool_call_ids[0],
-                "output": tool_call_results[0]
-            }
-        
-        run = openai_client.beta.threads.runs.submit_tool_outputs(
-            thread_id=thread.id,
-            run_id=run.id,
-            tool_outputs=[tool_output]
-        )
-    
-        run = wait_on_run(openai_client, thread, run)
-        run_steps = get_run_steps(openai_client, thread, run)
-    """
-    ###
-    """
-        tool_call_ids, tool_call_results = execute_tool_calls(run_steps)
-            
-        if len(tool_call_ids) > 1:
-            # https://platform.openai.com/docs/api-reference/runs/submitToolOutputs
-            tool_output = {}
-            
-            try:
-                tool_output = {
-                    "tool_call_id": tool_call_ids[1],
-                    "output": tool_call_results[1].to_json()
-                }
-            except AttributeError:
-                tool_output = {
-                    "tool_call_id": tool_call_ids[1],
-                    "output": tool_call_results[1]
-                }
-            
-            run = openai_client.beta.threads.runs.submit_tool_outputs(
-                thread_id=thread.id,
-                run_id=run.id,
-                tool_outputs=[tool_output]
-            )
-        
-            run = wait_on_run(openai_client, thread, run)
-            run_steps = get_run_steps(openai_client, thread, run)    
-    """
-    ###
     
-    messages = get_messages(openai_client, thread)
+    messages = get_messages(thread)
 
     text_values, image_values = extract_content_values(messages)