Tidy up

Author: treysp

sqlmesh/core/console.py

@@ -620,7 +620,7 @@ def start_evaluation_progress(
             self.evaluation_progress_live.start()
 
             self.evaluation_total_task = self.evaluation_total_progress.add_task(
-                "Evaluating models...", total=sum(batch_sizes.values())
+                "Executing models...", total=sum(batch_sizes.values())
             )
 
             self.evaluation_model_batch_sizes = batch_sizes
@@ -825,7 +825,7 @@ def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool)
         if self.promotion_progress is not None and self.promotion_task is not None:
             if self.verbosity >= Verbosity.VERBOSE:
                 check_mark = f"{GREEN_CHECK_MARK} " if promoted else "  "
-                action_str = "[green]updated[/green]" if promoted else "[yellow]demoted[/yellow]"
+                action_str = "[green]promoted[/green]" if promoted else "[yellow]demoted[/yellow]"
                 self.promotion_progress.live.console.print(
                     f"{check_mark}{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}"
                 )
@@ -2628,8 +2628,7 @@ def show_row_diff(
         self._write(row_diff)
 
 
-# _CONSOLE: Console = NoopConsole()
-_CONSOLE: Console = TerminalConsole()
+_CONSOLE: Console = NoopConsole()
 
 
 def set_console(console: Console) -> None:

sqlmesh/core/scheduler.py

@@ -478,7 +478,7 @@ def evaluate_node(node: SchedulingUnit) -> None:
             try:
                 assert execution_time  # mypy
                 assert deployability_index  # mypy
-                audit_results = []
+                audit_results = []  # so it exists for finally if `evaluate` raises
                 audit_results = self.evaluate(
                     snapshot=snapshot,
                     start=start,

tests/cli/test_cli.py

@@ -128,22 +128,22 @@ def assert_new_env(result, new_env="prod", from_env="prod", initialize=True) ->
     ) in result.output
 
 
-def assert_model_versions_created(result) -> None:
+def assert_physical_layer_updated(result) -> None:
     assert "Physical layer updated" in result.output
 
 
-def assert_model_batches_evaluated(result) -> None:
+def assert_model_batches_executed(result) -> None:
     assert "Model batches executed" in result.output
 
 
-def assert_env_views_updated(result) -> None:
+def assert_virtual_layer_updated(result) -> None:
     assert "Virtual layer updated" in result.output
 
 
 def assert_backfill_success(result) -> None:
-    assert_model_versions_created(result)
-    assert_model_batches_evaluated(result)
-    assert_env_views_updated(result)
+    assert_physical_layer_updated(result)
+    assert_model_batches_executed(result)
+    assert_virtual_layer_updated(result)
 
 
 def assert_plan_success(result, new_env="prod", from_env="prod") -> None:
@@ -243,8 +243,8 @@ def test_plan_restate_model(runner, tmp_path):
     assert_duckdb_test(result)
     assert "No changes to plan: project files match the `prod` environment" in result.output
     assert "sqlmesh_example.full_model                         [full refresh" in result.output
-    assert_model_batches_evaluated(result)
-    assert_env_views_updated(result)
+    assert_model_batches_executed(result)
+    assert_virtual_layer_updated(result)
 
 
 @pytest.mark.parametrize("flag", ["--skip-backfill", "--dry-run"])
@@ -396,7 +396,7 @@ def test_plan_dev_create_from_virtual(runner, tmp_path):
     )
     assert result.exit_code == 0
     assert_new_env(result, "dev2", "dev", initialize=False)
-    assert_env_views_updated(result)
+    assert_virtual_layer_updated(result)
     assert_virtual_update(result)
 
 
@@ -533,7 +533,7 @@ def test_plan_dev_no_changes(runner, tmp_path):
     )
     assert result.exit_code == 0
     assert_new_env(result, "dev", initialize=False)
-    assert_env_views_updated(result)
+    assert_virtual_layer_updated(result)
     assert_virtual_update(result)
 
 
@@ -718,7 +718,7 @@ def test_run_dev(runner, tmp_path, flag):
     # Confirm backfill occurs when we run non-backfilled dev env
     result = runner.invoke(cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "run", "dev"])
     assert result.exit_code == 0
-    assert_model_batches_evaluated(result)
+    assert_model_batches_executed(result)
 
 
 @time_machine.travel(FREEZE_TIME)
@@ -750,7 +750,7 @@ def test_run_cron_elapsed(runner, tmp_path):
         result = runner.invoke(cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "run"])
 
     assert result.exit_code == 0
-    assert_model_batches_evaluated(result)
+    assert_model_batches_executed(result)
 
 
 def test_clean(runner, tmp_path):

web/server/console.py

@@ -91,7 +91,7 @@ def stop_restate_progress(self, success: bool) -> None:
 
     def start_evaluation_progress(
         self,
-        batched_intervals: t.Dict[Snapshot, int],
+        batch_sizes: t.Dict[Snapshot, int],
         environment_naming_info: EnvironmentNamingInfo,
         default_catalog: t.Optional[str],
     ) -> None:
@@ -104,7 +104,7 @@ def start_evaluation_progress(
                     name=snapshot.name,
                     view_name=snapshot.display_name(environment_naming_info, default_catalog),
                 )
-                for snapshot, total_tasks in batched_intervals.items()
+                for snapshot, total_tasks in batch_sizes.items()
             }
             self.plan_apply_stage_tracker.add_stage(
                 models.PlanStage.backfill,
@@ -128,8 +128,8 @@ def update_snapshot_evaluation_progress(
         interval: Interval,
         batch_idx: int,
         duration_ms: t.Optional[int],
-        audits_passed: int,
-        audits_failed: int,
+        num_audits_passed: int,
+        num_audits_failed: int,
     ) -> None:
         if self.plan_apply_stage_tracker and self.plan_apply_stage_tracker.backfill:
             task = self.plan_apply_stage_tracker.backfill.tasks[snapshot.name]