Refactor to from_plan_id

Author: VaggelisD

sqlmesh/core/context.py

@@ -1597,7 +1597,7 @@ def apply(
             explainer.evaluate(
                 plan.to_evaluatable(),
                 snapshot_evaluator=self.snapshot_evaluator(
-                    correlation_id=CorrelationId.from_plan(plan)
+                    correlation_id=CorrelationId.from_plan_id(plan.plan_id)
                 ),
             )
             return
@@ -2405,7 +2405,7 @@ def _apply(self, plan: Plan, circuit_breaker: t.Optional[t.Callable[[], bool]])
         self._scheduler.create_plan_evaluator(self).evaluate(
             plan.to_evaluatable(),
             snapshot_evaluator=self.snapshot_evaluator(
-                correlation_id=CorrelationId.from_plan(plan)
+                correlation_id=CorrelationId.from_plan_id(plan.plan_id)
             ),
             circuit_breaker=circuit_breaker,
         )

sqlmesh/utils/__init__.py

@@ -26,9 +26,6 @@
 
 logger = logging.getLogger(__name__)
 
-if t.TYPE_CHECKING:
-    from sqlmesh.core.plan import Plan
-
 T = t.TypeVar("T")
 KEY = t.TypeVar("KEY", bound=t.Hashable)
 VALUE = t.TypeVar("VALUE")
@@ -404,5 +401,5 @@ def __str__(self) -> str:
         return f"{self.job_type.value}: {self.job_id}"
 
     @classmethod
-    def from_plan(cls, plan: Plan) -> CorrelationId:
-        return CorrelationId(JobType.PLAN, plan.plan_id)
+    def from_plan_id(cls, plan_id: str) -> CorrelationId:
+        return CorrelationId(JobType.PLAN, plan_id)

tests/conftest.py

@@ -269,7 +269,9 @@ def push_plan(context: Context, plan: Plan) -> None:
         context.create_scheduler,
         context.default_catalog,
     )
-    plan_evaluator.snapshot_evaluator = context.snapshot_evaluator(CorrelationId.from_plan(plan))
+    plan_evaluator.snapshot_evaluator = context.snapshot_evaluator(
+        CorrelationId.from_plan_id(plan.plan_id)
+    )
     deployability_index = DeployabilityIndex.create(context.snapshots.values())
     evaluatable_plan = plan.to_evaluatable()
     stages = plan_stages.build_plan_stages(

tests/core/test_integration.py

@@ -6484,7 +6484,7 @@ def _correlation_id_in_sqls(correlation_id: CorrelationId, mock_logger):
         ctx = Context(paths=[tmp_path], config=Config())
         plan = ctx.plan(auto_apply=True, no_prompts=True)
 
-    correlation_id = CorrelationId.from_plan(plan)
+    correlation_id = CorrelationId.from_plan_id(plan.plan_id)
     assert str(correlation_id) == f"SQLMESH_PLAN: {plan.plan_id}"
 
     assert _correlation_id_in_sqls(correlation_id, mock_logger)

tests/core/test_plan_evaluator.py

@@ -64,7 +64,9 @@ def test_builtin_evaluator_push(sushi_context: Context, make_snapshot):
         sushi_context.default_catalog,
         console=sushi_context.console,
     )
-    evaluator.snapshot_evaluator = sushi_context.snapshot_evaluator(CorrelationId.from_plan(plan))
+    evaluator.snapshot_evaluator = sushi_context.snapshot_evaluator(
+        CorrelationId.from_plan_id(plan.plan_id)
+    )
 
     evaluatable_plan = plan.to_evaluatable()
     stages = plan_stages.build_plan_stages(