more fixes

Author: amitgilad3

pyiceberg/table/__init__.py

@@ -438,6 +438,7 @@ def update_snapshot(self, snapshot_properties: Dict[str, str] = EMPTY_DICT) -> U
     def rewrite_manifests(self) -> RewriteManifestsResult:
         if self._table.current_snapshot() is None:
             return RewriteManifestsResult(rewritten_manifests=[], added_manifests=[])
+
         with self.update_snapshot().rewrite() as rewrite:
             rewritten = rewrite.rewrite_manifests()
             return rewritten
@@ -1375,20 +1376,6 @@ def add_files(
                 file_paths=file_paths, snapshot_properties=snapshot_properties, check_duplicate_files=check_duplicate_files
             )
 
-    def rewrite_manifests(
-        self,
-        spec_id: Optional[int] = None,
-    ) -> RewriteManifestsResult:
-        """
-        Shorthand API for Rewriting manifests for the table.
-
-        Args:
-            spec_id: Spec id of the manifests to rewrite (defaults to current spec id)
-
-        """
-        with self.transaction() as tx:
-            return tx.rewrite_manifests(spec_id=spec_id)
-
     def update_spec(self, case_sensitive: bool = True) -> UpdateSpec:
         return UpdateSpec(Transaction(self, autocommit=True), case_sensitive=case_sensitive)
 

pyiceberg/table/update/snapshot.py

@@ -474,19 +474,11 @@ def _deleted_entries(self) -> List[ManifestEntry]:
         return []
 
 
-@dataclass(init=False)
+@dataclass(frozen=True)
 class RewriteManifestsResult:
     rewritten_manifests: List[ManifestFile] = field(default_factory=list)
     added_manifests: List[ManifestFile] = field(default_factory=list)
 
-    def __init__(
-        self,
-        rewritten_manifests: Optional[List[ManifestFile]],
-        added_manifests: Optional[List[ManifestFile]],
-    ) -> None:
-        self.rewritten_manifests = rewritten_manifests or []
-        self.added_manifests = added_manifests or []
-
 
 class _MergeAppendFiles(_FastAppendFiles):
     _target_size_bytes: int
@@ -653,14 +645,15 @@ def _find_matching_manifests(self, snapshot: Snapshot, content: ManifestContent)
         return RewriteManifestsResult(rewritten_manifests=manifests, added_manifests=new_manifests)
 
     def _copy_manifest_file(self, manifest_file: ManifestFile, snapshot_id: int) -> ManifestFile:
-        return ManifestFile(
+        return ManifestFile.from_args(
+            _table_format_version=self._transaction.table_metadata.format_version,
             manifest_path=manifest_file.manifest_path,
             manifest_length=manifest_file.manifest_length,
             partition_spec_id=manifest_file.partition_spec_id,
             content=manifest_file.content,
             sequence_number=manifest_file.sequence_number,
             min_sequence_number=manifest_file.min_sequence_number,
-            added_snapshot_id=snapshot_id,
+            added_snapshot_id=snapshot_id,  # Using the new snapshot ID here
             added_files_count=manifest_file.added_files_count,
             existing_files_count=manifest_file.existing_files_count,
             deleted_files_count=manifest_file.deleted_files_count,

tests/integration/test_inspect_table.py

@@ -1102,6 +1102,7 @@ def test_inspect_files_partitioned(spark: SparkSession, session_catalog: Catalog
     )
     assert_frame_equal(lhs, rhs, check_dtype=False)
 
+
 def test_inspect_all_example(spark: SparkSession, session_catalog: Catalog, format_version: int) -> None:
     from pandas.testing import assert_frame_equal
 
@@ -1140,6 +1141,5 @@ def test_inspect_all_example(spark: SparkSession, session_catalog: Catalog, form
 
     tbl.refresh()
 
-
     tbl.rewrite_manifests()
-    print("efd")
+    print("efd")