Update app.py

app.py

@@ -2,42 +2,36 @@ import gradio as gr
 import json, openai, os, time
 from openai import OpenAI
 
-client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
-assistant2 = client.beta.assistants.create(
-                name="Math Tutor",
-                instructions="You are a personal math tutor. Answer questions briefly, in a sentence or less.",
-                model="gpt-4-1106-preview",
-            )
-thread = None
+_client = None
+_assistant = None
+_thread = None
 
 def show_json(str, obj):
-    print(f"### {str}")
-    #print(json.loads(obj.model_dump_json()))
-    print(obj)
+    print(f"===> {str}\n{json.loads(obj.model_dump_json())}")
 
 def init_assistant():
-    global client, assistant2, thread
+    global _client, _assistant, _thread
     
-    #client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
+    _client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
     
-    #assistant2 = client.beta.assistants.create(
-    #    name="Math Tutor",
-    #    instructions="You are a personal math tutor. Answer questions briefly, in a sentence or less.",
-    #    model="gpt-4-1106-preview",
-    #)
+    _assistant = client.beta.assistants.create(
+        name="Math Tutor",
+        instructions="You are a personal math tutor. Answer questions briefly, in a sentence or less.",
+        model="gpt-4-1106-preview",
+    )
     
-    thread = client.beta.threads.create()
+    _thread = client.beta.threads.create()
 
 def wait_on_run(client, run, thread):
     while run.status == "queued" or run.status == "in_progress":
         run = client.beta.threads.runs.retrieve(
-            thread_id=thread.id,
             run_id=run.id,
+            thread_id=thread.id,
         )
         time.sleep(0.25)
     return run
 
-def extract_content_value(data):
+def extract_content_values(data):
     content_values = []
     for item in data.data:
         for content in item.content:
@@ -46,9 +40,9 @@ def extract_content_value(data):
     return content_values
 
 def chat(message, history):
-    global client
-    global assistant2
-    global thread     
+    global _client
+    global _assistant
+    global _thread     
        
     history_openai_format = []
     
@@ -61,37 +55,35 @@ def chat(message, history):
     if len(history_openai_format) == 1:
         init_assistant()
     
-    show_json("assistant", assistant2)
-    show_json("thread", thread)
+    show_json("assistant", _assistant)
+    show_json("thread", _thread)
     
     #print("### history")
     #print(len(history_openai_format))
     #print(history_openai_format)
     
     message = client.beta.threads.messages.create(
-        thread_id=thread.id,
         role="user",
-        content=message,
+        thread_id=_thread.id,
+        content=history_openai_format,
     )
     
     #show_json("message", message)
     
     run = client.beta.threads.runs.create(
-        thread_id=thread.id,
-        assistant_id=assistant2.id,
+        assistant_id=_assistant.id,
+        thread_id=_thread.id,
     )
     
-    #show_json("run", run)
-
     run = wait_on_run(client, run, thread)
     
     #show_json("run", run)
 
-    messages = client.beta.threads.messages.list(thread_id=thread.id)
+    messages = client.beta.threads.messages.list(thread_id=_thread.id)
     
     #show_json("messages", messages)
 
-    return extract_content_value(messages)[0]
+    return extract_content_values(messages)[0]
 
 gr.ChatInterface(
     chat,