Update app.py

app.py

@@ -1646,51 +1646,48 @@ def launch_ui(bootstrap_instance: "Bootstrap"):
             return "".join(ch for ch in text if unicodedata.category(ch)[0] != "C").strip()
         
         def talk(m, uid, role, mode, hist, request: gr.Request): # type: ignore
-            eff = role if mode == "admin" else "user"
+            effective_role = role if mode == "admin" else "user"
             session_id = request.session_hash
             # Use session_id for guests, uid for logged-in users
             current_user_id = uid or session_id
             
             sanitized_m = _sanitize_input(m)
             if not sanitized_m:
-                hist.append([m, "Please provide a message."])
-                yield hist, gr.Textbox(value="")
+                yield hist, gr.Textbox()
                 return
             
-            messages_hist = gr.Chatbot.postprocess(hist) if hist else [] # `postprocess` handles the conversion
-            messages_hist.append({"role": "user", "content": sanitized_m})
-            yield messages_hist, gr.Textbox(value="", interactive=False) # Show user message immediately, disable textbox
+            current_history = (hist or []) + [{"role": "user", "content": sanitized_m}]
+            yield current_history, gr.Textbox(value="", interactive=False) # Show user message, disable textbox
 
-            hive_instance = get_hive_instance() # type: ignore
+            hive_instance = get_hive_instance(bootstrap_instance) # type: ignore
             
             if hive_instance.lite_mode:
                 # Lite mode: direct, non-streaming response.
-                reply = hive_instance.chat(sanitized_m, eff, current_user_id, max_new_tokens=256, temperature=0.7)
-                messages_hist.append({"role": "assistant", "content": reply or "[No response from model]"})
-                yield messages_hist, gr.Textbox(value="", interactive=True)
+                reply = hive_instance.chat(sanitized_m, effective_role, current_user_id, max_new_tokens=256, temperature=0.7)
+                current_history.append({"role": "assistant", "content": reply or "[No response from model]"})
+                yield current_history, gr.Textbox(value="", interactive=True)
             else:
                 # Full mode uses the DialogueManager for a streaming response.
                 if not hasattr(hive_instance, 'dialogue_manager'):
                     error_msg = "Dialogue Manager not available. Full core may still be initializing."
-                    messages_hist.append({"role": "assistant", "content": error_msg})
-                    yield messages_hist, gr.Textbox(value="", interactive=True)
+                    current_history.append({"role": "assistant", "content": error_msg})
+                    yield current_history, gr.Textbox(value="", interactive=True)
                     return
-                full_reply = ""
-                messages_hist.append({"role": "assistant", "content": ""})  # Placeholder for the stream
+                
+                current_history.append({"role": "assistant", "content": ""})
                 try:
-                    for chunk in hive_instance.dialogue_manager.process_turn(sanitized_m, current_user_id, eff, session_id):
+                    # The dialogue manager needs the full history to maintain context.
+                    for chunk in hive_instance.dialogue_manager.process_turn(current_history, current_user_id, effective_role, session_id):
                         if chunk["type"] == "token":
-                            full_reply += chunk["content"]
-                            messages_hist[-1]["content"] = full_reply
-                            yield messages_hist, gr.Textbox(value="", interactive=False)
-                        elif chunk["type"] == "final":
-                            messages_hist[-1]["content"] = chunk["content"]
-                            yield messages_hist, gr.Textbox(value="", interactive=True)
+                            current_history[-1]["content"] += chunk["content"]
+                            yield current_history, gr.Textbox(value="", interactive=False)
+                    # After the stream is complete, re-enable the textbox.
+                    yield current_history, gr.Textbox(placeholder=f"Talk to {CFG['AGENT_NAME']}", interactive=True)
                 except Exception as e:
                     error_msg = f"Error in DialogueManager: {e}"
                     print(f"[ERROR] {error_msg}")
-                    messages_hist[-1]["content"] = f"An error occurred: {error_msg}"
-                    yield messages_hist, gr.Textbox(value="", interactive=True)
+                    current_history[-1]["content"] = f"An error occurred: {error_msg}"
+                    yield current_history, gr.Textbox(value="", interactive=True)
 
         msg.submit(talk, [msg, uid_state, role_state, mode_state, chatbot], [chatbot, msg], api_name="chat")
         
@@ -1782,7 +1779,7 @@ def launch_ui(bootstrap_instance: "Bootstrap"):
             """Waits for ASR/TTS models and enables voice-related UI elements."""
             bootstrap_instance.voice_ready.wait()
             bootstrap_instance.hive_ready.wait() # Also wait for full core for voice features
-            hive_instance = get_hive_instance(bootstrap_instance)
+            hive_instance = get_hive_instance() # type: ignore
 
             voice_ready = not hive_instance.lite_mode and hasattr(hive_instance, 'asr_service') and hasattr(hive_instance, 'tts_service')
             video_ready = not hive_instance.lite_mode and hasattr(hive_instance, 'video_service') and CFG["VIDEO_ENABLED"] # type: ignore
@@ -2097,16 +2094,16 @@ def launch_ui(bootstrap_instance: "Bootstrap"):
         share=os.getenv("GRADIO_SHARE", "false").lower() == "true"
     ); return demo
 
-def get_hive_instance(bootstrap_instance: "Bootstrap"):
+def get_hive_instance(bootstrap_instance: "Bootstrap", lite: Optional[bool] = None, caps: Optional[Dict] = None):
     """
     Global function to safely get the current Hive instance.
     It prioritizes the full instance if ready, otherwise falls back to the lite one.
     """
     global HIVE_INSTANCE
-    if bootstrap_instance.hive_ready.is_set() and bootstrap_instance.hive_instance:
+    if bootstrap_instance and bootstrap_instance.hive_ready.is_set() and bootstrap_instance.hive_instance:
         if HIVE_INSTANCE is None or HIVE_INSTANCE.lite_mode:
             HIVE_INSTANCE = bootstrap_instance.hive_instance
-    elif HIVE_INSTANCE is None and bootstrap_instance.lite_core_ready.is_set():
+    elif bootstrap_instance and HIVE_INSTANCE is None and bootstrap_instance.lite_core_ready.is_set():
         HIVE_INSTANCE = bootstrap_instance.hive_lite_instance
     return HIVE_INSTANCE