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

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

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

fractal_server-1.4.0a10/fractal_server/__init__.py

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

{fractal_server-1.4.0a9 → fractal_server-1.4.0a10}/fractal_server/app/routes/admin.py

@@ -6,6 +6,8 @@ from typing import Optional
 
 from fastapi import APIRouter
 from fastapi import Depends
+from fastapi import HTTPException
+from fastapi import status as fastapi_status
 from sqlalchemy import func
 from sqlmodel import select
 
@@ -18,6 +20,7 @@ from ..models import Project
 from ..models import Workflow
 from ..models.security import UserOAuth as User
 from ..schemas import ApplyWorkflowRead
+from ..schemas import ApplyWorkflowUpdate
 from ..schemas import DatasetRead
 from ..schemas import ProjectRead
 from ..schemas import WorkflowRead
@@ -212,3 +215,39 @@ async def view_job(
     await db.close()
 
     return job_list
+
+
+@router_admin.patch(
+    "/job/{job_id}/",
+    response_model=ApplyWorkflowRead,
+)
+async def update_job(
+    job_update: ApplyWorkflowUpdate,
+    job_id: int,
+    user: User = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_db),
+) -> Optional[ApplyWorkflowRead]:
+    """
+    Change the status of an existing job.
+
+    This endpoint is only open to superusers, and it does not apply
+    project-based access-control to jobs.
+    """
+    job = await db.get(ApplyWorkflow, job_id)
+    if job is None:
+        raise HTTPException(
+            status_code=fastapi_status.HTTP_404_NOT_FOUND,
+            detail=f"Job {job_id} not found",
+        )
+
+    if job_update.status != JobStatusType.FAILED:
+        raise HTTPException(
+            status_code=fastapi_status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=f"Cannot set job status to {job_update.status}",
+        )
+
+    setattr(job, "status", job_update.status)
+    await db.commit()
+    await db.refresh(job)
+    await db.close()
+    return job

{fractal_server-1.4.0a9 → fractal_server-1.4.0a10}/fractal_server/app/routes/api/v1/job.py

@@ -15,12 +15,8 @@ from .....config import get_settings
 from .....syringe import Inject
 from ....db import AsyncSession
 from ....db import get_db
-from ....models import ApplyWorkflow
 from ....runner._common import SHUTDOWN_FILENAME
 from ....schemas import ApplyWorkflowRead
-from ....schemas import ApplyWorkflowUpdate
-from ....schemas import JobStatusType
-from ....security import current_active_superuser
 from ....security import current_active_user
 from ....security import User
 from ._aux_functions import _get_job_check_owner
@@ -200,39 +196,3 @@ async def stop_job(
         f.write(f"Trigger executor shutdown for {job.id=}, {project_id=}.")
 
     return Response(status_code=status.HTTP_204_NO_CONTENT)
-
-
-@router.patch(
-    "/job/{job_id}/",
-    response_model=ApplyWorkflowRead,
-)
-async def update_job(
-    job_update: ApplyWorkflowUpdate,
-    job_id: int,
-    user: User = Depends(current_active_superuser),
-    db: AsyncSession = Depends(get_db),
-) -> Optional[ApplyWorkflowRead]:
-    """
-    Change the status of an existing job.
-
-    This endpoint is only open to superusers, and it does not apply
-    project-based access-control to jobs.
-    """
-    job = await db.get(ApplyWorkflow, job_id)
-    if job is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"Job {job_id} not found",
-        )
-
-    if job_update.status != JobStatusType.FAILED:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"Cannot set job status to {job_update.status}",
-        )
-
-    setattr(job, "status", job_update.status)
-    await db.commit()
-    await db.refresh(job)
-    await db.close()
-    return job

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fractal-server"
-version = "1.4.0a9"
+version = "1.4.0a10"
 description = "Server component of the Fractal analytics platform"
 authors = [
     "Jacopo Nespolo <jacopo.nespolo@exact-lab.it>",
@@ -82,7 +82,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "1.4.0a9"
+current_version = "1.4.0a10"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-1.4.0a9/fractal_server/__init__.py

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