kleinkram 0.43.6.dev20250401140552__tar.gz → 0.44.0.dev20250408123038__tar.gz

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.43.6.dev20250401140552
+Version: 0.44.0.dev20250408123038
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Author-email: pucyril@ethz.ch, dgarmier@ethz.ch, jschwab@ethz.ch

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/kleinkram/cli/_verify.py

@@ -32,7 +32,15 @@ def verify(
         None, "--project", "-p", help="project id or name"
     ),
     mission: str = typer.Option(..., "--mission", "-m", help="mission id or name"),
-    skip_hash: bool = typer.Option(False, help="skip hash check"),
+    skip_hash: bool = typer.Option(None, help="skip hash check"),
+    check_file_hash: bool = typer.Option(
+        True,
+        help="check file hash. If True, file names and file hashes are checked.",
+    ),
+    check_file_size: bool = typer.Option(
+        True,
+        help="check file size. If True, file names and file sizes are checked.",
+    ),
 ) -> None:
     # get all filepaths
     file_paths = [Path(file) for file in files]
@@ -51,6 +59,8 @@ def verify(
         query=mission_query,
         file_paths=file_paths,
         skip_hash=skip_hash,
+        check_file_hash=check_file_hash,
+        check_file_size=check_file_size,
         verbose=verbose,
     )
     print_file_verification_status(file_status, pprint=verbose)

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/kleinkram/core.py

@@ -133,9 +133,20 @@ def verify(
     client: AuthenticatedClient,
     query: MissionQuery,
     file_paths: Sequence[Path],
-    skip_hash: bool = False,
+    skip_hash: Optional[bool] = None,
+    check_file_hash: bool = True,
+    check_file_size: bool = False,
     verbose: bool = False,
 ) -> Dict[Path, FileVerificationStatus]:
+
+    # add deprecated warning for skip_hash
+    if skip_hash is not None:
+        print(
+            "Warning: --skip-hash is deprecated and will be removed in a future version. "
+            "Use --check-file-hash=False instead.",
+        )
+        check_file_hash = not skip_hash
+
     # check that file paths are for valid files and have valid suffixes
     check_file_paths(file_paths)
 
@@ -167,14 +178,30 @@ def verify(
         if remote_file.state == FileState.UPLOADING:
             file_status[file] = FileVerificationStatus.UPLOADING
         elif remote_file.state == FileState.OK:
-            if remote_file.hash is None:
-                file_status[file] = FileVerificationStatus.COMPUTING_HASH
-            elif skip_hash or remote_file.hash == b64_md5(file):
-                file_status[file] = FileVerificationStatus.UPLAODED
-            else:
-                file_status[file] = FileVerificationStatus.MISMATCHED_HASH
+
+            # default case, will be overwritten if we find a mismatch
+            file_status[file] = FileVerificationStatus.UPLOADED
+
+            if check_file_size:
+                if remote_file.size == file.stat().st_size:
+                    file_status[file] = FileVerificationStatus.UPLOADED
+                else:
+                    file_status[file] = FileVerificationStatus.MISMATCHED_SIZE
+
+            if file_status[file] != FileVerificationStatus.UPLOADED:
+                continue  # abort if we already found a mismatch
+
+            if check_file_hash:
+                if remote_file.hash is None:
+                    file_status[file] = FileVerificationStatus.COMPUTING_HASH
+                elif remote_file.hash == b64_md5(file):
+                    file_status[file] = FileVerificationStatus.UPLOADED
+                else:
+                    file_status[file] = FileVerificationStatus.MISMATCHED_HASH
+
         else:
             file_status[file] = FileVerificationStatus.UNKNOWN
+
     return file_status
 
 

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/kleinkram/models.py

@@ -77,9 +77,10 @@ class File:
 
 # this is the file state for the verify command
 class FileVerificationStatus(str, Enum):
-    UPLAODED = "uploaded"
+    UPLOADED = "uploaded"
     UPLOADING = "uploading"
     COMPUTING_HASH = "computing hash"
     MISSING = "missing"
     MISMATCHED_HASH = "hash mismatch"
+    MISMATCHED_SIZE = "size mismatch"
     UNKNOWN = "unknown"

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/kleinkram/printing.py

@@ -38,10 +38,11 @@ FILE_STATE_COLOR = {
 
 
 FILE_VERIFICATION_STATUS_STYLES = {
-    FileVerificationStatus.UPLAODED: "green",
+    FileVerificationStatus.UPLOADED: "green",
     FileVerificationStatus.UPLOADING: "yellow",
     FileVerificationStatus.MISSING: "yellow",
     FileVerificationStatus.MISMATCHED_HASH: "red",
+    FileVerificationStatus.MISMATCHED_SIZE: "red",
     FileVerificationStatus.UNKNOWN: "gray",
     FileVerificationStatus.COMPUTING_HASH: "purple",
 }
@@ -296,7 +297,7 @@ def print_file_verification_status(
     else:
         for path, status in file_status.items():
             stream = (
-                sys.stdout if status == FileVerificationStatus.UPLAODED else sys.stderr
+                sys.stdout if status == FileVerificationStatus.UPLOADED else sys.stderr
             )
             print(path, file=stream, flush=True)
 

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/kleinkram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.43.6.dev20250401140552
+Version: 0.44.0.dev20250408123038
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Author-email: pucyril@ethz.ch, dgarmier@ethz.ch, jschwab@ethz.ch

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = kleinkram
-version = 0.43.6-dev20250401140552
+version = 0.44.0-dev20250408123038
 description = give me your bags
 long_description = file: README.md
 long_description_content_type = text/markdown

{kleinkram-0.43.6.dev20250401140552 → kleinkram-0.44.0.dev20250408123038}/tests/test_core.py

@@ -167,7 +167,7 @@ def test_verify(mission):
     )
 
     assert all(
-        status == FileVerificationStatus.UPLAODED for status in verify_status.values()
+        status == FileVerificationStatus.UPLOADED for status in verify_status.values()
     )