Fix: Revert to the old plan end behavior (#1936)

Author: izeigerman

sqlmesh/core/console.py

@@ -1197,7 +1197,7 @@ def end_change_callback(change: t.Dict[str, datetime.datetime]) -> None:
                         widgets.Label(f"End {backfill_or_preview} Date:", layout={"width": "8rem"}),
                         _date_picker(
                             plan_builder,
-                            to_date(plan_builder.build().end_or_now),
+                            to_date(plan_builder.build().end),
                             end_change_callback,
                         ),
                     ]

sqlmesh/core/plan/builder.py

@@ -201,7 +201,7 @@ def build(self) -> Plan:
             context_diff=self._context_diff,
             plan_id=self._plan_id,
             provided_start=self._start,
-            end=self._end,
+            provided_end=self._end,
             is_dev=self._is_dev,
             skip_backfill=self._skip_backfill,
             no_gaps=self._no_gaps,

sqlmesh/core/plan/definition.py

@@ -27,7 +27,7 @@ class Plan(PydanticModel, frozen=True):
     context_diff: ContextDiff
     plan_id: str
     provided_start: t.Optional[TimeLike] = None
-    end: t.Optional[TimeLike] = None
+    provided_end: t.Optional[TimeLike] = None
 
     is_dev: bool
     skip_backfill: bool
@@ -56,6 +56,7 @@ class Plan(PydanticModel, frozen=True):
     _snapshots: t.Optional[t.Dict[SnapshotId, Snapshot]] = None
     _environment: t.Optional[Environment] = None
     _start: t.Optional[TimeLike] = None
+    _end: t.Optional[TimeLike] = None
     __earliest_interval_start: t.Optional[datetime] = None
 
     @property
@@ -72,8 +73,10 @@ def start(self) -> TimeLike:
         return t.cast(TimeLike, self._start)
 
     @property
-    def end_or_now(self) -> TimeLike:
-        return self.end or now()
+    def end(self) -> TimeLike:
+        if self._end is None:
+            self._end = self.provided_end or now()
+        return self._end
 
     @property
     def previous_plan_id(self) -> t.Optional[str]:
@@ -172,7 +175,7 @@ def missing_intervals(self) -> t.List[SnapshotIntervals]:
             for snapshot, missing in missing_intervals(
                 [s for s in self.snapshots.values() if self.is_selected_for_backfill(s.name)],
                 start=self.provided_start or self._earliest_interval_start,
-                end=self.end,
+                end=self.provided_end,
                 execution_time=self.execution_time,
                 restatements=self.restatements,
                 deployability_index=self.deployability_index,
@@ -204,7 +207,7 @@ def environment(self) -> Environment:
             self._environment = Environment(
                 snapshots=snapshots,
                 start_at=self.provided_start or self._earliest_interval_start,
-                end_at=self.end,
+                end_at=self.provided_end,
                 plan_id=self.plan_id,
                 previous_plan_id=self.previous_plan_id,
                 expiration_ts=expiration_ts,

sqlmesh/core/plan/evaluator.py

@@ -211,7 +211,7 @@ def _promote(
                 [s for s in plan.snapshots.values() if s.is_paused],
                 plan.snapshots,
             )
-            self.state_sync.unpause_snapshots(promotion_result.added, plan.end_or_now)
+            self.state_sync.unpause_snapshots(promotion_result.added, plan.end)
 
         return promotion_result
 

tests/core/test_plan.py

@@ -107,19 +107,16 @@ def test_forward_only_dev(make_snapshot, mocker: MockerFixture):
     now_mock = mocker.patch("sqlmesh.core.snapshot.definition.now")
     now_mock.return_value = expected_end
 
-    now_ds_mock = mocker.patch("sqlmesh.core.plan.builder.now")
-    now_ds_mock.return_value = expected_end
+    mocker.patch("sqlmesh.core.plan.builder.now").return_value = expected_end
+    mocker.patch("sqlmesh.core.plan.definition.now").return_value = expected_end
 
     plan = PlanBuilder(context_diff, forward_only=True, is_dev=True).build()
 
     assert plan.restatements == {
         snapshot_a.snapshot_id: (to_timestamp(expected_start), expected_interval_end)
     }
     assert plan.start == to_date(expected_start)
-    assert plan.end is None
-
-    yesterday_ds_mock.assert_called_once()
-    now_ds_mock.call_count == 2
+    assert plan.end == expected_end
 
 
 def test_forward_only_plan_added_models(make_snapshot, mocker: MockerFixture):

web/server/api/endpoints/commands.py

@@ -210,7 +210,7 @@ def _run_plan_apply(
 
     tracker_apply = models.PlanApplyStageTracker(environment=environment, plan_options=plan_options)
     tracker_apply.start = plan.start
-    tracker_apply.end = plan.end_or_now
+    tracker_apply.end = plan.end
     api_console.start_plan_tracker(tracker_apply)
     try:
         context.apply(plan, circuit_breaker)

web/server/api/endpoints/plan.py

@@ -105,7 +105,7 @@ def get_plan_builder(
         )
         plan = plan_builder.build()
         tracker.start = plan.start
-        tracker.end = plan.end_or_now
+        tracker.end = plan.end
         tracker_stage_validate.stop(success=True)
         api_console.log_event_plan_overview()
     except Exception: