fractal-server 1.4.0a8__py3-none-any.whl → 1.4.0a10__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.4.0a8"
+__VERSION__ = "1.4.0a10"

fractal_server/app/db/__init__.py

@@ -82,11 +82,17 @@ class DB:
         )
 
         cls._async_session_maker = sessionmaker(
-            cls._engine_async, class_=AsyncSession, expire_on_commit=False
+            cls._engine_async,
+            class_=AsyncSession,
+            expire_on_commit=False,
+            future=True,
         )
 
         cls._sync_session_maker = sessionmaker(
-            bind=cls._engine_sync, autocommit=False, autoflush=False
+            bind=cls._engine_sync,
+            autocommit=False,
+            autoflush=False,
+            future=True,
         )
 
         @event.listens_for(cls._engine_sync, "connect")

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/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.0a8.dist-info → fractal_server-1.4.0a10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 1.4.0a8
+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
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: gunicorn
 Provides-Extra: postgres
 Provides-Extra: slurm
@@ -26,8 +27,8 @@ Requires-Dist: gunicorn (>=20.1.0,<21.0.0) ; extra == "gunicorn"
 Requires-Dist: psycopg2 (>=2.9.5,<3.0.0) ; extra == "postgres"
 Requires-Dist: pydantic (>=1.10.8,<2)
 Requires-Dist: python-dotenv (>=0.20.0,<0.21.0)
-Requires-Dist: sqlalchemy[asyncio] (==1.4.50)
-Requires-Dist: sqlmodel (>=0.0.11,<0.0.12)
+Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
+Requires-Dist: sqlmodel (>=0.0.12,<0.0.13)
 Requires-Dist: uvicorn (>=0.20.0,<0.21.0)
 Project-URL: Changelog, https://github.com/fractal-analytics-platform/fractal-server/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server

{fractal_server-1.4.0a8.dist-info → fractal_server-1.4.0a10.dist-info}/RECORD

@@ -1,8 +1,8 @@
-fractal_server/__init__.py,sha256=Gl9IwqFGt9CRV7tM8AMW8I-hVOCLlAPR4uz9rWz24Aw,24
+fractal_server/__init__.py,sha256=tmgA-5yDN48QJckSZGFd4ui39osD9xIRrN6v7Z3LX9U,25
 fractal_server/__main__.py,sha256=znijcImbcEC4P26ICOhEJ9VY3_5vWdMwQcl-WP25sYA,2202
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/db/__init__.py,sha256=7AA_hkOdQCI0LEKPuhYY8GVhQYs9zQ5b6KELiQzo-us,3681
+fractal_server/app/db/__init__.py,sha256=gJCmPYNVg8UEjvtPWLupM3yzZRpt3wvHjZuUsn1DBXk,3781
 fractal_server/app/models/__init__.py,sha256=RuxWH8fsmkTWsjLhYjrxSt-mvk74coCilAQlX2Q6OO0,353
 fractal_server/app/models/dataset.py,sha256=fcZkb2y7PXlFJAyZtndJ7Gf4c8VpkWjZe47iMybv1aE,2109
 fractal_server/app/models/job.py,sha256=DbX7OMx88eC-232C_OdYOpNeyN0tma7p8J3x7HB43os,2768
@@ -13,12 +13,12 @@ fractal_server/app/models/state.py,sha256=rSTjYPfPZntEfdQudKp6yu5vsdyfHA7nMYNRIB
 fractal_server/app/models/task.py,sha256=APndtea9A7EF7TtpVK8kWapBM01a6nk3FFCrQbbioI8,2632
 fractal_server/app/models/workflow.py,sha256=r_bdKxzGgRjiwJW2fMYV9pvqcAs2swh1xg_q8pvXSbE,5328
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/app/routes/admin.py,sha256=R-NpkziRdFp3lngSvoNb6_mDQn8S51FPlHqhcK09mQc,7223
+fractal_server/app/routes/admin.py,sha256=70A9YVRtrAw0Npetr6WD8o1eW8d6MOlxdrSgCMVa53I,8369
 fractal_server/app/routes/api/__init__.py,sha256=EVyZrEq3I_1643QGTPCC5lgCp4xH_auYbrFfogTm4pc,315
 fractal_server/app/routes/api/v1/__init__.py,sha256=V4nhYyMIqhlJxbotLTYikq_ghb6KID0ZKOOYaOq7C-g,944
 fractal_server/app/routes/api/v1/_aux_functions.py,sha256=qaeTsfSk78FHSsMVNkGdPIPBjeKOEd1sq0KhY0SQ1l0,10095
 fractal_server/app/routes/api/v1/dataset.py,sha256=_P8SUXEs5Gh-a82QR06xyZ_F6eX6R_CxmBduNXEeERY,14968
-fractal_server/app/routes/api/v1/job.py,sha256=9jEoIYnUvtc3oB52yRhFd_NYJk8tGK3qorDOjcgiN1I,6554
+fractal_server/app/routes/api/v1/job.py,sha256=07nrsWvPcV-DkFybiMKgHLVDp_CFeFx6pnEKnBNrvL4,5382
 fractal_server/app/routes/api/v1/project.py,sha256=uP-p9rghQBQ_vRZ2hUw_bT21WVLpqdgJNdxN6z367YI,11417
 fractal_server/app/routes/api/v1/task.py,sha256=iT45B_NXvBilp-aclWuONsNAWvpczrEWO21K9DOJsZ0,5504
 fractal_server/app/routes/api/v1/task_collection.py,sha256=bMnhrMkI_45Bttd6J9j_CEmpjQZCV5mTy8_j1Ca8xQg,11724
@@ -76,8 +76,8 @@ fractal_server/syringe.py,sha256=3qSMW3YaMKKnLdgnooAINOPxnCOxP7y2jeAQYB21Gdo,278
 fractal_server/tasks/__init__.py,sha256=Wzuxf5EoH1v0fYzRpAZHG_S-Z9f6DmbIsuSvllBCGvc,72
 fractal_server/tasks/collection.py,sha256=POKvQyS5G5ySybH0r0v21I_ZQ5AREe9kAqr_uFfGyaU,17627
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-1.4.0a8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-1.4.0a8.dist-info/METADATA,sha256=Q838zbjrh4zCM6l9ySGnJvmwvpDQCC7NaEz-b8qYOzA,3771
-fractal_server-1.4.0a8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-fractal_server-1.4.0a8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-1.4.0a8.dist-info/RECORD,,
+fractal_server-1.4.0a10.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-1.4.0a10.dist-info/METADATA,sha256=LwAeB6fkG05EJSvzDBC245TNhCKHkVcDuIPx_Zv8MiU,3828
+fractal_server-1.4.0a10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+fractal_server-1.4.0a10.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-1.4.0a10.dist-info/RECORD,,

{fractal_server-1.4.0a8.dist-info → fractal_server-1.4.0a10.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any