fractal-server 2.11.0a9__tar.gz → 2.11.0a10__tar.gz

{fractal_server-2.11.0a9 → fractal_server-2.11.0a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a9
+Version: 2.11.0a10
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.11.0a10/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.11.0a10"

{fractal_server-2.11.0a9 → fractal_server-2.11.0a10}/fractal_server/app/routes/api/v2/job.py

@@ -1,4 +1,6 @@
+import asyncio
 from pathlib import Path
+from typing import Iterator
 from typing import Optional
 
 from fastapi import APIRouter
@@ -24,6 +26,14 @@ from ._aux_functions import _get_workflow_check_owner
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_active_user
 
+
+# https://docs.python.org/3/library/asyncio-task.html#asyncio.to_thread
+# This moves the function execution to a separate thread,
+# preventing it from blocking the event loop.
+async def zip_folder_threaded(folder: str) -> Iterator[bytes]:
+    return await asyncio.to_thread(_zip_folder_to_byte_stream_iterator, folder)
+
+
 router = APIRouter()
 
 
@@ -128,8 +138,11 @@ async def download_job_logs(
     )
     job = output["job"]
     zip_name = f"{Path(job.working_dir).name}_archive.zip"
+
+    zip_bytes_iterator = await zip_folder_threaded(job.working_dir)
+
     return StreamingResponse(
-        _zip_folder_to_byte_stream_iterator(folder=job.working_dir),
+        zip_bytes_iterator,
         media_type="application/x-zip-compressed",
         headers={"Content-Disposition": f"attachment;filename={zip_name}"},
     )

{fractal_server-2.11.0a9 → fractal_server-2.11.0a10}/fractal_server/app/schemas/v2/workflowtask.py

@@ -180,7 +180,7 @@ class WorkflowTaskImportV2(BaseModel, extra=Extra.forbid):
     args_non_parallel: Optional[dict[str, Any]] = None
     args_parallel: Optional[dict[str, Any]] = None
     type_filters: Optional[dict[str, bool]] = None
-    filters: Optional[dict[str, Any]] = None
+    input_filters: Optional[dict[str, Any]] = None
 
     task: Union[TaskImportV2, TaskImportV2Legacy]
 
@@ -191,7 +191,7 @@ class WorkflowTaskImportV2(BaseModel, extra=Extra.forbid):
         Transform legacy filters (created with fractal-server<2.11.0)
         into type filters
         """
-        if values.get("filters") is not None:
+        if values.get("input_filters") is not None:
             if "type_filters" in values.keys():
                 raise ValueError(
                     "Cannot set filters both through the legacy field "
@@ -201,13 +201,15 @@ class WorkflowTaskImportV2(BaseModel, extra=Extra.forbid):
             else:
                 # As of 2.11.0, WorkflowTask do not have attribute filters
                 # any more.
-                if values["filters"]["attributes"] != {}:
+                if values["input_filters"]["attributes"] != {}:
                     raise ValueError(
                         "Cannot set attribute filters for WorkflowTasks."
                     )
                 # Convert legacy filters.types into new type_filters
-                values["type_filters"] = values["filters"].get("types", {})
-                values["filters"] = None
+                values["type_filters"] = values["input_filters"].get(
+                    "types", {}
+                )
+                values["input_filters"] = None
 
         return values
 

{fractal_server-2.11.0a9 → fractal_server-2.11.0a10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.11.0a9"
+version = "2.11.0a10"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.11.0a9"
+current_version = "2.11.0a10"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.11.0a9/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.11.0a9"