Merge pull request #6981 from cylc/8.5.x-sync

Author: MetRonnie

CHANGES.md

@@ -11,6 +11,14 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"
 
 <!-- towncrier release notes start -->
 
+## __cylc-8.5.3 (Released 2025-09-09)__
+
+### 🔧 Fixes
+
+[#6590](https://github.com/cylc/cylc-flow/pull/6590) - Fix validation of conditional expressions with negative integer offsets larger than `-P1`.
+
+[#6980](https://github.com/cylc/cylc-flow/pull/6980) - Fixed a bug where the GUI views would go blank when reloading a workflow.
+
 ## __cylc-8.5.2 (Released 2025-09-04)__
 
 ### 🚀 Enhancements

cylc/flow/commands.py

@@ -624,6 +624,7 @@ async def reload_workflow(schd: 'Scheduler', reload_global: bool = False):
         schd.task_job_mgr.task_remote_mgr.remote_init_map.clear()
         schd.task_job_mgr.task_remote_mgr.is_reload = True
         schd.pool.reload(config)
+        schd.data_store_mgr.apply_task_proxy_db_history()
         # Load jobs from DB
         schd.workflow_db_mgr.pri_dao.select_jobs_for_restart(
             schd.data_store_mgr.insert_db_job

cylc/flow/data_store_mgr.py

@@ -570,7 +570,7 @@ def __init__(self, schd, n_edge_distance=1):
         self.n_window_completed_walks = set()
         self.n_window_depths = {}
         self.update_window_depths = False
-        self.db_load_task_proxies = {}
+        self.db_load_task_proxies: Dict[str, Tuple[TaskProxy, bool]] = {}
         self.family_pruned_ids = set()
         self.prune_trigger_nodes = {}
         self.prune_flagged_nodes = set()
@@ -1527,12 +1527,10 @@ def apply_task_proxy_db_history(self):
                     # added to an already-spawned task before restart.)
 
         # Extract info from itasks to data-store.
-        for task_info in self.db_load_task_proxies.values():
+        for itask, _is_parent in self.db_load_task_proxies.values():
             self._process_internal_task_proxy(
-                task_info[0],
-                self.added[TASK_PROXIES][
-                    self.id_.duplicate(task_info[0].tokens).id
-                ]
+                itask,
+                self.added[TASK_PROXIES][self.id_.duplicate(itask.tokens).id]
             )
 
         # Batch load jobs from DB.

cylc/flow/prerequisite.py

@@ -197,26 +197,41 @@ def set_conditional_expr(self, expr):
 
         Examples:
             # GH #3644 construct conditional expression when one task name
-            # is a substring of another: foo | xfoo => bar.
-            # Add 'foo' to the 'satisfied' dict before 'xfoo'.
+            # is a substring of another: 11/foo | 1/foo => bar.
             >>> preq = Prerequisite(1)
             >>> preq[(1, 'foo', 'succeeded')] = False
-            >>> preq[(1, 'xfoo', 'succeeded')] = False
-            >>> preq.set_conditional_expr("1/foo succeeded|1/xfoo succeeded")
+            >>> preq[(11, 'foo', 'succeeded')] = False
+            >>> preq.set_conditional_expr("11/foo succeeded|1/foo succeeded")
             >>> expr = preq.conditional_expression
             >>> expr.split('|')  # doctest: +NORMALIZE_WHITESPACE
-            ['bool(self._satisfied[("1", "foo", "succeeded")])',
-            'bool(self._satisfied[("1", "xfoo", "succeeded")])']
+            ['bool(self._satisfied[("11", "foo", "succeeded")])',
+            'bool(self._satisfied[("1", "foo", "succeeded")])']
 
+            # GH #6588 integer offset "x[-P2] | a" gives a negative cycle point
+            # during validation, for evaluation at the initial cycle point 1.
+            >>> preq = Prerequisite(1)
+            >>> preq[(-1, 'x', 'succeeded')] = False
+            >>> preq[(1, 'a', 'succeeded')] = False
+            >>> preq.set_conditional_expr("-1/x succeeded|1/a succeeded")
+            >>> expr = preq.conditional_expression
+            >>> expr.split('|')  # doctest: +NORMALIZE_WHITESPACE
+            ['bool(self._satisfied[("-1", "x", "succeeded")])',
+            'bool(self._satisfied[("1", "a", "succeeded")])']
         """
         self._cached_satisfied = None
         if '|' in expr:
             # Make a Python expression so we can eval() the logic.
             for t_output in self._satisfied:
                 # Use '\b' in case one task name is a substring of another
                 # and escape special chars ('.', timezone '+') in task IDs.
+                msg = self.MESSAGE_TEMPLATE % t_output
+                if msg[0] == '-':
+                    # -ve cycles: \b needs to be to the right of the `-` char.
+                    pattern = fr"-\b{re.escape(msg[1:])}\b"
+                else:
+                    pattern = fr"\b{re.escape(msg)}\b"
                 expr = re.sub(
-                    fr"\b{re.escape(self.MESSAGE_TEMPLATE % t_output)}\b",
+                    pattern,
                     self.SATISFIED_TEMPLATE % t_output,
                     expr
                 )

tests/integration/test_reload.py

@@ -19,6 +19,8 @@
 from contextlib import suppress
 
 from cylc.flow import commands
+from cylc.flow.data_store_mgr import TASK_PROXIES
+from cylc.flow.scheduler import Scheduler
 from cylc.flow.task_state import (
     TASK_STATUS_WAITING,
     TASK_STATUS_PREPARING,
@@ -46,16 +48,7 @@ async def test_reload_waits_for_pending_tasks(
     See https://github.com/cylc/cylc-flow/issues/5107
     """
     # a simple workflow with a single task
-    id_ = flow({
-        'scheduling': {
-            'graph': {
-                'R1': 'foo',
-            },
-        },
-        'runtime': {
-            'foo': {},
-        },
-    })
+    id_ = flow('foo')
     schd = scheduler(id_, paused_start=False)
 
     # we will artificially push the task through these states
@@ -270,7 +263,6 @@ async def test_reload_global_platform_group(
 
     # Task using the platform group
     conf = {
-        'scheduler': {'allow implicit tasks': True},
         'scheduling': {'graph': {'R1': 'one'}},
         'runtime': {
             'one': {
@@ -314,3 +306,23 @@ async def test_reload_global_platform_group(
         )
         platform = get_platform(rtconf)
         assert platform['meta']['x'] == '2'
+
+
+async def test_data_store_tproxy(flow, scheduler, start):
+    """Check N>0 task proxy in data store has correct info on reload.
+
+    https://github.com/cylc/cylc-flow/issues/6973
+    """
+    schd: Scheduler = scheduler(flow('foo => bar'))
+
+    def get_ds_tproxy(task):
+        return schd.data_store_mgr.data[schd.id][TASK_PROXIES][
+            f'{schd.id}//1/{task}'
+        ]
+
+    async with start(schd):
+        await schd.update_data_structure()
+        assert str(get_ds_tproxy('bar').runtime)
+
+        await commands.run_cmd(commands.reload_workflow(schd))
+        assert str(get_ds_tproxy('bar').runtime)