nost-tools 2.1.0__tar.gz → 2.1.1__tar.gz

{nost_tools-2.1.0 → nost_tools-2.1.1}/PKG-INFO

@@ -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 → nost_tools-2.1.1}/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-2.1.0 → nost_tools-2.1.1}/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 → nost_tools-2.1.1}/nost_tools.egg-info/PKG-INFO

@@ -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