fractal-server 2.3.8__py3-none-any.whl → 2.3.9__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.3.8"
+__VERSION__ = "2.3.9"

fractal_server/zip_tools.py

@@ -7,6 +7,10 @@ from typing import TypeVar
 from zipfile import ZIP_DEFLATED
 from zipfile import ZipFile
 
+from fractal_server.logger import get_logger
+
+logger = get_logger("zip_tools")
+
 T = TypeVar("T", str, BytesIO)
 THRESHOLD_ZIP_FILE_SIZE_MB = 1.0
 
@@ -74,6 +78,10 @@ def _folder_can_be_deleted(folder: str) -> bool:
     # CHECK 1: zip file exists
     zip_file = f"{folder}.zip"
     if not os.path.exists(zip_file):
+        logger.info(
+            f"Folder '{folder}' won't be deleted because file '{zip_file}' "
+            "does not exist."
+        )
         return False
 
     # CHECK 2: folder and zip file have the same number of files
@@ -81,11 +89,21 @@ def _folder_can_be_deleted(folder: str) -> bool:
     with ZipFile(zip_file, "r") as zip_ref:
         zip_files_count = len(zip_ref.namelist())
     if folder_files_count != zip_files_count:
+        logger.info(
+            f"Folder '{folder}' won't be deleted because it contains "
+            f"{folder_files_count} files while '{zip_file}' contains "
+            f"{zip_files_count}."
+        )
         return False
 
     # CHECK 3: zip file size is >= than `THRESHOLD_ZIP_FILE_SIZE_MB`
     zip_size = os.path.getsize(zip_file)
-    if zip_size < THRESHOLD_ZIP_FILE_SIZE_MB * 1024 * 1024:
+    if zip_size < THRESHOLD_ZIP_FILE_SIZE_MB * (1024**2):
+        logger.info(
+            f"Folder '{folder}' won't be deleted because '{zip_file}' is too "
+            f"small ({zip_size / (1024**2):.5f} MB, whereas the minimum limit "
+            f"for deletion is {THRESHOLD_ZIP_FILE_SIZE_MB})."
+        )
         return False
 
     return True
@@ -107,4 +125,6 @@ def _zip_folder_to_file_and_remove(folder: str) -> None:
     _create_zip(folder, f"{folder}_tmp.zip")
     shutil.move(f"{folder}_tmp.zip", f"{folder}.zip")
     if _folder_can_be_deleted(folder):
+        logger.info(f"Deleting folder '{folder}'...")
         shutil.rmtree(folder)
+        logger.info(f"Deletion of folder '{folder}' completed.")

{fractal_server-2.3.8.dist-info → fractal_server-2.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.8
+Version: 2.3.9
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.3.8.dist-info → fractal_server-2.3.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=pPimcjq1LECZwUR8cl5IoaPogld-1apxfHo12UP1w0w,22
+fractal_server/__init__.py,sha256=IZCNzAeT1hiPh6fpVTHVwF-NSu-mtsX00Rk32jd8RDM,22
 fractal_server/__main__.py,sha256=CocbzZooX1UtGqPi55GcHGNxnrJXFg5tUU5b3wyFCyo,4958
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -193,9 +193,9 @@ fractal_server/tasks/v2/templates/_5_pip_show.sh,sha256=GrJ19uHYQxANEy9JaeNJZVTq
 fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kqXRM,1657
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server/zip_tools.py,sha256=TbFiNhuP4e-o3a3Y-Aq-0likPNtBzTOWdxqA83nY2lE,3617
-fractal_server-2.3.8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.3.8.dist-info/METADATA,sha256=GNthWF58sDUb_M6943aMtnh0DuGxaEaEN5OnQT1vwQM,4628
-fractal_server-2.3.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.3.8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.3.8.dist-info/RECORD,,
+fractal_server/zip_tools.py,sha256=BxW36QGJLTiiabYWJMG56hO_eL_Lhse90nd3VdcNKDM,4411
+fractal_server-2.3.9.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.3.9.dist-info/METADATA,sha256=YjDygtiQ8x2fwH8SOonXMzLv3bKWsDO9hg_IpLLe6MI,4628
+fractal_server-2.3.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.3.9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.3.9.dist-info/RECORD,,