nost-tools 3.0.0__py3-none-any.whl → 3.0.2__py3-none-any.whl

nost_tools/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.0"
+__version__ = "3.0.2"
 
 from .application import Application
 from .application_utils import ConnectionConfig, ModeStatusObserver, TimeStatusPublisher

nost_tools/managed_application.py

@@ -324,7 +324,27 @@ class ManagedApplication(Application):
             message = body.decode("utf-8")
             params = FreezeCommand.model_validate_json(message).tasking_parameters
             logger.info(f"Received freeze command {message}")
-            # freeze simulation time
+
+            sim_freeze_time = params.sim_freeze_time
+            if sim_freeze_time is not None:
+                try:
+                    # Only wait if we haven't reached the requested sim time yet
+                    if self.simulator.get_time() < sim_freeze_time:
+                        target_wc = self.simulator.get_wallclock_time_at_simulation_time(sim_freeze_time)
+                        # Sleep in short intervals to keep responsiveness
+                        while True:
+                            now_wc = self.simulator.get_wallclock_time()
+                            remaining = (target_wc - now_wc).total_seconds()
+                            if remaining <= 0:
+                                break
+                            # Exit early if execution is stopping
+                            if self.simulator.get_mode() in (Mode.TERMINATING, Mode.TERMINATED):
+                                return
+                            time.sleep(min(0.5, max(0.01, remaining)))
+                except Exception as e:
+                    logger.warning(f"Could not align to simFreezeTime={sim_freeze_time}: {e}")
+
+            # Freeze simulation time
             self.simulator.pause()
 
         except Exception as e:

nost_tools/manager.py

@@ -757,20 +757,6 @@ class Manager(Application):
                 )
                 return
 
-            # Compute authoritative resume time
-            target_resume_time = base + freeze_duration
-            # Optionally honor requested resume_time if it's later than base
-            if resume_time is not None and resume_time > base:
-                # Keep the earlier of the two if you want to minimize drift across nodes,
-                # or the later if you prefer never resuming before a requested time.
-                # Here we choose the later to avoid early resume vs. a peer's expectation.
-                target_resume_time = max(target_resume_time, resume_time)
-
-            logger.info(
-                f"Resume Time: requested={resume_time} calculated={target_resume_time} "
-                f"delta={abs((target_resume_time - (resume_time or target_resume_time)).total_seconds())}s"
-            )
-
             # Poll until we reach the target, allowing early exit and heartbeats
             while True:
                 mode = self.simulator.get_mode()
@@ -782,8 +768,11 @@ class Manager(Application):
                 ):
                     break
                 remaining = (
-                    target_resume_time - self.simulator.get_wallclock_time()
+                    resume_time - self.simulator.get_wallclock_time()
                 ).total_seconds()
+                logger.debug(
+                    f"Resume Time: {resume_time} Current Scenario Time: {self.simulator.get_time()} Current Wall Clock Time: {self.simulator.get_wallclock_time()} Remaining time: {remaining}"
+                )
                 if remaining <= 0:
                     break
                 self._sleep_with_heartbeat(min(1.0, max(0.01, remaining)))

nost_tools/simulator.py

@@ -312,8 +312,6 @@ class Simulator(Observable):
             self._wallclock_epoch = self.get_wallclock_time()
             self._simulation_epoch = self._time
             self._set_mode(Mode.EXECUTING)
