From 47d81f2e518bbdee43cffd0a70323346a4fb92e0 Mon Sep 17 00:00:00 2001 From: Xander Date: Fri, 13 Nov 2026 14:32:20 -0500 Subject: [PATCH] Check format version rather than TableMetadataV3 type for encryption Matches how the rest of the codebase gates v3 features. --- pyiceberg/encryption/manager.py | 4 ++-- pyiceberg/table/update/__init__.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pyiceberg/encryption/manager.py b/pyiceberg/encryption/manager.py index 73c57dfd5b..4e29614aac 100644 --- a/pyiceberg/encryption/manager.py +++ b/pyiceberg/encryption/manager.py @@ -29,7 +29,7 @@ from pyiceberg.encryption.ciphers import AesGcmCipher, AesKeySize, SecureKey from pyiceberg.encryption.key_metadata import StandardKeyMetadata from pyiceberg.encryption.kms import KeyManagementClient -from pyiceberg.table.metadata import EncryptedKey, TableMetadata, TableMetadataV3 +from pyiceberg.table.metadata import EncryptedKey, TableMetadata from pyiceberg.utils.properties import property_as_int KEK_CREATED_AT_PROPERTY = "KEY_TIMESTAMP" @@ -68,7 +68,7 @@ def from_table_metadata(cls, kms_client: KeyManagementClient | None, metadata: T if (table_key_id := metadata.properties.get(TableProperties.ENCRYPTION_KEY_ID)) is None: return None - if not isinstance(metadata, TableMetadataV3): + if metadata.format_version < 3: raise ValueError(f"Invalid properties for v{metadata.format_version}: {TableProperties.ENCRYPTION_KEY_ID}") if kms_client is None: diff --git a/pyiceberg/table/update/__init__.py b/pyiceberg/table/update/__init__.py index 3b12cc07dd..fc1d2347d9 100644 --- a/pyiceberg/table/update/__init__.py +++ b/pyiceberg/table/update/__init__.py @@ -35,7 +35,6 @@ EncryptedKey, TableMetadata, TableMetadataUtil, - TableMetadataV3, _check_properties_format_version_compatibility, ) from pyiceberg.table.refs import MAIN_BRANCH, SnapshotRef, SnapshotRefType @@ -704,7 +703,7 @@ def _( @_apply_table_update.register(AddEncryptionKeyUpdate) def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context: _TableMetadataUpdateContext) -> TableMetadata: - if not isinstance(base_metadata, TableMetadataV3): + if base_metadata.format_version < 3: raise ValueError(f"Encryption keys are not supported in format version {base_metadata.format_version}") if any(key.key_id == update.encryption_key.key_id for key in base_metadata.encryption_keys): @@ -716,7 +715,7 @@ def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context: _Ta @_apply_table_update.register(RemoveEncryptionKeyUpdate) def _(update: RemoveEncryptionKeyUpdate, base_metadata: TableMetadata, context: _TableMetadataUpdateContext) -> TableMetadata: - if not isinstance(base_metadata, TableMetadataV3): + if base_metadata.format_version < 3: raise ValueError(f"Encryption keys are not supported in format version {base_metadata.format_version}") encryption_keys = [key for key in base_metadata.encryption_keys if key.key_id != update.key_id]