Update app.py

app.py

@@ -2,60 +2,94 @@ import gradio as gr
 import requests
 import uuid
 import os
+import json
+
+
+HF_TOKEN = os.environ.get("HF_TOKEN")
+
+API_URL = "https://baxin-simulator.hf.space/simulate"
 
 def generate_unique_name():
-    unique_name = str(uuid.uuid4()) + ".py"
-    return unique_name
+    return f"protocol_{uuid.uuid4().hex[:8]}.py"
+
+def simulate_protocol(protocol_content: str):
+    if not HF_TOKEN:
+        return "Error: HF_TOKEN is not set. Please set it in your environment variables."
 
-def send_post_request(payload):
-    url = "https://baxin-simulator.hf.space/simulate"
-    token = os.environ['HF_TOKEN']
     protocol_name = generate_unique_name()
-    data = {"name": protocol_name, "content": payload}
-    headers = {"Content-Type": "application/json", 'Authorization': 'Bearer {}'.format(token)}
-
-    response = requests.post(url, json=data, headers=headers)
-
-    if response.status_code != 200:
-        print("Error: " + response.text)
-        return "Error: " + response.text
-
-    # Check the response before returning it
-    # ToDo clean up code
-    response_data = response.json()
-    if "error_message" in response_data:
-        print("Error in response:", response_data["error_message"])
-        return response_data["error_message"]
-    elif "protocol_name" in response_data:
-        # print("Protocol executed successfully. Run log:", response_data["run_log"])
+    
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {HF_TOKEN}"
+    }
+    
+    data = {
+        "name": protocol_name,
+        "content": protocol_content
+    }
+
+    try:
+        response = requests.post(API_URL, json=data, headers=headers, timeout=60)
         
-        return response_data["run_status"]
-        # ToDo if run_log option is on
-        # return response_data["run_log"]
+        if response.status_code == 200:
+            response_data = response.json()
+            return response_data.get("run_log", "Success, but no run log was returned.")
+        else:
+            try:
+                error_data = response.json()
+                detail = error_data.get("detail", {})
+                if isinstance(detail, dict):
+                    error_message = detail.get('error_details', response.text)
+                else:
+                    error_message = detail
+                return f"API Error (Status {response.status_code}):\n\n{error_message}"
+            except json.JSONDecodeError:
+                return f"API Error (Status {response.status_code}):\n\n{response.text}"
 
-    else:
-        print("Unexpected response:", response_data)
-        return "Unexpected response"
+    except requests.exceptions.RequestException as e:
+        return f"Network Error: Failed to connect to the API.\n\n{e}"
 
-def send_message(text, chatbot):
-   # Send POST request and get response
-   response = send_post_request(text)
-   # Update chatbot with response
-   chatbot.append(("opentrons_simulator result", response))
-   return chatbot
+def add_to_chatbot(protocol_text: str, chat_history: list):
+    chat_history.append((protocol_text, None))
+    response = simulate_protocol(protocol_text)
+    chat_history.append((None, response))
+    return chat_history
 
+# --- Gradio UI ---
 title = """
 <div align="center">
-  # OT-2 Simulator: Emulating Opentrons Protocols with Python API
-  
+  <h1>OT-2 Simulator</h1>
+  <p>Enter your Opentrons protocol code below and click 'Send' to run the simulation.</p>
 </div>
 """
-with gr.Blocks() as app:
+
+with gr.Blocks(theme=gr.themes.Soft()) as app:
     gr.Markdown(title)
-    textbox = gr.Textbox(label="Enter protocol")
-    send_button = gr.Button(value="Send")
-    chatbot = gr.Chatbot()
-    clear_button = gr.ClearButton([textbox, chatbot])
-    send_button.click(send_message, [textbox, chatbot], [chatbot])
+    
+    with gr.Row():
+        chatbot = gr.Chatbot(
+            label="Simulation Log", 
+            bubble_full_width=True,
+            height=500
+        )
+
+    with gr.Row():
+        textbox = gr.Textbox(
+            label="Enter your protocol here",
+            placeholder="from opentrons import protocol_api\n\nmetadata = {'apiLevel': '2.11'}\n\ndef run(protocol: protocol_api.ProtocolContext):\n    tiprack = protocol.load_labware('opentrons_96_tiprack_300ul', 1)\n    p300 = protocol.load_instrument('p300_single_gen2', 'right', tip_racks=[tiprack])\n    p300.pick_up_tip()\n    p300.drop_tip()",
+            lines=15,
+            scale=4,
+        )
+
+    with gr.Row():
+        send_button = gr.Button("▶️ Run Simulation", variant="primary")
+        clear_button = gr.ClearButton([textbox, chatbot], value="🗑️ Clear")
+
+    # ボタンがクリックされたときの動作を定義
+    send_button.click(
+        fn=add_to_chatbot,
+        inputs=[textbox, chatbot],
+        outputs=[chatbot]
+    )
 
-app.launch()
+app.launch()