kleinkram 0.44.0.dev20250407065841__py3-none-any.whl → 0.44.0.dev20250409080103__py3-none-any.whl

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/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/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/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/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.dist-info → kleinkram-0.44.0.dev20250409080103.dist-info}/METADATA

@@ -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.dist-info → kleinkram-0.44.0.dev20250409080103.dist-info}/RECORD

@@ -3,11 +3,11 @@ kleinkram/__main__.py,sha256=B9RiZxfO4jpCmWPUHyKJ7_EoZlEG4sPpH-nz7T_YhhQ,125
 kleinkram/_version.py,sha256=QYJyRTcqFcJj4qWYpqs7WcoOP6jxDMqyvxLY-cD6KcE,129
 kleinkram/auth.py,sha256=XD_rHOyJmYYfO7QJf3TLYH5qXA22gXGWi7PT3jujlVs,2968
 kleinkram/config.py,sha256=nx6uSM5nLP4SKe8b9VAx4KDtCCwtyshXmzbEJcUwpsY,7411
-kleinkram/core.py,sha256=vUW9sr6NW7VwEHReyfyhKggQ0fy1zDuNQYPro-Umyx0,9621
+kleinkram/core.py,sha256=COJcUx8tP6EQIyg4OiVprJfQUCMbiq2QGB9xZ2CPUCo,9621
 kleinkram/errors.py,sha256=qa98YvhDbLqX60P8bcMcFmHy4HxgYNlSROXud8Kj-P4,965
 kleinkram/main.py,sha256=BTE0mZN__xd46wBhFi6iBlK9eGGQvJ1LdUMsbnysLi0,172
-kleinkram/models.py,sha256=JnBvmOn1gWpnLLQeGI8EmZ-WAPMB0VzQGFTa9Z7Kkpw,1870
-kleinkram/printing.py,sha256=BKlwh-KzuWylkh3AlR1qtOAa41szV4Ok8AjBiLXZGJg,12212
+kleinkram/models.py,sha256=MkWdGIWuCSnyg45DbdEUhtGIprwPYwKppYumHkRAS18,1870
+kleinkram/printing.py,sha256=q29iYGkBUCmeJNzNacLHRP-8BqF2UhoXirwX7ja7a1k,12212
 kleinkram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/types.py,sha256=nfDjj8TB1Jn5vqO0Xg6qhLOuKom9DDhe62BrngqnVGM,185
 kleinkram/utils.py,sha256=AsKZxEGStn03L2tqqiMVCQCrDyl8HhwOfpa3no4dfYc,6767
@@ -15,12 +15,12 @@ kleinkram/wrappers.py,sha256=ZScoEov5Q6D2rvaJJ8E-4f58P_NGWrGc9mRPYxSqOC0,13127
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/api/client.py,sha256=VwuT97_WdbDpcVGwMXB0fRnUoQnUSf7BOP5eXUFokfI,5932
 kleinkram/api/deser.py,sha256=xRpYUFKZ0Luoo7XyAtYblJvprmpjNSZOiFVnFKmOzcM,4819
-kleinkram/api/file_transfer.py,sha256=IqQoKdpK9oqPllE4deell64VoP__vjKOU8lY2gao4vQ,17458
+kleinkram/api/file_transfer.py,sha256=GYO5CaTQjpSjNg3Nc28kavqfdEy2pgPRkPsnPDSFUPw,18093
 kleinkram/api/pagination.py,sha256=P_zPsBKlMWkmAv-YfUNHaGW-XLB_4U8BDMrKyiDFIXk,1370
 kleinkram/api/query.py,sha256=9Exi4hJR7Ml38_zjAcOvSEoIAxZLlpM6QwwzO9fs5Gk,3293
 kleinkram/api/routes.py,sha256=x0IfzQO5RAC3rohDSpdUNlVOWl221gh4e0fbMKfGrQA,12251
 kleinkram/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kleinkram/cli/_download.py,sha256=H4YlXJkZE4Md02nzgrO_i8Hsm4ZIejPsxBEKkcn4KHs,2371
+kleinkram/cli/_download.py,sha256=e0fDyp_CFOdbKIUGKmtITvAVINa6STYJk5w5QlElXSs,2394
 kleinkram/cli/_endpoint.py,sha256=oY0p4bnuHLEDJCXtTmir4AHswcKAygZ8I4IWC3RFcKc,1796
 kleinkram/cli/_file.py,sha256=Q2fLDdUyfHFmdGC6wIxMqgEl0F76qszhzWJrRV5rTBM,2973
 kleinkram/cli/_list.py,sha256=5gI3aIUeKC0_eWPQqdFXSBBFvpkTTJSm31TamHa197c,3090
@@ -35,7 +35,7 @@ testing/backend_fixtures.py,sha256=t5QWwyezHUhxxAlbUuE_eFmpyRaGbnWNNcGPwrO17JM,1
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=5MLYQOtQoXWl0TRkYntYKNdqpd4hl9m0XTRi5OXanYI,104
 tests/test_config.py,sha256=uvVh1iUSCoZc8YioxS_GjF-J7m4JE2z4XUbwK_4wDV0,5855
-tests/test_core.py,sha256=9oAb-jxWlRI6EzMwe-oStUFpK4R6ad5vzy95gZgAeuk,5623
+tests/test_core.py,sha256=tVvmC4yBkE00VspoowhfdNAUiBsmkIJQodaC3jjUqqM,5623
 tests/test_end_to_end.py,sha256=0W5pUES5hek-pXq4NZtpPZqKTORkGCRsDv5_D3rDMjY,3372
 tests/test_error_handling.py,sha256=qPSMKF1qsAHyUME0-krxbIrk38iGKkhAyAah-KwN4NE,1300
 tests/test_fixtures.py,sha256=UlPmGbEsGvrDPsaStGMRjNvrVPGjCqOB0RMfLJq2VRA,1071
@@ -43,8 +43,8 @@ tests/test_printing.py,sha256=Jz1AjqmqBRjp1JLm6H1oVJyvGaMPlahVXdKnd7UDQFc,2231
 tests/test_query.py,sha256=fExmCKXLA7-9j2S2sF_sbvRX_2s6Cp3a7OTcqE25q9g,3864
 tests/test_utils.py,sha256=eUBYrn3xrcgcaxm1X4fqZaX4tRvkbI6rh6BUbNbu9T0,4784
 tests/test_wrappers.py,sha256=TbcTyO2L7fslbzgfDdcVZkencxNQ8cGPZm_iB6c9d6Q,2673
-kleinkram-0.44.0.dev20250407065841.dist-info/METADATA,sha256=1lxrB_VQPIrYGw8sB4r0X20ug8mJJytGRsavxM-olxI,2825
-kleinkram-0.44.0.dev20250407065841.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-kleinkram-0.44.0.dev20250407065841.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.44.0.dev20250407065841.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.44.0.dev20250407065841.dist-info/RECORD,,
+kleinkram-0.44.0.dev20250409080103.dist-info/METADATA,sha256=slvYitYbGRQnyaZ7BweL9HMUpcMWQUbWgcUdNYeqIJU,2825
+kleinkram-0.44.0.dev20250409080103.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+kleinkram-0.44.0.dev20250409080103.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.44.0.dev20250409080103.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.44.0.dev20250409080103.dist-info/RECORD,,

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()
     )