kleinkram 0.25.8.dev20241004161727__py3-none-any.whl → 0.25.10.dev20241007123024__py3-none-any.whl

kleinkram/helper.py

@@ -7,7 +7,8 @@ from functools import partial
 
 import typer
 from botocore.config import Config
-from typing_extensions import Dict
+from botocore.utils import calculate_md5
+from typing_extensions import Dict, List
 import boto3
 
 import tqdm
@@ -127,18 +128,24 @@ def uploadFiles(files: Dict[str, str], credentials: Dict[str, str], nrThreads: i
         _queue.put(file)
     threads = []
     transferCallback = TransferCallback()
+    failed_uploads = []
+
 
     for i in range(nrThreads):
         thread = threading.Thread(
-            target=uploadFile, args=(_queue, s3, transferCallback)
+            target=uploadFile, args=(_queue, s3, transferCallback, failed_uploads)
         )
         thread.start()
         threads.append(thread)
     for thread in threads:
         thread.join()
+    if(len(failed_uploads) > 0):
+        print("Failed to upload the following files:")
+        for file in failed_uploads:
+            print(file)
 
 
-def uploadFile(_queue: queue.Queue, s3: BaseClient, transferCallback: TransferCallback):
+def uploadFile(_queue: queue.Queue, s3: BaseClient, transferCallback: TransferCallback, failed_uploads: List[str]):
     while True:
         try:
             filename, _file = _queue.get(timeout=3)
@@ -150,21 +157,26 @@ def uploadFile(_queue: queue.Queue, s3: BaseClient, transferCallback: TransferCa
                 multipart_chunksize=10 * 1024 * 1024, max_concurrency=5
             )
             with open(filepath, "rb") as f:
-                size = os.path.getsize(filepath)
-                transferCallback.add_file(filename, size)
+                md5_checksum = calculate_md5(f)
+                file_size = os.path.getsize(filepath)
+                transferCallback.add_file(filename, file_size)
                 callback_function = create_transfer_callback(transferCallback, filename)
                 s3.Bucket(bucket).upload_file(
-                    filepath, target_location, Config=config, Callback=callback_function
+                    filepath,
+                    target_location,
+                    Config=config,
+                    Callback=callback_function,
                 )
 
                 client = AuthenticatedClient()
-                res = client.post("/queue/confirmUpload", json={"uuid": queueUUID})
+                res = client.post("/queue/confirmUpload", json={"uuid": queueUUID, "md5": md5_checksum})
                 res.raise_for_status()
             _queue.task_done()
         except queue.Empty:
             break
         except Exception as e:
             print(f"Error uploading {filename}: {e}")
+            failed_uploads.append(filepath)
             _queue.task_done()
 
 

kleinkram/mission/mission.py

@@ -1,4 +1,6 @@
 import os
+
+from botocore.utils import calculate_md5
 from typing_extensions import Annotated, Optional, List
 
 import httpx

{kleinkram-0.25.8.dev20241004161727.dist-info → kleinkram-0.25.10.dev20241007123024.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.25.8.dev20241004161727
+Version: 0.25.10.dev20241007123024
 Summary: A CLI for the ETH project kleinkram
 Project-URL: Homepage, https://github.com/leggedrobotics/kleinkram
 Project-URL: Issues, https://github.com/leggedrobotics/kleinkram/issues

{kleinkram-0.25.8.dev20241004161727.dist-info → kleinkram-0.25.10.dev20241007123024.dist-info}/RECORD

@@ -2,19 +2,19 @@ kleinkram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/api_client.py,sha256=1GPsM-XFbPYEKP7RfWmzMTwxRqnVh4wtHVuW25KT8kA,2264
 kleinkram/consts.py,sha256=pm_6OuQcO-tYcRhwauTtyRRsuYY0y0yb6EGuIl49LnI,50
 kleinkram/error_handling.py,sha256=Nm3tUtc4blQylJLNChSLgkDLFDHg3Xza0CghRrd_SYE,4015
-kleinkram/helper.py,sha256=BQawKoKLIwtAtVIZ7MjxH6Azqi7wHP4ja_gsrqyYAWU,7849
+kleinkram/helper.py,sha256=YlL955tLhD_XonN8dpnpYDKkPO9WUrkEyLrt3JQip-o,8296
 kleinkram/main.py,sha256=9u_msMlPhphfaL92GNrm-cRUeSHxc_mOFPeXLDzv-ok,9642
 kleinkram/auth/auth.py,sha256=w3-TsxWxURzLQ3_p43zgV4Rlh4dVL_WqI6HG2aes-b4,4991
 kleinkram/endpoint/endpoint.py,sha256=uez5UrAnP7L5rVHUysA9tFkN3dB3dG1Ojt9g3w-UWuQ,1441
 kleinkram/file/file.py,sha256=LaqIFYZ2HL5-tCqEXqQJ-ptXU8Eyg0T4Hy5W0NATEXg,3395
-kleinkram/mission/mission.py,sha256=UuKMZqU3gbdxq6J4WJ_RSo90slhIqexhDotmDyGY-6E,8634
+kleinkram/mission/mission.py,sha256=ByztTOQYW2exvXRravebI_UkzU_iSp-PQiH_wR4Ly6Y,8676
 kleinkram/project/project.py,sha256=yDygz9JJ4Td5VsoCoCLm36HccRyd7jl65Hq05uxEGts,1602
 kleinkram/queue/queue.py,sha256=MaLBjAu8asi9BkPvbbT-5AobCcpy3ex5rxM1kHpRINA,181
 kleinkram/tag/tag.py,sha256=JSHbDPVfsvP34MuQhw__DPQk-Bah5G9BgwYsj_K_JGc,1805
 kleinkram/topic/topic.py,sha256=IaXhrIHcJ3FSIr0WC-N7u9fkz-lAvSBgQklTX67t0Yc,1641
 kleinkram/user/user.py,sha256=hDrbWeFPPnh2sswDd445SwcIFGyAbfXXWpYq1VqrK0g,1379
-kleinkram-0.25.8.dev20241004161727.dist-info/METADATA,sha256=2TaUVnqPE5iL0WUM1uDshVOwwxCCkzj9pj6bMBD4_Zc,845
-kleinkram-0.25.8.dev20241004161727.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-kleinkram-0.25.8.dev20241004161727.dist-info/entry_points.txt,sha256=RHXtRzcreVHImatgjhQwZQ6GdJThElYjHEWcR1BPXUI,45
-kleinkram-0.25.8.dev20241004161727.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-kleinkram-0.25.8.dev20241004161727.dist-info/RECORD,,
+kleinkram-0.25.10.dev20241007123024.dist-info/METADATA,sha256=6NwF32wRNX5BQuq95zRr01UB1xHD9FNU64S9Ytr2_Ys,846
+kleinkram-0.25.10.dev20241007123024.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+kleinkram-0.25.10.dev20241007123024.dist-info/entry_points.txt,sha256=RHXtRzcreVHImatgjhQwZQ6GdJThElYjHEWcR1BPXUI,45
+kleinkram-0.25.10.dev20241007123024.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+kleinkram-0.25.10.dev20241007123024.dist-info/RECORD,,