fractal-server 2.13.0__tar.gz → 2.13.1__tar.gz

{fractal_server-2.13.0 → fractal_server-2.13.1}/PKG-INFO

@@ -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.1/fractal_server/__init__.py

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

{fractal_server-2.13.0 → fractal_server-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-2.13.1/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-2.13.0 → fractal_server-2.13.1}/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-2.13.1/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-2.13.1/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.0 → fractal_server-2.13.1}/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-2.13.1/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()