fractal-server 2.13.0__py3-none-any.whl → 2.13.1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.13.0"
+__VERSION__ = "2.13.1"

fractal_server/app/models/v2/__init__.py

@@ -2,6 +2,8 @@
 v2 `models` module
 """
 from ..linkuserproject import LinkUserProjectV2
+from .accounting import AccountingRecord
+from .accounting import AccountingRecordSlurm
 from .dataset import DatasetV2
 from .job import JobV2
 from .project import ProjectV2
@@ -12,6 +14,8 @@ from .workflow import WorkflowV2
 from .workflowtask import WorkflowTaskV2
 
 __all__ = [
+    "AccountingRecord",
+    "AccountingRecordSlurm",
     "LinkUserProjectV2",
     "DatasetV2",
     "JobV2",

fractal_server/app/models/v2/accounting.py

@@ -0,0 +1,35 @@
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import Column
+from sqlalchemy import Integer
+from sqlalchemy.dialects.postgresql import ARRAY
+from sqlalchemy.types import DateTime
+from sqlmodel import Field
+from sqlmodel import SQLModel
+
+from ....utils import get_timestamp
+
+
+class AccountingRecord(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    user_id: int = Field(foreign_key="user_oauth.id", nullable=False)
+    timestamp: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )
+    num_tasks: int
+    num_new_images: int
+
+
+class AccountingRecordSlurm(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    user_id: int = Field(foreign_key="user_oauth.id", nullable=False)
+    timestamp: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )
+    slurm_job_ids: list[int] = Field(
+        default_factory=list,
+        sa_column=Column(ARRAY(Integer)),
+    )

fractal_server/app/routes/admin/v2/__init__.py

@@ -3,6 +3,8 @@
 """
 from fastapi import APIRouter
 
+from .accounting import router as accounting_router
+from .impersonate import router as impersonate_router
 from .job import router as job_router
 from .project import router as project_router
 from .task import router as task_router
@@ -11,6 +13,7 @@ from .task_group_lifecycle import router as task_group_lifecycle_router
 
 router_admin_v2 = APIRouter()
 
+router_admin_v2.include_router(accounting_router, prefix="/accounting")
 router_admin_v2.include_router(job_router, prefix="/job")
 router_admin_v2.include_router(project_router, prefix="/project")
 router_admin_v2.include_router(task_router, prefix="/task")
@@ -18,3 +21,4 @@ router_admin_v2.include_router(task_group_router, prefix="/task-group")
 router_admin_v2.include_router(
     task_group_lifecycle_router, prefix="/task-group"
 )
+router_admin_v2.include_router(impersonate_router, prefix="/impersonate")

fractal_server/app/routes/admin/v2/accounting.py

