fractal-server 2.11.0a4__tar.gz → 2.11.0a5__tar.gz

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a4
+Version: 2.11.0a5
 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.0a5/fractal_server/__init__.py

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

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/routes/api/v2/_aux_functions_tasks.py

@@ -22,6 +22,7 @@ from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
+from fractal_server.images.tools import merge_type_filters
 from fractal_server.logger import set_logger
 
 logger = set_logger(__name__)
@@ -351,3 +352,23 @@ async def _add_warnings_to_workflow_tasks(
             wftask_data["warning"] = "Current user has no access to this task."
         wftask_list_with_warnings.append(wftask_data)
     return wftask_list_with_warnings
+
+
+def _check_type_filters_compatibility(
+    *,
+    task_input_types: dict[str, bool],
+    wftask_type_filters: dict[str, bool],
+) -> None:
+    """
+    Wrap `merge_type_filters` and raise `HTTPException` if needed.
+    """
+    try:
+        merge_type_filters(
+            task_input_types=task_input_types,
+            wftask_type_filters=wftask_type_filters,
+        )
+    except ValueError as e:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"Incompatible type filters.\nOriginal error: {str(e)}",
+        )

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/routes/api/v2/images.py

@@ -207,7 +207,7 @@ async def query_dataset_images(
         if page > last_page:
             page = last_page
         offset = (page - 1) * page_size
-        images = images[offset : offset + page_size]  # noqa E203
+        images = images[offset : offset + page_size]
 
     return ImagePage(
         total_count=total_count,

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/routes/api/v2/submit.py

@@ -28,6 +28,7 @@ from ...aux.validate_user_settings import validate_user_settings
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import clean_app_job_list_v2
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from fractal_server.app.models import TaskGroupV2
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
@@ -108,15 +109,17 @@ async def apply_workflow(
 
     # Check that tasks have read-access and are `active`
     used_task_group_ids = set()
-    for wftask in workflow.task_list[
-        first_task_index : last_task_index + 1  # noqa: E203
-    ]:
+    for wftask in workflow.task_list[first_task_index : last_task_index + 1]:
         task = await _get_task_read_access(
             user_id=user.id,
             task_id=wftask.task_id,
             require_active=True,
             db=db,
         )
+        _check_type_filters_compatibility(
+            task_input_types=task.input_types,
+            wftask_type_filters=wftask.type_filters,
+        )
         used_task_group_ids.add(task.taskgroupv2_id)
 
     # Validate user settings

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/routes/api/v2/workflow_import.py

@@ -19,6 +19,7 @@ from ._aux_functions import _check_workflow_exists
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
@@ -325,6 +326,13 @@ async def import_workflow(
         list_wf_tasks.append(new_wf_task)
         list_task_ids.append(task_id)
 
+    for wftask, task_id in zip(list_wf_tasks, list_task_ids):
+        task = await db.get(TaskV2, task_id)
+        _check_type_filters_compatibility(
+            task_input_types=task.input_types,
+            wftask_type_filters=wftask.type_filters,
+        )
+
     # Create new Workflow
     db_workflow = WorkflowV2(
         project_id=project_id,

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/routes/api/v2/workflowtask.py

@@ -12,6 +12,7 @@ from ....db import get_async_db
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _get_workflow_task_check_owner
 from ._aux_functions import _workflow_insert_task
+from ._aux_functions_tasks import _check_type_filters_compatibility
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import WorkflowTaskV2
@@ -47,24 +48,29 @@ async def replace_workflowtask(
         db=db,
     )
 
-    task = await _get_task_read_access(
+    new_task = await _get_task_read_access(
         task_id=task_id, user_id=user.id, db=db, require_active=True
     )
 
-    if task.type != old_workflow_task.task.type:
+    if new_task.type != old_workflow_task.task.type:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=(
                 f"Cannot replace a Task '{old_workflow_task.task.type}' with a"
-                f"  Task '{task.type}'."
+                f"  Task '{new_task.type}'."
             ),
         )
 
+    _check_type_filters_compatibility(
+        task_input_types=new_task.input_types,
+        wftask_type_filters=old_workflow_task.type_filters,
+    )
+
     _args_non_parallel = old_workflow_task.args_non_parallel
     _args_parallel = old_workflow_task.args_parallel
     if replace is not None:
         if replace.args_non_parallel is not None:
-            if task.type == "parallel":
+            if new_task.type == "parallel":
                 raise HTTPException(
                     status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     detail=(
@@ -76,7 +82,7 @@ async def replace_workflowtask(
                 _args_non_parallel = replace.args_non_parallel
 
         if replace.args_parallel is not None:
-            if task.type == "non_parallel":
+            if new_task.type == "non_parallel":
                 raise HTTPException(
                     status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     detail=(
@@ -92,22 +98,24 @@ async def replace_workflowtask(
     if (
         old_workflow_task.meta_non_parallel
         != old_workflow_task.task.meta_non_parallel
-    ) and (old_workflow_task.task.meta_non_parallel == task.meta_non_parallel):
+    ) and (
+        old_workflow_task.task.meta_non_parallel == new_task.meta_non_parallel
+    ):
         _meta_non_parallel = old_workflow_task.meta_non_parallel
     else:
-        _meta_non_parallel = task.meta_non_parallel
+        _meta_non_parallel = new_task.meta_non_parallel
     # Same for `meta_parallel`
     if (
         old_workflow_task.meta_parallel != old_workflow_task.task.meta_parallel
-    ) and (old_workflow_task.task.meta_parallel == task.meta_parallel):
+    ) and (old_workflow_task.task.meta_parallel == new_task.meta_parallel):
         _meta_parallel = old_workflow_task.meta_parallel
     else:
-        _meta_parallel = task.meta_parallel
+        _meta_parallel = new_task.meta_parallel
 
     new_workflow_task = WorkflowTaskV2(
-        task_id=task.id,
-        task_type=task.type,
-        task=task,
+        task_id=new_task.id,
+        task_type=new_task.type,
+        task=new_task,
         # old-task values
         type_filters=old_workflow_task.type_filters,
         # possibly new values
@@ -134,7 +142,7 @@ async def create_workflowtask(
     project_id: int,
     workflow_id: int,
     task_id: int,
-    new_task: WorkflowTaskCreateV2,
+    wftask: WorkflowTaskCreateV2,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowTaskReadV2]:
@@ -152,8 +160,8 @@ async def create_workflowtask(
 
     if task.type == "parallel":
         if (
-            new_task.meta_non_parallel is not None
-            or new_task.args_non_parallel is not None
+            wftask.meta_non_parallel is not None
+            or wftask.args_non_parallel is not None
         ):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -165,8 +173,8 @@ async def create_workflowtask(
             )
     elif task.type == "non_parallel":
         if (
-            new_task.meta_parallel is not None
-            or new_task.args_parallel is not None
+            wftask.meta_parallel is not None
+            or wftask.args_parallel is not None
         ):
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -176,20 +184,26 @@ async def create_workflowtask(
                     "is `non_parallel`."
                 ),
             )
-    workflow_task = await _workflow_insert_task(
+
+    _check_type_filters_compatibility(
+        task_input_types=task.input_types,
+        wftask_type_filters=wftask.type_filters,
+    )
+
+    wftask_db = await _workflow_insert_task(
         workflow_id=workflow.id,
         task_id=task_id,
-        meta_non_parallel=new_task.meta_non_parallel,
-        meta_parallel=new_task.meta_parallel,
-        args_non_parallel=new_task.args_non_parallel,
-        args_parallel=new_task.args_parallel,
-        type_filters=new_task.type_filters,
+        meta_non_parallel=wftask.meta_non_parallel,
+        meta_parallel=wftask.meta_parallel,
+        args_non_parallel=wftask.args_non_parallel,
+        args_parallel=wftask.args_parallel,
+        type_filters=wftask.type_filters,
         db=db,
     )
 
     await db.close()
 
-    return workflow_task
+    return wftask_db
 
 
 @router.get(
@@ -236,6 +250,11 @@ async def update_workflowtask(
         user_id=user.id,
         db=db,
     )
+    if workflow_task_update.type_filters is not None:
+        _check_type_filters_compatibility(
+            task_input_types=db_wf_task.task.input_types,
+            wftask_type_filters=workflow_task_update.type_filters,
+        )
 
     if db_wf_task.task_type == "parallel" and (
         workflow_task_update.args_non_parallel is not None

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -966,8 +966,8 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                 # Retrieve job and future objects
                 job = jobs[ind_job]
                 future = futures[ind_job]
-                remaining_job_ids = job_ids[ind_job + 1 :]  # noqa: E203
-                remaining_futures = futures[ind_job + 1 :]  # noqa: E203
+                remaining_job_ids = job_ids[ind_job + 1 :]
+                remaining_futures = futures[ind_job + 1 :]
 
                 outputs = []
 

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/logger.py

@@ -109,7 +109,10 @@ def set_logger(
             if isinstance(handler, logging.FileHandler)
         ]
         if len(current_file_handlers) > 1:
-            logger.warning(f"Logger {logger_name} has multiple file handlers.")
+            logger.warning(
+                f"Logger {logger_name} has multiple file handlers: "
+                f"{current_file_handlers}"
+            )
 
     return logger
 

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/local/collect.py

@@ -33,8 +33,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_local(
     *,
@@ -59,6 +57,8 @@ def collect_local(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/local/deactivate.py

@@ -21,8 +21,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_local(
     *,
@@ -40,6 +38,8 @@ def deactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/local/reactivate.py

@@ -23,9 +23,6 @@ from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
 
-LOGGER_NAME = __name__
-
-
 def reactivate_local(
     *,
     task_group_activity_id: int,
@@ -42,6 +39,8 @@ def reactivate_local(
         task_group_activity_id:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/ssh/collect.py

@@ -30,8 +30,6 @@ from fractal_server.tasks.v2.utils_templates import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def collect_ssh(
     *,
@@ -62,6 +60,8 @@ def collect_ssh(
         wheel_file:
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     # Work within a temporary folder, where also logs will be placed
     with TemporaryDirectory() as tmpdir:
         LOGGER_NAME = "task_collection_ssh"

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/ssh/deactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def deactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def deactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/fractal_server/tasks/v2/ssh/reactivate.py

@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
 from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
 from fractal_server.utils import get_timestamp
 
-LOGGER_NAME = __name__
-
 
 def reactivate_ssh(
     *,
@@ -47,6 +45,8 @@ def reactivate_ssh(
             `user_settings.ssh_tasks_dir`.
     """
 
+    LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
+
     with TemporaryDirectory() as tmpdir:
         log_file_path = get_log_path(Path(tmpdir))
         logger = set_logger(

{fractal_server-2.11.0a4 → fractal_server-2.11.0a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.11.0a4"
+version = "2.11.0a5"
 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.0a4"
+current_version = "2.11.0a5"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.11.0a4/fractal_server/__init__.py

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