nost-tools 2.0.4__py3-none-any.whl → 2.1.0__py3-none-any.whl

nost_tools/entity.py

@@ -43,13 +43,30 @@ class Entity(Observable):
         """
         self._init_time = self._time = self._next_time = init_time
 
+    # def tick(self, time_step: timedelta) -> None:
+    #     """
+    #     Computes the next state transition following an elapsed scenario duration (time step).
+
+    #     Args:
+    #         time_step (:obj:`timedelta`): elapsed scenario duration
+    #     """
+    #     self._next_time = self._time + time_step
     def tick(self, time_step: timedelta) -> None:
         """
         Computes the next state transition following an elapsed scenario duration (time step).
+        If the entity hasn't been initialized yet, the time_step will be stored but no
+        time advancement will occur until the entity is initialized.
 
         Args:
             time_step (:obj:`timedelta`): elapsed scenario duration
         """
+        if self._time is None:
+            logger.debug(
+                f"Entity {self.name} not yet initialized, waiting for initialization."
+            )
+            # Don't try to calculate next_time yet, just maintain the current None state
+            return
+
         self._next_time = self._time + time_step
 
     def tock(self) -> None:

nost_tools/managed_application.py

@@ -196,7 +196,7 @@ class ManagedApplication(Application):
                 self._sim_stop_time = params.sim_stop_time
                 logger.info(f"Sim stop time: {params.sim_stop_time}")
 
