Update app.py

app.py

@@ -144,7 +144,7 @@ def create_issues_repairs_agent(client):
 
 def create_thread(client):
     thread = client.beta.threads.create()
-    show_json("thread", thread)
+    #show_json("thread", thread)
     
     return thread
 
@@ -154,7 +154,7 @@ def create_message(client, thread, msg):
         thread_id=thread.id,
         content=msg,
     )
-    show_json("message", message)
+    #show_json("message", message)
     
     return message
 
@@ -163,7 +163,7 @@ def create_run(client, assistant, thread):
         assistant_id=assistant.id,
         thread_id=thread.id,
     )
-    show_json("run", run)
+    #show_json("run", run)
     
     return run
 
@@ -174,10 +174,20 @@ def wait_on_run(client, thread, run):
             run_id=run.id,
         )
         time.sleep(0.25)
-    show_json("run", run)
+    #show_json("run", run)
     
     return run
 
+def list_steps(client, thread, run):
+    steps = client.beta.threads.runs.steps.list(
+        thread_id=thread.id,
+        run_id=run.id,
+        order="asc",
+    )
+    show_json("steps", steps)
+
+    return steps
+
 def execute_tool_call(tool_call):
     name = tool_call.function.name
     args = json.loads(tool_call.function.arguments)
@@ -186,25 +196,16 @@ def execute_tool_call(tool_call):
 
     tools[name](**args)
 
-def list_run_steps(client, thread, run):
-    run_steps = client.beta.threads.runs.steps.list(
-        thread_id=thread.id,
-        run_id=run.id,
-        order="asc",
-    )
-
-    for step in run_steps.data:
+def execute_tool_calls(steps):
+    for step in steps.data:
         step_details = step.step_details
         show_json("step_details", step_details)
 
-        if not hasattr(step_details, "tool_calls"):
-            continue
-
-        for tool_call in step_details.tool_calls:
-            execute_tool_call(tool_call)
+        if hasattr(step_details, "tool_calls"):
+            for tool_call in step_details.tool_calls:
+                execute_tool_call(tool_call)
+                show_json("tool_call", tool_call)
 
-    return run_steps
-    
 def list_messages(client, thread):
     messages = client.beta.threads.messages.list(
         thread_id=thread.id
@@ -218,7 +219,7 @@ def extract_content_values(data):
     
     for item in data.data:
         for content in item.content:
-            if content.type == 'text':
+            if content.type == "text":
                 content_values.append(content.text.value)
     
     return content_values
@@ -276,24 +277,23 @@ def chat(message, history, openai_api_key):
     run = create_run(client, assistant, thread)
     run = wait_on_run(client, thread, run)
 
-    list_run_steps(client, thread, run)
+    steps = list_steps(client, thread, run)
 
+    execute_tool_calls(steps)
+    
     messages = list_messages(client, thread)
 
-    return extract_content_values(messages)[0]
+    content_values = extract_content_values(messages)
+    
+    return content_values[0]
 
 gr.ChatInterface(
     chat,
     chatbot=gr.Chatbot(),
-    textbox=gr.Textbox(placeholder="Type here", container=False, scale=7),
+    textbox=gr.Textbox(placeholder="hi", container=False, scale=7),
     title="Multi-Agent Orchestration",
     description="Demo using hand-off pattern: triage agent, sales agent, and issues & repairs agent",
     clear_btn=None,
     retry_btn=None,
     undo_btn=None,
-    #examples=[["Generate the first 10 Fibbonaci numbers with code.", "sk-<BringYourOwn>"]],
-    #cache_examples=False,
-    #additional_inputs=[
-    #    gr.Textbox("sk-", label="OpenAI API Key", type = "password"),
-    #],
 ).launch()