fractal-server 2.3.1a0__tar.gz → 2.3.2__tar.gz

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.1a0
+Version: 2.3.2
 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.2/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.3.2"

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/fractal_server/app/routes/admin/v1.py

@@ -387,9 +387,7 @@ async def download_job_logs(
     # Create and return byte stream for zipped log folder
     PREFIX_ZIP = Path(job.working_dir).name
     zip_filename = f"{PREFIX_ZIP}_archive.zip"
-    byte_stream = _zip_folder_to_byte_stream(
-        folder=job.working_dir, zip_filename=zip_filename
-    )
+    byte_stream = _zip_folder_to_byte_stream(folder=job.working_dir)
     return StreamingResponse(
         iter([byte_stream.getvalue()]),
         media_type="application/x-zip-compressed",

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/fractal_server/app/routes/admin/v2.py

@@ -274,9 +274,7 @@ async def download_job_logs(
     # Create and return byte stream for zipped log folder
     PREFIX_ZIP = Path(job.working_dir).name
     zip_filename = f"{PREFIX_ZIP}_archive.zip"
-    byte_stream = _zip_folder_to_byte_stream(
-        folder=job.working_dir, zip_filename=zip_filename
-    )
+    byte_stream = _zip_folder_to_byte_stream(folder=job.working_dir)
     return StreamingResponse(
         iter([byte_stream.getvalue()]),
         media_type="application/x-zip-compressed",

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/fractal_server/app/routes/api/v1/job.py

@@ -128,9 +128,7 @@ async def download_job_logs(
     # Create and return byte stream for zipped log folder
     PREFIX_ZIP = Path(job.working_dir).name
     zip_filename = f"{PREFIX_ZIP}_archive.zip"
-    byte_stream = _zip_folder_to_byte_stream(
-        folder=job.working_dir, zip_filename=zip_filename
-    )
+    byte_stream = _zip_folder_to_byte_stream(folder=job.working_dir)
     return StreamingResponse(
         iter([byte_stream.getvalue()]),
         media_type="application/x-zip-compressed",

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/fractal_server/app/routes/api/v2/job.py

@@ -131,9 +131,7 @@ async def download_job_logs(
     # Create and return byte stream for zipped log folder
     PREFIX_ZIP = Path(job.working_dir).name
     zip_filename = f"{PREFIX_ZIP}_archive.zip"
-    byte_stream = _zip_folder_to_byte_stream(
-        folder=job.working_dir, zip_filename=zip_filename
-    )
+    byte_stream = _zip_folder_to_byte_stream(folder=job.working_dir)
     return StreamingResponse(
         iter([byte_stream.getvalue()]),
         media_type="application/x-zip-compressed",

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/fractal_server/app/routes/aux/_job.py

@@ -1,3 +1,4 @@
+import os
 from io import BytesIO
 from pathlib import Path
 from typing import Union
@@ -25,19 +26,20 @@ def _write_shutdown_file(*, job: Union[ApplyWorkflow, JobV2]):
         f.write(f"Trigger executor shutdown for {job.id=}.")
 
 
-def _zip_folder_to_byte_stream(*, folder: str, zip_filename: str) -> BytesIO:
+def _zip_folder_to_byte_stream(*, folder: str) -> BytesIO:
     """
     Get byte stream with the zipped log folder of a job.
 
     Args:
         folder: the folder to zip
-        zip_filename: name of the zipped archive
     """
-    working_dir_path = Path(folder)
 
     byte_stream = BytesIO()
     with ZipFile(byte_stream, mode="w", compression=ZIP_DEFLATED) as zipfile:
-        for fpath in working_dir_path.glob("*"):
-            zipfile.write(filename=str(fpath), arcname=str(fpath.name))
+        for root, dirs, files in os.walk(folder):
+            for file in files:
+                file_path = os.path.join(root, file)
+                archive_path = os.path.relpath(file_path, folder)
+                zipfile.write(file_path, archive_path)
 
     return byte_stream

{fractal_server-2.3.1a0 → fractal_server-2.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "2.3.1a0"
+version = "2.3.2"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Tommaso Comparin <tommaso.comparin@exact-lab.it>",
@@ -91,7 +91,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.3.1a0"
+current_version = "2.3.2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.3.1a0/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.3.1a0"