fractal-server 1.4.0a4__py3-none-any.whl → 1.4.0a6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.4.0a4"
+__VERSION__ = "1.4.0a6"

fractal_server/app/routes/api/v1/dataset.py

@@ -81,7 +81,7 @@ async def read_dataset_list(
 
 
 @router.get(
-    "/project/{project_id}/dataset/{dataset_id}",
+    "/project/{project_id}/dataset/{dataset_id}/",
     response_model=DatasetRead,
 )
 async def read_dataset(
@@ -105,7 +105,7 @@ async def read_dataset(
 
 
 @router.patch(
-    "/project/{project_id}/dataset/{dataset_id}",
+    "/project/{project_id}/dataset/{dataset_id}/",
     response_model=DatasetRead,
 )
 async def update_dataset(
@@ -143,7 +143,7 @@ async def update_dataset(
 
 
 @router.delete(
-    "/project/{project_id}/dataset/{dataset_id}",
+    "/project/{project_id}/dataset/{dataset_id}/",
     status_code=204,
 )
 async def delete_dataset(
@@ -246,7 +246,7 @@ async def get_resource_list(
 
 
 @router.patch(
-    "/project/{project_id}/dataset/{dataset_id}/resource/{resource_id}",
+    "/project/{project_id}/dataset/{dataset_id}/resource/{resource_id}/",
     response_model=ResourceRead,
 )
 async def update_resource(
@@ -287,7 +287,7 @@ async def update_resource(
 
 
 @router.delete(
-    "/project/{project_id}/dataset/{dataset_id}/resource/{resource_id}",
+    "/project/{project_id}/dataset/{dataset_id}/resource/{resource_id}/",
     status_code=204,
 )
 async def delete_resource(
@@ -481,7 +481,7 @@ async def get_workflowtask_status(
     return response_body
 
 
-@router.get("/project/dataset/", response_model=list[DatasetRead])
+@router.get("/dataset/", response_model=list[DatasetRead])
 async def get_user_datasets(
     user: User = Depends(current_active_user),
 ) -> list[DatasetRead]:

fractal_server/app/routes/api/v1/job.py

@@ -27,7 +27,7 @@ from ._aux_functions import _get_workflow_check_owner
 router = APIRouter()
 
 
-@router.get("/project/job/", response_model=list[ApplyWorkflowRead])
+@router.get("/job/", response_model=list[ApplyWorkflowRead])
 async def get_user_jobs(
     user: User = Depends(current_active_user),
 ) -> list[ApplyWorkflowRead]:
@@ -66,7 +66,7 @@ async def get_workflow_jobs(
 
 
 @router.get(
-    "/project/{project_id}/job/{job_id}",
+    "/project/{project_id}/job/{job_id}/",
     response_model=ApplyWorkflowRead,
 )
 async def read_job(

fractal_server/app/routes/api/v1/project.py

@@ -95,7 +95,7 @@ async def create_project(
     return db_project
 
 
-@router.get("/{project_id}", response_model=ProjectRead)
+@router.get("/{project_id}/", response_model=ProjectRead)
 async def read_project(
     project_id: int,
     user: User = Depends(current_active_user),
@@ -111,7 +111,7 @@ async def read_project(
     return project
 
 
-@router.patch("/{project_id}", response_model=ProjectRead)
+@router.patch("/{project_id}/", response_model=ProjectRead)
 async def update_project(
     project_id: int,
     project_update: ProjectUpdate,
@@ -137,7 +137,7 @@ async def update_project(
     return project
 
 
-@router.delete("/{project_id}", status_code=204)
+@router.delete("/{project_id}/", status_code=204)
 async def delete_project(
     project_id: int,
     user: User = Depends(current_active_user),

fractal_server/app/routes/api/v1/task.py

@@ -42,7 +42,7 @@ async def get_list_task(
     return task_list
 
 
-@router.get("/{task_id}", response_model=TaskRead)
+@router.get("/{task_id}/", response_model=TaskRead)
 async def get_task(
     task_id: int,
     user: User = Depends(current_active_user),
@@ -60,7 +60,7 @@ async def get_task(
     return task
 
 
-@router.patch("/{task_id}", response_model=TaskRead)
+@router.patch("/{task_id}/", response_model=TaskRead)
 async def patch_task(
     task_id: int,
     task_update: TaskUpdate,
@@ -151,7 +151,7 @@ async def create_task(
     return db_task
 
 
-@router.delete("/{task_id}", status_code=204)
+@router.delete("/{task_id}/", status_code=204)
 async def delete_task(
     task_id: int,
     user: User = Depends(current_active_user),

fractal_server/app/routes/api/v1/task_collection.py

@@ -307,7 +307,7 @@ async def collect_tasks_pip(
     return state
 
 
-@router.get("/collect/{state_id}", response_model=StateRead)
+@router.get("/collect/{state_id}/", response_model=StateRead)
 async def check_collection_status(
     state_id: int,
     user: User = Depends(current_active_user),

fractal_server/app/routes/api/v1/workflow.py

@@ -93,7 +93,7 @@ async def create_workflow(
 
 
 @router.get(
-    "/project/{project_id}/workflow/{workflow_id}",
+    "/project/{project_id}/workflow/{workflow_id}/",
     response_model=WorkflowRead,
 )
 async def read_workflow(
@@ -114,7 +114,7 @@ async def read_workflow(
 
 
 @router.patch(
-    "/project/{project_id}/workflow/{workflow_id}",
+    "/project/{project_id}/workflow/{workflow_id}/",
     response_model=WorkflowRead,
 )
 async def update_workflow(
@@ -166,7 +166,7 @@ async def update_workflow(
 
 
 @router.delete(
-    "/project/{project_id}/workflow/{workflow_id}",
+    "/project/{project_id}/workflow/{workflow_id}/",
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def delete_workflow(
@@ -314,7 +314,7 @@ async def import_workflow(
     return db_workflow
 
 
-@router.get("/project/workflow/", response_model=list[WorkflowRead])
+@router.get("/workflow/", response_model=list[WorkflowRead])
 async def get_user_workflows(
     user: User = Depends(current_active_user),
 ) -> list[WorkflowRead]:

fractal_server/app/routes/api/v1/workflowtask.py

@@ -75,7 +75,7 @@ async def create_workflowtask(
 
 
 @router.get(
-    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}",
+    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
     response_model=WorkflowTaskRead,
 )
 async def read_workflowtask(
@@ -96,7 +96,7 @@ async def read_workflowtask(
 
 
 @router.patch(
-    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}",
+    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
     response_model=WorkflowTaskRead,
 )
 async def update_workflowtask(
@@ -152,7 +152,7 @@ async def update_workflowtask(
 
 
 @router.delete(
-    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}",
+    "/project/{project_id}/workflow/{workflow_id}/wftask/{workflow_task_id}/",
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def delete_workflowtask(

fractal_server/app/routes/auth.py

@@ -39,8 +39,15 @@ router_auth.include_router(
 router_auth.include_router(
     fastapi_users.get_verify_router(UserRead),
 )
+
+# Include users routes, after removing DELETE endpoint (ref
+# https://github.com/fastapi-users/fastapi-users/discussions/606)
+users_router = fastapi_users.get_users_router(UserRead, UserUpdate)
+users_router.routes = [
+    route for route in users_router.routes if route.name != "users:delete_user"
+]
 router_auth.include_router(
-    fastapi_users.get_users_router(UserRead, UserUpdate),
+    users_router,
     prefix="/users",
     dependencies=[Depends(current_active_superuser)],
 )
@@ -119,3 +126,9 @@ for client_config in settings.OAUTH_CLIENTS_CONFIG:
         ),
         prefix=f"/{client_name}",
     )
+
+
+# Add trailing slash to all routes' paths
+for route in router_auth.routes:
+    if not route.path.endswith("/"):
+        route.path = f"{route.path}/"

fractal_server/app/schemas/applyworkflow.py

@@ -1,13 +1,12 @@
 from datetime import datetime
 from enum import Enum
+from typing import Any
 from typing import Optional
 
 from pydantic import BaseModel
 from pydantic import validator
 
 from ._validators import valstr
-from .dataset import DatasetRead
-from .workflow import WorkflowRead
 
 __all__ = (
     "_ApplyWorkflowBase",
@@ -128,11 +127,11 @@ class ApplyWorkflowRead(_ApplyWorkflowBase):
     project_id: Optional[int]
     user_email: str
     workflow_id: Optional[int]
-    workflow_dump: Optional[WorkflowRead]
+    workflow_dump: Optional[dict[str, Any]]
     input_dataset_id: Optional[int]
-    input_dataset_dump: Optional[DatasetRead]
+    input_dataset_dump: Optional[dict[str, Any]]
     output_dataset_id: Optional[int]
-    output_dataset_dump: Optional[DatasetRead]
+    output_dataset_dump: Optional[dict[str, Any]]
     start_timestamp: datetime
     end_timestamp: Optional[datetime]
     status: str

{fractal_server-1.4.0a4.dist-info → fractal_server-1.4.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 1.4.0a4
+Version: 1.4.0a6
 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.0a4.dist-info → fractal_server-1.4.0a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=JfZWaC1BqnxbqOUgf5lHzgHzu1_rNvq5jDI6N85FkOE,24
+fractal_server/__init__.py,sha256=f8Dtud26HpKHjrFuYNUkxKp-XbpCyKJlfttQZjwzDrE,24
 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
@@ -16,14 +16,14 @@ fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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=9uh5MNGQyLg3HgSNp2ZrfMfJ_rv6WPN1oznmrWgaYmQ,10139
-fractal_server/app/routes/api/v1/dataset.py,sha256=UWa17aG35Cg-9YcnVWhO7ocjb7OcVobzzklmFkb6KvM,14971
-fractal_server/app/routes/api/v1/job.py,sha256=HrkffALjcA9Xtz5MraHBSsCL6cPulNt-1S7YnghQTNA,5389
-fractal_server/app/routes/api/v1/project.py,sha256=VH0rP3DBIIxpQ96iD1_R0gXKZ2otJ755A0HvEoL3yqQ,11414
-fractal_server/app/routes/api/v1/task.py,sha256=cJp9ucKtGfzU3jalO3A-6yMBMF-0q69Vd5n-YceKfbE,5592
-fractal_server/app/routes/api/v1/task_collection.py,sha256=wZI89f3jQ653IcNxn932IqHVg2bKLpHlkRP0tevvWv0,11723
-fractal_server/app/routes/api/v1/workflow.py,sha256=MQC5dLtf6r-aAlauiL3v9bEpJjLf-9OLJ0XgS0nLbH4,9824
-fractal_server/app/routes/api/v1/workflowtask.py,sha256=BW2qEEl078vPnFV3zVkvVSU9nWLKM4bAl0tMtoGqAto,5429
-fractal_server/app/routes/auth.py,sha256=fdrGvXYkG2oKF9q0e7WhB01z7MCTbftxt0oM-OcAcsM,3403
+fractal_server/app/routes/api/v1/dataset.py,sha256=_P8SUXEs5Gh-a82QR06xyZ_F6eX6R_CxmBduNXEeERY,14968
+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=PUPB1pGsWRUrGAyFCKG_AMcLW3IQzIsAhfA3FB1FS_Q,5595
+fractal_server/app/routes/api/v1/task_collection.py,sha256=bMnhrMkI_45Bttd6J9j_CEmpjQZCV5mTy8_j1Ca8xQg,11724
+fractal_server/app/routes/api/v1/workflow.py,sha256=rXU-wyU8SFJ7t6tNl2dCiugXzMjFpYV_ljTcYQrC8NE,9819
+fractal_server/app/routes/api/v1/workflowtask.py,sha256=ZXmZBymcQgt838Bywoxcy6M0l1z2uatHJxq_e45-8T0,5432
+fractal_server/app/routes/auth.py,sha256=XEerBzlHE7b4XfB6Bk0qYj6edRM6yFZr3UosLzjfvt8,3816
 fractal_server/app/routes/monitoring.py,sha256=JYE9wxluDamJUiUrbluU9CHc97_7wmuOM4ENg0fvGg8,6747
 fractal_server/app/runner/.gitignore,sha256=ytzN_oyHWXrGU7iFAtoHSTUbM6Rn6kG0Zkddg0xZk6s,16
 fractal_server/app/runner/__init__.py,sha256=WNMxT9XFEocPOdJRN6FfMek-LecOpBYXfJxmxupMRUE,13597
@@ -45,7 +45,7 @@ fractal_server/app/runner/common.py,sha256=nz0ZuIro0iwZm-OV-e-Y-PrtgKcLK0d7Brzeb
 fractal_server/app/runner/handle_failed_job.py,sha256=PKgJARHjXyv33sDsl7oTINdcTu7EwmFmIkp38RqAE3Q,4641
 fractal_server/app/schemas/__init__.py,sha256=th51Dzbe94xatOIMVheqlq0rVFy8oI1CHRfzCbjiTSg,1859
 fractal_server/app/schemas/_validators.py,sha256=7YEbgrnGRpzkLMfZzQNfczEmcNnO__SmVOaBHhzaiXE,1819
-fractal_server/app/schemas/applyworkflow.py,sha256=QoCJCe3tTOvLG05UGTyG6Ijpd3UnIye3snSasX1sjpc,3948
+fractal_server/app/schemas/applyworkflow.py,sha256=zzQy_vxWjzUE0WnZHQWQBU7GB0a8ZkBczZidl32WOY0,3911
 fractal_server/app/schemas/dataset.py,sha256=PPqGTsRQ5JEwkiM4NcjPYFckxnCdi_Zov-bWXDm1LUk,3092
 fractal_server/app/schemas/json_schemas/manifest.json,sha256=yXYKHbYXPYSkSXMTLfTpfCUGBtmQuPTk1xuSXscdba4,1787
 fractal_server/app/schemas/manifest.py,sha256=xxTd39dAXMK9Ox1y-p3gbyg0zd5udW99pV4JngCUGwM,3819
@@ -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.0a4.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-1.4.0a4.dist-info/METADATA,sha256=gjG77QQZKX2Z6tT_RvSBx5h1XDfQVG7JxRcGd3CNG2w,3773
-fractal_server-1.4.0a4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-fractal_server-1.4.0a4.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-1.4.0a4.dist-info/RECORD,,
+fractal_server-1.4.0a6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-1.4.0a6.dist-info/METADATA,sha256=uEKvn9e4l-C6qeB5z6wCLq7skQibIIrDPvjryYEVkMk,3773
+fractal_server-1.4.0a6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+fractal_server-1.4.0a6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-1.4.0a6.dist-info/RECORD,,