mypy

Author: wxtim

cylc/flow/simulation.py

@@ -52,7 +52,7 @@ class ModeSettings:
     ]
 
     def __init__(self):
-        self.simulated_run_length: Optional[float] = None
+        self.simulated_run_length: float = 0.0
         self.sim_task_fails: bool = False
 
     def __repr__(self):
@@ -62,7 +62,7 @@ def __repr__(self):
             >>> this = ModeSettings()
             >>> print(this)
             <flow.simulation.ModeSettings object at ...
-                simulated_run_length  : None
+                simulated_run_length  : 0.0
                 sim_task_fails        : False
         """
         repr_ = [super().__repr__()]
@@ -220,21 +220,20 @@ def sim_time_check(
     Returns:
         True if _any_ simulated task state has changed.
     """
-    sim_task_state_changed = False
-    now = time()
+    sim_task_state_changed: bool = False
+    now: float = time()
     for itask in itasks:
         if itask.state.status != TASK_STATUS_RUNNING:
             continue
         # Started time is not set on restart
         if itask.summary['started_time'] is None:
             itask.summary['started_time'] = now
+        started_time = itask.summary['started_time']
+        if itask.mode_settings is None:
             itask.mode_settings = ModeSettings()
             itask.mode_settings.update(
                 itask, broadcast_mgr)
-        timeout = (
-            itask.summary['started_time'] +
-            itask.mode_settings.simulated_run_length
-        )
+        timeout = started_time + itask.mode_settings.simulated_run_length
         if now > timeout:
             job_d = itask.tokens.duplicate(job=str(itask.submit_num))
             now_str = get_current_time_string()

cylc/flow/task_proxy.py

@@ -40,6 +40,7 @@
 if TYPE_CHECKING:
     from cylc.flow.id import Tokens
     from cylc.flow.cycling import PointBase
+    from cylc.flow.simulation import ModeSettings
     from cylc.flow.task_action_timer import TaskActionTimer
     from cylc.flow.taskdef import TaskDef
 
@@ -259,7 +260,7 @@ def __init__(
         else:
             self.graph_children = generate_graph_children(tdef, self.point)
 
-        self.mode_settings = None
+        self.mode_settings: Optional['ModeSettings'] = None
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__} '{self.tokens}'>"