mindroot 10.6.0__py3-none-any.whl → 10.7.0__py3-none-any.whl

mindroot/coreplugins/chat/services.py

@@ -24,6 +24,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 +71,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 +138,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
@@ -217,30 +223,61 @@ def process_result(result, formatted_results):
 
     return formatted_results
 
+# Deprecated - use active_tasks instead
 in_progress = {}
 
+
 @service()
-async def send_message_to_agent(session_id: str, message: str | List[MessageParts], max_iterations=35, context=None, user=None):
-    global in_progress
-    existing_session = in_progress.get(session_id, False)
-    print(existing_session)
-
-    if existing_session:
-        context_ = await get_context(session_id, user)
-        context.data['finished_conversation'] = True
-        await asyncio.sleep(0.4)
-    else:
-        print('starting')
+async def cancel_and_wait(session_id: str, user:str, context=None):
+    global in_progress, active_tasks
+    existing_task = active_tasks.get(session_id)
 
-    print('ok')
-    in_progress[session_id] = True
+    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.1)
+
+    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):
+    global in_progress, active_tasks
+    
+    # Check if there's an active task for this session
+    existing_task = active_tasks.get(session_id)
 
-    print('b')
-    if os.environ.get("MR_MAX_ITERATIONS") is not None:
-        max_iterations = int(os.environ.get("MR_MAX_ITERATIONS"))
     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 }
@@ -248,14 +285,72 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
         if hasattr(user, "dict"):
             user = user.dict()
 
+    # If there's an existing task, cancel it and wait for it to finish
+    if existing_task and not existing_task.done():
+        #print("SEND_MESSAGE  rejecting because active task, but sneaking in new user message")
+        #if type(message) is str:
+            #context.chat_log.add_message({"role": "user", "content": [{"type": "text", "text": message}]})
+            #context.chat_log.add_message_role({"role": "user", "content": message })
+ 
+        #return []
+        print(f"SEND_MESSAGE: Cancelling existing task for session {session_id}")
+        
+        # Load the context to set cancellation flags
+        try:
+            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.1)
+
+
+        print(f"SEND_MESSAGE Previous task cancelled for session {session_id}")
+
+    context.data['cancel_current_turn'] = False
+    context.data['finished_conversation'] = False
+    context.save_context()
+
+    in_progress[session_id] = True
+    asyncio.sleep(0.2)
+
+    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)
@@ -390,9 +485,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
@@ -417,7 +515,18 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
 
         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())
@@ -508,8 +617,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'
@@ -568,3 +676,4 @@ async def cancel_active_response(log_id: str, context=None):
     
     print(f"Cancelled active response for session {log_id}")
     return {"status": "cancelled", "log_id": log_id}
+

mindroot/lib/chatcontext.py

@@ -9,6 +9,7 @@ from .chatlog import ChatLog
 from .chatlog import extract_delegate_task_log_ids, find_child_logs_by_parent_id, find_chatlog_file
 from typing import TypeVar, Type, Protocol, runtime_checkable, Set
 from .utils.debug import debug_box
+
 contexts = {}
 
 async def get_context(log_id, user):

mindroot/lib/chatlog.py

@@ -62,6 +62,8 @@ class ChatLog:
                 self.agent = log_data.get('agent')
                 self.messages = log_data.get('messages', [])
                 self.parent_log_id = log_data.get('parent_log_id', None)
+            # we need the last modification time of the file
+            self.last_modified = os.path.getmtime(log_file)
             print("Loaded log file at ", log_file)
             print("Message length: ", len(self.messages))
         else:
@@ -71,12 +73,23 @@ class ChatLog:
     def _save_log_sync(self) -> None:
         """Synchronous version for backward compatibility"""
         log_file = os.path.join(self.log_dir, f'chatlog_{self.log_id}.json')
+        self.last_modified = time.time()
         with open(log_file, 'w') as f:
             json.dump(self._get_log_data(), f, indent=2)
 
+
+    def add_message_role(self, message: Dict[str, str]) -> None:
+        for i in range(len(self.messages)-1, -1, -1):
+            if self.messages[i]['role'] == message.get('role'):
+                self.messages[i]['content'].append(message)
+                self.last_modified = time.time()
+                self._save_log_sync()
+                return
+
     def add_message(self, message: Dict[str, str]) -> None:
         """Synchronous version for backward compatibility"""
         should_save = self._add_message_impl(message)
+        self.last_modified = time.time()
         if should_save:
             self._save_log_sync()
         else:
@@ -157,6 +170,25 @@ class ChatLog:
     def get_history(self) -> List[Dict[str, str]]:
         return self.messages
 
