Fix: nothing to run message should not appear during plan (#3708)

Author: treysp

sqlmesh/core/context.py

@@ -94,6 +94,7 @@
     SnapshotFingerprint,
     to_table_mapping,
 )
+from sqlmesh.core.snapshot.definition import get_next_model_interval_start
 from sqlmesh.core.state_sync import (
     CachingStateSync,
     StateReader,
@@ -111,7 +112,7 @@
 from sqlmesh.core.user import User
 from sqlmesh.utils import UniqueKeyDict, sys_path
 from sqlmesh.utils.dag import DAG
-from sqlmesh.utils.date import TimeLike, now_ds, to_timestamp
+from sqlmesh.utils.date import TimeLike, now_ds, to_timestamp, format_tz_datetime
 from sqlmesh.utils.errors import (
     CircuitBreakerError,
     ConfigError,
@@ -1951,7 +1952,7 @@ def _run(
                 select_models, no_auto_upstream, snapshots.values()
             )
 
-        return scheduler.run(
+        completion_status = scheduler.run(
             environment,
             start=start,
             end=end,
@@ -1962,6 +1963,22 @@ def _run(
             auto_restatement_enabled=environment.lower() == c.PROD,
         )
 
+        if completion_status.is_nothing_to_do:
+            next_run_ready_msg = ""
+
+            next_ready_interval_start = get_next_model_interval_start(snapshots.values())
+            if next_ready_interval_start:
+                utc_time = format_tz_datetime(next_ready_interval_start)
+                local_time = format_tz_datetime(next_ready_interval_start, use_local_timezone=True)
+                time_msg = local_time if local_time == utc_time else f"{local_time} ({utc_time})"
+                next_run_ready_msg = f"\n\nNext run will be ready at {time_msg}."
+
+            self.console.log_status_update(
+                f"No models are ready to run. Please wait until a model `cron` interval has elapsed.{next_run_ready_msg}"
+            )
+
+        return completion_status
+
     def _apply(self, plan: Plan, circuit_breaker: t.Optional[t.Callable[[], bool]]) -> None:
         self._scheduler.create_plan_evaluator(self).evaluate(
             plan.to_evaluatable(), circuit_breaker=circuit_breaker

sqlmesh/core/scheduler.py

@@ -26,7 +26,6 @@
 from sqlmesh.core.snapshot.definition import (
     Interval,
     expand_range,
-    get_next_model_interval_start,
     parent_snapshots_by_name,
 )
 from sqlmesh.core.state_sync import StateSync
@@ -35,7 +34,6 @@
 from sqlmesh.utils.dag import DAG
 from sqlmesh.utils.date import (
     TimeLike,
-    format_tz_datetime,
     now_timestamp,
     to_timestamp,
     validate_date_range,
@@ -313,18 +311,6 @@ def run(
         )
 
         if not merged_intervals:
-            next_run_ready_msg = ""
-
-            next_ready_interval_start = get_next_model_interval_start(self.snapshots.values())
-            if next_ready_interval_start:
-                utc_time = format_tz_datetime(next_ready_interval_start)
-                local_time = format_tz_datetime(next_ready_interval_start, use_local_timezone=True)
-                time_msg = local_time if local_time == utc_time else f"{local_time} ({utc_time})"
-                next_run_ready_msg = f"\n\nNext run will be ready at {time_msg}."
-
-            self.console.log_status_update(
-                f"No models are ready to run. Please wait until a model `cron` interval has elapsed.{next_run_ready_msg}"
-            )
             return CompletionStatus.NOTHING_TO_DO
 
         errors, skipped_intervals = self.run_merged_intervals(