neuro-simulator 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

neuro_simulator/api/stream.py

@@ -33,7 +33,7 @@ async def start_stream():
 async def stop_stream():
     """Stops the live stream processes."""
     if process_manager.is_running:
-        process_manager.stop_live_processes()
+        await process_manager.stop_live_processes()
         return {"status": "success", "message": "Stream stopped"}
     else:
         return {"status": "info", "message": "Stream is not running"}
@@ -41,7 +41,7 @@ async def stop_stream():
 @router.post("/restart", dependencies=[Depends(get_api_token)])
 async def restart_stream():
     """Restarts the live stream processes."""
-    process_manager.stop_live_processes()
+    await process_manager.stop_live_processes()
     await asyncio.sleep(1) # Give time for tasks to cancel
     process_manager.start_live_processes()
     return {"status": "success", "message": "Stream restarted"}

neuro_simulator/core/application.py

@@ -17,6 +17,8 @@ from starlette.websockets import WebSocketState
 # --- Core Imports ---
 from .config import config_manager, AppSettings
 from ..core.agent_factory import create_agent
+from ..services.letta import LettaAgent
+from ..services.builtin import BuiltinAgentWrapper
 
 # --- API Routers ---
 from ..api.agent import router as agent_router
@@ -130,16 +132,40 @@ async def neuro_response_cycle():
 
     while True:
         try:
-            if is_first_response:
-                add_to_neuro_input_queue({"username": "System", "text": config_manager.settings.neuro_behavior.initial_greeting})
-                is_first_response = False
-            elif is_neuro_input_queue_empty():
-                await asyncio.sleep(1)
-                continue
+            selected_chats = []
+            # Superchat logic
+            if app_state.superchat_queue and (time.time() - app_state.last_superchat_time > 10):
+                sc = app_state.superchat_queue.popleft()
+                app_state.last_superchat_time = time.time()
+                await connection_manager.broadcast({"type": "processing_superchat", "data": sc})
+
+                # Agent-specific payload generation for superchats
+                if isinstance(agent, LettaAgent):
+                    selected_chats = [
+                        {"role": "system", "content": "=== RANDOM 10 MSG IN CHATROOM ===\nNO MSG FETCH DUE TO UNPROCESSED HIGHLIGHTED MESSAGE"},
+                        {"role": "system", "content": f"=== HIGHLIGHTED MESSAGE ===\n{sc['username']}: {sc['text']}"}
+                    ]
+                else: # For BuiltinAgent and any other future agents
+                    selected_chats = [{'username': sc['username'], 'text': sc['text']}]
+
+                # Clear the regular input queue to prevent immediate follow-up with normal chats
+                get_all_neuro_input_chats()
+            else:
+                if is_first_response:
+                    add_to_neuro_input_queue({"username": "System", "text": config_manager.settings.neuro_behavior.initial_greeting})
+                    is_first_response = False
+                elif is_neuro_input_queue_empty():
+                    await asyncio.sleep(1)
+                    continue
+                
+                current_queue_snapshot = get_all_neuro_input_chats()
+                if not current_queue_snapshot:
+                    continue
+                sample_size = min(config_manager.settings.neuro_behavior.input_chat_sample_size, len(current_queue_snapshot))
+                selected_chats = random.sample(current_queue_snapshot, sample_size)
             
-            current_queue_snapshot = get_all_neuro_input_chats()
-            sample_size = min(config_manager.settings.neuro_behavior.input_chat_sample_size, len(current_queue_snapshot))
-            selected_chats = random.sample(current_queue_snapshot, sample_size)
+            if not selected_chats:
+                continue
             
             response_result = await asyncio.wait_for(agent.process_messages(selected_chats), timeout=20.0)
             
@@ -208,7 +234,7 @@ async def startup_event():
     logger.info("FastAPI application has started.")
 
 @app.on_event("shutdown")
-async def shutdown_event():
+def shutdown_event():
     """Actions to perform on application shutdown."""
     if process_manager.is_running:
         process_manager.stop_live_processes()
@@ -232,11 +258,20 @@ async def websocket_stream_endpoint(websocket: WebSocket):
             raw_data = await websocket.receive_text()
             data = json.loads(raw_data)
             if data.get("type") == "user_message":
