Move filtering into console method

Author: treysp

sqlmesh/core/console.py

@@ -968,10 +968,13 @@ def start_promotion_progress(
                 "Updating virtual layer ", self.console, justify="left"
             )
 
+            snapshots_with_virtual_views = [
+                s for s in snapshots if s.is_model and not s.is_symbolic
+            ]
             self.promotion_progress.start()
             self.promotion_task = self.promotion_progress.add_task(
                 f"Virtually updating {environment_naming_info.name}...",
-                total=len(snapshots),
+                total=len(snapshots_with_virtual_views),
             )
 
             # determine name column widths if we're printing names
@@ -984,15 +987,20 @@ def start_promotion_progress(
                             dialect=self.dialect,
                         )
                     )
-                    for snapshot in snapshots
+                    for snapshot in snapshots_with_virtual_views
                 )
 
             self.environment_naming_info = environment_naming_info
             self.default_catalog = default_catalog
 
     def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> 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.is_model
+            and not snapshot.is_symbolic
+        ):
             if self.verbosity >= Verbosity.VERBOSE:
                 display_name = snapshot.display_name(
                     self.environment_naming_info,
@@ -1007,9 +1015,7 @@ def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool)
                         else "[green]created[/green]"
                     )
                 action_str = action_str or "[red]dropped[/red]"
-                self.promotion_progress.live.console.print(
-                    f"{snapshot.display_name(self.environment_naming_info, self.default_catalog if self.verbosity < Verbosity.VERY_VERBOSE else None, dialect=self.dialect).ljust(self.PROGRESS_BAR_COLUMN_WIDTHS['name'])} {action_str.ljust(7)}"
-                )
+                self.promotion_progress.live.console.print(f"{display_name} {action_str}")
             self.promotion_progress.update(self.promotion_task, refresh=True, advance=1)
 
     def stop_promotion_progress(self, success: bool = True) -> None:

sqlmesh/core/environment.py

@@ -169,20 +169,11 @@ def promoted_snapshot_id_dicts(self) -> t.List[dict]:
 
     @property
     def promoted_snapshots(self) -> t.List[SnapshotTableInfo]:
-        def has_virtual_view(s: SnapshotTableInfo) -> bool:
-            return (
-                s.is_model and s.model_kind_name is not None and not s.model_kind_name.is_symbolic
-            )
-
         if self.promoted_snapshot_ids is None:
-            return [s for s in self.snapshots if has_virtual_view(s)]
+            return self.snapshots
 
         promoted_snapshot_ids = set(self.promoted_snapshot_ids)
-        return [
-            s
-            for s in self.snapshots
-            if s.snapshot_id in promoted_snapshot_ids and has_virtual_view(s)
-        ]
+        return [s for s in self.snapshots if s.snapshot_id in promoted_snapshot_ids]
 
     @property
     def previous_finalized_snapshots(self) -> t.Optional[t.List[SnapshotTableInfo]]:

sqlmesh/core/plan/definition.py

@@ -185,13 +185,7 @@ def environment(self) -> Environment:
 
         snapshots_by_name = self.context_diff.snapshots_by_name
         snapshots = [s.table_info for s in self.snapshots.values()]
-
-        # only promote snapshots with virtual layer views
-        promoted_snapshot_ids = [
-            s.snapshot_id
-            for s in snapshots
-            if s.is_model and s.model_kind_name and not s.model_kind_name.is_symbolic
-        ]
+        promoted_snapshot_ids = None
 
         if self.is_dev and not self.include_unmodified:
             if self.selected_models_to_backfill is not None:
@@ -208,7 +202,7 @@ def environment(self) -> Environment:
                 promotable_snapshot_ids = self.context_diff.promotable_snapshot_ids.copy()
 
             promoted_snapshot_ids = [
-                id for id in promoted_snapshot_ids if id in promotable_snapshot_ids
+                s.snapshot_id for s in snapshots if s.snapshot_id in promotable_snapshot_ids
             ]
 
         previous_finalized_snapshots = (

sqlmesh/core/plan/evaluator.py

@@ -376,7 +376,7 @@ def _update_views(
         environment = plan.environment
 
         self.console.start_promotion_progress(
-            len(promotion_result.added) + len(promotion_result.removed),
+            promotion_result.added + promotion_result.removed,
             environment.naming_info,
             self.default_catalog,
         )

sqlmesh/core/scheduler.py

@@ -427,7 +427,7 @@ def run_merged_intervals(
         batched_intervals = self.batch_intervals(merged_intervals, deployability_index)
 
         self.console.start_evaluation_progress(
-            {snapshot: len(intervals) for snapshot, intervals in batched_intervals.items()},
+            batched_intervals,
             environment_naming_info,
             self.default_catalog,
         )

tests/cli/test_cli.py

@@ -294,8 +294,8 @@ def test_plan_verbose(runner, tmp_path):
         cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "plan", "--verbose"], input="y\n"
     )
     assert_plan_success(result)
-    assert "sqlmesh_example.seed_model                           created" in result.output
-    assert "sqlmesh_example.full_model                           created" in result.output
+    assert "sqlmesh_example.seed_model        created" in result.output
+    assert "sqlmesh_example.full_model        created" in result.output
 
 
 def test_plan_very_verbose(runner, tmp_path, copy_to_temp_path):

web/server/console.py

@@ -172,11 +172,7 @@ 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) -> 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}