-            # Return immediately after resume to avoid waiting
-            return
         while (
             self._mode == Mode.EXECUTING
             and self.get_wallclock_time_at_simulation_time(self._next_time)
@@ -536,7 +534,7 @@ class Simulator(Observable):
         """
         Pauses the scenario execution. Requires that the simulator is in EXECUTING mode.
         """
-        logger.info("Pausing simulation execution.")
+        logger.info(f"Pausing simulation execution at {self._time}.")
         if self._mode != Mode.EXECUTING:
             raise RuntimeError("Cannot pause: simulator is not executing.")
 
@@ -548,7 +546,6 @@ class Simulator(Observable):
         """
         if self._mode not in [Mode.PAUSING, Mode.PAUSED]:
             raise RuntimeError("Cannot resume: simulator is not pausing or paused.")
-        self._next_time = self._time
         self._set_mode(Mode.RESUMING)
 
     def terminate(self) -> None:

{nost_tools-3.0.0.dist-info → nost_tools-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nost_tools
-Version: 3.0.0
+Version: 3.0.2
 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-3.0.0.dist-info → nost_tools-3.0.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
-nost_tools/__init__.py,sha256=U8ylAZeztjYh1QXalVZU8-0BsY1JKRqTFAcnUBxEJro,853
+nost_tools/__init__.py,sha256=GvxR3KpH7ZhKsNxbgoPlXzzoGtojkcdaZ1Fr37W1XQk,853
 nost_tools/application.py,sha256=C-19kvRTHUt-xXA_0hBh1aoIE32fvTETwCqtrFswYCQ,67406
 nost_tools/application_utils.py,sha256=jiMzuuP6-47UlUO64HhwNvbl6uKvVnsksYgOw7CmxL4,9327
 nost_tools/configuration.py,sha256=qHXfWK_IrLj5Z8xWfF3H5rqHOLL0bLlZ3Ls73rTDHUk,13046
 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=0P3_UHSQfdLqgaAnxjEJetkYU4P6M7NAHkOcRTUXe9o,18631
-nost_tools/manager.py,sha256=Xu200PlrNNMBhWMryRcuVT-_vE0oW5wrn7PtLLAPSIY,34148
+nost_tools/managed_application.py,sha256=p34YBW0v-YDcm6MJ5W_CRqPsRgBQM-k0I_Ybu9Gw7Sw,19758
+nost_tools/manager.py,sha256=0gDdzDKVje28sOojXCSAPxoDFP7wLBECNu9ZTtXprfc,33559
 nost_tools/observer.py,sha256=PmqxnVN422dIRgwH29RcvK331Q4vtH_eD7MP1eIe_vk,8564
 nost_tools/publisher.py,sha256=-p5G9JLVZKhNNOSUGlvDKyWZSHlWikQV1TabsNIyLJA,5714
 nost_tools/schemas.py,sha256=nuo0mdL1kouuuWXOROHTxA63lGJSvr15BDVygvl3PKU,24727
-nost_tools/simulator.py,sha256=AtAHVl0BLAZuewqnpheNoLIDbObD-PWh9an_-d4Dx40,21148
-nost_tools-3.0.0.dist-info/licenses/LICENSE,sha256=aAMU-mTHTKpWkBsg9QhkhCQpEm3Gri7J_fVuJov8s3s,1539
-nost_tools-3.0.0.dist-info/METADATA,sha256=OoZcUL8cm9QG7JNAyF4rVNPIntY1cX8Fsooq-U40dhw,4256
-nost_tools-3.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nost_tools-3.0.0.dist-info/top_level.txt,sha256=LNChUgrv2-wiym12O0r61kY83COjTpTiJ2Ly1Ca58A8,11
-nost_tools-3.0.0.dist-info/RECORD,,
+nost_tools/simulator.py,sha256=JkubEEExq080AnYwLCaeJCA1SWrhqQRl6KyoCdfYSac,21046
+nost_tools-3.0.2.dist-info/licenses/LICENSE,sha256=aAMU-mTHTKpWkBsg9QhkhCQpEm3Gri7J_fVuJov8s3s,1539
+nost_tools-3.0.2.dist-info/METADATA,sha256=g-Aj-9pqt8CVr2lqfknhVn0fVVXlyeJ241R-W33Uq1o,4256
+nost_tools-3.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nost_tools-3.0.2.dist-info/top_level.txt,sha256=LNChUgrv2-wiym12O0r61kY83COjTpTiJ2Ly1Ca58A8,11
+nost_tools-3.0.2.dist-info/RECORD,,