+
+    def parsed_commands(self) -> List[Dict[str, any]]:
+        commands = []
+        filtered = [m for m in self.messages if m['role'] == 'assistant']
+        for message in filtered:
+            content = message['content']
+            if isinstance(content, list) and len(content) > 0 and 'text' in content[0]:
+                text = content[0]['text']
+            else:
+                continue
+            try:
+                cmd_list = json.loads(text)
+                if not isinstance(cmd_list, list):
+                    cmd_list = [cmd_list]
+                commands.extend(cmd_list)
+            except (json.JSONDecodeError, TypeError):
+                continue
+        return commands
+
     def get_recent(self, max_tokens: int = 4096) -> List[Dict[str, str]]:
         recent_messages = []
         total_length = 0

{mindroot-10.6.0.dist-info → mindroot-10.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 10.6.0
+Version: 10.7.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE

{mindroot-10.6.0.dist-info → mindroot-10.7.0.dist-info}/RECORD

@@ -439,8 +439,9 @@ mindroot/coreplugins/admin/static/js/lit-html/node/directives/when.js,sha256=NLe
 mindroot/coreplugins/admin/static/js/lit-html/node/directives/when.js.map,sha256=tOonih_-EaqrunhNGshA9xN--WIVdGikjg8MkVp0itQ,1534
 mindroot/coreplugins/admin/templates/admin.jinja2,sha256=H_oDqoWWk0Da0Jre67LIKvB3h30fmjcZz2T5knUyz0k,13272
 mindroot/coreplugins/admin/templates/model-preferences-v2.jinja2,sha256=5J3rXYmtp_yMTFCk85SYN03gc4lbidF0Nip6YcqcIW4,891
-mindroot/coreplugins/agent/agent.py,sha256=k3G3VaRjGwd1TNYQloytE4NV5cXyVxiuUl1GaMfdTEE,22335
+mindroot/coreplugins/agent/agent.py,sha256=m28_7JNXbqDjo5ZQ2H2goPA1bGoeCLc1riUiDaNa_6E,22903
 mindroot/coreplugins/agent/agent.py.bak,sha256=X-EmtrpEpdfo-iUw9gj7mLveRVzAApsDWPTwMAuv7Ww,20715
+mindroot/coreplugins/agent/buagentz1.py,sha256=XVRKf-jEHgv6ru-iESg1uPJGgUz3pzeAG-0UjPA4bqw,22404
 mindroot/coreplugins/agent/cmd_start_example.py,sha256=Mdcd9st6viI6-M7a0-zqkw3IxR9FAxIiZ_8G-tLdIJk,1416
 mindroot/coreplugins/agent/command_parser.py,sha256=dgMqtVLPQWE2BU7iyjqwKGy5Gh74jcZkiy1JDs07t4E,13166
 mindroot/coreplugins/agent/ensure_msg_type.py,sha256=P2XSBs3gtjlDQLOF7808nm-Dl5jswyO6qgv0lNRyHXM,240
@@ -461,15 +462,15 @@ mindroot/coreplugins/api_keys/router.py,sha256=pz6VjUDPryKxYgnPt8-5AP1P-wjIIQq2c
 mindroot/coreplugins/api_keys/inject/admin.jinja2,sha256=t50he2aeK_GJ6838LekBcGjkYRbo5p6OHeTWtlggbyU,372
 mindroot/coreplugins/api_keys/static/js/api-key-manager.js,sha256=imqlhd85Z-1e7uxDlprphGV_N467WKo8_BYVQsJJ1V0,5327
 mindroot/coreplugins/chat/__init__.py,sha256=qVdTF1fHZJHwY_ChnPvNFx2Nlg07FHvK0V_JmzfWzdw,230
+mindroot/coreplugins/chat/buservices.py,sha256=MHwkwlWNh8xJ_nnskSBj4N5B1xtFhOMfN-dUyxVC_M8,24635
 mindroot/coreplugins/chat/buwidget_routes.py,sha256=MtwaPX2vEGDylifWOqcx7EAhDw0y1Y3Y91z58EJaLsc,9982
-mindroot/coreplugins/chat/commands.py,sha256=vlgGOvwvjpCbSsW25x4HaeFzeRNWXoEKrdqNpwX_EGg,17077
-mindroot/coreplugins/chat/edit_router.py,sha256=25BStzAIvGhULb_07bZw2aNxnpqabKV6CZHl9xrYdbQ,18629
+mindroot/coreplugins/chat/commands.py,sha256=YVmOMyihMoPMxeaQI2f9QAz91Z7lHfjZ01rTfogmyeM,17308
 mindroot/coreplugins/chat/format_result_msgs.py,sha256=daEdpEyAJIa8b2VkCqSKcw8PaExcB6Qro80XNes_sHA,2
 mindroot/coreplugins/chat/mod.py,sha256=Xydjv3feKJJRbwdiB7raqiQnWtaS_2GcdC9bXYQX3nE,425
 mindroot/coreplugins/chat/models.py,sha256=GRcRuDUAJFpyWERPMxkxUaZ21igNlWeeamriruEKiEQ,692
 mindroot/coreplugins/chat/router.py,sha256=vq9UwYoFoGQMVmDC0TkjH7TWivFwkIe6OU0Scu-dtHg,15998
 mindroot/coreplugins/chat/router_dedup_patch.py,sha256=lDSpVMSd26pXJwrrdirUmR1Jv_N5VHiDzTS8t3XswDU,918
-mindroot/coreplugins/chat/services.py,sha256=cODRoNjE0lrraYBR5fwzMAwB-Y-GBQTr8VCMTzsejlY,22325
+mindroot/coreplugins/chat/services.py,sha256=pufIrviR5KD5LcuuQW-lfU9mgZTP0GPy3ayDSBb3PaI,27081
 mindroot/coreplugins/chat/utils.py,sha256=BiE14PpsAcQSO5vbU88klHGm8cAXJDXxgVgva-EXybU,155
 mindroot/coreplugins/chat/widget_manager.py,sha256=LrMbZlHqpxbLwdN4XZ4GkLxORwxa1o6IVCrlUDBmGQs,4786
 mindroot/coreplugins/chat/widget_routes.py,sha256=iV3OwLFnvLDsMHdckJnmVXcUgyyng-zIPNXyK2LAUjc,11802
@@ -2196,8 +2197,8 @@ mindroot/lib/buchatlog.py,sha256=LJZc3ksKgJcStltmHrrwNLaON3EDzhOKVAWj0Wl22wk,586
 mindroot/lib/buchatlog2.py,sha256=Va9FteBWePEjWD9OZcw-OtQfEb-IoCVGTmJeMRaX9is,13729
 mindroot/lib/buchatlog3.py,sha256=SAvcK2m_CW0Jw8p1pqnbrTexcx24PotrsJTqvQ_D290,24573
 mindroot/lib/butemplates.py,sha256=gfHGPTOjvoEenXsR7xokNuqMjOAPuC2DawheH1Ae4bU,12196
-mindroot/lib/chatcontext.py,sha256=CXk-pX-7RG3NiRFsAZWERWxnuFJOHH7FHtOLm-kGRXE,12437
-mindroot/lib/chatlog.py,sha256=ACdixKTn_GlVVfB00fNlphNPMFnRrum_za_mQfGPQoQ,26372
+mindroot/lib/chatcontext.py,sha256=1NjD3YFmw5KpEi0rAUeFNYU1DRnu2k7kL3KRX4ebJc8,12438
+mindroot/lib/chatlog.py,sha256=RKEx29JB-48fntWIzsdI4NTu-hp6eKxcpwRmNW6cSAc,27629
 mindroot/lib/chatlog_optimized.py,sha256=rL7KBP-V4_cGgMLihxPm3HoKcjFEyA1uEtPtqvkOa3A,20011
 mindroot/lib/json_escape.py,sha256=5cAmAdNbnYX2uyfQcnse2fFtNI0CdB-AfZ23RwaDm-k,884
 mindroot/lib/model_selector.py,sha256=Wz-8NZoiclmnhLeCNnI3WCuKFmjsO5HE4bK5F8GpZzU,1397
@@ -2251,9 +2252,9 @@ mindroot/protocols/services/stream_chat.py,sha256=fMnPfwaB5fdNMBLTEg8BXKAGvrELKH
 mindroot/registry/__init__.py,sha256=40Xy9bmPHsgdIrOzbtBGzf4XMqXVi9P8oZTJhn0r654,151
 mindroot/registry/component_manager.py,sha256=WZFNPg4SNvpqsM5NFiC2DpgmrJQCyR9cNhrCBpp30Qk,995
 mindroot/registry/data_access.py,sha256=81In5TwETpaqnnY1_-tBQM7rfWvUxZUZkG7lEelRUfU,5321
-mindroot-10.6.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
-mindroot-10.6.0.dist-info/METADATA,sha256=B_jgoqAFx9YKO_ddBGR0_rVBewpVyTae8JJhUxQI_LY,1035
-mindroot-10.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mindroot-10.6.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
-mindroot-10.6.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
-mindroot-10.6.0.dist-info/RECORD,,
+mindroot-10.7.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
+mindroot-10.7.0.dist-info/METADATA,sha256=xSlNhS5t0OcnEBR_5RmPECCguk-qPcRDF_BRZJoaSqc,1035
+mindroot-10.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mindroot-10.7.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
+mindroot-10.7.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
+mindroot-10.7.0.dist-info/RECORD,,