@@ -0,0 +1,108 @@
+from itertools import chain
+from typing import Optional
+
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import Query
+from fastapi import status
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel
+from pydantic.types import AwareDatetime
+from sqlmodel import func
+from sqlmodel import select
+
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import AccountingRecord
+from fractal_server.app.models.v2 import AccountingRecordSlurm
+from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.schemas.v2 import AccountingRecordRead
+
+
+class AccountingQuery(BaseModel):
+    user_id: Optional[int] = None
+    timestamp_min: Optional[AwareDatetime] = None
+    timestamp_max: Optional[AwareDatetime] = None
+
+
+class AccountingPage(BaseModel):
+    total_count: int
+    page_size: int
+    current_page: int
+    records: list[AccountingRecordRead]
+
+
+router = APIRouter()
+
+
+@router.post("/", response_model=AccountingPage)
+async def query_accounting(
+    query: AccountingQuery,
+    # pagination
+    page: int = Query(default=1, ge=1),
+    page_size: Optional[int] = Query(default=None, ge=1),
+    # dependencies
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> AccountingPage:
+
+    if page_size is None and page > 1:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(f"Invalid pagination parameters: {page=}, {page_size=}."),
+        )
+
+    stm = select(AccountingRecord).order_by(AccountingRecord.id)
+    stm_count = select(func.count(AccountingRecord.id))
+    if query.user_id is not None:
+        stm = stm.where(AccountingRecord.user_id == query.user_id)
+        stm_count = stm_count.where(AccountingRecord.user_id == query.user_id)
+    if query.timestamp_min is not None:
+        stm = stm.where(AccountingRecord.timestamp >= query.timestamp_min)
+        stm_count = stm_count.where(
+            AccountingRecord.timestamp >= query.timestamp_min
+        )
+    if query.timestamp_max is not None:
+        stm = stm.where(AccountingRecord.timestamp <= query.timestamp_max)
+        stm_count = stm_count.where(
+            AccountingRecord.timestamp <= query.timestamp_max
+        )
+    if page_size is not None:
+        stm = stm.offset((page - 1) * page_size).limit(page_size)
+
+    res = await db.execute(stm)
+    records = res.scalars().all()
+    res_total_count = await db.execute(stm_count)
+    total_count = res_total_count.scalar()
+
+    actual_page_size = page_size or len(records)
+    return AccountingPage(
+        total_count=total_count,
+        page_size=actual_page_size,
+        current_page=page,
+        records=[record.model_dump() for record in records],
+    )
+
+
+@router.post("/slurm/")
+async def query_accounting_slurm(
+    query: AccountingQuery,
+    # dependencies
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> JSONResponse:
+
+    stm = select(AccountingRecordSlurm.slurm_job_ids)
+    if query.user_id is not None:
+        stm = stm.where(AccountingRecordSlurm.user_id == query.user_id)
+    if query.timestamp_min is not None:
+        stm = stm.where(AccountingRecordSlurm.timestamp >= query.timestamp_min)
+    if query.timestamp_max is not None:
+        stm = stm.where(AccountingRecordSlurm.timestamp <= query.timestamp_max)
+
+    res = await db.execute(stm)
+    nested_slurm_job_ids = res.scalars().all()
+    aggregated_slurm_job_ids = list(chain(*nested_slurm_job_ids))
+    return JSONResponse(content=aggregated_slurm_job_ids, status_code=200)

fractal_server/app/routes/admin/v2/impersonate.py

@@ -0,0 +1,35 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi.responses import JSONResponse
+from fastapi_users.authentication import JWTStrategy
+
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth._aux_auth import _user_or_404
+from fractal_server.config import get_settings
+from fractal_server.syringe import Inject
+
+router = APIRouter()
+
+
+@router.get("/{user_id}/")
+async def impersonate_user(
+    user_id: int,
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> JSONResponse:
+    user = await _user_or_404(user_id, db)
+
+    settings = Inject(get_settings)
+    jwt_strategy = JWTStrategy(
+        secret=settings.JWT_SECRET_KEY,  # type: ignore
+        lifetime_seconds=7200,  # 2 hours
+    )
+    token = await jwt_strategy.write_token(user)
+
+    return JSONResponse(
+        content={"access_token": token, "token_type": "bearer"},
+        status_code=200,
+    )

fractal_server/app/routes/admin/v2/job.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from pathlib import Path
 from typing import Optional
 
@@ -8,6 +7,7 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 from fastapi.responses import StreamingResponse
+from pydantic.types import AwareDatetime
 from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
@@ -16,7 +16,6 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.routes.auth import current_active_superuser
-from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.routes.aux._job import _write_shutdown_file
 from fractal_server.app.routes.aux._runner import _check_shutdown_is_supported
 from fractal_server.app.runner.filenames import WORKFLOW_LOG_FILENAME
@@ -37,10 +36,10 @@ async def view_job(
     dataset_id: Optional[int] = None,
     workflow_id: Optional[int] = None,
     status: Optional[JobStatusTypeV2] = None,
-    start_timestamp_min: Optional[datetime] = None,
-    start_timestamp_max: Optional[datetime] = None,
-    end_timestamp_min: Optional[datetime] = None,
-    end_timestamp_max: Optional[datetime] = None,
+    start_timestamp_min: Optional[AwareDatetime] = None,
+    start_timestamp_max: Optional[AwareDatetime] = None,
+    end_timestamp_min: Optional[AwareDatetime] = None,
+    end_timestamp_max: Optional[AwareDatetime] = None,
     log: bool = True,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
@@ -67,13 +66,6 @@ async def view_job(
             `job.log` is set to `None`.
     """
 
-    _raise_if_naive_datetime(
-        start_timestamp_min,
-        start_timestamp_max,
-        end_timestamp_min,
-        end_timestamp_max,
-    )
-
     stm = select(JobV2)
 
     if id is not None:

fractal_server/app/routes/admin/v2/task_group.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Optional
 
 from fastapi import APIRouter
@@ -6,6 +5,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
+from pydantic.types import AwareDatetime
 from sqlalchemy.sql.operators import is_
 from sqlalchemy.sql.operators import is_not
 from sqlmodel import select
@@ -20,7 +20,6 @@ from fractal_server.app.routes.auth import current_active_superuser
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
-from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
@@ -42,13 +41,11 @@ async def get_task_group_activity_list(
     pkg_name: Optional[str] = None,
     status: Optional[TaskGroupActivityStatusV2] = None,
     action: Optional[TaskGroupActivityActionV2] = None,
-    timestamp_started_min: Optional[datetime] = None,
+    timestamp_started_min: Optional[AwareDatetime] = None,
     superuser: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
 
-    _raise_if_naive_datetime(timestamp_started_min)
-
     stm = select(TaskGroupActivityV2)
     if task_group_activity_id is not None:
         stm = stm.where(TaskGroupActivityV2.id == task_group_activity_id)
@@ -96,19 +93,14 @@ async def query_task_group_list(
     active: Optional[bool] = None,
     pkg_name: Optional[str] = None,
     origin: Optional[TaskGroupV2OriginEnum] = None,
-    timestamp_last_used_min: Optional[datetime] = None,
-    timestamp_last_used_max: Optional[datetime] = None,
+    timestamp_last_used_min: Optional[AwareDatetime] = None,
+    timestamp_last_used_max: Optional[AwareDatetime] = None,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupReadV2]:
 
     stm = select(TaskGroupV2)
 
-    _raise_if_naive_datetime(
-        timestamp_last_used_max,
-        timestamp_last_used_min,
-    )
-
     if user_group_id is not None and private is True:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,

fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -55,7 +55,7 @@ async def get_package_version_from_pypi(
             f"A TimeoutException occurred while getting {url}.\n"
             f"Original error: {str(e)}."
         )
-        logger.error(error_msg)
+        logger.warning(error_msg)
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=error_msg,
@@ -65,7 +65,7 @@ async def get_package_version_from_pypi(
             f"An unknown error occurred while getting {url}. "
             f"Original error: {str(e)}."
         )
-        logger.error(error_msg)
+        logger.warning(error_msg)
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
             detail=error_msg,
@@ -85,7 +85,7 @@ async def get_package_version_from_pypi(
         latest_version = response_data["info"]["version"]
         available_releases = response_data["releases"].keys()
     except KeyError as e:
-        logger.error(
+        logger.warning(
             f"A KeyError occurred while getting {url}. "
             f"Original error: {str(e)}."
         )

fractal_server/app/routes/api/v2/submit.py

@@ -239,6 +239,7 @@ async def apply_workflow(
         workflow_id=workflow.id,
         dataset_id=dataset.id,
         job_id=job.id,
+        user_id=user.id,
         user_settings=user_settings,
         worker_init=job.worker_init,
         slurm_user=user_settings.slurm_user,

fractal_server/app/routes/api/v2/task_group.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Optional
 
 from fastapi import APIRouter
@@ -6,6 +5,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
+from pydantic.types import AwareDatetime
 from sqlmodel import or_
 from sqlmodel import select
 
@@ -23,7 +23,6 @@ from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
-from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
@@ -43,13 +42,11 @@ async def get_task_group_activity_list(
     pkg_name: Optional[str] = None,
     status: Optional[TaskGroupActivityStatusV2] = None,
     action: Optional[TaskGroupActivityActionV2] = None,
-    timestamp_started_min: Optional[datetime] = None,
+    timestamp_started_min: Optional[AwareDatetime] = None,
     user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
 
-    _raise_if_naive_datetime(timestamp_started_min)
-
     stm = select(TaskGroupActivityV2).where(
         TaskGroupActivityV2.user_id == user.id
     )

fractal_server/app/routes/aux/__init__.py

@@ -1,20 +0,0 @@
-from datetime import datetime
-from typing import Optional
-
-from fastapi import HTTPException
-from fastapi import status
-
-
-def _raise_if_naive_datetime(*timestamps: tuple[Optional[datetime]]) -> None:
-    """
-    Raise 422 if any not-null argument is a naive `datetime` object:
-    https://docs.python.org/3/library/datetime.html#determining-if-an-object-is-aware-or-naive
-    """
-    for timestamp in filter(None, timestamps):
-        if (timestamp.tzinfo is None) or (
-            timestamp.tzinfo.utcoffset(timestamp) is None
-        ):
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-                detail=f"{timestamp=} is naive. You must provide a timezone.",
-            )

fractal_server/app/runner/v2/__init__.py

@@ -70,6 +70,7 @@ def submit_workflow(
     workflow_id: int,
     dataset_id: int,
     job_id: int,
+    user_id: int,
     user_settings: UserSettings,
     worker_init: Optional[str] = None,
     slurm_user: Optional[str] = None,
@@ -90,6 +91,8 @@ def submit_workflow(
         job_id:
             Id of the job record which stores the state for the current
             workflow application.
+        user_id:
+            User ID.
         worker_init:
             Custom executor parameters that get parsed before the execution of
             each task.
@@ -312,6 +315,7 @@ def submit_workflow(
         process_workflow(
             workflow=workflow,
             dataset=dataset,
+            user_id=user_id,
             workflow_dir_local=WORKFLOW_DIR_LOCAL,
             workflow_dir_remote=WORKFLOW_DIR_REMOTE,
             logger_name=logger_name,

fractal_server/app/runner/v2/_local/__init__.py

@@ -41,6 +41,7 @@ def process_workflow(
     last_task_index: Optional[int] = None,
     logger_name: str,
     job_attribute_filters: AttributeFiltersType,
+    user_id: int,
     # Slurm-specific
     user_cache_dir: Optional[str] = None,
     slurm_user: Optional[str] = None,
@@ -75,6 +76,7 @@ def process_workflow(
             Positional index of the last task to execute; if `None`, proceed
             until the last task.
         logger_name: Logger name
+        user_id:
         slurm_user:
             Username to impersonate to run the workflow. This argument is
             present for compatibility with the standard backend interface, but
@@ -126,4 +128,5 @@ def process_workflow(
             logger_name=logger_name,
             submit_setup_call=_local_submit_setup,
             job_attribute_filters=job_attribute_filters,
+            user_id=user_id,
         )

fractal_server/app/runner/v2/_slurm_ssh/__init__.py

@@ -45,6 +45,7 @@ def process_workflow(
     job_attribute_filters: AttributeFiltersType,
     fractal_ssh: FractalSSH,
     worker_init: Optional[str] = None,
+    user_id: int,
     # Not used
     user_cache_dir: Optional[str] = None,
     slurm_user: Optional[str] = None,
@@ -94,4 +95,5 @@ def process_workflow(
             logger_name=logger_name,
             submit_setup_call=_slurm_submit_setup,
             job_attribute_filters=job_attribute_filters,
+            user_id=user_id,
         )

fractal_server/app/runner/v2/_slurm_sudo/__init__.py

@@ -38,6 +38,7 @@ def process_workflow(
     last_task_index: Optional[int] = None,
     logger_name: str,
     job_attribute_filters: AttributeFiltersType,
+    user_id: int,
     # Slurm-specific
     user_cache_dir: Optional[str] = None,
     slurm_user: Optional[str] = None,
@@ -85,4 +86,5 @@ def process_workflow(
             logger_name=logger_name,
             submit_setup_call=_slurm_submit_setup,
             job_attribute_filters=job_attribute_filters,
+            user_id=user_id,
         )

fractal_server/app/runner/v2/runner.py

@@ -18,6 +18,7 @@ from .runner_functions import run_v2_task_non_parallel
 from .runner_functions import run_v2_task_parallel
 from .task_interface import TaskOutput
 from fractal_server.app.db import get_sync_db
+from fractal_server.app.models.v2 import AccountingRecord
 from fractal_server.app.models.v2 import DatasetV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.schemas.v2.dataset import _DatasetHistoryItemV2
@@ -31,6 +32,7 @@ def execute_tasks_v2(
     wf_task_list: list[WorkflowTaskV2],
     dataset: DatasetV2,
     executor: ThreadPoolExecutor,
+    user_id: int,
     workflow_dir_local: Path,
     workflow_dir_remote: Optional[Path] = None,
     logger_name: Optional[str] = None,
@@ -88,7 +90,7 @@ def execute_tasks_v2(
             db.commit()
         # TASK EXECUTION (V2)
         if task.type == "non_parallel":
-            current_task_output = run_v2_task_non_parallel(
+            current_task_output, num_tasks = run_v2_task_non_parallel(
                 images=filtered_images,
                 zarr_dir=zarr_dir,
                 wftask=wftask,
@@ -96,22 +98,20 @@ def execute_tasks_v2(
                 workflow_dir_local=workflow_dir_local,
                 workflow_dir_remote=workflow_dir_remote,
                 executor=executor,
-                logger_name=logger_name,
                 submit_setup_call=submit_setup_call,
             )
         elif task.type == "parallel":
-            current_task_output = run_v2_task_parallel(
+            current_task_output, num_tasks = run_v2_task_parallel(
                 images=filtered_images,
                 wftask=wftask,
                 task=task,
                 workflow_dir_local=workflow_dir_local,
                 workflow_dir_remote=workflow_dir_remote,
                 executor=executor,
-                logger_name=logger_name,
                 submit_setup_call=submit_setup_call,
             )
         elif task.type == "compound":
-            current_task_output = run_v2_task_compound(
+            current_task_output, num_tasks = run_v2_task_compound(
                 images=filtered_images,
                 zarr_dir=zarr_dir,
                 wftask=wftask,
@@ -119,7 +119,6 @@ def execute_tasks_v2(
                 workflow_dir_local=workflow_dir_local,
                 workflow_dir_remote=workflow_dir_remote,
                 executor=executor,
-                logger_name=logger_name,
                 submit_setup_call=submit_setup_call,
             )
         else:
@@ -144,6 +143,7 @@ def execute_tasks_v2(
             )
 
         # Update image list
+        num_new_images = 0
         current_task_output.check_zarr_urls_are_unique()
         for image_obj in current_task_output.image_list_updates:
             image = image_obj.model_dump()
@@ -246,6 +246,7 @@ def execute_tasks_v2(
                 SingleImage(**new_image)
                 # Add image into the dataset image list
                 tmp_images.append(new_image)
+                num_new_images += 1
 
         # Remove images from tmp_images
         for img_zarr_url in current_task_output.image_list_removals:
@@ -281,4 +282,13 @@ def execute_tasks_v2(
             db.merge(db_dataset)
             db.commit()
 
+            # Create accounting record
+            record = AccountingRecord(
+                user_id=user_id,
+                num_tasks=num_tasks,
+                num_new_images=num_new_images,
+            )
+            db.add(record)
+            db.commit()
+
         logger.debug(f'END    {wftask.order}-th task (name="{task_name}")')

fractal_server/app/runner/v2/runner_functions.py

@@ -115,9 +115,8 @@ def run_v2_task_non_parallel(
     workflow_dir_local: Path,
     workflow_dir_remote: Optional[Path] = None,
     executor: Executor,
-    logger_name: Optional[str] = None,
     submit_setup_call: Callable = no_op_submit_setup_call,
-) -> TaskOutput:
+) -> tuple[TaskOutput, int]:
     """
     This runs server-side (see `executor` argument)
     """
@@ -154,10 +153,11 @@ def run_v2_task_non_parallel(
         **executor_options,
     )
     output = future.result()
+    num_tasks = 1
     if output is None:
-        return TaskOutput()
+        return (TaskOutput(), num_tasks)
     else:
-        return _cast_and_validate_TaskOutput(output)
+        return (_cast_and_validate_TaskOutput(output), num_tasks)
 
 
 def run_v2_task_parallel(
@@ -168,12 +168,11 @@ def run_v2_task_parallel(
     executor: Executor,
     workflow_dir_local: Path,
     workflow_dir_remote: Optional[Path] = None,
-    logger_name: Optional[str] = None,
     submit_setup_call: Callable = no_op_submit_setup_call,
-) -> TaskOutput:
+) -> tuple[TaskOutput, int]:
 
     if len(images) == 0:
-        return TaskOutput()
+        return (TaskOutput(), 0)
 
     _check_parallelization_list_size(images)
 
@@ -216,8 +215,9 @@ def run_v2_task_parallel(
         else:
             outputs[ind] = _cast_and_validate_TaskOutput(output)
 
+    num_tasks = len(images)
     merged_output = merge_outputs(outputs)
-    return merged_output
+    return (merged_output, num_tasks)
 
 
 def run_v2_task_compound(
@@ -229,7 +229,6 @@ def run_v2_task_compound(
     executor: Executor,
     workflow_dir_local: Path,
     workflow_dir_remote: Optional[Path] = None,
-    logger_name: Optional[str] = None,
     submit_setup_call: Callable = no_op_submit_setup_call,
 ) -> TaskOutput:
 
@@ -273,11 +272,13 @@ def run_v2_task_compound(
     parallelization_list = init_task_output.parallelization_list
     parallelization_list = deduplicate_list(parallelization_list)
 
+    num_task = 1 + len(parallelization_list)
+
     # 3/B: parallel part of a compound task
     _check_parallelization_list_size(parallelization_list)
 
     if len(parallelization_list) == 0:
-        return TaskOutput()
+        return (TaskOutput(), 0)
 
     list_function_kwargs = []
     for ind, parallelization_item in enumerate(parallelization_list):
@@ -313,4 +314,4 @@ def run_v2_task_compound(
             outputs[ind] = validated_output
 
     merged_output = merge_outputs(outputs)
-    return merged_output
+    return (merged_output, num_task)

fractal_server/app/schemas/v2/__init__.py

@@ -1,3 +1,4 @@
+from .accounting import AccountingRecordRead  # noqa F401
 from .dataset import DatasetCreateV2  # noqa F401
 from .dataset import DatasetExportV2  # noqa F401
 from .dataset import DatasetImportV2  # noqa F401

fractal_server/app/schemas/v2/accounting.py

@@ -0,0 +1,18 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+from pydantic import field_serializer
+from pydantic.types import AwareDatetime
+
+
+class AccountingRecordRead(BaseModel):
+
+    id: int
+    user_id: int
+    timestamp: AwareDatetime
+    num_tasks: int
+    num_new_images: int
+
+    @field_serializer("timestamp")
+    def serialize_datetime(v: datetime) -> str:
+        return v.isoformat()

fractal_server/config.py

@@ -611,74 +611,80 @@ class Settings(BaseSettings):
     """
     Comma-separated list of recipients of the OAuth-signup emails.
     """
-    FRACTAL_EMAIL_USE_STARTTLS: Optional[bool] = True
+    FRACTAL_EMAIL_USE_STARTTLS: Literal["true", "false"] = "true"
     """
     Whether to use StartTLS when using the SMTP server.
+    Accepted values: 'true', 'false'.
     """
-    FRACTAL_EMAIL_USE_LOGIN: Optional[bool] = True
+    FRACTAL_EMAIL_USE_LOGIN: Literal["true", "false"] = "true"
     """
     Whether to use login when using the SMTP server.
+    If 'true', FRACTAL_EMAIL_PASSWORD and FRACTAL_EMAIL_PASSWORD_KEY must be
+    provided.
+    Accepted values: 'true', 'false'.
     """
     email_settings: Optional[MailSettings] = None
 
-    @model_validator(mode="before")
-    @classmethod
-    def validate_email_settings(cls, values):
-        email_values = {
-            k: v for k, v in values.items() if k.startswith("FRACTAL_EMAIL")
-        }
-        if email_values:
-
-            def assert_key(key: str):
-                if key not in email_values:
-                    raise ValueError(f"Missing '{key}'")
-
-            assert_key("FRACTAL_EMAIL_SENDER")
-            assert_key("FRACTAL_EMAIL_SMTP_SERVER")
-            assert_key("FRACTAL_EMAIL_SMTP_PORT")
-            assert_key("FRACTAL_EMAIL_INSTANCE_NAME")
-            assert_key("FRACTAL_EMAIL_RECIPIENTS")
+    @model_validator(mode="after")
+    def validate_email_settings(self):
+        email_values = [
+            self.FRACTAL_EMAIL_SENDER,
+            self.FRACTAL_EMAIL_SMTP_SERVER,
+            self.FRACTAL_EMAIL_SMTP_PORT,
+            self.FRACTAL_EMAIL_INSTANCE_NAME,
+            self.FRACTAL_EMAIL_RECIPIENTS,
+        ]
+        if len(set(email_values)) == 1:
+            # All required EMAIL attributes are None
+            pass
+        elif None in email_values:
+            # Not all required EMAIL attributes are set
+            error_msg = (
+                "Invalid FRACTAL_EMAIL configuration. "
+                f"Given values: {email_values}."
+            )
+            raise ValueError(error_msg)
+        else:
+            use_starttls = self.FRACTAL_EMAIL_USE_STARTTLS == "true"
+            use_login = self.FRACTAL_EMAIL_USE_LOGIN == "true"
 
-            if email_values.get("FRACTAL_EMAIL_USE_LOGIN", True):
-                if "FRACTAL_EMAIL_PASSWORD" not in email_values:
+            if use_login:
+                if self.FRACTAL_EMAIL_PASSWORD is None:
                     raise ValueError(
-                        "'FRACTAL_EMAIL_USE_LOGIN' is True but "
+                        "'FRACTAL_EMAIL_USE_LOGIN' is 'true' but "
                         "'FRACTAL_EMAIL_PASSWORD' is not provided."
                     )
-                elif "FRACTAL_EMAIL_PASSWORD_KEY" not in email_values:
+                if self.FRACTAL_EMAIL_PASSWORD_KEY is None:
                     raise ValueError(
-                        "'FRACTAL_EMAIL_USE_LOGIN' is True but "
+                        "'FRACTAL_EMAIL_USE_LOGIN' is 'true' but "
                         "'FRACTAL_EMAIL_PASSWORD_KEY' is not provided."
                     )
-                else:
-                    try:
-                        (
-                            Fernet(email_values["FRACTAL_EMAIL_PASSWORD_KEY"])
-                            .decrypt(email_values["FRACTAL_EMAIL_PASSWORD"])
-                            .decode("utf-8")
-                        )
-                    except Exception as e:
-                        raise ValueError(
-                            "Invalid pair (FRACTAL_EMAIL_PASSWORD, "
-                            "FRACTAL_EMAIL_PASSWORD_KEY). "
-                            f"Original error: {str(e)}."
-                        )
+                try:
+                    (
+                        Fernet(self.FRACTAL_EMAIL_PASSWORD_KEY)
+                        .decrypt(self.FRACTAL_EMAIL_PASSWORD)
+                        .decode("utf-8")
+                    )
+                except Exception as e:
+                    raise ValueError(
+                        "Invalid pair (FRACTAL_EMAIL_PASSWORD, "
+                        "FRACTAL_EMAIL_PASSWORD_KEY). "
+                        f"Original error: {str(e)}."
+                    )
 
-            values["email_settings"] = MailSettings(
-                sender=email_values["FRACTAL_EMAIL_SENDER"],
-                recipients=email_values["FRACTAL_EMAIL_RECIPIENTS"].split(","),
-                smtp_server=email_values["FRACTAL_EMAIL_SMTP_SERVER"],
-                port=email_values["FRACTAL_EMAIL_SMTP_PORT"],
-                encrypted_password=email_values.get("FRACTAL_EMAIL_PASSWORD"),
-                encryption_key=email_values.get("FRACTAL_EMAIL_PASSWORD_KEY"),
-                instance_name=email_values["FRACTAL_EMAIL_INSTANCE_NAME"],
-                use_starttls=email_values.get(
-                    "FRACTAL_EMAIL_USE_STARTTLS", True
-                ),
-                use_login=email_values.get("FRACTAL_EMAIL_USE_LOGIN", True),
+            self.email_settings = MailSettings(
+                sender=self.FRACTAL_EMAIL_SENDER,
+                recipients=self.FRACTAL_EMAIL_RECIPIENTS.split(","),
+                smtp_server=self.FRACTAL_EMAIL_SMTP_SERVER,
+                port=self.FRACTAL_EMAIL_SMTP_PORT,
+                encrypted_password=self.FRACTAL_EMAIL_PASSWORD,
+                encryption_key=self.FRACTAL_EMAIL_PASSWORD_KEY,
+                instance_name=self.FRACTAL_EMAIL_INSTANCE_NAME,
+                use_starttls=use_starttls,
+                use_login=use_login,
             )
 
-        return values
+        return self
 
     ###########################################################################
     # BUSINESS LOGIC

fractal_server/migrations/versions/af1ef1c83c9b_add_accounting_tables.py

@@ -0,0 +1,57 @@
+"""Add accounting tables
+
+Revision ID: af1ef1c83c9b
+Revises: 1eac13a26c83
+Create Date: 2025-02-17 14:22:32.701581
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "af1ef1c83c9b"
+down_revision = "1eac13a26c83"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "accountingrecord",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("num_tasks", sa.Integer(), nullable=False),
+        sa.Column("num_new_images", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["user_oauth.id"],
+            name=op.f("fk_accountingrecord_user_id_user_oauth"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_accountingrecord")),
+    )
+    op.create_table(
+        "accountingrecordslurm",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user_id", sa.Integer(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(timezone=True), nullable=False),
+        sa.Column(
+            "slurm_job_ids", postgresql.ARRAY(sa.Integer()), nullable=True
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["user_oauth.id"],
+            name=op.f("fk_accountingrecordslurm_user_id_user_oauth"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_accountingrecordslurm")),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("accountingrecordslurm")
+    op.drop_table("accountingrecord")
+    # ### end Alembic commands ###

fractal_server/tasks/v2/utils_background.py

@@ -34,7 +34,7 @@ def fail_and_cleanup(
     db: DBSyncSession,
 ):
     logger = get_logger(logger_name)
-    logger.error(
+    logger.warning(
         f"Task {task_group_activity.action} failed. "
         f"Original error: {str(exception)}"
     )

{fractal_server-2.13.0.dist-info → fractal_server-2.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.13.0
+Version: 2.13.1
 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.13.0.dist-info → fractal_server-2.13.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=9ob5spirSIHc6BZ8Gib1GW_SY2DX0L2EX7f1ZzmBmCE,23
+fractal_server/__init__.py,sha256=RVVgvOrf56lXdkkOitLzI3TL2D6aaRZrlU-iLjRWJ7w,23
 fractal_server/__main__.py,sha256=igfS2XL3e8JycuhASl2vsYuIPma0MG0cfPPFRuQfh14,6906
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,7 +8,8 @@ fractal_server/app/models/linkusergroup.py,sha256=LWTUfhH2uAnn_4moK7QdRUIHWtpw-h
 fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
 fractal_server/app/models/security.py,sha256=mMb_HiwWY74QZrs9xuyno0CVSmk4GYQWk5FxGixr8SU,3860
 fractal_server/app/models/user_settings.py,sha256=Y-ZV-uZAFLZqXxy8c5_Qeh_F7zQuZDWOgLpU6Zs6iqU,1316
-fractal_server/app/models/v2/__init__.py,sha256=63THGEZQlxWcosGCI74SEvJU7wOoOn1j1byTjf4NFOI,526
+fractal_server/app/models/v2/__init__.py,sha256=TvY6VBvRG0XEfayCFNeaDxi0SZX_-rGPSvkoctl7wNM,666
+fractal_server/app/models/v2/accounting.py,sha256=f2ALxfKKBNxFLJTtC2-YqRepVK253x68y7zkD2V_Nls,1115
 fractal_server/app/models/v2/dataset.py,sha256=O5_6YfNeX6JM7PUcEZhbeV4JCvuAhFCQbOOuefpVnqc,1544
 fractal_server/app/models/v2/job.py,sha256=L0P1mrztMqqb-6qdPEbuHXhCsf2mxVUct_ehcXrREGg,1844
 fractal_server/app/models/v2/project.py,sha256=rAHoh5KfYwIaW7rTX0_O0jvWmxEvfo1BafvmcXuSSRk,786
@@ -18,27 +19,29 @@ fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO
 fractal_server/app/models/v2/workflowtask.py,sha256=919L2jCm9y57MXiezGBb28uiXpxyiSHwA_DkDF9OVjg,1226
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/routes/admin/v2/__init__.py,sha256=KYrw0COmmMuIMp7c6YcYRXah4tEYplCWeROnPK1VTeg,681
-fractal_server/app/routes/admin/v2/job.py,sha256=cbkFIRIIXaWmNsUFI7RAu8HpQ0mWn_bgoxtvWZxr-IA,7624
+fractal_server/app/routes/admin/v2/__init__.py,sha256=_5lqb6-M8-fZqE1HRMep6pAFYRUKMxrvbZOKs-RXWkw,933
+fractal_server/app/routes/admin/v2/accounting.py,sha256=ueTGk9748d-gNorqCkkhddgGKzgpWVZQ4G0Loobl7eQ,3788
+fractal_server/app/routes/admin/v2/impersonate.py,sha256=gc4lshfEPFR6W2asH7aKu6hqE6chzusdhAUVV9p51eU,1131
+fractal_server/app/routes/admin/v2/job.py,sha256=4soc-5d99QEsir7U9AqpofgaGggSBwgMm7mXW5LBvSI,7439
 fractal_server/app/routes/admin/v2/project.py,sha256=luy-yiGX1JYTdPm1hpIdDUUqPm8xHuipLy9k2X6zu74,1223
 fractal_server/app/routes/admin/v2/task.py,sha256=h6O_DLYgp7KMExydPRO-1UsvsYj8S52E3CjslDNJZnA,4375
-fractal_server/app/routes/admin/v2/task_group.py,sha256=QD7Ui8bMJW698YAlhejWKj_ywjMwt8jymWppl2HnkLU,8126
+fractal_server/app/routes/admin/v2/task_group.py,sha256=XTjdqgABXZcx9EenaoqSmHh12BXSentUus3SV0oxBMs,7929
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=0e0ZJ_k75TVHaT2o8Xk33DPDSgh-eBhZf-y4y7t-Adg,9429
 fractal_server/app/routes/api/__init__.py,sha256=2IDheFi0OFdsUg7nbUiyahqybvpgXqeHUXIL2QtWrQQ,641
 fractal_server/app/routes/api/v2/__init__.py,sha256=w4c9WzagaVV5d4TWBX5buu5ENk8jf3YftMQYmhavz9Q,2172
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=NJ6_1biN_hhIEK1w8Vj6XhLmdkQ5kMVd_MX5JC_nHLU,11524
-fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=c8eqPXdMhc3nIixX50B1Ka5n7LgbOZm2JbEs7lICQ04,6767
+fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=qdXCb6IP8-qPEAxGZKljtjIqNzIAyRaAsQSRi5VqFHM,6773
 fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=uhNSs-jcS7ndIUFKiOC1yrDiViw3uvKEXi9UL04BMks,11642
 fractal_server/app/routes/api/v2/dataset.py,sha256=tyZjoncjzWd3Bl3t1vBFNMIY1FVo0z23aagdFlNKX0Q,9465
 fractal_server/app/routes/api/v2/images.py,sha256=32sSDSWri_A8uQHcdbVTPvGGEjj9vk5ILj8q0-2jLX8,8507
 fractal_server/app/routes/api/v2/job.py,sha256=m89FTh9Px25oXCeWj2k2NdGWQaO2oxMh-6lZppcsJOY,5551
 fractal_server/app/routes/api/v2/project.py,sha256=3kMp1ValIVwY-qogfRNgWmSMk0jgsk1VJlY8MhwvH1Q,6665
 fractal_server/app/routes/api/v2/status.py,sha256=Ls_TMPBE_pqOFsO1XBWf8NDSoQkle45XuI7clKwGouQ,6305
-fractal_server/app/routes/api/v2/submit.py,sha256=a2Jo9kEvFCAD8L1mHPkk5aj_xPWfrXrT0o-wf758z1s,8599
+fractal_server/app/routes/api/v2/submit.py,sha256=K4OjcSg476JXIeeMUaYdTDk8Qpj5IO5UULvfErI7Y5Y,8624
 fractal_server/app/routes/api/v2/task.py,sha256=z3_SxsXoKsbM9GGNJUdIiZisQwAJSBqvCc7thaJIOTU,7191
 fractal_server/app/routes/api/v2/task_collection.py,sha256=IDNF6sjDuU37HIQ0TuQA-TZIuf7nfHAQXUUNmkrlhLM,12706
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=cctW61-C2QYF2KXluS15lLhZJS_kt30Ca6UGLFO32z0,6207
-fractal_server/app/routes/api/v2/task_group.py,sha256=LjX2X1sfqr3xlqhH8lfJmFG5ecpEzK_jCV548pU7s24,8268
+fractal_server/app/routes/api/v2/task_group.py,sha256=j3zDvVZizB7NWEgVgZU42JCXETkaVkk2ImJPr0jS7BQ,8164
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=3o9bCC8ubMwffQPPaxQZy-CjH9IB2RkIReIecI6L2_w,9300
 fractal_server/app/routes/api/v2/workflow.py,sha256=Z71EI_WdLnaI0Z5OXy9RaAk_0xN9EHkhR5qieLtM8t0,11689
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=INmnhlMEBJp-vHPR0f940DANPmIidts3OfcooeM_aNA,11205
@@ -52,7 +55,7 @@ fractal_server/app/routes/auth/oauth.py,sha256=AnFHbjqL2AgBX3eksI931xD6RTtmbciHB
 fractal_server/app/routes/auth/register.py,sha256=DlHq79iOvGd_gt2v9uwtsqIKeO6i_GKaW59VIkllPqY,587
 fractal_server/app/routes/auth/router.py,sha256=tzJrygXFZlmV_uWelVqTOJMEH-3Fr7ydwlgx1LxRjxY,527
 fractal_server/app/routes/auth/users.py,sha256=Zr1Bsa7Hpricb_1uFwKPCtgt3PzGnP0TaMLMdpbQDNs,7825
-fractal_server/app/routes/aux/__init__.py,sha256=LR4bR7RunHAK6jc9IR2bReQd-BdXADdnDccXI4uGeGY,731
+fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=XWyWpOObcV55YyK7uzGRlaslmPDCBZy4hiSZBpoa_bg,616
 fractal_server/app/routes/aux/_runner.py,sha256=spNudutueHTBJPhm55RlOuYzb31DhyheSjl2rk6dloM,873
 fractal_server/app/routes/aux/validate_user_settings.py,sha256=FLVi__8YFcm_6c_K5uMQo7raWWXQLBcZtx8yaPO4jaE,2301
@@ -82,22 +85,22 @@ fractal_server/app/runner/run_subprocess.py,sha256=c3JbYXq3hX2aaflQU19qJ5Xs6J6oX
 fractal_server/app/runner/set_start_and_last_task_index.py,sha256=-q4zVybAj8ek2XlbENKlfOAJ39hT_zoJoZkqzDqiAMY,1254
 fractal_server/app/runner/shutdown.py,sha256=9pfSKHDNdIcm0eY-opgRTi7y0HmvfPmYiu9JR6Idark,2082
 fractal_server/app/runner/task_files.py,sha256=sd_MpJ01C8c9QTO8GzGMidFGdlq_hXX_ARDRhd_YMnI,3762
-fractal_server/app/runner/v2/__init__.py,sha256=hA5WyFh1GI2p56D86tf-8BFE9Dcj8f4Ua-X0XTbJIfQ,14770
-fractal_server/app/runner/v2/_local/__init__.py,sha256=QnQ9jfqpzShzjp6H7rfVx9Sqp03J1JB6fCpwNx2MDOw,5119
+fractal_server/app/runner/v2/__init__.py,sha256=Qa2HsdtFfFNCUsKPhDPwjoy5jRpDlIWeraLYsF0ytsY,14855
+fractal_server/app/runner/v2/_local/__init__.py,sha256=URU4bQIFfTEJLJnp4iJLkyGDLKha1wkhskajNmLQfd4,5183
 fractal_server/app/runner/v2/_local/_local_config.py,sha256=L54CYrkCyzwgUUra-YhnYR7fy2nyMl6GGu3-4hjoZ4U,3653
 fractal_server/app/runner/v2/_local/_submit_setup.py,sha256=MucNOo8Er0F5ZIwH7CnTeXgnFMc6d3pKPkv563QNVi0,1630
 fractal_server/app/runner/v2/_local/executor.py,sha256=QrJlD77G6q4WohoJQO7XXbvi2RlCUsNvMnPDEZIoAqA,3620
 fractal_server/app/runner/v2/_slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/runner/v2/_slurm_common/get_slurm_config.py,sha256=21Tl70L8oyo3H_r0vXW6KO9pq2IKEiV5ZkshsPsBjzI,6226
-fractal_server/app/runner/v2/_slurm_ssh/__init__.py,sha256=wDW58jBPcmOUeBMcuaOqTz1ElEqiyQn9ar7zp2xCPX4,3274
+fractal_server/app/runner/v2/_slurm_ssh/__init__.py,sha256=qSRQrCSnPJJ-EwjdQP9sPPtn-Tm2e4zmgOJo2_bCtyU,3321
 fractal_server/app/runner/v2/_slurm_ssh/_submit_setup.py,sha256=a5_FDPH_yxYmrjAjMRLgh_Y4DSG3mRslCLQodGM3-t4,2838
-fractal_server/app/runner/v2/_slurm_sudo/__init__.py,sha256=16P_3nDRtXztBf0-JOZzNmpnp164kgzRTADaLX733NI,2921
+fractal_server/app/runner/v2/_slurm_sudo/__init__.py,sha256=F9YsldPrGeEYQ27jz6bn-Nf6u0bwOpmgFhZPXYlJ1fE,2968
 fractal_server/app/runner/v2/_slurm_sudo/_submit_setup.py,sha256=a5_FDPH_yxYmrjAjMRLgh_Y4DSG3mRslCLQodGM3-t4,2838
 fractal_server/app/runner/v2/deduplicate_list.py,sha256=IVTE4abBU1bUprFTkxrTfYKnvkNTanWQ-KWh_etiT08,645
 fractal_server/app/runner/v2/handle_failed_job.py,sha256=-zFWw4d208bQEFUF_sAdH2LdHEARyg1FC8BENr1SjhU,2045
 fractal_server/app/runner/v2/merge_outputs.py,sha256=D1L4Taieq9i71SPQyNc1kMokgHh-sV_MqF3bv7QMDBc,907
-fractal_server/app/runner/v2/runner.py,sha256=EzmoF_7K6n1w1vo2hM12h2EppWW6WyrpT_MmCBbFlCw,11778
-fractal_server/app/runner/v2/runner_functions.py,sha256=BLREIcQaE6FSc2AEJyZuiYk6rGazEz_9gprUqUZDljs,9488
+fractal_server/app/runner/v2/runner.py,sha256=L1zvv5f4IuCW7DaJTxmznQO7LLIO8rdzpN_0WNhlDMs,12088
+fractal_server/app/runner/v2/runner_functions.py,sha256=EnyHkMj7boM1MbS0DEGk2R_pJbVpspqt6BEHcSU7jBE,9548
 fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=1fWvQ6YZUUnDhO_mipXC5hnaT-zK-GHxg8ayoxZX82k,3648
 fractal_server/app/runner/v2/task_interface.py,sha256=e1GGQSYd0MyBj1EZvEVzqv-HpVE4YffXOq82WLrCaOc,1866
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
@@ -107,7 +110,8 @@ fractal_server/app/schemas/_validators.py,sha256=ap0VWJzOfPcq_tbH3sglZClkuinNvMj
 fractal_server/app/schemas/user.py,sha256=vLijVyPIQJdpFc36S6qK2XtSKMzfkhULN1nBsb9tV18,2407
 fractal_server/app/schemas/user_group.py,sha256=Uao1igRYflBu7Dg6Zs0kaFU3zBFJzIwDLrkFfaJk6z8,2176
 fractal_server/app/schemas/user_settings.py,sha256=4XeXQ3rnDS1UvLPd9hvh-WVSbzBGcMDjChfiZ_WGi-w,3134
-fractal_server/app/schemas/v2/__init__.py,sha256=IT2a6fbRx3rt8h6jri_4gZWzTN9EVXewiWoIuBcZ-xA,2618
+fractal_server/app/schemas/v2/__init__.py,sha256=pjRUOJwZGzsDbBbxfnCgQgShs5V8SaHRqwIQDW3STpY,2676
+fractal_server/app/schemas/v2/accounting.py,sha256=Wylt7uWTiDIFlHJOh4XEtYitk2FjFlmnodDrJDxcr0E,397
 fractal_server/app/schemas/v2/dataset.py,sha256=FRJI1hWEjj7M_QhAq3mhWkmJ5lMKOtr1pXcUq-bH-Gk,5517
 fractal_server/app/schemas/v2/dumps.py,sha256=2GUjoqeblUvrSoojBz5odoUUf53IABtbY_5GvFZoMVc,1782
 fractal_server/app/schemas/v2/job.py,sha256=Dp_RRiC5uvJqq1fAJlBXztAFA-tS5FWuRnUbTnLtL6M,4226
@@ -122,7 +126,7 @@ fractal_server/app/schemas/v2/workflowtask.py,sha256=qMvwlnFCsnyD8uv8HJ4cFy2-QMm
 fractal_server/app/security/__init__.py,sha256=8dg7vBzLjU43p_eGoHuFBO97FtIDtNnbJJ5mzVSVRNI,14094
 fractal_server/app/security/signup_email.py,sha256=CR1VbsGFNshxsWquLDZPbUAYnGzkCHeJChtncq63RBc,1434
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
-fractal_server/config.py,sha256=qNhfBYRAGFjT7rcg_LPLQXexzxWydJr4kHyrWaWoMew,28753
+fractal_server/config.py,sha256=16IxtLytZcUZCY1Bog0Vv9t20cK3vG0XyQ_y94DaOh8,28810
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -154,6 +158,7 @@ fractal_server/migrations/versions/99ea79d9e5d2_add_dataset_history.py,sha256=0i
 fractal_server/migrations/versions/9c5ae74c9b98_add_user_settings_table.py,sha256=syONdZNf4-OnAcWIsbzXpYwpXPsXZ4SsmjwVvmVG0PU,2256
 fractal_server/migrations/versions/9fd26a2b0de4_add_workflow_timestamp_created.py,sha256=4l1AHGUsa0ONoJVZlr3fTXw_xbbQ8O7wlD92Az2aRfM,1849
 fractal_server/migrations/versions/a7f4d6137b53_add_workflow_dump_to_applyworkflow.py,sha256=ekDUML7ILpmdoqEclKbEUdyLi4uw9HSG_sTjG2hp_JE,867
+fractal_server/migrations/versions/af1ef1c83c9b_add_accounting_tables.py,sha256=BftudWuSGvKGBzIL5AMb3yWkgTAuaKPBGsYcOzp_gLQ,1899
 fractal_server/migrations/versions/af8673379a5c_drop_old_filter_columns.py,sha256=9sLd0F7nO5chHHm7RZ4wBA-9bvWomS-av_odKwODADM,1551
 fractal_server/migrations/versions/d256a7379ab8_taskgroup_activity_and_venv_info_to_.py,sha256=HN3_Pk8G81SzdYjg4K1RZAyjKSlsZGvcYE2nWOUbwxQ,3861
 fractal_server/migrations/versions/d4fe3708d309_make_applyworkflow_workflow_dump_non_.py,sha256=6cHEZFuTXiQg9yu32Y3RH1XAl71av141WQ6UMbiITIg,949
@@ -186,7 +191,7 @@ fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V
 fractal_server/tasks/v2/templates/4_pip_show.sh,sha256=84NGHlg6JIbrQktgGKyfGsggPFzy6RBJuOmIpPUhsrw,1747
 fractal_server/tasks/v2/templates/5_get_venv_size_and_file_number.sh,sha256=q-6ZUvA6w6FDVEoSd9O63LaJ9tKZc7qAFH72SGPrd_k,284
 fractal_server/tasks/v2/templates/6_pip_install_from_freeze.sh,sha256=A2y8RngEjAcRhG-_owA6P7tAdrS_AszFuGXnaeMV8u0,1122
-fractal_server/tasks/v2/utils_background.py,sha256=6wM7Z6zedsR8oVGwrJ-HN2Hj1b7BgmaSBdvuB_r9hI8,4246
+fractal_server/tasks/v2/utils_background.py,sha256=W_RvihI1aiYPJNsPo8z4wKuA_bPs0UT2huzLihRpjU4,4248
 fractal_server/tasks/v2/utils_database.py,sha256=iLbwkxMxTCgpyKe1JQzdfIR3zBfxohgmLwSdGps1AUo,1274
 fractal_server/tasks/v2/utils_package_names.py,sha256=RDg__xrvQs4ieeVzmVdMcEh95vGQYrv9Hfal-5EDBM8,2393
 fractal_server/tasks/v2/utils_python_interpreter.py,sha256=5_wrlrTqXyo1YuLZvAW9hrSoh5MyLOzdPVUlUwM7uDQ,955
@@ -194,8 +199,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.13.0.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.13.0.dist-info/METADATA,sha256=YY5WVT35OWNC2Ilx_EIBFAIfd7KXo5xZjDEVfe04R-E,4548
-fractal_server-2.13.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.13.0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.13.0.dist-info/RECORD,,
+fractal_server-2.13.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.13.1.dist-info/METADATA,sha256=xWwzGuagIVtTBtHUpvpmo3jk5NPwmDq71eZgGrKnYjI,4548
+fractal_server-2.13.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.13.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.13.1.dist-info/RECORD,,