Base eval progress bar column widths on what will be displayed

Author: treysp

sqlmesh/core/console.py

@@ -373,7 +373,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/plan/evaluator.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,
         )

sqlmesh/core/scheduler.py

@@ -371,7 +371,7 @@ def _get_data_objects(
         if not snapshots_to_create:
             return CompletionStatus.NOTHING_TO_DO
         if on_start:
-            on_start(len(snapshots_to_create))
+            on_start(snapshots_to_create)
 
         for gateway, tables_by_schema in tables_by_gateway_and_schema.items():
             self._create_schemas(tables=tables_by_schema, gateway=gateway)

sqlmesh/core/snapshot/evaluator.py

@@ -347,6 +347,18 @@ class Verbosity(IntEnum):
     VERBOSE = 1
     VERY_VERBOSE = 2
 
+    @property
+    def is_default(self) -> bool:
+        return self == Verbosity.DEFAULT
+
+    @property
+    def is_verbose(self) -> bool:
+        return self == Verbosity.VERBOSE
+
+    @property
+    def is_very_verbose(self) -> bool:
+        return self == Verbosity.VERY_VERBOSE
+
 
 class CompletionStatus(Enum):
     SUCCESS = "success"

sqlmesh/utils/__init__.py

@@ -182,10 +182,7 @@ def test_plan(runner, tmp_path):
     assert_plan_success(result)
     # 'Models needing backfill' section and eval progress bar should display the same inclusive intervals
     assert "sqlmesh_example.incremental_model: [2020-01-01 - 2022-12-31]" in result.output
-    assert (
-        "sqlmesh_example.incremental_model                    [insert 2020-01-01 -\n2022-12-31]"
-        in result.output
-    )
+    assert "sqlmesh_example.incremental_model  [insert 2020-01-01 - 2022-12-31]" in result.output
 
 
 def test_plan_skip_tests(runner, tmp_path):
@@ -246,7 +243,7 @@ def test_plan_restate_model(runner, tmp_path):
     assert result.exit_code == 0
     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 "sqlmesh_example.full_model  [full refresh" in result.output
     assert_model_batches_executed(result)
     assert_virtual_layer_updated(result)
 
@@ -297,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.seed_model                           promoted" in result.output
+    assert "sqlmesh_example.seed_model         created" in result.output
+    assert "sqlmesh_example.seed_model         promoted" in result.output
 
 
 def test_plan_very_verbose(runner, tmp_path, copy_to_temp_path):
@@ -556,8 +553,8 @@ def test_plan_nonbreaking(runner, tmp_path):
     assert "+  'a' AS new_col" in result.output
     assert "Directly Modified: sqlmesh_example.incremental_model (Non-breaking)" in result.output
     assert "sqlmesh_example.full_model (Indirect Non-breaking)" in result.output
-    assert "sqlmesh_example.incremental_model                    [insert" in result.output
-    assert "sqlmesh_example.full_model evaluated [full refresh" not in result.output
+    assert "sqlmesh_example.incremental_model  [insert" in result.output
+    assert "sqlmesh_example.full_model  [full refresh" not in result.output
     assert_backfill_success(result)
 
 
@@ -614,8 +611,8 @@ def test_plan_breaking(runner, tmp_path):
     assert result.exit_code == 0
     assert "+  item_id + 1 AS item_id," in result.output
     assert "Directly Modified: sqlmesh_example.full_model (Breaking)" in result.output
-    assert "sqlmesh_example.full_model                           [full refresh" in result.output
-    assert "sqlmesh_example.incremental_model                     [insert" not in result.output
+    assert "sqlmesh_example.full_model  [full refresh" in result.output
+    assert "sqlmesh_example.incremental_model  [insert" not in result.output
     assert_backfill_success(result)
 
 
@@ -653,8 +650,8 @@ def test_plan_dev_select(runner, tmp_path):
     assert "+  item_id + 1 AS item_id," not in result.output
     assert "Directly Modified: sqlmesh_example__dev.full_model (Breaking)" not in result.output
     # only incremental_model backfilled
-    assert "sqlmesh_example__dev.incremental_model               [insert" in result.output
-    assert "sqlmesh_example__dev.full_model                    [full refresh" not in result.output
+    assert "sqlmesh_example__dev.incremental_model  [insert" in result.output
+    assert "sqlmesh_example__dev.full_model  [full refresh" not in result.output
     assert_backfill_success(result)
 
 
@@ -692,8 +689,8 @@ def test_plan_dev_backfill(runner, tmp_path):
         "Directly Modified: sqlmesh_example__dev.incremental_model (Non-breaking)" in result.output
     )
     # only incremental_model backfilled
-    assert "sqlmesh_example__dev.incremental_model               [insert" in result.output
-    assert "sqlmesh_example__dev.full_model                      [full refresh" not in result.output
+    assert "sqlmesh_example__dev.incremental_model  [insert" in result.output
+    assert "sqlmesh_example__dev.full_model  [full refresh" not in result.output
     assert_backfill_success(result)
 
 

tests/cli/test_cli.py

@@ -4,14 +4,13 @@
 import json
 import typing as t
 import unittest
-
 from fastapi.encoders import jsonable_encoder
 from sse_starlette.sse import ServerSentEvent
-from sqlmesh.core.snapshot.definition import Interval
+from sqlmesh.core.snapshot.definition import Interval, Intervals
 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
+from sqlmesh.core.snapshot import Snapshot, SnapshotInfoLike, SnapshotTableInfo
 from sqlmesh.core.test import ModelTest
 from sqlmesh.utils.date import now_timestamp
 from web.server import models
@@ -41,14 +40,14 @@ def stop_plan_evaluation(self) -> None:
 
     def start_creation_progress(
         self,
-        total_tasks: int,
+        snapshots: t.List[Snapshot],
         environment_naming_info: EnvironmentNamingInfo,
         default_catalog: t.Optional[str],
     ) -> None:
         if self.plan_apply_stage_tracker:
             self.plan_apply_stage_tracker.add_stage(
                 models.PlanStage.creation,
-                models.PlanStageCreation(total_tasks=total_tasks, num_tasks=0),
+                models.PlanStageCreation(total_tasks=len(snapshots), num_tasks=0),
             )
 
         self.log_event_plan_apply()
@@ -91,11 +90,14 @@ def stop_restate_progress(self, success: bool) -> None:
 
     def start_evaluation_progress(
         self,
-        batch_sizes: t.Dict[Snapshot, int],
+        batched_intervals: t.Dict[Snapshot, Intervals],
         environment_naming_info: EnvironmentNamingInfo,
         default_catalog: t.Optional[str],
     ) -> None:
         if self.plan_apply_stage_tracker:
+            batch_sizes = {
+                snapshot: len(intervals) for snapshot, intervals in batched_intervals.items()
+            }
             tasks = {
                 snapshot.name: models.BackfillTask(
                     completed=0,
@@ -154,15 +156,15 @@ def stop_evaluation_progress(self, success: bool = True) -> None:
 
     def start_promotion_progress(
         self,
-        total_tasks: int,
+        snapshots: t.List[SnapshotTableInfo],
         environment_naming_info: EnvironmentNamingInfo,
         default_catalog: t.Optional[str],
     ) -> None:
         if self.plan_apply_stage_tracker:
             self.plan_apply_stage_tracker.add_stage(
                 models.PlanStage.promote,
                 models.PlanStagePromote(
-                    total_tasks=total_tasks,
+                    total_tasks=len(snapshots),
                     num_tasks=0,
                     target_environment=environment_naming_info.name,
                 ),