fractal-server 2.0.0a12__py3-none-any.whl → 2.0.1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.0.0a12"
+__VERSION__ = "2.0.1"

fractal_server/app/routes/api/v2/submit.py

@@ -146,7 +146,7 @@ async def apply_workflow(
         workflow_id=workflow_id,
         user_email=user.email,
         dataset_dump=dict(
-            **dataset.model_dump(exclude={"timestamp_created"}),
+            **dataset.model_dump(exclude={"images", "timestamp_created"}),
             timestamp_created=_encode_as_utc(dataset.timestamp_created),
         ),
         workflow_dump=dict(

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

@@ -12,7 +12,7 @@ from pydantic.error_wrappers import ValidationError
 from sqlmodel import select
 
 from .....config import get_settings
-from .....logger import close_logger
+from .....logger import reset_logger_handlers
 from .....logger import set_logger
 from .....syringe import Inject
 from ....db import AsyncSession
@@ -196,7 +196,7 @@ async def collect_tasks_pip(
         "Task-collection endpoint: start background collection "
         "and return state"
     )
-    close_logger(logger)
+    reset_logger_handlers(logger)
     info = (
         "Collecting tasks in the background. "
         f"GET /task/collect/{state.id} to query collection status"
@@ -234,6 +234,6 @@ async def check_collection_status(
     if verbose and not data.log:
         data.log = get_collection_log(data.venv_path)
         state.data = data.sanitised_dict()
-    close_logger(logger)
+    reset_logger_handlers(logger)
     await db.close()
     return state

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

@@ -7,7 +7,7 @@ from fastapi import Response
 from fastapi import status
 from sqlmodel import select
 
-from .....logger import close_logger
+from .....logger import reset_logger_handlers
 from .....logger import set_logger
 from ....db import AsyncSession
 from ....db import get_async_db
@@ -259,7 +259,7 @@ async def export_worfklow(
                     "portable; re-importing this workflow may not work as "
                     "expected."
                 )
-    close_logger(logger)
+    reset_logger_handlers(logger)
 
     await db.close()
     return workflow

fractal_server/app/runner/v2/__init__.py

@@ -13,7 +13,7 @@ from typing import Optional
 from sqlalchemy.orm.attributes import flag_modified
 
 from ....config import get_settings
-from ....logger import close_logger
+from ....logger import reset_logger_handlers
 from ....logger import set_logger
 from ....syringe import Inject
 from ....utils import get_timestamp
@@ -332,5 +332,5 @@ async def submit_workflow(
         db_sync.merge(job)
         db_sync.commit()
     finally:
-        close_logger(logger)
+        reset_logger_handlers(logger)
         db_sync.close()

fractal_server/logger.py

@@ -125,3 +125,14 @@ def close_logger(logger: logging.Logger) -> None:
     """
     for handle in logger.handlers:
         handle.close()
+
+
+def reset_logger_handlers(logger: logging.Logger) -> None:
+    """
+    Close and remove all handlers associated to a `logging.Logger` object
+
+    Arguments:
+        logger: The actual logger
+    """
+    close_logger(logger)
+    logger.handlers.clear()

fractal_server/tasks/v2/background_operations.py

@@ -20,8 +20,8 @@ from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.schemas.v2 import TaskCollectStatusV2
 from fractal_server.app.schemas.v2 import TaskCreateV2
 from fractal_server.app.schemas.v2 import TaskReadV2
-from fractal_server.logger import close_logger
 from fractal_server.logger import get_logger
+from fractal_server.logger import reset_logger_handlers
 from fractal_server.logger import set_logger
 from fractal_server.utils import execute_command
 
@@ -358,14 +358,14 @@ async def background_collect_pip(
             # Write last logs to file
             logger.debug("Task-collection status: OK")
             logger.info("Background task collection completed successfully")
-            close_logger(logger)
+            reset_logger_handlers(logger)
+
             db.close()
 
         except Exception as e:
             # Write last logs to file
             logger.debug("Task-collection status: fail")
             logger.info(f"Background collection failed. Original error: {e}")
-            close_logger(logger)
 
             # Update db
             data.status = "fail"
@@ -379,3 +379,5 @@ async def background_collect_pip(
             # Delete corrupted package dir
             logger.info(f"Now deleting temporary folder {venv_path}")
             shell_rmtree(venv_path)
+            logger.info("Temporary folder deleted")
+            reset_logger_handlers(logger)

{fractal_server-2.0.0a12.dist-info → fractal_server-2.0.1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.0.0a12
+Version: 2.0.1
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
-Author: Jacopo Nespolo
-Author-email: jacopo.nespolo@exact-lab.it
+Author: Tommaso Comparin
+Author-email: tommaso.comparin@exact-lab.it
 Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3

{fractal_server-2.0.0a12.dist-info → fractal_server-2.0.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=n09kNau5UUJa9hzn0KtsMdH-0FpJzIry0v93FUKYRLg,25
+fractal_server/__init__.py,sha256=JTWFDLKimtlT6mPcm6_e8XrP61UXaA7yz2ycXya7oVs,22
 fractal_server/__main__.py,sha256=CocbzZooX1UtGqPi55GcHGNxnrJXFg5tUU5b3wyFCyo,4958
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,11 +42,11 @@ fractal_server/app/routes/api/v2/images.py,sha256=4r_HblPWyuKSZSJZfn8mbDaLv1ncwZ
 fractal_server/app/routes/api/v2/job.py,sha256=BtaxErBDbLwjY2zgGD1I6eRpsffoMonifcS1CMEXmLU,5325
 fractal_server/app/routes/api/v2/project.py,sha256=qyvizYZ4aUFgF3tGdfp4z8AwWgfo19N_KbFEljfUaC8,5594
 fractal_server/app/routes/api/v2/status.py,sha256=3bqQejJ3TnIMan5wK6jr9sv4ypsQr9WWU8xqlvTgDCE,5739
-fractal_server/app/routes/api/v2/submit.py,sha256=lbPTZKemoRjypcpExi-Yz9fIiPdv9OIjFeUu9yuILA4,6889
+fractal_server/app/routes/api/v2/submit.py,sha256=63nfaPr3rCiMXCITJ0TWBqqSuZdLrQ7vcfzJonU5nHk,6899
 fractal_server/app/routes/api/v2/task.py,sha256=gJ0LruSk-Q1iMw8ZOX8C0wrZ4S4DGlQTr_5SdJJud0Q,7130
-fractal_server/app/routes/api/v2/task_collection.py,sha256=wHkPkQKnvXEzidywuJqLe8QB_xjlHUqzPgsitXydNkU,8961
+fractal_server/app/routes/api/v2/task_collection.py,sha256=eN3NkZaZHkrqnLGRKE7Xd5mo0cHc8aK2lojCt26ErOQ,8988
 fractal_server/app/routes/api/v2/task_legacy.py,sha256=P_VJv9v0yzFUBuS-DQHhMVSOe20ecGJJcFBqiiFciOM,1628
-fractal_server/app/routes/api/v2/workflow.py,sha256=sw-1phO_rrmDAcWX9Zqb9M8SfrWF78-02AuLB1-D1PU,11845
+fractal_server/app/routes/api/v2/workflow.py,sha256=2GlcYNjpvCdjwC_Kn7y0UP16B3pOLSNXBvIVsVDtDKM,11863
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=l4eTD5IIun5cOdYzsxh3ajmnOISaSccYA_mVf15Cjtw,8802
 fractal_server/app/routes/auth.py,sha256=Xv80iqdyfY3lyicYs2Y8B6zEDEnyUu_H6_6psYtv3R4,4885
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -80,7 +80,7 @@ fractal_server/app/runner/v1/_slurm/_submit_setup.py,sha256=llTgSOCnCVMvm7Q0SoVp
 fractal_server/app/runner/v1/_slurm/get_slurm_config.py,sha256=6TLWQon8hSicsD7c3yXK4P9xeId0s_H3HOOeMUVGVss,5977
 fractal_server/app/runner/v1/common.py,sha256=_L-vjLnWato80VdlB_BFN4G8P4jSM07u-5cnl1T3S34,3294
 fractal_server/app/runner/v1/handle_failed_job.py,sha256=bHzScC_aIlU3q-bQxGW6rfWV4xbZ2tho_sktjsAs1no,4684
-fractal_server/app/runner/v2/__init__.py,sha256=RwIOSLCChMZWHix5QuUNRPtRwgf1UmFDk3YufRCTOoc,12482
+fractal_server/app/runner/v2/__init__.py,sha256=mnXlC69UBQVpEwEWH3ZbMSsrVLl1yCnROh8_WGnXKUk,12500
 fractal_server/app/runner/v2/_local/__init__.py,sha256=Q1s-DwXleUq6w1ZNv6tlh3tZv6cyBqxB_hMvZlqVYaM,5881
 fractal_server/app/runner/v2/_local/_local_config.py,sha256=lR0Js-l63mQUzN9hK0HkfdLsrTf-W6GHvPvbPC64amY,3630
 fractal_server/app/runner/v2/_local/_submit_setup.py,sha256=deagsLSy6A3ZHKaSDcQqrdvbQVM3i4kgyTcbVc0tC5U,1614
@@ -126,7 +126,7 @@ fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7H
 fractal_server/images/__init__.py,sha256=xO6jTLE4EZKO6cTDdJsBmK9cdeh9hFTaSbSuWgQg7y4,196
 fractal_server/images/models.py,sha256=9ipU5h4N6ogBChoB-2vHoqtL0TXOHCv6kRR-fER3mkM,4167
 fractal_server/images/tools.py,sha256=gxeniYy4Z-cp_ToK2LHPJUTVVUUrdpogYdcBUvBuLiY,2209
-fractal_server/logger.py,sha256=95duXY8eSxf1HWg0CVn8SUGNzgJw9ZR0FlapDDF6WAY,3924
+fractal_server/logger.py,sha256=AuCmrwIydaFWpotMTM_tGRNJbExQO5fP8Xolo82Vdbg,4178
 fractal_server/main.py,sha256=7CpwPfCsHxBAo5fWuXPCsYOFCpbBI0F7Z0jsgCQdou8,3001
 fractal_server/migrations/README,sha256=4rQvyDfqodGhpJw74VYijRmgFP49ji5chyEemWGHsuw,59
 fractal_server/migrations/env.py,sha256=bsl0HGZpjhommztgcs7wQ94sJzI1Orgnij97K8P_uyo,2630
@@ -158,12 +158,12 @@ fractal_server/tasks/v1/background_operations.py,sha256=I-D4SaG56UMkoH7dNy5CzbEs
 fractal_server/tasks/v1/get_collection_data.py,sha256=bi9tuApLgoKZNMIG1kR4GoKI9S6Y040gFfNQapw4ikM,502
 fractal_server/tasks/v2/_TaskCollectPip.py,sha256=QeCqXDgOnMjk3diVlC5bgGEywyQjYFm5637Rke49vJY,3775
 fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/tasks/v2/background_operations.py,sha256=fUukEA-zFjUDhxgI3oO_Bvy7FinaYFaydciASOIbL3w,12842
+fractal_server/tasks/v2/background_operations.py,sha256=MAMBn6W2bhkdK59kfUGiD7a1G163exiYeJqqtj08Gv4,12922
 fractal_server/tasks/v2/get_collection_data.py,sha256=Qhf2T_aaqAfqu9_KpUSlXsS7EJoZQbEPEreHHa2jco8,502
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.0.0a12.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.0.0a12.dist-info/METADATA,sha256=vBB1xO15zGGC1KMJRwj7xmVLHS0pF0BLTjVUusilAns,4201
-fractal_server-2.0.0a12.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-fractal_server-2.0.0a12.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.0.0a12.dist-info/RECORD,,
+fractal_server-2.0.1.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.0.1.dist-info/METADATA,sha256=P7zEZwNFrYKxiIHHc24m3XGNKnjrYiY7xabRv7vwz5A,4202
+fractal_server-2.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.0.1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.0.1.dist-info/RECORD,,

{fractal_server-2.0.0a12.dist-info → fractal_server-2.0.1.dist-info}/WHEEL

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