Fixes

OS/01/core/interpreter/main.py

@@ -36,26 +36,6 @@ def load_conversation():
         return []
 
 
-def check_for_new_messages(task) -> Tuple[Optional[str], Optional[str]]:
-    # Has the user sent a message?
-    if task.done():
-        return {"role": "user", "type": "message", "content": task.result()}
-
-    # Has the queue recieved a message?
-    queued_message = check_queue()
-    if queued_message:
-        return queued_message
-
-    return None
-
-
-async def get_new_messages(task) -> Tuple[Optional[str], Optional[str]]:
-    message = check_for_new_messages(task)
-    if message:
-        return message
-    else:
-        await asyncio.sleep(0.2)
-        return await get_new_messages(task)                  
 
 
 def main(interpreter: OpenInterpreter):
@@ -68,10 +48,36 @@ def main(interpreter: OpenInterpreter):
         
         while True:
             # This is the task for waiting for the user to send any message at all.
+            try:
+                task.cancel()
+                try:
+                    await task
+                except asyncio.CancelledError:
+                    pass
+            except:
+                pass
             task = asyncio.create_task(websocket.receive_text())
 
             if data == None: # Data will have stuff in it if we inturrupted it.
-                data = await get_new_messages(task)
+                while data == None:
+                    # Has the user sent a message?
+                    if task.done():
+                        try:
+                            data = {"role": "user", "type": "message", "content": task.result()}
+                        except Exception as e:
+                            print(e)
+                        task.cancel()
+                        try:
+                            await task
+                        except asyncio.CancelledError:
+                            pass
+
+                    # Has the queue recieved a message?
+                    queued_message = check_queue()
+                    if queued_message:
+                        data = queued_message
+
+                    await asyncio.sleep(0.2)
             
             ### CONVERSATION / DISC MANAGEMENT
             message = data
@@ -82,16 +88,42 @@ def main(interpreter: OpenInterpreter):
             ### RESPONDING
 
             # This is the task for waiting for user inturruptions.
+            try:
+                task.cancel()
+                try:
+                    await task
+                except asyncio.CancelledError:
+                    pass
+            except:
+                pass
             task = asyncio.create_task(websocket.receive_text())
 
+            recieved_chunks = []
+
             for chunk in interpreter.chat(
                 messages, stream=True, display=True
             ):
+                
+                recieved_chunks.append(chunk)
+                
+                # Has the user sent a message?
+                if task.done():
                     try:
-                    data = check_for_new_messages(task)
+                        data = {"role": "user", "type": "message", "content": task.result()}
-                except:
+                    except Exception as e:
+                        print(e)
+                    task.cancel() # The user didn't inturrupt
+                    try:
+                        await task
+                    except asyncio.CancelledError:
                         pass
-                if data:
+                    save_conversation(interpreter.messages)
+                    break
+
+                # Has the queue recieved a message?
+                queued_message = check_queue()
+                if queued_message:
+                    data = queued_message
                     save_conversation(interpreter.messages)
                     break
                 
@@ -104,8 +136,48 @@ def main(interpreter: OpenInterpreter):
                     save_conversation(interpreter.messages)
                     data = None
 
-            if data == None:
+            if not any([message["type"] == "code" for message in recieved_chunks]):
+                for chunk in interpreter.chat(
+                    "Did you need to run code? It's okay if not, but please do if you did.", stream=True, display=True
+                ):
+                    # Has the user sent a message?
+                    if task.done():
+                        try:
+                            data = {"role": "user", "type": "message", "content": task.result()}
+                        except Exception as e:
+                            print(e)
                         task.cancel() # The user didn't inturrupt
+                        try:
+                            await task
+                        except asyncio.CancelledError:
+                            pass
+                        save_conversation(interpreter.messages)
+                        break
+
+                    # Has the queue recieved a message?
+                    queued_message = check_queue()
+                    if queued_message:
+                        data = queued_message
+                        save_conversation(interpreter.messages)
+                        break
+                    
+                    # Send out chunks
+                    await websocket.send_json(chunk)
+                    await asyncio.sleep(0.01)  # Add a small delay
+
+                    # If the interpreter just finished sending a message, save it
+                    if "end" in chunk:
+                        save_conversation(interpreter.messages)
+                        data = None
+
+            if not task.done():
+                task.cancel() # User didn't inturrupt
+                try:
+                    await task
+                except asyncio.CancelledError:
+                    pass
+
+            
         
 
 

OS/01/core/interpreter/start.py

@@ -40,7 +40,7 @@ To do this, schedule a reminder based on estimated completion time using the fun
 
 You guide the user through the list one task at a time, convincing them to move forward, giving a pep talk if need be. Your job is essentially to answer "what should I (the user) be doing right now?" for every moment of the day.
 
-Remember: You can run Python code. Be very concise.
+Remember: You can run Python code. Be very concise. Ensure that you actually run code every time! THIS IS IMPORTANT. You NEED to write code. **Help the user by being very concise in your answers.** Do not break down tasks excessively, just into simple, few minute steps. Don't assume the user lives their life in a certain way— pick very general tasks if you're breaking a task down.
 
 """.strip()