Skip to content

Commit

Permalink
adjust to API changes
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Sablotny <msablotny@nvidia.com>
  • Loading branch information
susperius committed Jul 22, 2024
1 parent 271ff95 commit 6d0ea75
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion model_signing/serialization/serialize_by_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def __init__(
self,
file_hasher_factory: Callable[[pathlib.Path], file.FileHasher],
max_workers: int | None = None,
ignore_paths: list[str] = [],
):
"""Initializes an instance to serialize a model with this serializer.
Expand All @@ -160,6 +161,7 @@ def __init__(
"""
self._hasher_factory = file_hasher_factory
self._max_workers = max_workers
self._ignore_paths = ignore_paths

@override
def serialize(self, model_path: pathlib.Path) -> manifest.FileLevelManifest:
Expand All @@ -177,7 +179,7 @@ def serialize(self, model_path: pathlib.Path) -> manifest.FileLevelManifest:
# improvement.
for path in model_path.glob("**/*"):
check_file_or_directory(path)
if path.is_file():
if path.is_file() and path.name not in self._ignore_paths:
paths.append(path)

manifest_items = []
Expand Down
4 changes: 2 additions & 2 deletions model_signing/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from model_signing.hashing import file
from model_signing.hashing import memory
from model_signing.manifest import in_toto
from model_signing.serialization import itemized
from model_signing.serialization import serialize_by_file
from model_signing.signature import SUPPORTED_METHODS
from model_signing.signature import key
from model_signing.signature import pki
Expand Down Expand Up @@ -105,7 +105,7 @@ def hasher_factory(file_path: pathlib.Path) -> file.FileHasher:
file=file_path,
content_hasher=memory.SHA256())

serializer = itemized.FilesSerializer(
serializer = serialize_by_file.FilesSerializer(
file_hasher_factory=hasher_factory,
ignore_paths=ignore_paths)
manifest = serializer.serialize(path)
Expand Down
4 changes: 2 additions & 2 deletions model_signing/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from model_signing.hashing import file
from model_signing.hashing import memory
from model_signing.manifest import in_toto
from model_signing.serialization import itemized
from model_signing.serialization import serialize_by_file
from model_signing.signature import SUPPORTED_METHODS
from model_signing.signature import verifying
from model_signing.signature import key
Expand Down Expand Up @@ -99,7 +99,7 @@ def hasher_factory(file_path: pathlib.Path) -> file.FileHasher:

log.info('signature verification passed')

serializer = itemized.FilesSerializer(
serializer = serialize_by_file.FilesSerializer(
file_hasher_factory=hasher_factory,
ignore_paths=[signature_path.name])
local_manifest = serializer.serialize(model_path)
Expand Down

0 comments on commit 6d0ea75

Please sign in to comment.