fixup! ai: Enable gradio default stop button.

jarvis.py

@@ -58,10 +58,9 @@ ALLOWED_EXTENSIONS = json.loads(os.getenv("ALLOWED_EXTENSIONS", "[]"))
 ACTIVE_CANDIDATE = None
 
 class SessionWithID(requests.Session):
-    def __init__(self):
+    def __init__(sess):
         super().__init__()
-        self.session_id = str(uuid.uuid4())
-        self.stop_event = asyncio.Event()
+        sess.session_id = str(uuid.uuid4())
 
 def create_session():
     return SessionWithID()
@@ -224,6 +223,7 @@ async def fetch_response_async(host, key, model, msgs, cfg, sid):
     return None
 
 async def chat_with_model_async(history, user_input, model_display, sess, custom_prompt):
+    ensure_stop_event(sess)
     if not get_available_items(LINUX_SERVER_PROVIDER_KEYS, LINUX_SERVER_PROVIDER_KEYS_MARKED) or not get_available_items(LINUX_SERVER_HOSTS, LINUX_SERVER_HOSTS_ATTEMPTS):
         return RESPONSES["RESPONSE_3"]
     if not hasattr(sess, "session_id"):
@@ -256,24 +256,20 @@ async def chat_with_model_async(history, user_input, model_display, sess, custom
     return RESPONSES["RESPONSE_2"]
 
 async def respond_async(multi, history, model_display, sess, custom_prompt):
-    if not hasattr(sess, "stop_event"):
-        sess.stop_event = asyncio.Event()
+    ensure_stop_event(sess)
     sess.stop_event.clear()
     msg_input = {"text": multi.get("text", "").strip(), "files": multi.get("files", [])}
     if not msg_input["text"] and not msg_input["files"]:
-        yield history, gr.MultimodalTextbox(value="", interactive=True, submit_btn=True, stop_btn=False), sess
+        yield history, gr.update(value="", interactive=True, submit_btn=True, stop_btn=False), sess
         return
     inp = ""
     for f in msg_input["files"]:
-        if isinstance(f, dict):
-            fp = f.get("data", f.get("name", ""))
-        else:
-            fp = f
+        fp = f.get("data", f.get("name", "")) if isinstance(f, dict) else f
         inp += f"{Path(fp).name}\n\n{extract_file_content(fp)}\n\n"
     if msg_input["text"]:
         inp += msg_input["text"]
     history.append([inp, RESPONSES["RESPONSE_8"]])
-    yield history, gr.MultimodalTextbox(value="", interactive=False, submit_btn=False, stop_btn=True), sess
+    yield history, gr.update(interactive=False, submit_btn=False, stop_btn=True), sess
     ai = await chat_with_model_async(history, inp, model_display, sess, custom_prompt)
     history[-1][1] = ""
     buffer = []
@@ -281,7 +277,7 @@ async def respond_async(multi, history, model_display, sess, custom_prompt):
     for char in ai:
         if sess.stop_event.is_set():
             history[-1][1] = RESPONSES["RESPONSE_1"]
-            yield history, gr.MultimodalTextbox(value="", interactive=True, submit_btn=True, stop_btn=False), sess
+            yield history, gr.update(value="", interactive=True, submit_btn=True, stop_btn=False), sess
             sess.stop_event.clear()
             return
         buffer.append(char)
@@ -290,12 +286,12 @@ async def respond_async(multi, history, model_display, sess, custom_prompt):
             history[-1][1] += "".join(buffer)
             buffer.clear()
             last_update = current_time
-            yield history, gr.MultimodalTextbox(value="", interactive=False, submit_btn=False, stop_btn=True), sess
+            yield history, gr.update(interactive=False, submit_btn=False, stop_btn=True), sess
             await asyncio.sleep(0.016)
     if buffer:
         history[-1][1] += "".join(buffer)
-        yield history, gr.MultimodalTextbox(value="", interactive=False, submit_btn=False, stop_btn=True), sess
-    yield history, gr.MultimodalTextbox(value="", interactive=True, submit_btn=True, stop_btn=False), sess
+        yield history, gr.update(interactive=False, submit_btn=False, stop_btn=True), sess
+    yield history, gr.update(value="", interactive=True, submit_btn=True, stop_btn=False), sess
 
 def change_model(new):
     visible = new != MODEL_CHOICES[0]
@@ -303,13 +299,12 @@ def change_model(new):
     return [], create_session(), new, default, gr.update(value=default, visible=visible)
 
 def stop_response(history, sess):
-    if not hasattr(sess, "stop_event"):
-        sess.stop_event = asyncio.Event()
+    ensure_stop_event(sess)
     sess.stop_event.set()
     if history:
         history[-1][1] = RESPONSES["RESPONSE_1"]
     new_session = create_session()
-    return history, gr.MultimodalTextbox(value="", interactive=True, submit_btn=True, stop_btn=False), new_session
+    return history, None, new_session
 
 with gr.Blocks(fill_height=True, fill_width=True, title=AI_TYPES["AI_TYPE_4"], head=META_TAGS) as jarvis:
     user_history = gr.State([])