Print messages when no physical layer or model evals occurred

Author: treysp

sqlmesh/core/console.py

@@ -1303,7 +1303,7 @@ def show_model_difference_summary(
         ):
             self._print(
                 Tree(
-                    f"[bold]Differences from the `{context_diff.create_from if context_diff.is_new_environment else context_diff.environment}` environment:\n"
+                    f"\n[bold]Differences from the `{context_diff.create_from if context_diff.is_new_environment else context_diff.environment}` environment:\n"
                 )
             )
 

sqlmesh/core/plan/evaluator.py

@@ -37,6 +37,7 @@
     SnapshotInfoLike,
     SnapshotTableInfo,
 )
+from sqlmesh.core.scheduler import CompletionStatus
 from sqlmesh.core.state_sync import StateSync
 from sqlmesh.core.state_sync.base import PromotionResult
 from sqlmesh.core.user import User
@@ -136,7 +137,7 @@ def evaluate(
             self._push(plan, snapshots, deployability_index_for_creation)
             update_intervals_for_new_snapshots(plan.new_snapshots, self.state_sync)
             self._restate(plan, snapshots_by_name)
-            self._backfill(
+            first_bf_completion_status = self._backfill(
                 plan,
                 snapshots_by_name,
                 before_promote_snapshots,
@@ -146,20 +147,22 @@ def evaluate(
             promotion_result = self._promote(
                 plan, snapshots, before_promote_snapshots, deployability_index_for_creation
             )
-            self._backfill(
+            second_bf_completion_status = self._backfill(
                 plan,
                 snapshots_by_name,
                 after_promote_snapshots,
                 deployability_index_for_evaluation,
                 circuit_breaker=circuit_breaker,
             )
+            if (
+                first_bf_completion_status.is_nothing_to_do
+                and second_bf_completion_status.is_nothing_to_do
+            ):
+                self.console.log_status_update("[green]SKIP: No model batches to execute[/green]\n")
             self._update_views(
                 plan, snapshots, promotion_result, deployability_index_for_evaluation
             )
 
-            if not plan.requires_backfill:
-                self.console.log_success("Virtual Update executed successfully")
-
             execute_environment_statements(
                 adapter=self.snapshot_evaluator.adapter,
                 environment_statements=plan.environment_statements or [],
@@ -187,7 +190,7 @@ def _backfill(
         selected_snapshots: t.Set[str],
         deployability_index: DeployabilityIndex,
         circuit_breaker: t.Optional[t.Callable[[], bool]] = None,
-    ) -> None:
+    ) -> CompletionStatus:
         """Backfill missing intervals for snapshots that are part of the given plan.
 
         Args:
@@ -212,10 +215,10 @@ def _backfill(
                     )
                 )
             self.state_sync.add_snapshots_intervals(intervals_to_add)
-            return
+            return CompletionStatus.NOTHING_TO_DO
 
         if not plan.requires_backfill or not selected_snapshots:
-            return
+            return CompletionStatus.NOTHING_TO_DO
 
         scheduler = self.create_scheduler(snapshots_by_name.values())
         completion_status = scheduler.run(
@@ -236,6 +239,8 @@ def _backfill(
         if completion_status.is_failure:
             raise PlanError("Plan application failed.")
 
+        return completion_status
+
     def _push(
         self,
         plan: EvaluatablePlan,
@@ -279,6 +284,7 @@ def _should_create(s: Snapshot) -> bool:
                 on_start=lambda x: self.console.start_creation_progress(
                     x, plan.environment, self.default_catalog
                 ),
+                on_no_work=self.console.log_status_update,
                 on_complete=self.console.update_creation_progress,
             )
             completed = True

sqlmesh/core/snapshot/evaluator.py

@@ -279,6 +279,7 @@ def create(
         snapshots: t.Dict[SnapshotId, Snapshot],
         deployability_index: t.Optional[DeployabilityIndex] = None,
         on_start: t.Optional[t.Callable] = None,
+        on_no_work: t.Optional[t.Callable] = None,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]] = None,
         allow_destructive_snapshots: t.Optional[t.Set[str]] = None,
     ) -> None:
@@ -289,6 +290,7 @@ def create(
             snapshots: Mapping of snapshot ID to snapshot.
             deployability_index: Determines snapshots that are deployable in the context of this creation.
             on_start: A callback to initialize the snapshot creation progress bar.
+            on_no_work: A callback to call when no snapshots are to be created.
             on_complete: A callback to call on each successfully created snapshot.
             allow_destructive_snapshots: Set of snapshots that are allowed to have destructive schema changes.
         """
@@ -348,6 +350,8 @@ def _get_data_objects(schema: exp.Table, gateway: t.Optional[str] = None) -> t.S
                 target_deployability_flags[snapshot.name].sort()
 
         if not snapshots_to_create:
+            if on_no_work:
+                on_no_work("\n[green]SKIP: No physical layer updates to perform[/green]\n")
             return
         if on_start:
             on_start(len(snapshots_to_create))

tests/cli/test_cli.py

@@ -154,10 +154,6 @@ def assert_plan_success(result, new_env="prod", from_env="prod") -> None:
     assert_backfill_success(result)
 
 
-def assert_virtual_update(result) -> None:
-    assert "Virtual Update executed" in result.output
-
-
 def test_version(runner, tmp_path):
     from sqlmesh import __version__ as SQLMESH_VERSION
 
@@ -275,7 +271,7 @@ def test_plan_skip_backfill(runner, tmp_path, flag):
         input="y\n",
     )
     assert result.exit_code == 0
-    assert_virtual_update(result)
+    assert_virtual_layer_updated(result)
     assert "Model batches executed" not in result.output
 
 
@@ -404,8 +400,9 @@ def test_plan_dev_create_from_virtual(runner, tmp_path):
     )
     assert result.exit_code == 0
     assert_new_env(result, "dev2", "dev", initialize=False)
+    assert "SKIP: No physical layer updates to perform" in result.output
+    assert "SKIP: No model batches to execute" in result.output
     assert_virtual_layer_updated(result)
-    assert_virtual_update(result)
 
 
 def test_plan_dev_create_from(runner, tmp_path):
@@ -542,7 +539,6 @@ def test_plan_dev_no_changes(runner, tmp_path):
     assert result.exit_code == 0
     assert_new_env(result, "dev", initialize=False)
     assert_virtual_layer_updated(result)
-    assert_virtual_update(result)
 
 
 def test_plan_nonbreaking(runner, tmp_path):