kleinkram 0.44.0.dev20250407065841__tar.gz → 0.44.0.dev20250409080103__tar.gz

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.44.0.dev20250407065841
+Version: 0.44.0.dev20250409080103
 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.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram/api/file_transfer.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import signal
 import logging
 import sys
 from concurrent.futures import Future
@@ -18,6 +17,9 @@ from uuid import UUID
 import boto3.s3.transfer
 import botocore.config
 import httpx
+from rich.console import Console
+from tqdm import tqdm
+
 from kleinkram.api.client import AuthenticatedClient
 from kleinkram.config import get_config
 from kleinkram.errors import AccessDenied
@@ -28,8 +30,6 @@ from kleinkram.utils import format_bytes
 from kleinkram.utils import format_error
 from kleinkram.utils import format_traceback
 from kleinkram.utils import styled_string
-from rich.console import Console
-from tqdm import tqdm
 
 logger = logging.getLogger(__name__)
 
@@ -267,7 +267,7 @@ def _url_download(
     if path.exists() and not overwrite:
         raise FileExistsError(f"file already exists: {path}")
 
-    with httpx.stream("GET", url) as response:
+    with httpx.stream("GET", url, timeout=S3_READ_TIMEOUT) as response:
         response.raise_for_status()
         with open(path, "wb") as f:
             with tqdm(
@@ -289,6 +289,7 @@ class DownloadState(Enum):
     DOWNLOADED_INVALID_HASH = 3
     SKIPPED_INVALID_HASH = 4
     SKIPPED_INVALID_REMOTE_STATE = 5
+    SKIPPED_FILE_SIZE_MISMATCH = 6
 
 
 def download_file(
@@ -307,17 +308,29 @@ def download_file(
         return DownloadState.SKIPPED_INVALID_REMOTE_STATE, 0
 
     if path.exists():
-        local_hash = b64_md5(path)
-        if local_hash != file.hash and not overwrite and file.hash is not None:
-            return DownloadState.SKIPPED_INVALID_HASH, 0
 
-        elif local_hash == file.hash:
-            return DownloadState.SKIPPED_OK, 0
+        # compare file size
+        if file.size == path.stat().st_size:
+            local_hash = b64_md5(path)
+            if local_hash != file.hash and not overwrite and file.hash is not None:
+                return DownloadState.SKIPPED_INVALID_HASH, 0
 
-        # this has to be here
-        if verbose:
+            elif local_hash == file.hash:
+                return DownloadState.SKIPPED_OK, 0
+
+            elif verbose:
+                tqdm.write(
+                    styled_string(f"overwriting {path}, hash missmatch", style="yellow")
+                )
+
+        elif not overwrite and file.size is not None:
+            return DownloadState.SKIPPED_FILE_SIZE_MISMATCH, 0
+
+        elif verbose:
             tqdm.write(
-                styled_string(f"overwriting {path}, hash missmatch", style="yellow")
+                styled_string(
+                    f"overwriting {path}, file size missmatch", style="yellow"
+                )
             )
 
     # request a download url
@@ -400,6 +413,7 @@ DOWNLOAD_STATE_COLOR = {
     DownloadState.SKIPPED_OK: "green",
     DownloadState.DOWNLOADED_INVALID_HASH: "red",
     DownloadState.SKIPPED_INVALID_HASH: "yellow",
+    DownloadState.SKIPPED_FILE_SIZE_MISMATCH: "yellow",
     DownloadState.SKIPPED_INVALID_REMOTE_STATE: "purple",
 }
 
@@ -432,6 +446,8 @@ def _download_handler(
         msg = f"skipped {path} already downloaded (hash ok)"
     elif state == DownloadState.SKIPPED_INVALID_HASH:
         msg = f"skipped {path}, exists with hash mismatch (use --overwrite?)"
+    elif state == DownloadState.SKIPPED_FILE_SIZE_MISMATCH:
+        msg = f"skipped {path}, exists with file size mismatch (use --overwrite?)"
     elif state == DownloadState.SKIPPED_INVALID_REMOTE_STATE:
         msg = f"skipped {path}, remote file has invalid state ({file.state.value})"
     else:

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram/cli/_download.py

@@ -43,7 +43,8 @@ def download(
         False, help="save files in nested directories, project-name/mission-name"
     ),
     overwrite: bool = typer.Option(
-        False, help="overwrite files if they already exist and don't match the filehash"
+        False,
+        help="overwrite files if they already exist and don't match the file size or file hash",
     ),
 ) -> None:
     # create destionation directory

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram/core.py

@@ -180,22 +180,22 @@ def verify(
         elif remote_file.state == FileState.OK:
 
             # default case, will be overwritten if we find a mismatch
-            file_status[file] = FileVerificationStatus.UPLAODED
+            file_status[file] = FileVerificationStatus.UPLOADED
 
             if check_file_size:
                 if remote_file.size == file.stat().st_size:
-                    file_status[file] = FileVerificationStatus.UPLAODED
+                    file_status[file] = FileVerificationStatus.UPLOADED
                 else:
                     file_status[file] = FileVerificationStatus.MISMATCHED_SIZE
 
-            if file_status[file] != FileVerificationStatus.UPLAODED:
+            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.UPLAODED
+                    file_status[file] = FileVerificationStatus.UPLOADED
                 else:
                     file_status[file] = FileVerificationStatus.MISMATCHED_HASH
 

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram/models.py

@@ -77,7 +77,7 @@ 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"

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram/printing.py

@@ -38,7 +38,7 @@ FILE_STATE_COLOR = {
 
 
 FILE_VERIFICATION_STATUS_STYLES = {
-    FileVerificationStatus.UPLAODED: "green",
+    FileVerificationStatus.UPLOADED: "green",
     FileVerificationStatus.UPLOADING: "yellow",
     FileVerificationStatus.MISSING: "yellow",
     FileVerificationStatus.MISMATCHED_HASH: "red",
@@ -297,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.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/kleinkram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.44.0.dev20250407065841
+Version: 0.44.0.dev20250409080103
 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.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/setup.cfg

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

{kleinkram-0.44.0.dev20250407065841 → kleinkram-0.44.0.dev20250409080103}/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()
     )