Fix: display inclusive intervals in eval progress bar (#4075)

Author: treysp

sqlmesh/core/console.py

@@ -42,7 +42,7 @@
 from sqlmesh.utils import rich as srich
 from sqlmesh.utils import Verbosity
 from sqlmesh.utils.concurrency import NodeExecutionFailedError
-from sqlmesh.utils.date import time_like_to_str, to_date, yesterday_ds, to_ds, to_datetime
+from sqlmesh.utils.date import time_like_to_str, to_date, yesterday_ds, to_ds, make_inclusive
 from sqlmesh.utils.errors import (
     PythonModelEvalError,
     NodeAuditsErrors,
@@ -3144,10 +3144,13 @@ def _format_evaluation_model_interval(snapshot: Snapshot, interval: Interval) ->
         or snapshot.model.kind.is_managed
         or snapshot.model.kind.is_custom
     ):
-        # include time if interval < 1 day
-        if (interval[1] - interval[0]) < datetime.timedelta(days=1).total_seconds() * 1000:
-            return f"insert {to_ds(interval[0])} {to_datetime(interval[0]).strftime('%H:%M:%S')}-{to_datetime(interval[1]).strftime('%H:%M:%S')}"
-        return f"insert {to_ds(interval[0])} - {to_ds(interval[1])}"
+        inclusive_interval = make_inclusive(interval[0], interval[1])
+        if snapshot.model.interval_unit.is_date_granularity:
+            return f"insert {to_ds(inclusive_interval[0])} - {to_ds(inclusive_interval[1])}"
+        # omit end date if interval start/end on same day
+        if inclusive_interval[0].date() == inclusive_interval[1].date():
+            return f"insert {to_ds(inclusive_interval[0])} {inclusive_interval[0].strftime('%H:%M:%S')}-{inclusive_interval[1].strftime('%H:%M:%S')}"
+        return f"insert {inclusive_interval[0].strftime('%Y-%m-%d %H:%M:%S')} - {inclusive_interval[1].strftime('%Y-%m-%d %H:%M:%S')}"
     return ""
 
 

tests/cli/test_cli.py

@@ -173,6 +173,7 @@ def test_plan_no_config(runner, tmp_path):
     assert "Error: SQLMesh project config could not be found" in result.output
 
 
+@time_machine.travel(FREEZE_TIME)
 def test_plan(runner, tmp_path):
     create_example_project(tmp_path)
 
@@ -183,6 +184,12 @@ def test_plan(runner, tmp_path):
         cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "plan"], input="y\n"
     )
     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
+    )
 
 
 def test_plan_skip_tests(runner, tmp_path):