fix lint

Author: KazuhitoT

pyiceberg/catalog/__init__.py

@@ -67,8 +67,7 @@
     TableVersion,
 )
 from pyiceberg.utils.config import Config, merge_config
-from pyiceberg.utils.properties import property_as_bool, property_as_int
-from pyiceberg.utils.retry import RetryConfig, run_with_suppressed_failure
+from pyiceberg.utils.properties import property_as_bool
 
 if TYPE_CHECKING:
     import pyarrow as pa

pyiceberg/table/__init__.py

@@ -35,8 +35,8 @@
 from pydantic import Field
 from sortedcontainers import SortedList
 
-from pyiceberg.exceptions import CommitFailedException
 import pyiceberg.expressions.parser as parser
+from pyiceberg.exceptions import CommitFailedException
 from pyiceberg.expressions import (
     AlwaysFalse,
     AlwaysTrue,
@@ -292,7 +292,7 @@ class Transaction:
     _autocommit: bool
     _updates: tuple[TableUpdate, ...]
     _requirements: tuple[TableRequirement, ...]
-    _pending_updates: list[_StaticUpdate | UpdateTableMetadata]
+    _pending_updates: list[_StaticUpdate | UpdateTableMetadata[Any]]
     # NOTE: Whenever _updates is modified, _working_metadata must be updated via update_table_metadata()
     _working_metadata: TableMetadata
 
@@ -328,7 +328,7 @@ def _apply(
         self,
         updates: tuple[TableUpdate, ...],
         requirements: tuple[TableRequirement, ...] = (),
-        pending_update: _StaticUpdate | UpdateTableMetadata | None = None,
+        pending_update: _StaticUpdate | UpdateTableMetadata[Any] | None = None,
     ) -> Transaction:
         """Check if the requirements are met, and applies the updates to the metadata."""
         for requirement in requirements:
@@ -340,12 +340,12 @@ def _apply(
 
         # For the requirements, it does not make sense to add a requirement more than once
         # For example, you cannot assert that the current schema has two different IDs
-        existing_requirements = {req.key() for req in self._requirements}
+        existing_requirement_keys = {req.key() for req in self._requirements}
         for new_requirement in requirements:
             key = new_requirement.key()
-            if key not in existing_requirements:
+            if key not in existing_requirement_keys:
                 self._requirements += (new_requirement,)
-                existing_requirements.add(key)
+                existing_requirement_keys.add(key)
 
         if pending_update is not None:
             self._pending_updates.append(pending_update)
@@ -1034,7 +1034,6 @@ def _commit_with_retry(self) -> None:
         On retry, refreshes table metadata and regenerates snapshots from
         the pending snapshot producers.
         """
-
         properties = self._table.metadata.properties
 
         retry_config = RetryConfig(
@@ -1116,12 +1115,15 @@ def _reapply_updates(self) -> None:
             self._updates += updates
             self._working_metadata = update_table_metadata(self._working_metadata, updates)
 
-            existing_requirements = {req.key() for r in self._requirements}
+            existing_requirement_keys: set[tuple[Any, ...]] = set()
+            existing_req: TableRequirement
+            for existing_req in self._requirements:
+                existing_requirement_keys.add(existing_req.key())
             for req in requirements:
                 key = req.key()
-                if key not in existing_requirements:
+                if key not in existing_requirement_keys:
                     self._requirements += (req,)
-                    existing_requirements.add(key)
+                    existing_requirement_keys.add(key)
 
         self._requirements += (AssertTableUUID(uuid=self.table_metadata.table_uuid),)
 

pyiceberg/table/update/__init__.py

@@ -754,7 +754,7 @@ def validate(self, base_metadata: TableMetadata | None) -> None:
         """
         ...
 
-    def key(self) -> tuple:
+    def key(self) -> tuple[Any, ...]:
         """Return a deduplication key for this requirement."""
         return (type(self),)
 
@@ -816,7 +816,7 @@ def validate(self, base_metadata: TableMetadata | None) -> None:
         elif self.snapshot_id is not None:
             raise CommitFailedException(f"Requirement failed: branch or tag {self.ref} is missing, expected {self.snapshot_id}")
 
-    def key(self) -> tuple:
+    def key(self) -> tuple[Any, ...]:
         return (type(self), self.ref)
 
 

pyiceberg/table/update/snapshot.py

@@ -30,6 +30,10 @@
 from sortedcontainers import SortedList
 
 from pyiceberg.avro.codecs import AvroCompressionCodec
+from pyiceberg.exceptions import (
+    CommitFailedException,
+    CommitStateUnknownException,
+)
 from pyiceberg.expressions import (
     AlwaysFalse,
     BooleanExpression,
@@ -58,6 +62,7 @@
 from pyiceberg.partitioning import (
     PartitionSpec,
 )
+from pyiceberg.table.metadata import TableMetadata
 from pyiceberg.table.refs import MAIN_BRANCH, SnapshotRefType
 from pyiceberg.table.snapshots import (
     Operation,
@@ -66,11 +71,6 @@
     Summary,
     update_snapshot_summaries,
 )
-from pyiceberg.exceptions import (
-    CommitFailedException,
-    CommitStateUnknownException,
-)
-from pyiceberg.table.metadata import TableMetadata
 from pyiceberg.table.update import (
     AddSnapshotUpdate,
     AssertRefSnapshotId,
@@ -293,9 +293,7 @@ def _build_updates(self) -> UpdatesAndRequirements:
         """Build the updates and requirements for this snapshot operation."""
         # Recalculate parent snapshot ID from current table_metadata
         self._parent_snapshot_id = (
-            snapshot.snapshot_id
-            if (snapshot := self._transaction.table_metadata.snapshot_by_name(self._target_branch))
-            else None
+            snapshot.snapshot_id if (snapshot := self._transaction.table_metadata.snapshot_by_name(self._target_branch)) else None
         )
 
         new_manifests = self._manifests()
@@ -416,9 +414,7 @@ def _reset_state(self) -> None:
         self._manifest_num_counter = itertools.count(0)
 
         self._parent_snapshot_id = (
-            snapshot.snapshot_id
-            if (snapshot := self._transaction.table_metadata.snapshot_by_name(self._target_branch))
-            else None
+            snapshot.snapshot_id if (snapshot := self._transaction.table_metadata.snapshot_by_name(self._target_branch)) else None
         )
 
         # Clear cached properties that depend on snapshot state
@@ -483,9 +479,7 @@ def do_commit() -> None:
 
             updates, requirements = self._commit()
 
-            requirements = requirements + (
-                AssertTableUUID(uuid=self._transaction.table_metadata.table_uuid),
-            )
+            requirements = requirements + (AssertTableUUID(uuid=self._transaction.table_metadata.table_uuid),)
 
             # Directly commit to catalog (bypassing transaction accumulation)
             # This is necessary because:
@@ -503,7 +497,7 @@ def do_commit() -> None:
                 retry_on=(CommitFailedException,),
             )
         except CommitStateUnknownException:
-            # NOTE: Use the function like checkCommitStatus() in Java 
+            # NOTE: Use the function like checkCommitStatus() in Java
             # to determine if the commit succeeded before raising this exception.
             raise
 

pyiceberg/utils/retry.py

@@ -85,15 +85,12 @@ def run_with_retry(
     """
     start_time_ms = int(time.time() * 1000)
     attempt = 0
-    last_exception: Exception | None = None
 
     while True:
         attempt += 1
         try:
             return task()
         except Exception as e:
-            last_exception = e
-
             if not isinstance(e, retry_on):
                 raise