-                user_message = {"username": data.get("username", "User"), "text": data.get("message", "").strip()}
+                user_message = {"username": data.get("username", "User"), "text": data.get("text", "").strip()}
                 if user_message["text"]:
                     add_to_audience_buffer(user_message)
                     add_to_neuro_input_queue(user_message)
                     await connection_manager.broadcast({"type": "chat_message", **user_message, "is_user_message": True})
+            elif data.get("type") == "superchat":
+                sc_message = {
+                    "username": data.get("username", "User"),
+                    "text": data.get("text", "").strip(),
+                    "sc_type": data.get("sc_type", "bits")
+                }
+                if sc_message["text"]:
+                    app_state.superchat_queue.append(sc_message)
+
     except WebSocketDisconnect:
         pass
     finally:
@@ -275,4 +310,4 @@ def run_server(host: str = None, port: int = None):
         host=server_host,
         port=server_port,
         reload=False
-    )
+    )

neuro_simulator/services/letta.py

@@ -74,8 +74,38 @@ class LettaAgent(BaseAgent):
             logger.warning(f"Failed to reset Letta Agent message history: {e}")
 
     async def process_messages(self, messages: List[Dict[str, str]]) -> Dict[str, Any]:
-        if messages:
-            injected_chat_lines = [f"{chat['username']}: {chat['text']}" for chat in messages]
+        # Check if this is a superchat message based on the specific structure
+        # from neuro_response_cycle
+        is_superchat = (
+            len(messages) == 2 and
+            messages[0].get("role") == "system" and
+            messages[1].get("role") == "system" and
+            "HIGHLIGHTED MESSAGE" in messages[1].get("content", "")
+        )
+
+        if is_superchat:
+            try:
+                # Extract username and text from the superchat message
+                # Format is "=== HIGHLIGHTED MESSAGE ===\n{username}: {text}"
+                content_lines = messages[1]["content"].split('\n', 1)
+                user_and_text = content_lines[1]
+                parts = user_and_text.split(':', 1)
+                sc_username = parts[0].strip()
+                sc_text = parts[1].strip()
+                injected_chat_lines = [f"{sc_username}: {sc_text}"]
+                injected_chat_text = (
+                    "Here is a highlighted message from my Twitch chat:\n---\n" +
+                    "\n".join(injected_chat_lines) +
+                    "\n---\nNow, as the streamer Neuro-Sama, please continue the conversation naturally."
+                )
+                logger.info(f"Processing highlighted message for Letta: {injected_chat_lines[0]}")
+            except (IndexError, AttributeError) as e:
+                logger.error(f"Failed to parse superchat for Letta, falling back. Error: {e}")
+                # Fallback to default empty prompt if parsing fails
+                injected_chat_text = "My chat is quiet right now. As Neuro-Sama, what should I say to engage them?"
+
+        elif messages:
+            injected_chat_lines = [f"{chat['username']}: {chat['text']}" for chat in messages if 'username' in chat and 'text' in chat]
             injected_chat_text = (
                 "Here are some recent messages from my Twitch chat:\n---\n" +
                 "\n".join(injected_chat_lines) + 

neuro_simulator/utils/process.py

@@ -2,6 +2,9 @@
 import asyncio
 import logging
 
+from ..services.stream import live_stream_manager
+from .websocket import connection_manager
+
 logger = logging.getLogger(__name__.replace("neuro_simulator", "server", 1))
 
 class ProcessManager:
@@ -28,7 +31,6 @@ class ProcessManager:
 
         logger.info("Starting core stream processes...")
         from ..core.application import generate_audience_chat_task, neuro_response_cycle, broadcast_events_task
-        from ..services.stream import live_stream_manager
         from ..utils.queue import clear_all_queues
         from ..core.agent_factory import create_agent
         
@@ -45,10 +47,14 @@ class ProcessManager:
         self._is_running = True
         logger.info(f"Core processes started: {len(self._tasks)} tasks.")
 
-    def stop_live_processes(self):
+    async def stop_live_processes(self):
         """Stops and cleans up all running background tasks."""
         if not self.is_running:
             return
+        
+        logger.info("Broadcasting offline message before stopping tasks...")
+        await connection_manager.broadcast({"type": "offline"})
+        await asyncio.sleep(0.1) # Give a brief moment for the message to be sent
             
         logger.info(f"Stopping {len(self._tasks)} core tasks...")
         for task in self._tasks:
@@ -58,7 +64,6 @@ class ProcessManager:
         self._tasks.clear()
         self._is_running = False
         
-        from ..services.stream import live_stream_manager
         live_stream_manager.reset_stream_state()
         
         logger.info("All core tasks have been stopped.")

neuro_simulator/utils/queue.py

@@ -6,6 +6,7 @@ from collections import deque
 from pathlib import Path
 
 from ..core.config import config_manager
+from ..utils.state import app_state
 
 logger = logging.getLogger(__name__.replace("neuro_simulator", "server", 1))
 
@@ -17,7 +18,8 @@ def clear_all_queues():
     """Clears all chat queues."""
     audience_chat_buffer.clear()
     neuro_input_queue.clear()
-    logger.info("All chat queues have been cleared.")
+    app_state.superchat_queue.clear()
+    logger.info("All chat queues (including superchats) have been cleared.")
 
 def add_to_audience_buffer(chat_item: dict):
     """Adds a chat item to the audience buffer."""

neuro_simulator/utils/state.py

@@ -2,6 +2,8 @@
 """Manages the shared state of the application using a singleton class."""
 
 import asyncio
+import time
+from collections import deque
 
 class AppState:
     """A singleton class to hold all shared application state."""
@@ -9,6 +11,8 @@ class AppState:
         self.live_phase_started_event = asyncio.Event()
         self.neuro_last_speech_lock = asyncio.Lock()
         self.neuro_last_speech: str = "Neuro-Sama has just started the stream and hasn't said anything yet."
+        self.superchat_queue = deque()
+        self.last_superchat_time: float = 0.0
 
 # Create a single, globally accessible instance of the AppState.
-app_state = AppState()
+app_state = AppState()

{neuro_simulator-0.2.1.dist-info → neuro_simulator-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuro_simulator
-Version: 0.2.1
+Version: 0.3.0
 Summary: Neuro Simulator Server
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{neuro_simulator-0.2.1.dist-info → neuro_simulator-0.3.0.dist-info}/RECORD

@@ -11,27 +11,27 @@ neuro_simulator/agent/tools/__init__.py,sha256=1WZy6PADfi6o1avyy1y-ThWBFAPJ_bBqt
 neuro_simulator/agent/tools/core.py,sha256=o6Oyis-HFD-g6Z_u3T--tkmr9ylKJvybKqMRSMUwi1Q,5555
 neuro_simulator/api/__init__.py,sha256=5LWyDSayPGdQS8Rv13nmAKLyhPnMVPyTYDdvoMPB4xw,56
 neuro_simulator/api/agent.py,sha256=ABl_JoIxB4wW_J2J52bWndmTXkfGJBS5LZmbGuh7zv8,6343
-neuro_simulator/api/stream.py,sha256=Pg793dXLnJ0oydrIwWFgWD0cVdFAx_QOw6L5LjE0uIo,2069
+neuro_simulator/api/stream.py,sha256=Yg-cwjVI2HTLAt7moWbDQ1ZbbP6QE1ZB8LrW6A3tcQk,2081
 neuro_simulator/api/system.py,sha256=hXznMcThuFhwopYWgpzrRxwtBuFnF_b_vinkOaE5XOs,3712
 neuro_simulator/core/__init__.py,sha256=-ojq25c8XA0CU25b0OxcGjH4IWFEDHR-HXSRSZIuKe8,57
 neuro_simulator/core/agent_factory.py,sha256=qMFidwT5IrOkyNHwmpO8_fRv20KLbaIBfWF-VTFCLNA,1742
 neuro_simulator/core/agent_interface.py,sha256=r58Opcgs7SWVovYTjMWuxF8AiTy9QfRz276_YGmSei0,2791
-neuro_simulator/core/application.py,sha256=zN8KOR_nwsYsR1ZcyZU1GlW3-ijFLbjw5lz1g8DYVIU,11578
+neuro_simulator/core/application.py,sha256=fM9XgYBvx-mNB173rYDezbKdLJRTJ5Mr0nOtxNlSfSc,13365
 neuro_simulator/core/config.py,sha256=brA8kiekV_995mpz04JiGj1swIWbZZuWWLNYtbroMyE,14884
 neuro_simulator/services/__init__.py,sha256=s3ZrAHg5TpJakadAAGY1h0wDw_xqN4Je4aJwJyRBmk4,61
 neuro_simulator/services/audience.py,sha256=0phlhsujh_GMXm_UMiyOntY-ZMtoseRa_FroIfc5A6w,5028
 neuro_simulator/services/audio.py,sha256=ZscQA25wVYpm9FUl4Hya7tKH8t0TjR3th9-OEZ0G7xk,2934
 neuro_simulator/services/builtin.py,sha256=7ePxEom5HIK6wGto_H5M8JOnAjyiHqUuE381DEGgzjE,3821
-neuro_simulator/services/letta.py,sha256=iXyzFyPVty3SjYCHOJAF1QqhUFmxTQbqk8lYJOwB5pc,9415
+neuro_simulator/services/letta.py,sha256=6jBvOTsLMlRILDv-fvX9fhHMONSYeu-ImJGFcKU00kc,11067
 neuro_simulator/services/stream.py,sha256=dG7RuNI_ICohPkqKZ-zlBppo54BgWm_KYBs-ezzc73E,5907
 neuro_simulator/utils/__init__.py,sha256=xSEFzjT827W81mNyQ_DLtr00TgFlttqfFgpz9pSxFXQ,58
 neuro_simulator/utils/logging.py,sha256=BO-q_cCcoeamsc8eJqq2-L3Z8nhApze_v6LnmD-O8Ww,3411
-neuro_simulator/utils/process.py,sha256=FmwIuOsp19jJBEbAj-WeUpdUsQN7B9_J1rlU0Q1TXuo,2388
-neuro_simulator/utils/queue.py,sha256=7SSnUnrqxHkqSeYVjp1S5kpr8qlo4IVdU2NsGwFQAVw,1546
-neuro_simulator/utils/state.py,sha256=E1ilecgMTOAhiw_kNvLG0akkhdZKhzKLrA3oB4NNVTA,538
+neuro_simulator/utils/process.py,sha256=9w2JQH59Wy6L8ADrig2QF88iajdykGPZIYJVJe6Al2Y,2603
+neuro_simulator/utils/queue.py,sha256=vSkh-BrgfsGN_gDAx2mfK44ydmMapdVyLsDG-7LIJZQ,1643
+neuro_simulator/utils/state.py,sha256=DdBqSAYfjOFtJfB1hEGhYPh32r1ZvFuVlN_-29_-luA,664
 neuro_simulator/utils/websocket.py,sha256=yOdFvJzbNhcUn5EAuyS55G_R8q-snas5OvkOtS8g19E,2292
-neuro_simulator-0.2.1.dist-info/METADATA,sha256=bbJ6VZxoq8fqq0qVzjm0nYUKIhwfoNPNQd8hDKPSREY,8676
-neuro_simulator-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-neuro_simulator-0.2.1.dist-info/entry_points.txt,sha256=qVd5ypnRRgU8Cw7rWfZ7o0OXyS9P9hgY-cRoN_mgz9g,51
-neuro_simulator-0.2.1.dist-info/top_level.txt,sha256=V8awSKpcrFnjJDiJxSfy7jtOrnuE2BgAR9hLmfMDWK8,16
-neuro_simulator-0.2.1.dist-info/RECORD,,
+neuro_simulator-0.3.0.dist-info/METADATA,sha256=PELlUyyTi3i1u1_EOLIntPwd7-FAXAoy6uiSs2QA2uE,8676
+neuro_simulator-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+neuro_simulator-0.3.0.dist-info/entry_points.txt,sha256=qVd5ypnRRgU8Cw7rWfZ7o0OXyS9P9hgY-cRoN_mgz9g,51
+neuro_simulator-0.3.0.dist-info/top_level.txt,sha256=V8awSKpcrFnjJDiJxSfy7jtOrnuE2BgAR9hLmfMDWK8,16
+neuro_simulator-0.3.0.dist-info/RECORD,,