Fixed comments for AssertSnapshotRef

Author: vinjai

pyiceberg/table/__init__.py

@@ -341,7 +341,6 @@ def _set_ref_snapshot(
             AssertRefSnapshotId(
                 snapshot_id=self.table_metadata.refs[ref_name].snapshot_id if ref_name in self.table_metadata.refs else None,
                 ref=ref_name,
-                ref_type=type,
             ),
         )
 

pyiceberg/table/update/__init__.py

@@ -609,14 +609,16 @@ class AssertRefSnapshotId(ValidatableTableRequirement):
 
     type: Literal["assert-ref-snapshot-id"] = Field(default="assert-ref-snapshot-id")
     ref: str = Field(...)
-    ref_type: SnapshotRefType = Field(...)
+    # ref_type: SnapshotRefType = Field(...)
     snapshot_id: Optional[int] = Field(default=None, alias="snapshot-id")
 
     def validate(self, base_metadata: Optional[TableMetadata]) -> None:
         if base_metadata is None:
             raise CommitFailedException("Requirement failed: current table metadata is missing")
         elif len(base_metadata.snapshots) == 0 and self.ref != MAIN_BRANCH:
-            raise CommitFailedException(f"Requirement failed: No snapshot available in table for ref: {self.ref}")
+            raise CommitFailedException(
+                f"Requirement failed: Table has no snapshots and can only be written to the {MAIN_BRANCH} BRANCH."
+            )
         elif snapshot_ref := base_metadata.refs.get(self.ref):
             ref_type = snapshot_ref.snapshot_ref_type
             if self.snapshot_id is None:
@@ -625,8 +627,8 @@ def validate(self, base_metadata: Optional[TableMetadata]) -> None:
                 raise CommitFailedException(
                     f"Requirement failed: {ref_type} {self.ref} has changed: expected id {self.snapshot_id}, found {snapshot_ref.snapshot_id}"
                 )
-            elif ref_type != self.ref_type:
-                raise CommitFailedException(f"Requirement failed: {ref_type} {self.ref} can't be changed to type {self.ref_type}")
+            elif ref_type == SnapshotRefType.TAG:
+                raise CommitFailedException(f"Requirement failed: TAG {self.ref} can't be updated once created")
         elif self.snapshot_id is not None:
             raise CommitFailedException(f"Requirement failed: branch or tag {self.ref} is missing, expected {self.snapshot_id}")
 

pyiceberg/table/update/snapshot.py

@@ -287,7 +287,6 @@ def _commit(self) -> UpdatesAndRequirements:
                     if self._branch in self._transaction.table_metadata.refs
                     else self._transaction.table_metadata.current_snapshot_id,
                     ref=self._branch,
-                    ref_type=SnapshotRefType.BRANCH,
                 ),
             ),
         )

tests/integration/test_writes/test_writes.py

@@ -44,7 +44,7 @@
 from pyiceberg.io.pyarrow import _dataframe_to_data_files
 from pyiceberg.partitioning import PartitionField, PartitionSpec
 from pyiceberg.schema import Schema
-from pyiceberg.table import TableProperties
+from pyiceberg.table import TableProperties, MAIN_BRANCH
 from pyiceberg.table.sorting import SortDirection, SortField, SortOrder
 from pyiceberg.transforms import DayTransform, HourTransform, IdentityTransform
 from pyiceberg.types import (
@@ -1578,7 +1578,7 @@ def test_abort_table_transaction_on_exception(
 def test_append_to_non_existing_branch(session_catalog: Catalog, arrow_table_with_null: pa.Table) -> None:
     identifier = "default.test_non_existing_branch"
     tbl = _create_table(session_catalog, identifier, {"format-version": "2"}, [])
-    with pytest.raises(CommitFailedException, match="No snapshot available in table for ref:"):
+    with pytest.raises(CommitFailedException, match=f"Table has no snapshots and can only be written to the {MAIN_BRANCH} BRANCH."):
         tbl.append(arrow_table_with_null, branch="non_existing_branch")
 
 

tests/table/test_init.py

@@ -49,7 +49,7 @@
     _match_deletes_to_data_file,
 )
 from pyiceberg.table.metadata import INITIAL_SEQUENCE_NUMBER, TableMetadataUtil, TableMetadataV2, _generate_snapshot_id
-from pyiceberg.table.refs import SnapshotRef, SnapshotRefType
+from pyiceberg.table.refs import SnapshotRef
 from pyiceberg.table.snapshots import (
     MetadataLogEntry,
     Operation,
@@ -982,43 +982,41 @@ def test_assert_table_uuid(table_v2: Table) -> None:
 
 def test_assert_ref_snapshot_id(table_v2: Table) -> None:
     base_metadata = table_v2.metadata
-    AssertRefSnapshotId(ref="main", snapshot_id=base_metadata.current_snapshot_id, ref_type=SnapshotRefType.BRANCH).validate(
-        base_metadata
-    )
+    AssertRefSnapshotId(ref="main", snapshot_id=base_metadata.current_snapshot_id).validate(base_metadata)
 
     with pytest.raises(CommitFailedException, match="Requirement failed: current table metadata is missing"):
-        AssertRefSnapshotId(ref="main", snapshot_id=1, ref_type=SnapshotRefType.BRANCH).validate(None)
+        AssertRefSnapshotId(ref="main", snapshot_id=1).validate(None)
 
     with pytest.raises(
         CommitFailedException,
         match="Requirement failed: branch main was created concurrently",
     ):
-        AssertRefSnapshotId(ref="main", snapshot_id=None, ref_type=SnapshotRefType.BRANCH).validate(base_metadata)
+        AssertRefSnapshotId(ref="main", snapshot_id=None).validate(base_metadata)
 
     with pytest.raises(
         CommitFailedException,
         match="Requirement failed: branch main has changed: expected id 1, found 3055729675574597004",
     ):
-        AssertRefSnapshotId(ref="main", snapshot_id=1, ref_type=SnapshotRefType.BRANCH).validate(base_metadata)
+        AssertRefSnapshotId(ref="main", snapshot_id=1).validate(base_metadata)
 
     with pytest.raises(
         CommitFailedException,
         match="Requirement failed: branch or tag not_exist_branch is missing, expected 1",
     ):
-        AssertRefSnapshotId(ref="not_exist_branch", snapshot_id=1, ref_type=SnapshotRefType.BRANCH).validate(base_metadata)
+        AssertRefSnapshotId(ref="not_exist_branch", snapshot_id=1).validate(base_metadata)
 
     with pytest.raises(
         CommitFailedException,
         match="Requirement failed: branch or tag not_exist_tag is missing, expected 1",
     ):
-        AssertRefSnapshotId(ref="not_exist_tag", snapshot_id=1, ref_type=SnapshotRefType.TAG).validate(base_metadata)
+        AssertRefSnapshotId(ref="not_exist_tag", snapshot_id=1).validate(base_metadata)
 
     # existing Tag in metadata: test
     with pytest.raises(
         CommitFailedException,
-        match="Requirement failed: tag test can't be changed to type branch",
+        match="Requirement failed: TAG test can't be updated once created",
     ):
-        AssertRefSnapshotId(ref="test", snapshot_id=3051729675574597004, ref_type=SnapshotRefType.BRANCH).validate(base_metadata)
+        AssertRefSnapshotId(ref="test", snapshot_id=3051729675574597004).validate(base_metadata)
 
 
 def test_assert_last_assigned_field_id(table_v2: Table) -> None: