PR feedback

Author: treysp

sqlmesh/core/console.py

@@ -250,7 +250,6 @@ def update_promotion_progress(
         self,
         snapshot: SnapshotInfoLike,
         promoted: bool,
-        snapshots_with_virtual_views: t.List[SnapshotId],
     ) -> None:
         """Update the snapshot promotion progress."""
 
@@ -483,7 +482,6 @@ def update_promotion_progress(
         self,
         snapshot: SnapshotInfoLike,
         promoted: bool,
-        snapshots_with_virtual_views: t.List[SnapshotId],
     ) -> None:
         pass
 
@@ -964,14 +962,9 @@ 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
-            and snapshot.snapshot_id in snapshots_with_virtual_views
-        ):
+        if self.promotion_progress is not None and self.promotion_task is not None:
             if self.verbosity >= Verbosity.VERBOSE:
                 action_str = ""
                 if promoted:
@@ -2844,7 +2837,6 @@ 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
@@ -2980,7 +2972,6 @@ def update_promotion_progress(
         self,
         snapshot: SnapshotInfoLike,
         promoted: bool,
-        snapshots_with_virtual_views: t.List[SnapshotId],
     ) -> None:
         self._write(f"Promoting {snapshot.name}")
 

sqlmesh/core/plan/evaluator.py

@@ -394,19 +394,17 @@ 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, snapshots_with_virtual_views
-                ),
+                on_complete=lambda s: self.console.update_promotion_progress(s, True),
                 snapshots=snapshots,
+                snapshots_with_virtual_views=snapshots_with_virtual_views,
             )
             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, snapshots_with_virtual_views
-                    ),
+                    on_complete=lambda s: self.console.update_promotion_progress(s, False),
+                    snapshots_with_virtual_views=snapshots_with_virtual_views,
                 )
 
             self.state_sync.finalize(environment)
@@ -422,6 +420,7 @@ def _promote_snapshots(
         snapshots: t.Dict[SnapshotId, Snapshot],
         deployability_index: t.Optional[DeployabilityIndex] = None,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]] = None,
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         self.snapshot_evaluator.promote(
             target_snapshots,
@@ -438,6 +437,7 @@ def _promote_snapshots(
             environment_naming_info=environment_naming_info,
             deployability_index=deployability_index,
             on_complete=on_complete,
+            snapshots_with_virtual_views=snapshots_with_virtual_views,
         )
 
     def _demote_snapshots(
@@ -446,9 +446,13 @@ def _demote_snapshots(
         target_snapshots: t.Iterable[SnapshotTableInfo],
         environment_naming_info: EnvironmentNamingInfo,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]] = None,
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         self.snapshot_evaluator.demote(
-            target_snapshots, environment_naming_info, on_complete=on_complete
+            target_snapshots,
+            environment_naming_info,
+            on_complete=on_complete,
+            snapshots_with_virtual_views=snapshots_with_virtual_views,
         )
 
     def _restate(self, plan: EvaluatablePlan, snapshots_by_name: t.Dict[str, Snapshot]) -> None:

sqlmesh/core/snapshot/evaluator.py

@@ -216,6 +216,7 @@ def promote(
         snapshots: t.Optional[t.Dict[SnapshotId, Snapshot]] = None,
         table_mapping: t.Optional[t.Dict[str, str]] = None,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]] = None,
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         """Promotes the given collection of snapshots in the target environment by replacing a corresponding
         view with a physical table associated with the given snapshot.
@@ -257,6 +258,7 @@ def promote(
                     environment_naming_info=environment_naming_info,
                     deployability_index=deployability_index,  # type: ignore
                     on_complete=on_complete,
+                    snapshots_with_virtual_views=snapshots_with_virtual_views,
                 ),
                 self.ddl_concurrent_tasks,
             )
@@ -266,6 +268,7 @@ def demote(
         target_snapshots: t.Iterable[SnapshotInfoLike],
         environment_naming_info: EnvironmentNamingInfo,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]] = None,
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         """Demotes the given collection of snapshots in the target environment by removing its view.
 
@@ -277,7 +280,9 @@ def demote(
         with self.concurrent_context():
             concurrent_apply_to_snapshots(
                 target_snapshots,
-                lambda s: self._demote_snapshot(s, environment_naming_info, on_complete),
+                lambda s: self._demote_snapshot(
+                    s, environment_naming_info, on_complete, snapshots_with_virtual_views
+                ),
                 self.ddl_concurrent_tasks,
             )
 
@@ -943,6 +948,7 @@ def _promote_snapshot(
         execution_time: t.Optional[TimeLike] = None,
         snapshots: t.Optional[t.Dict[SnapshotId, Snapshot]] = None,
         table_mapping: t.Optional[t.Dict[str, str]] = None,
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         if snapshot.is_model:
             adapter = (
@@ -973,14 +979,19 @@ def _promote_snapshot(
             )
             adapter.execute(snapshot.model.render_on_virtual_update(**render_kwargs))
 
-            if on_complete is not None:
+            if (
+                on_complete is not None
+                and snapshots_with_virtual_views
+                and snapshot.snapshot_id in snapshots_with_virtual_views
+            ):
                 on_complete(snapshot)
 
     def _demote_snapshot(
         self,
         snapshot: SnapshotInfoLike,
         environment_naming_info: EnvironmentNamingInfo,
         on_complete: t.Optional[t.Callable[[SnapshotInfoLike], None]],
+        snapshots_with_virtual_views: t.Optional[t.List[SnapshotId]] = None,
     ) -> None:
         adapter = (
             self.get_adapter(snapshot.model_gateway)
@@ -992,7 +1003,11 @@ def _demote_snapshot(
         )
         _evaluation_strategy(snapshot, adapter).demote(view_name)
 
-        if on_complete is not None:
+        if (
+            on_complete is not None
+            and snapshots_with_virtual_views
+            and snapshot.snapshot_id in snapshots_with_virtual_views
+        ):
             on_complete(snapshot)
 
     def _cleanup_snapshot(

web/server/console.py

@@ -11,7 +11,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, SnapshotId
+from sqlmesh.core.snapshot import Snapshot, SnapshotInfoLike
 from sqlmesh.core.test import ModelTest
 from sqlmesh.utils.date import now_timestamp
 from web.server import models
@@ -174,7 +174,6 @@ 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(