Only include snapshots with virtual layer views in promotion progress bar

Author: treysp

sqlmesh/core/console.py

@@ -246,7 +246,12 @@ def start_promotion_progress(
         """Indicates that a new snapshot promotion progress has begun."""
 
     @abc.abstractmethod
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         """Update the snapshot promotion progress."""
 
     @abc.abstractmethod
@@ -474,7 +479,12 @@ def start_promotion_progress(
     ) -> None:
         pass
 
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         pass
 
     def stop_promotion_progress(self, success: bool = True) -> None:
@@ -990,17 +1000,33 @@ def start_promotion_progress(
             self.environment_naming_info = environment_naming_info
             self.default_catalog = default_catalog
 
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         """Update the snapshot promotion progress."""
-        if self.promotion_progress is not None and self.promotion_task is not None:
+        if (
+            self.promotion_progress is not None
+            and self.promotion_task is not None
+            and snapshot.snapshot_id in snapshots_with_virtual_views
+        ):
             if self.verbosity >= Verbosity.VERBOSE:
                 display_name = snapshot.display_name(
                     self.environment_naming_info,
                     self.default_catalog if self.verbosity < Verbosity.VERY_VERBOSE else None,
                     dialect=self.dialect,
                 ).ljust(self.promotion_column_widths["name"])
                 action_str = (
-                    "[green]promoted[/green]" if promoted else "[yellow]demoted[/yellow]"
+                    ""
+                if promoted:
+                    action_str = (
+                        "[yellow]updated[/yellow]"
+                        if snapshot.previous_version
+                        else "[green]created[/green]"
+                    )
+                action_str = action_str or "[red]dropped[/red]"
                 ).ljust(len("promoted"))
                 self.promotion_progress.live.console.print(f"{display_name}  {action_str}")
             self.promotion_progress.update(self.promotion_task, refresh=True, advance=1)
@@ -2862,7 +2888,12 @@ def start_promotion_progress(
         self.promotion_status = (0, len(snapshots))
         print(f"Virtually Updating '{environment_naming_info.name}'")
 
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         """Update the snapshot promotion progress."""
         num_promotions, total_promotions = self.promotion_status
         num_promotions += 1
@@ -2995,7 +3026,12 @@ def start_promotion_progress(
     ) -> None:
         self._write(f"Starting promotion for {len(snapshots)} snapshots")
 
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         self._write(f"Promoting {snapshot.name}")
 
     def stop_promotion_progress(self, success: bool = True) -> None:

sqlmesh/core/plan/evaluator.py

@@ -375,8 +375,14 @@ def _update_views(
 
         environment = plan.environment
 
+        # progress bar should only show snapshots that have a virtual layer view
+        snapshots_with_virtual_views = [
+            s.snapshot_id
+            for s in [*promotion_result.added, *promotion_result.removed]
+            if s.is_model and s.model_kind_name and not s.model_kind_name.is_symbolic
+        ]
         self.console.start_promotion_progress(
-            promotion_result.added + promotion_result.removed,
+            len(snapshots_with_virtual_views),
             environment.naming_info,
             self.default_catalog,
         )
@@ -388,15 +394,19 @@ def _update_views(
                 [snapshots[s.snapshot_id] for s in promotion_result.added],
                 environment.naming_info,
                 deployability_index=deployability_index,
-                on_complete=lambda s: self.console.update_promotion_progress(s, True),
+                on_complete=lambda s: self.console.update_promotion_progress(
+                    s, True, snapshots_with_virtual_views
+                ),
                 snapshots=snapshots,
             )
             if promotion_result.removed_environment_naming_info:
                 self._demote_snapshots(
                     plan,
                     promotion_result.removed,
                     promotion_result.removed_environment_naming_info,
-                    on_complete=lambda s: self.console.update_promotion_progress(s, False),
+                    on_complete=lambda s: self.console.update_promotion_progress(
+                        s, False, snapshots_with_virtual_views
+                    ),
                 )
 
             self.state_sync.finalize(environment)

sqlmesh/core/snapshot/evaluator.py

@@ -973,8 +973,8 @@ def _promote_snapshot(
             )
             adapter.execute(snapshot.model.render_on_virtual_update(**render_kwargs))
 
-        if on_complete is not None:
-            on_complete(snapshot)
+            if on_complete is not None:
+                on_complete(snapshot)
 
     def _demote_snapshot(
         self,

web/server/console.py

@@ -10,7 +10,7 @@
 from sqlmesh.core.console import TerminalConsole
 from sqlmesh.core.environment import EnvironmentNamingInfo
 from sqlmesh.core.plan.definition import EvaluatablePlan
-from sqlmesh.core.snapshot import Snapshot, SnapshotInfoLike, SnapshotTableInfo
+from sqlmesh.core.snapshot import Snapshot, SnapshotInfoLike, SnapshotId, SnapshotTableInfo
 from sqlmesh.core.test import ModelTest
 from sqlmesh.utils.date import now_timestamp
 from web.server import models
@@ -172,7 +172,12 @@ def start_promotion_progress(
 
         self.log_event_plan_apply()
 
-    def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
+    def update_promotion_progress(
+        self,
+        snapshot: SnapshotInfoLike,
+        promoted: bool,
+        snapshots_with_virtual_views: t.List[SnapshotId],
+    ) -> None:
         if self.plan_apply_stage_tracker and self.plan_apply_stage_tracker.promote:
             self.plan_apply_stage_tracker.promote.update(
                 {"num_tasks": self.plan_apply_stage_tracker.promote.num_tasks + 1}