fractal-server 1.2.3a0__py3-none-any.whl → 1.2.3a2__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.2.3a0"
+__VERSION__ = "1.2.3a2"

fractal_server/app/api/v1/project.py

@@ -216,7 +216,6 @@ async def apply_workflow(
     project = output["project"]
 
     workflow = db_sync.get(Workflow, apply_workflow.workflow_id)
-    db_sync.close()
     if not workflow:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
@@ -295,7 +294,6 @@ async def apply_workflow(
     db.add(job)
     await db.commit()
     await db.refresh(job)
-    await db.close()
 
     background_tasks.add_task(
         submit_workflow,
@@ -308,6 +306,9 @@ async def apply_workflow(
         user_cache_dir=user.cache_dir,
     )
 
+    await db.close()
+    db_sync.close()
+
     return job
 
 
@@ -408,7 +409,7 @@ async def get_job_list(
     stm = select(ApplyWorkflow).where(ApplyWorkflow.project_id == project_id)
     res = await db.execute(stm)
     job_list = res.scalars().all()
-
+    await db.close()
     return job_list
 
 

fractal_server/app/api/v1/task.py

@@ -48,7 +48,9 @@ router = APIRouter()
 
 
 async def _background_collect_pip(
-    state: State, venv_path: Path, task_pkg: _TaskCollectPip, db: AsyncSession
+    state_id: int,
+    venv_path: Path,
+    task_pkg: _TaskCollectPip,
 ) -> None:
     """
     Install package and collect tasks
@@ -59,6 +61,12 @@ async def _background_collect_pip(
     In case of error, copy the log into the state and delete the package
     directory.
     """
+
+    # Note: anext(get_db()) is only available for python>=3.10
+    db = await get_db().__anext__()
+
+    state: State = await db.get(State, state_id)
+
     logger_name = task_pkg.package.replace("/", "_")
     logger = set_logger(
         logger_name=logger_name,
@@ -110,6 +118,7 @@ async def _background_collect_pip(
         logger.debug("Task-collection status: OK")
         logger.info("Background task collection completed successfully")
         close_logger(logger)
+        await db.close()
 
     except Exception as e:
         # Write last logs to file
@@ -124,6 +133,7 @@ async def _background_collect_pip(
         state.data = data.sanitised_dict()
         await db.merge(state)
         await db.commit()
+        await db.close()
 
         # Delete corrupted package dir
         shell_rmtree(venv_path)
@@ -240,10 +250,9 @@ async def collect_tasks_pip(
 
     background_tasks.add_task(
         _background_collect_pip,
-        state=state,
+        state_id=state.id,
         venv_path=venv_path,
         task_pkg=task_pkg,
-        db=db,
     )
     logger.debug(
         "Task-collection endpoint: start background collection "

fractal_server/app/runner/__init__.py

@@ -207,6 +207,10 @@ async def submit_workflow(
             worker_init=worker_init,
         )
 
+        logger.info(
+            f'End execution of workflow "{workflow.name}"; '
+            f"more logs at {str(log_file_path)}"
+        )
         logger.debug(f'END workflow "{workflow.name}"')
 
         db_sync.merge(output_dataset)

fractal_server/app/security/__init__.py

@@ -173,6 +173,7 @@ async def list_users(
     stm = select(User)
     res = await db.execute(stm)
     user_list = res.scalars().all()
+    await db.close()
     return user_list
 
 

{fractal_server-1.2.3a0.dist-info → fractal_server-1.2.3a2.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 fractal_server/.gitignore,sha256=9swdobOQ_Celjt2OgRUpy9oEpNqTBn-1NRUFfJU4rps,69
-fractal_server/__init__.py,sha256=pNSeR9OL1QrOEA4eaf7OgP90gXM2mS8ZyfUKYNbZQSA,24
+fractal_server/__init__.py,sha256=YVtB2kEziyfiwQ28AUVU4Yh9khootFg2QyizaaNDKHs,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
 fractal_server/app/api/__init__.py,sha256=A_RS6hUnnFef2dcWbvG0kLmQdNs26g9W47fAbWc_WXo,887
 fractal_server/app/api/v1/__init__.py,sha256=2HMymr1YkUk39V8iof7KENyLnre4ghouOSvNZ_kF1ec,24
 fractal_server/app/api/v1/job.py,sha256=UldY2tt904rF95JXaMf7yIkEK0BIVI1k7YchJVr847o,2783
-fractal_server/app/api/v1/project.py,sha256=Cg0PZzFTtM2AXb4zPUGR1zOqHM3G-qsaTQ6RoCIZHhQ,22420
-fractal_server/app/api/v1/task.py,sha256=OpWIn8WJeUVQuVAG65geeSQgM2huiqj1DUCqJfqhbGM,12019
+fractal_server/app/api/v1/project.py,sha256=WxSnUaY6Xhn1sHlNVKih7iUp6uEJeHzrucfka4heAl8,22441
+fractal_server/app/api/v1/task.py,sha256=Gbk0mcyQeUb7ebhl5MWHONAFD4pbc81ZcTfbB7Hjm5E,12203
 fractal_server/app/api/v1/workflow.py,sha256=DPmDgS3Thf1HS46FZCEni9vQEDkA7wPj0BmBa-T2wU0,11503
 fractal_server/app/db/__init__.py,sha256=Ont7FOvNEEx8-_GFsJ5Lv_5nbxySs_bEpLTdKEzOqDM,2724
 fractal_server/app/models/__init__.py,sha256=MyHn6KDfdPvBpfvcR2QrhWuP1qle3St3e_YzNYcu9y8,372
@@ -18,7 +18,7 @@ fractal_server/app/models/state.py,sha256=uVMwkpalARAni7DNbOQ44v9LikRHJqR7MWlsGy
 fractal_server/app/models/task.py,sha256=3lTZMmHcQK0CgWLjcceyOANdqRt-89n1_z1AMEL2L2Q,1080
 fractal_server/app/models/workflow.py,sha256=Tf4sT4kciDMhGRCTUFWDtEfTvNj3mdWhCx6fURJp9Vc,5371
 fractal_server/app/runner/.gitignore,sha256=ytzN_oyHWXrGU7iFAtoHSTUbM6Rn6kG0Zkddg0xZk6s,16
-fractal_server/app/runner/__init__.py,sha256=ex0LZfjCKt-Y2oR-appVVMcOaiBRReldEdqXJckLyGE,8850
+fractal_server/app/runner/__init__.py,sha256=dvv6hAQwMGDuJ1S8AiuiCayIX1BDwQC95ywY8VGTmjc,8991
 fractal_server/app/runner/_common.py,sha256=PoiBIaCclo1DqjqrIY4qbEAvnRgxQ4MgN3x7xfqXUNw,19294
 fractal_server/app/runner/_local/__init__.py,sha256=JuwhEinF-Yu5C7kkXKqs5cl3OYzCWSSl8uz1HK2eIYY,5460
 fractal_server/app/runner/_local/_local_config.py,sha256=tz93dzmG2NtgQiCO3k81QgDzNbC1x38_tOjNKNyqYEY,3273
@@ -34,7 +34,7 @@ fractal_server/app/runner/_slurm/_subprocess_run_as_user.py,sha256=k7JWKJ5oSM-WE
 fractal_server/app/runner/_slurm/executor.py,sha256=AgmDD3qXVyyI8FWU-udQLS3PAuc1V84oZC7HoYM6q3o,40272
 fractal_server/app/runner/_slurm/remote.py,sha256=wLziIsGdSMiO-jIXM8x77JRK82g_2hx0iBKTiMghuIo,5852
 fractal_server/app/runner/common.py,sha256=JvE0MICApdnuE3b0UeCr0A-GBk8XB1IpZM1tG_lUqko,9749
-fractal_server/app/security/__init__.py,sha256=zK1SyIdJHq6n48cOOsd3TK4wFx09EwioyDNv5HhWGug,7379
+fractal_server/app/security/__init__.py,sha256=MEOl7CN5nMQE-DhFclvSRtpzRVoY-sCqjkaQsIZNJ1c,7400
 fractal_server/common/.git,sha256=Tc99_jnBzoLdeHxTTuFRz3i7bxoCBKM-WemKlGVThi8,49
 fractal_server/common/.github/workflows/ci.yml,sha256=48COJi9_H9cyRV1kWyp54dtS64PoN9Bt9f8IWEYuZTE,717
 fractal_server/common/.github/workflows/project-management.yml,sha256=Qe6bkHmZVGAIL1LP56mL8Aro0vpMElFY85Ozn6DtysY,364
@@ -75,8 +75,8 @@ fractal_server/syringe.py,sha256=3qSMW3YaMKKnLdgnooAINOPxnCOxP7y2jeAQYB21Gdo,278
 fractal_server/tasks/__init__.py,sha256=Wzuxf5EoH1v0fYzRpAZHG_S-Z9f6DmbIsuSvllBCGvc,72
 fractal_server/tasks/collection.py,sha256=hvZeOHenJwvjyFgxIxU7OqOwG8SdmCA9MTBuRAt_Onc,12782
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-1.2.3a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-1.2.3a0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-fractal_server-1.2.3a0.dist-info/METADATA,sha256=5b_X9kzseeZvZsi4WKkWrE5BQAqiVUmnBkG2ahRhN04,3591
-fractal_server-1.2.3a0.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-1.2.3a0.dist-info/RECORD,,
+fractal_server-1.2.3a2.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-1.2.3a2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+fractal_server-1.2.3a2.dist-info/METADATA,sha256=67PqHNb5VRpj6J26ML8ixnb_qMG6jBUyY5dQRhcNWXQ,3591
+fractal_server-1.2.3a2.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-1.2.3a2.dist-info/RECORD,,