mindroot 10.5.0__py3-none-any.whl → 10.14.0__py3-none-any.whl

mindroot/coreplugins/chat/services.py

@@ -8,6 +8,7 @@ from typing import List
 from lib.utils.dataurl import dataurl_to_pil
 from .models import MessageParts
 from coreplugins.agent import agent
+from coreplugins.agent.speech_to_speech import SpeechToSpeechAgent
 from lib.utils.debug import debug_box
 import os
 import sys
@@ -24,6 +25,9 @@ import nanoid
 sse_clients = {}
 from lib.chatcontext import get_context
 
+# Track active processing tasks per session
+active_tasks = {}
+
 @service()
 async def prompt(model: str, instructions: str, temperature=0, max_tokens=400, json=False, context=None):
     messages = [
@@ -68,7 +72,7 @@ def results_output(results):
     text = ""
     for result in results:
         if 'output' in result['args']:
-            return result['args']['output']
+            return str(result['args']['output'])
 
 def results_text_output(results):
     text = ""
@@ -135,6 +139,9 @@ async def run_task(instructions: str, agent_name:str = None, user:str = None, lo
 
     while retried < retries:
         [results, full_results] = await send_message_to_agent(context.log_id, instructions, context=context)
+        print('#####################################################33')
+        print("Full results: ", full_results)
+        print("Results: ", results)
         text = results_output(full_results)
         if text == "":
             retried += 1
@@ -165,6 +172,11 @@ async def init_chat_session(user:str, agent_name: str, log_id: str, context=None
         print("context.agent_name: ", context.agent_name)
         await context.save_context()
     print("initiated_chat_session: ", log_id, agent_name, context.agent_name, context.agent)
+
+    if 'live' in context.agent['stream_chat'] or 'realtime' in context.agent['stream_chat']:
+        agent = SpeechToSpeechAgent(agent_name, context=context)
+        await agent.connect()
+
     return log_id
 
 @service()
@@ -217,13 +229,61 @@ def process_result(result, formatted_results):
 
     return formatted_results
 
+# Deprecated - use active_tasks instead
+in_progress = {}
+
+
+@service()
+async def cancel_and_wait(session_id: str, user:str, context=None):
+    global in_progress, active_tasks
+    existing_task = active_tasks.get(session_id)
+
+    if not in_progress.get(session_id, False):
+        print(f"SEND_MESSAGE No active processing for session {session_id} to cancel.")
+        return
+    try:
+        print(f"SEND_MESSAGE Cancelling active task for session {session_id}...")
+        existing_context = await get_context(session_id, user)
+        existing_context.data['cancel_current_turn'] = True
+        existing_context.data['finished_conversation'] = True
+        existing_context.save_context()
+        # Cancel any active command task
+        if 'active_command_task' in existing_context.data:
+            cmd_task = existing_context.data['active_command_task']
+            if cmd_task and not cmd_task.done():
+                cmd_task.cancel()
+        
+        await existing_context.save_context()
+    except Exception as e:
+        print(f"SEND_MESSAGE Error setting cancellation flags: {e}")
+    
+    # Cancel the main task
+    existing_task.cancel()
+    
+    # Wait for it to actually finish (with timeout)
+    try:
+        await asyncio.wait_for(existing_task, timeout=2.0)
+    except (asyncio.CancelledError, asyncio.TimeoutError):
+        pass  # Expected
+   
+    start_wait = time.time()
+    while in_progress.get(session_id, False) and (time.time() - start_wait) < 5.0:
+        print(f"SEND_MESSAGE Waiting for cancellation of session {session_id} to complete...")
+        await asyncio.sleep(0.025)
+
+    print(f"SEND_MESSAGE Cancellation complete for session {session_id}")
+
 @service()
 async def send_message_to_agent(session_id: str, message: str | List[MessageParts], max_iterations=35, context=None, user=None):
-    if os.environ.get("MR_MAX_ITERATIONS") is not None:
-        max_iterations = int(os.environ.get("MR_MAX_ITERATIONS"))
+    global in_progress, active_tasks
+    
+    # Check if there's an active task for this session
+    existing_task = active_tasks.get(session_id)
+
     if not user:
         # check context
         if not context.username:
+            print("SEND_MESSAGE No user provided and context has no username")
             raise Exception("User required")
         else:
             user = {"user": context.username }
@@ -231,20 +291,46 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
         if hasattr(user, "dict"):
             user = user.dict()
 
+    context.data['cancel_current_turn'] = False
+    context.data['finished_conversation'] = False
+    await context.save_context()
+
+    in_progress[session_id] = True
+    await asyncio.sleep(0.05)
+
+    print('b')
+    if os.environ.get("MR_MAX_ITERATIONS") is not None:
+        max_iterations = int(os.environ.get("MR_MAX_ITERATIONS"))
     try:
         if type(message) is list:
             message = [m.dict() for m in message]
 
         if session_id is None or session_id == "" or message is None or message == "":
-            print("Invalid session_id or message")
+            print("SEND_MESSAGE Invalid session_id or message")
             return []
 
+        # Create the main processing task and store it
+        processing_task = asyncio.current_task()
+        active_tasks[session_id] = processing_task
+
+        print("SEND_MESSAGE proceeding with message processing")
         print("send_message_to_agent: ", session_id, message, max_iterations)
         if context is None:
             context = ChatContext(command_manager, service_manager, user)
             await context.load_context(session_id)
 
-        agent_ = agent.Agent(agent=context.agent)
+        if 'live' in context.agent['stream_chat'] or 'realtime' in context.agent['stream_chat']:
+            agent_ = SpeechToSpeechAgent(context.agent_name, context=context)
+            print('Using SpeechToSpeechAgent for live/realtime chat')
+            print()
+            print()
+            print()
+            print('message: ', message)
+            results = await agent_.send_message(message)
+            return results, []
+        else:
+            agent_ = agent.Agent(agent=context.agent)
+
         if user is not None and hasattr(user, "keys"):
             for key in user.keys():
                 context.data[key] = user[key]
@@ -373,9 +459,12 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
                     context.chat_log.add_message({"role": "user", "content": formatted_results})
                     results.append(out_results) 
                 else:
-                    print("Processing iteration: ", iterations, "no message added")
+                    print("SEND_MESSAGE Processing iteration: ", iterations, "no message added")
                 if context.data.get('finished_conversation') is True:
                     termcolor.cprint("Finished conversation, exiting send_message_to_agent", "red")
+                    if context.data.get('task_result') is not None:
+                        task_result = context.data.get('task_result')
+                        full_results.append({ "cmd": "task_result", "args": { "result": task_result } })
                     continue_processing = False
             except Exception as e:
                 continue_processing = False
@@ -399,10 +488,23 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
         print("Exiting send_message_to_agent: ", session_id, message, max_iterations)
 
         await context.finished_chat()
+        in_progress.pop(session_id, None)
+        active_tasks.pop(session_id, None)
+        if len(results) == 0:
+            if context.data.get('task_result') is not None:
+                task_result = context.data.get('task_result')
+                results.append(task_result)
+        print("SEND_MESSAGE Done")
         return [results, full_results]
+    except asyncio.CancelledError:
+        print(f"Task cancelled for session {session_id}")
+        in_progress.pop(session_id, None)
+        active_tasks.pop(session_id, None)
+        raise  # Re-raise to properly handle cancellation
     except Exception as e:
         print("Error in send_message_to_agent: ", e)
         print(traceback.format_exc())
+        in_progress.pop(session_id, None)
         return []
 
 @pipe(name='process_results', priority=5)
@@ -489,8 +591,7 @@ async def command_result(command: str, result, context=None):
 @service()
 async def backend_user_message(message: str, context=None):
     """
-    Insert a user message from the backend and signal the frontend to display it.
-    This allows backend processes to inject messages into the chat without user interaction.
+    Signal the frontend to display a user message.
     """
     agent_ = context.agent
     persona = 'user'
@@ -542,10 +643,15 @@ async def cancel_active_response(log_id: str, context=None):
                 # DEBUG TRACE
                 print("\033[91;107m[DEBUG TRACE 6/6] Active command task found and cancelled.\033[0m")
                 print(f"Cancelled active command task for session {log_id}")
+                print(f"Removing last assistant message from chat log for session {log_id}")
+                await context.chat_log.drop_last('assistant')
+
             except Exception as e:
                 print(f"Error cancelling active command task: {e}")
-    
+
+ 
     await context.save_context()
     
     print(f"Cancelled active response for session {log_id}")
-    return {"status": "cancelled", "log_id": log_id}
+    return {"status": "cancelled", "log_id": log_id}
+

mindroot/coreplugins/chat/static/css/dark.css

@@ -1,3 +1,8 @@
+/* Import JetBrains Mono from Google Fonts */
+@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&display=swap');
+
+/* Base styles */
+
 html, body {
   background-color: #101020;
   color: #f0f0f0;
@@ -16,7 +21,7 @@ input, * {
   background-color: transparent;
   color: #f0f0f0;
   margin: 2px 2px;
-  font-family: ui-sans-serif, -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif, Helvetica, "Apple Color Emoji", Arial, "Segoe UI Emoji", "Segoe UI Symbol";
+  /*font-family: ui-sans-serif, -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif, Helvetica, "Apple Color Emoji", Arial, "Segoe UI Emoji", "Segoe UI Symbol";*/
 }
 
 p {
@@ -1020,3 +1025,87 @@ tbody tr {
 .left-side {
   overflow-y: auto;
 }
+
+/* Enhanced Shell/Terminal output styling */
+pre.shellout {
+  background: linear-gradient(to bottom, #2d2d2d 0%, #1e1e1e 30px, #1a1a1a 100%);
+  border: 1px solid #404040;
+  border-radius: 12px;
+  padding: 0;
+  margin: 15px 0;
+  overflow-x: auto;
+  max-height: 50vh;
+  overflow-y: auto;
+  box-shadow: 0 8px 16px rgba(0, 0, 0, 0.4), 
+              0 0 0 1px rgba(255, 255, 255, 0.05) inset;
+  position: relative;
+}
+
+/* Mock terminal title bar */
+pre.shellout::before {
+  content: '';
+  display: block;
+  height: 30px;
+  background: linear-gradient(to bottom, #3a3a3a, #2d2d2d);
+  border-bottom: 1px solid #1a1a1a;
+  border-radius: 12px 12px 0 0;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
+/* Terminal window controls (dots) */
+pre.shellout::after {
+  content: '';
+  position: absolute;
+  top: 11px;
+  left: 12px;
+  width: 12px;
+  height: 12px;
+  background: #ff5f56;
+  border-radius: 50%;
+  box-shadow: 
+    20px 0 0 #ffbd2e,
+    40px 0 0 #27c93f,
+    0 0 0 1px rgba(0, 0, 0, 0.2);
+  z-index: 2;
+}
+
+/* Code element inside shellout pre */
+pre.shellout code {
+  background-color: transparent;
+  color: #e8e8e8;
+  font-family: 'JetBrains Mono', 'Fira Code', 'Consolas', 'Monaco', monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  padding: 15px 20px;
+  padding-top: 10px;
+  margin: 0;
+  border: none;
+  white-space: pre-wrap;
+  display: block;
+  font-weight: 400;
+  letter-spacing: 0.02em;
+}
+
+/* Custom scrollbar for terminal */
+pre.shellout::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+pre.shellout::-webkit-scrollbar-track {
+  background: #1a1a1a;
+  border-radius: 0 0 12px 0;
+}
+
+pre.shellout::-webkit-scrollbar-thumb {
+  background: #404040;
+  border-radius: 5px;
+  border: 2px solid #1a1a1a;
+}
+
+pre.shellout::-webkit-scrollbar-thumb:hover {
+  background: #4a4a4a;
+}
+

mindroot/coreplugins/chat/static/css/default.css

@@ -1,3 +1,8 @@
+/* Import JetBrains Mono from Google Fonts */
+@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&display=swap');
+
+/* Base styles */
+
 html, body {
   background-color: #101020;
   color: #f0f0f0;
@@ -16,7 +21,7 @@ input, * {
   background-color: transparent;
   color: #f0f0f0;
   margin: 2px 2px;
-  font-family: ui-sans-serif, -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif, Helvetica, "Apple Color Emoji", Arial, "Segoe UI Emoji", "Segoe UI Symbol";
+  /*font-family: ui-sans-serif, -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", sans-serif, Helvetica, "Apple Color Emoji", Arial, "Segoe UI Emoji", "Segoe UI Symbol";*/
 }
 
 p {
@@ -1020,3 +1025,87 @@ tbody tr {
 .left-side {
   overflow-y: auto;
 }
+
+/* Enhanced Shell/Terminal output styling */
+pre.shellout {
+  background: linear-gradient(to bottom, #2d2d2d 0%, #1e1e1e 30px, #1a1a1a 100%);
+  border: 1px solid #404040;
+  border-radius: 12px;
+  padding: 0;
+  margin: 15px 0;
+  overflow-x: auto;
+  max-height: 50vh;
+  overflow-y: auto;
+  box-shadow: 0 8px 16px rgba(0, 0, 0, 0.4), 
+              0 0 0 1px rgba(255, 255, 255, 0.05) inset;
+  position: relative;
+}
+
+/* Mock terminal title bar */
+pre.shellout::before {
+  content: '';
+  display: block;
+  height: 30px;
+  background: linear-gradient(to bottom, #3a3a3a, #2d2d2d);
+  border-bottom: 1px solid #1a1a1a;
+  border-radius: 12px 12px 0 0;
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
+/* Terminal window controls (dots) */
+pre.shellout::after {
+  content: '';
+  position: absolute;
+  top: 11px;
+  left: 12px;
+  width: 12px;
+  height: 12px;
+  background: #ff5f56;
+  border-radius: 50%;
+  box-shadow: 
+    20px 0 0 #ffbd2e,
+    40px 0 0 #27c93f,
+    0 0 0 1px rgba(0, 0, 0, 0.2);
+  z-index: 2;
+}
+
+/* Code element inside shellout pre */
+pre.shellout code {
+  background-color: transparent;
+  color: #e8e8e8;
+  font-family: 'JetBrains Mono', 'Fira Code', 'Consolas', 'Monaco', monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  padding: 15px 20px;
+  padding-top: 10px;
+  margin: 0;
+  border: none;
+  white-space: pre-wrap;
+  display: block;
+  font-weight: 400;
+  letter-spacing: 0.02em;
+}
+
+/* Custom scrollbar for terminal */
+pre.shellout::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+pre.shellout::-webkit-scrollbar-track {
+  background: #1a1a1a;
+  border-radius: 0 0 12px 0;
+}
+
+pre.shellout::-webkit-scrollbar-thumb {
+  background: #404040;
+  border-radius: 5px;
+  border: 2px solid #1a1a1a;
+}
+
+pre.shellout::-webkit-scrollbar-thumb:hover {
+  background: #4a4a4a;
+}
+