Skip to content

Commit acad2ed

Browse files
committed
Add display_name to SnapshotIdAndVersion
1 parent c1da66a commit acad2ed

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

sqlmesh/core/plan/explainer.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from sqlmesh.core import constants as c
1212
from sqlmesh.core.console import Console, TerminalConsole, get_console
1313
from sqlmesh.core.environment import EnvironmentNamingInfo
14-
from sqlmesh.core.snapshot.definition import model_display_name
1514
from sqlmesh.core.plan.common import (
1615
SnapshotIntervalClearRequest,
1716
identify_restatement_intervals_across_snapshot_versions,
@@ -22,7 +21,7 @@
2221
PlanEvaluator,
2322
)
2423
from sqlmesh.core.state_sync import StateReader
25-
from sqlmesh.core.snapshot.definition import SnapshotInfoMixin, SnapshotNameVersionLike
24+
from sqlmesh.core.snapshot.definition import SnapshotInfoMixin, SnapshotIdAndVersion
2625
from sqlmesh.utils import Verbosity, rich as srich, to_snake_case
2726
from sqlmesh.utils.date import to_ts
2827
from sqlmesh.utils.errors import SQLMeshError
@@ -323,22 +322,17 @@ def visit_finalize_environment_stage(
323322

324323
def _display_name(
325324
self,
326-
snapshot: t.Union[SnapshotInfoMixin, SnapshotNameVersionLike],
325+
snapshot: t.Union[SnapshotInfoMixin, SnapshotIdAndVersion],
327326
environment_naming_info: t.Optional[EnvironmentNamingInfo] = None,
328327
) -> str:
329-
naming_kwargs: t.Any = dict(
328+
return snapshot.display_name(
330329
environment_naming_info=environment_naming_info or self.environment_naming_info,
331330
default_catalog=self.default_catalog
332331
if self.verbosity < Verbosity.VERY_VERBOSE
333332
else None,
334333
dialect=self.dialect,
335334
)
336335

337-
if isinstance(snapshot, SnapshotInfoMixin):
338-
return snapshot.display_name(**naming_kwargs)
339-
340-
return model_display_name(node_name=snapshot.name, **naming_kwargs)
341-
342336
def _limit_tree(self, tree: Tree) -> Tree:
343337
tree_length = len(tree.children)
344338
if tree_length <= MAX_TREE_LENGTH:

sqlmesh/core/snapshot/definition.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,16 @@ def dev_version(self) -> str:
638638
def model_kind_name(self) -> t.Optional[ModelKindName]:
639639
return self.kind_name_
640640

641+
def display_name(
642+
self,
643+
environment_naming_info: EnvironmentNamingInfo,
644+
default_catalog: t.Optional[str],
645+
dialect: DialectType = None,
646+
) -> str:
647+
return model_display_name(
648+
self.name, environment_naming_info, default_catalog, dialect=dialect
649+
)
650+
641651

642652
class Snapshot(PydanticModel, SnapshotInfoMixin):
643653
"""A snapshot represents a node at a certain point in time.

0 commit comments

Comments
 (0)