Implement ModelKindMixin on SnapshotIdAndVersion

Author: erindru

sqlmesh/core/plan/common.py

@@ -181,7 +181,7 @@ def identify_restatement_intervals_across_snapshot_versions(
         # So for now, these are not considered
         s_id
         for s_id, s in snapshot_intervals_to_clear.items()
-        if s.snapshot.kind_name and s.snapshot.kind_name.full_history_restatement_only
+        if s.snapshot.full_history_restatement_only
     ]
     if full_history_restatement_snapshot_ids:
         # only load full snapshot records that we havent already loaded

sqlmesh/core/snapshot/definition.py

@@ -599,14 +599,14 @@ def id_and_version(self) -> SnapshotIdAndVersion:
         )
 
 
-class SnapshotIdAndVersion(PydanticModel):
+class SnapshotIdAndVersion(PydanticModel, ModelKindMixin):
     """A stripped down version of a snapshot that is used in situations where we want to fetch the main fields of the snapshots table
     without the overhead of parsing the full snapshot payload and fetching intervals.
     """
 
     name: str
     version: str
-    kind_name: t.Optional[ModelKindName] = None
+    kind_name_: t.Optional[ModelKindName] = Field(default=None, alias="kind_name")
     dev_version_: t.Optional[str] = Field(alias="dev_version")
     identifier: str
     fingerprint_: t.Union[str, SnapshotFingerprint] = Field(alias="fingerprint")
@@ -634,6 +634,10 @@ def fingerprint(self) -> SnapshotFingerprint:
     def dev_version(self) -> str:
         return self.dev_version_ or self.fingerprint.to_version()
 
+    @property
+    def model_kind_name(self) -> t.Optional[ModelKindName]:
+        return self.kind_name_
+
 
 class Snapshot(PydanticModel, SnapshotInfoMixin):
     """A snapshot represents a node at a certain point in time.

tests/core/test_snapshot.py

@@ -3578,7 +3578,7 @@ def test_snapshot_id_and_version_optional_kind_name():
         fingerprint="",
     )
 
-    assert snapshot.kind_name is None
+    assert snapshot.model_kind_name is None
 
     snapshot = SnapshotIdAndVersion(
         name="a",
@@ -3589,6 +3589,6 @@ def test_snapshot_id_and_version_optional_kind_name():
         fingerprint="",
     )
 
-    assert snapshot.kind_name
-    assert snapshot.kind_name.is_incremental_unmanaged
-    assert snapshot.kind_name.full_history_restatement_only
+    assert snapshot.model_kind_name
+    assert snapshot.is_incremental_unmanaged
+    assert snapshot.full_history_restatement_only