-            threading.Thread(
+            self._simulation_thread = threading.Thread(
                 target=self.simulator.execute,
                 kwargs={
                     "init_time": self._sim_start_time,
@@ -205,7 +205,8 @@ class ManagedApplication(Application):
                     "wallclock_epoch": params.start_time,
                     "time_scale_factor": params.time_scaling_factor,
                 },
-            ).start()
+            )
+            self._simulation_thread.start()
 
         except Exception as e:
             logger.error(

nost_tools/manager.py

@@ -94,10 +94,40 @@ class Manager(Application):
         self.channel.exchange_declare(
             exchange=self.prefix,
             exchange_type="topic",
-            durable=False,
+            durable=True,
             auto_delete=True,
         )
 
+    def _sleep_with_heartbeat(self, total_seconds):
+        """
+        Sleep for a specified number of seconds while allowing connection heartbeats.
+        Works with SelectConnection by using short sleep intervals.
+
+        Args:
+            total_seconds (float): Total number of seconds to sleep
+        """
+        if total_seconds <= 0:
+            return
+
+        # Sleep in smaller chunks to allow heartbeats to pass through
+        check_interval = 30  # Check every 30 seconds at most
+        end_time = time.time() + total_seconds
+
+        logger.debug(f"Starting heartbeat-safe sleep for {total_seconds:.2f} seconds")
+
+        while time.time() < end_time:
+            # Calculate remaining time
+            remaining = end_time - time.time()
+
+            # Sleep for the shorter of check_interval or remaining time
+            sleep_time = min(check_interval, remaining)
+
+            if sleep_time > 0:
+                time.sleep(sleep_time)
+                logger.debug(
+                    f"Heartbeat check: {remaining:.2f} seconds remaining in sleep"
+                )
+
     def execute_test_plan(self, *args, **kwargs) -> None:
         """
         Starts the test plan execution in a background thread.
@@ -147,6 +177,7 @@ class Manager(Application):
             init_retry_delay_s (float): number of seconds to wait between initialization commands while waiting for required applications
             init_max_retry (int): number of initialization commands while waiting for required applications before continuing to execution
         """
+        # Initialize parameters from arguments or config
         if sim_start_time is not None and sim_stop_time is not None:
             self.sim_start_time = sim_start_time
             self.sim_stop_time = sim_stop_time
@@ -186,13 +217,10 @@ class Manager(Application):
                 raise ValueError(
                     "No configuration runtime. Please provide simulation start and stop times."
                 )
-        ####
+
         self.establish_exchange()
-        # if self.predefined_exchanges_queues:
-        #     self.declare_exchange()
-        #     self.declare_bind_queue()
-        ####
 
+        # Set up tracking of required applications
         self.required_apps_status = dict(
             zip(self.required_apps, [False] * len(self.required_apps))
         )
@@ -200,35 +228,37 @@ class Manager(Application):
         self.add_message_callback("*", "status.time", self.on_app_time_status)
 
         self._create_time_status_publisher(self.time_status_step, self.time_status_init)
+
+        # Initialize with retry logic
         for i in range(self.init_max_retry):
-            # issue the init command
             self.init(self.sim_start_time, self.sim_stop_time, self.required_apps)
             next_try = self.simulator.get_wallclock_time() + timedelta(
                 seconds=self.init_retry_delay_s
             )
-            # wait until all required apps are ready
             while (
                 not all([self.required_apps_status[app] for app in self.required_apps])
                 and self.simulator.get_wallclock_time() < next_try
             ):
                 time.sleep(0.001)
-        # self.remove_message_callback("*", "status.ready")
-        # self.remove_message_callback()
-        # configure start time
+
+        # Configure start time if not provided
         if self.start_time is None:
             self.start_time = self.simulator.get_wallclock_time() + self.command_lead
-        # sleep until the start command needs to be issued
-        time.sleep(
-            max(
-                0,
-                (
-                    (self.start_time - self.simulator.get_wallclock_time())
-                    - self.command_lead
-                )
-                / timedelta(seconds=1),
+
+        # Sleep until start time using heartbeat-safe approach
+        sleep_seconds = max(
+            0,
+            (
+                (self.start_time - self.simulator.get_wallclock_time())
+                - self.command_lead
             )
+            / timedelta(seconds=1),
         )
-        # issue the start command
+
+        # Use our heartbeat-safe sleep
+        self._sleep_with_heartbeat(sleep_seconds)
+
+        # Issue the start command
         self.start(
             self.sim_start_time,
             self.sim_stop_time,
@@ -238,43 +268,51 @@ class Manager(Application):
             self.time_status_step,
             self.time_status_init,
         )
-        # wait for simulation to start executing
+
+        # Wait for simulation to start executing
         while self.simulator.get_mode() != Mode.EXECUTING:
             time.sleep(0.001)
+
+        # Process time scale updates
         for update in self.time_scale_updates:
             update_time = self.simulator.get_wallclock_time_at_simulation_time(
                 update.sim_update_time
             )
-            # sleep until the update command needs to be issued
-            time.sleep(
-                max(
-                    0,
-                    (
-                        (update_time - self.simulator.get_wallclock_time())
-                        - self.command_lead
-                    )
-                    / timedelta(seconds=1),
+            # Sleep until update time using heartbeat-safe approach
+            sleep_seconds = max(
+                0,
+                (
+                    (update_time - self.simulator.get_wallclock_time())
+                    - self.command_lead
                 )
+                / timedelta(seconds=1),
             )
-            # issue the update command
-            self.update(
-                update.time_scale_factor, update.sim_update_time, self.required_apps
-            )
-            # wait until the update command takes effect
+
+            # Use our heartbeat-safe sleep
+            self._sleep_with_heartbeat(sleep_seconds)
+
+            # Issue the update command
+            self.update(update.time_scale_factor, update.sim_update_time)
+
+            # Wait until update takes effect
             while self.simulator.get_time_scale_factor() != update.time_scale_factor:
-                time.sleep(self.command_lead / timedelta(seconds=1) / 100)
+                time.sleep(0.001)
+
         end_time = self.simulator.get_wallclock_time_at_simulation_time(
             self.simulator.get_end_time()
         )
-        # sleep until the stop command should be issued
-        time.sleep(
-            max(
-                0,
-                ((end_time - self.simulator.get_wallclock_time()) - self.command_lead)
-                / timedelta(seconds=1),
-            )
+
+        # Sleep until stop time using heartbeat-safe approach
+        sleep_seconds = max(
+            0,
+            ((end_time - self.simulator.get_wallclock_time()) - self.command_lead)
+            / timedelta(seconds=1),
         )
-        # issue the stop command
+
+        # Use our heartbeat-safe sleep
+        self._sleep_with_heartbeat(sleep_seconds)
+
+        # Issue the stop command
         self.stop(self.sim_stop_time)
 
     def on_app_ready_status(self, ch, method, properties, body) -> None:

nost_tools/observer.py

@@ -3,8 +3,12 @@ Provides base classes that implement the observer pattern to loosely couple an o
 """
 
 from abc import ABC, abstractmethod
-from datetime import datetime, timezone
-from typing import List, Optional, Union
+from collections.abc import Callable
+from datetime import datetime, timedelta, timezone
+from typing import TYPE_CHECKING, List, Optional, Union
+
+if TYPE_CHECKING:
+    from nost_tools.simulator import Mode, Simulator
 
 
 class Observer(ABC):
@@ -179,3 +183,76 @@ class MessageObservable(Observable):
         """
         for observer in self._message_observers:
             observer.on_message(ch, method, properties, body)
+
+
+class PropertyChangeCallback(Observer):
+    """
+    Triggers a provided callback basedwhen a named property changes.
+    """
+
+    def __init__(self, property_name: str, callback: Callable[[object, object], None]):
+        self.callback = callback
+        self.property_name = property_name
+
+    def on_change(
+        self, source: object, property_name: str, old_value: object, new_value: object
+    ) -> None:
+        if self.property_name == property_name:
+            self.callback(source, new_value)
+
+
+class ScenarioTimeIntervalCallback(Observer):
+    """
+    Triggers a provided callback at a fixed interval in scenario time.
+    """
+
+    def __init__(
+        self, callback: Callable[[object, datetime], None], time_inteval: timedelta
+    ):
+        self.callback = callback
+        self.time_interval = time_inteval
+        self._next_time = None
+
+    def on_change(
+        self, source: object, property_name: str, old_value: object, new_value: object
+    ):
+        if property_name == source.PROPERTY_TIME:
+            if self._next_time is None:
+                self._next_time = old_value + self.time_interval
+            while self._next_time <= new_value:
+                self.callback(source, self._next_time)
+                self._next_time = self._next_time + self.time_interval
+
+
+class WallclockTimeIntervalCallback(Observer):
+    """
+    Triggers a provided callback at a fixed interval in wallclock time.
+    """
+
+    def __init__(
+        self,
+        simulator: "Simulator",
+        callback: Callable[[datetime], None],
+        time_inteval: timedelta,
+        time_init: timedelta = None,
+    ):
+        self.simulator = simulator
+        self.callback = callback
+        self.time_interval = time_inteval
+        self.time_init = time_init
+        self._next_time = None
+
+    def on_change(
+        self, source: object, property_name: str, old_value: object, new_value: object
+    ):
+        from nost_tools.simulator import Mode, Simulator
+
+        if property_name == Simulator.PROPERTY_MODE and new_value == Mode.INITIALIZED:
+            self._next_time = self.time_init
+        elif property_name == Simulator.PROPERTY_TIME:
+            wallclock_time = self.simulator.get_wallclock_time()
+            if self._next_time is None:
+                self._next_time = wallclock_time + self.time_interval
+            while self._next_time <= wallclock_time:
+                self.callback(self._next_time)
+                self._next_time = self._next_time + self.time_interval

nost_tools/schemas.py

@@ -219,20 +219,48 @@ class RabbitMQConfig(BaseModel):
     keycloak_authentication: bool = Field(
         False, description="Keycloak authentication for RabbitMQ."
     )
-    host: str = Field("localhost", description="RabbitMQ host.")
-    port: int = Field(5672, description="RabbitMQ port.")
     tls: bool = Field(False, description="RabbitMQ TLS/SSL.")
-    virtual_host: str = Field("/", description="RabbitMQ virtual host.")
-    message_expiration: str = Field(
-        None, description="RabbitMQ expiration, in milliseconds."
+    reconnect_delay: int = Field(10, description="Reconnection delay, in seconds.")
+    queue_max_size: int = Field(5000, description="Maximum size of the RabbitMQ queue.")
+    # BasicProperties
+    content_type: str = Field(
+        None,
+        description="RabbitMQ MIME content type (application/json, text/plain, etc.).",
+    )
+    content_encoding: str = Field(
+        None,
+        description="RabbitMQ MIME content encoding (gzip, deflate, etc.).",
+    )
+    headers: Dict[str, str] = Field(
+        None, description="RabbitMQ message headers (key-value pairs)."
     )
     delivery_mode: int = Field(
         None, description="RabbitMQ delivery mode (1: non-persistent, 2: durable)."
     )
-    content_type: str = Field(
-        None,
-        description="RabbitMQ MIME content type (application/json, text/plain, etc.).",
+    priority: int = Field(None, description="RabbitMQ message priority (0-255).")
+    correlation_id: str = Field(
+        None, description="RabbitMQ correlation ID for message tracking."
+    )
+    reply_to: str = Field(
+        None, description="RabbitMQ reply-to queue for response messages."
+    )
+    message_expiration: str = Field(
+        None, description="RabbitMQ expiration, in milliseconds."
+    )
+    message_id: str = Field(None, description="RabbitMQ message ID for tracking.")
+    timestamp: datetime = Field(None, description="RabbitMQ message timestamp.")
+    type: str = Field(None, description="RabbitMQ message type (e.g., 'text', 'json').")
+    user_id: str = Field(None, description="RabbitMQ user ID for authentication.")
+    app_id: str = Field(None, description="RabbitMQ application ID for tracking.")
+    cluster_id: str = Field(None, description="RabbitMQ cluster ID for tracking.")
+    # ConnectionParameters
+    host: str = Field("localhost", description="RabbitMQ host.")
+    port: int = Field(5672, description="RabbitMQ port.")
+    virtual_host: str = Field("/", description="RabbitMQ virtual host.")
+    channel_max: int = Field(
+        65535, description="RabbitMQ maximum number of channels per connection."
     )
+    frame_max: int = Field(131072, description="RabbitMQ maximum frame size in bytes.")
     heartbeat: int = Field(None, description="RabbitMQ heartbeat interval, in seconds.")
     connection_attempts: int = Field(
         1, description="RabbitMQ connection attempts before giving up."
@@ -244,7 +272,6 @@ class RabbitMQConfig(BaseModel):
     blocked_connection_timeout: int = Field(
         None, description="Timeout for blocked connections."
     )
-    reconnect_delay: int = Field(10, description="Reconnect delay, in seconds.")
 
 
 class KeycloakConfig(BaseModel):

{nost_tools-2.0.4.dist-info → nost_tools-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nost_tools
-Version: 2.0.4
+Version: 2.1.0
 Summary: Tools for Novel Observing Strategies Testbed (NOS-T) Applications
 Author-email: "Paul T. Grogan" <paul.grogan@asu.edu>, "Emmanuel M. Gonzalez" <emmanuelgonzalez@asu.edu>
 License-Expression: BSD-3-Clause

nost_tools-2.1.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+nost_tools/__init__.py,sha256=lEj4-pG2wDOV6AHI8ROPB9X63nMnzSgzpyoyCSLDJns,870
+nost_tools/application.py,sha256=bPuRMBifppJ-qkDKqOqp13rW_LOjbM7JaXIozMyxmlw,60914
+nost_tools/application_utils.py,sha256=_R39D26FYxgaO4uyTON24KXc4UQ4zAEDBZfEkHbEw64,9386
+nost_tools/configuration.py,sha256=ikNpZi8aofhZzJRbJf4x46afbAnp8r5C7Yr50Rnn1Nc,11639
+nost_tools/entity.py,sha256=JrSN5rz7h-N9zIQsaJOQVBIYPDfygacedks55fsq_QQ,2802
+nost_tools/errors.py,sha256=0JcDlMEkZAya3-5c0rRozLuxp8qF58StG4JgRsaxfKU,344
+nost_tools/logger_application.py,sha256=rxPBfyA7Zym5b_EsoSJvT9JWNIVWZX1a-4czFwCqaQ4,7217
+nost_tools/managed_application.py,sha256=7393kCF9FeXlf_pSP_C-tAeNSW9_-smQH6pQgyHC6Cw,11576
+nost_tools/manager.py,sha256=QSOcFqA3xpa84AuxvXV6134PZp8iQndNCq1w3P4tHUU,21315
+nost_tools/observer.py,sha256=D64V0KTvHRPEqbB8q3BosJhoAlpBah2vyBlVbxWQR44,8161
+nost_tools/publisher.py,sha256=omU8tb0AXnA6RfhYSh0vnXbJtrRo4ukx1J5ANl4bDLQ,5291
+nost_tools/schemas.py,sha256=Wlzo21D94wFbQ2jlIU-vdhLGvE-2gaEYWx04KCGmhF0,16730
+nost_tools/simulator.py,sha256=ALnGDmnA_ga-1Lq-bVWi2vcrspgjS4vtuDE0jWsI7fE,20191
+nost_tools-2.1.0.dist-info/licenses/LICENSE,sha256=aAMU-mTHTKpWkBsg9QhkhCQpEm3Gri7J_fVuJov8s3s,1539
+nost_tools-2.1.0.dist-info/METADATA,sha256=eQcmCcznZHJtDqOHgoO_ydMMRRfhyjqGlPG5l2tVsgk,4256
+nost_tools-2.1.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nost_tools-2.1.0.dist-info/top_level.txt,sha256=LNChUgrv2-wiym12O0r61kY83COjTpTiJ2Ly1Ca58A8,11
+nost_tools-2.1.0.dist-info/RECORD,,

{nost_tools-2.0.4.dist-info → nost_tools-2.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nost_tools-2.0.4.dist-info/RECORD

@@ -1,18 +0,0 @@
-nost_tools/__init__.py,sha256=sG0Uwgsr3_fZsBiCWJ_Ff_kdhYNX3Xec6asi3T0yrck,873
-nost_tools/application.py,sha256=1mFCw6b5BCAlaof-ijzjFYCvVB-WCn9llpHHijxeIik,37027
-nost_tools/application_utils.py,sha256=_R39D26FYxgaO4uyTON24KXc4UQ4zAEDBZfEkHbEw64,9386
-nost_tools/configuration.py,sha256=ikNpZi8aofhZzJRbJf4x46afbAnp8r5C7Yr50Rnn1Nc,11639
-nost_tools/entity.py,sha256=AwbZMP3_H4RQuyU4voyQwYFkETxG0mfD-0BMHxrRFf8,2064
-nost_tools/errors.py,sha256=0JcDlMEkZAya3-5c0rRozLuxp8qF58StG4JgRsaxfKU,344
-nost_tools/logger_application.py,sha256=rxPBfyA7Zym5b_EsoSJvT9JWNIVWZX1a-4czFwCqaQ4,7217
-nost_tools/managed_application.py,sha256=jjS-URl4D_-VwKNYnqwYg_myFugKgMd_Gy1aAxxw0SU,11514
-nost_tools/manager.py,sha256=0282l6h2KSP2-OfFjI8tRaXJAvnZDzwqC_7dPzFK7U0,20304
-nost_tools/observer.py,sha256=w66jZQ11Fr7XSCcvcc2f5ISce2n8Ba7cXqheSTuyrmw,5519
-nost_tools/publisher.py,sha256=omU8tb0AXnA6RfhYSh0vnXbJtrRo4ukx1J5ANl4bDLQ,5291
-nost_tools/schemas.py,sha256=m6Np7DGrBIgtswpnrTqSowTb_niC4NY59BTQFBYfkZc,15332
-nost_tools/simulator.py,sha256=ALnGDmnA_ga-1Lq-bVWi2vcrspgjS4vtuDE0jWsI7fE,20191
-nost_tools-2.0.4.dist-info/licenses/LICENSE,sha256=aAMU-mTHTKpWkBsg9QhkhCQpEm3Gri7J_fVuJov8s3s,1539
-nost_tools-2.0.4.dist-info/METADATA,sha256=diDeXkc0h1cthwamEVkSxIjjQv08EUjoV1dQ-6xiUkU,4256
-nost_tools-2.0.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nost_tools-2.0.4.dist-info/top_level.txt,sha256=LNChUgrv2-wiym12O0r61kY83COjTpTiJ2Ly1Ca58A8,11
-nost_tools-2.0.4.dist-info/RECORD,,