commands issue

Author: marcomelloni

agents/matlab/matlab_agent/src/core/interactive.py

@@ -17,7 +17,6 @@
 from ..utils.create_response import create_response
 from ..utils.logger import get_logger
 from ..utils.performance_monitor import PerformanceMonitor
-from ..utils.commands import CommandRegistry
 from ..utils.constants import (
     ACCEPT_TIMEOUT,
     BUFFER_SIZE,
@@ -247,9 +246,6 @@ def run(self, pm: PerformanceMonitor, msg_dict: Dict[str, Any]) -> None:
                 method, _ , body = ch.basic_get(
                     queue=qname, auto_ack=True)
                 while method:
-                    if CommandRegistry.should_stop():
-                        logger.info("[INTERACTIVE] Stop command received")
-                        return
                     frame = _parse_frame(body)
                     if frame:
                         # Send the inputs to MATLAB
@@ -269,7 +265,6 @@ def run(self, pm: PerformanceMonitor, msg_dict: Dict[str, Any]) -> None:
             logger.info("[INTERACTIVE] Interrupted by user")
         finally:
             pm.record_simulation_complete()
-            CommandRegistry.reset()
 
     def close(self) -> None:
         """Close the TCP servers"""

agents/matlab/matlab_agent/src/core/streaming.py

@@ -20,7 +20,6 @@
 from ..utils.create_response import create_response
 from ..utils.logger import get_logger
 from ..utils.performance_monitor import PerformanceMonitor
-from ..utils.commands import CommandRegistry
 
 # Configure logger
 logger = get_logger()
@@ -301,9 +300,6 @@ def run(self, inputs: Dict[str, Any], performance_monitor) -> None:
             buffer = b""
             sequence = 0
             while True:
-                if CommandRegistry.should_stop():
-                     logger.info("Stopping streaming simulation on command")
-                     break
                 chunk = self.connection.connection.recv(4096)
                 if not chunk:
                     logger.debug("Connection closed")
@@ -320,7 +316,6 @@ def run(self, inputs: Dict[str, Any], performance_monitor) -> None:
                         except json.JSONDecodeError as e:
                             logger.warning("Invalid JSON: %s", str(e))
             performance_monitor.record_simulation_complete()
-            CommandRegistry.reset()
         except socket.timeout as e:
             logger.error("Connection timeout: %s", str(e))
             raise MatlabStreamingError("Connection timeout") from e

agents/matlab/matlab_agent/src/utils/commands.py

@@ -1,21 +1,25 @@
 import threading
 
-class CommandRegistry:
-    """Global command registry for simulation control."""
+class StopRequested(Exception):
+    """Raised to unwind the stack when a stop is requested."""
+    pass
 
+class CommandRegistry:
     _stop_event = threading.Event()
 
     @classmethod
     def stop(cls) -> None:
-        """Signal that the current simulation should stop."""
         cls._stop_event.set()
 
     @classmethod
     def reset(cls) -> None:
-        """Clear the stop flag, allowing simulations to run."""
         cls._stop_event.clear()
 
     @classmethod
     def should_stop(cls) -> bool:
-        """Check whether a stop command was issued."""
-        return cls._stop_event.is_set()
+        return cls._stop_event.is_set()
+
+    @classmethod
+    def wait(cls, timeout: float) -> bool:
+        """Block up to `timeout` seconds. Return True if stop requested."""
+        return cls._stop_event.wait(timeout)