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

nost_tools/__init__.py

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

nost_tools/schemas.py

@@ -339,12 +339,18 @@ class ManagerConfig(BaseModel):
     shut_down_when_terminated: bool = Field(
         False, description="Shut down when terminated."
     )
+    is_scenario_time_status_step: bool = Field(
+        True,
+        description="If True, time_status_step is in scenario time and won't be scaled. If False, time_status_step is in wallclock time and will be scaled by the time scale factor.",
+    )
 
     @model_validator(mode="before")
     def scale_time(cls, values):
         time_scale_factor = values.get("time_scale_factor", 1.0)
 
-        if "time_status_step" in values:
+        if "time_status_step" in values and not values.get(
+            "is_scenario_time_status_step", True
+        ):
             time_status_step = values["time_status_step"]
             if isinstance(time_status_step, str):
                 hours, minutes, seconds = map(int, time_status_step.split(":"))
@@ -371,12 +377,20 @@ class ManagedApplicationConfig(BaseModel):
         False, description="Shut down when terminated."
     )
     manager_app_name: str = Field("manager", description="Manager application name.")
+    is_scenario_time_step: bool = Field(
+        True,
+        description="If True, time_step is in scenario time and won't be scaled. If False, time_step is in wallclock time and will be scaled by the time scale factor.",
+    )
+    is_scenario_time_status_step: bool = Field(
+        True,
+        description="If True, time_status_step is in scenario time and won't be scaled. If False, time_status_step is in wallclock time and will be scaled by the time scale factor.",
+    )
 
     @model_validator(mode="before")
     def scale_time(cls, values):
         time_scale_factor = values.get("time_scale_factor", 1.0)
 
-        if "time_step" in values:
+        if "time_step" in values and not values.get("is_scenario_time_step", True):
             time_step = values["time_step"]
             if isinstance(time_step, str):
                 hours, minutes, seconds = map(int, time_step.split(":"))
@@ -386,7 +400,9 @@ class ManagedApplicationConfig(BaseModel):
                     seconds=time_step.total_seconds() * time_scale_factor
                 )
 
-        if "time_status_step" in values:
+        if "time_status_step" in values and not values.get(
+            "is_scenario_time_status_step", True
+        ):
             time_status_step = values["time_status_step"]
             if isinstance(time_status_step, str):
                 hours, minutes, seconds = map(int, time_status_step.split(":"))

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

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

@@ -1,4 +1,4 @@
-nost_tools/__init__.py,sha256=lEj4-pG2wDOV6AHI8ROPB9X63nMnzSgzpyoyCSLDJns,870
+nost_tools/__init__.py,sha256=bNVX1vszl3KMnBrd1x53pAeZgUUwlPQCF0FuLotlc3Y,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
@@ -9,10 +9,10 @@ nost_tools/managed_application.py,sha256=7393kCF9FeXlf_pSP_C-tAeNSW9_-smQH6pQgyH
 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/schemas.py,sha256=nlMG4gZH-hUdmvz5a2294wGVN9Km7yE80x40vRJJRu8,17670
 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.1.1.dist-info/licenses/LICENSE,sha256=aAMU-mTHTKpWkBsg9QhkhCQpEm3Gri7J_fVuJov8s3s,1539
+nost_tools-2.1.1.dist-info/METADATA,sha256=fNbyKb9l5zQyeYZfYL9bfV5bfGHV1rF4z__FJ2leKfA,4256
+nost_tools-2.1.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nost_tools-2.1.1.dist-info/top_level.txt,sha256=LNChUgrv2-wiym12O0r61kY83COjTpTiJ2Ly1Ca58A8,11
+nost_tools-2.1.1.dist-info/RECORD,,