fractal-server 2.17.0a0__py3-none-any.whl → 2.17.0a1__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.17.0a0"
+__VERSION__ = "2.17.0a1"

fractal_server/__main__.py

@@ -136,8 +136,8 @@ def init_db_data(
     from sqlalchemy import select, func
     from fractal_server.app.models.security import UserOAuth
     from fractal_server.app.models import Resource, Profile
-    from fractal_server.app.schemas.v2.resource import validate_resource_data
-    from fractal_server.app.schemas.v2.profile import validate_profile_data
+    from fractal_server.app.schemas.v2.resource import cast_serialize_resource
+    from fractal_server.app.schemas.v2.profile import cast_serialize_profile
 
     init_data_settings = Inject(get_init_data_settings)
 
@@ -203,15 +203,17 @@ def init_db_data(
 
         # Validate resource/profile data
         try:
-            validate_resource_data(resource_data)
+            resource_data = cast_serialize_resource(resource_data)
         except ValidationError as e:
-            print(e)
-            sys.exit("ERROR: Invalid resource data.")
+            sys.exit(
+                f"ERROR: Invalid resource data.\nOriginal error:\n{str(e)}"
+            )
         try:
-            validate_profile_data(profile_data)
+            profile_data = cast_serialize_profile(profile_data)
         except ValidationError as e:
-            print(e)
-            sys.exit("ERROR: Invalid profile data.")
+            sys.exit(
+                f"ERROR: Invalid profile data.\nOriginal error:\n{str(e)}"
+            )
 
         # Create resource/profile db objects
         resource_obj = Resource(**resource_data)

fractal_server/app/routes/aux/validate_user_profile.py

@@ -6,8 +6,8 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.models import Profile
 from fractal_server.app.models import Resource
 from fractal_server.app.models import UserOAuth
-from fractal_server.app.schemas.v2.profile import validate_profile_data
-from fractal_server.app.schemas.v2.resource import validate_resource_data
+from fractal_server.app.schemas.v2.profile import cast_serialize_profile
+from fractal_server.app.schemas.v2.resource import cast_serialize_resource
 from fractal_server.logger import set_logger
 
 logger = set_logger(__name__)
@@ -38,10 +38,10 @@ async def validate_user_profile(
     profile = await db.get(Profile, user.profile_id)
     resource = await db.get(Resource, profile.resource_id)
     try:
-        validate_resource_data(
+        cast_serialize_resource(
             resource.model_dump(exclude={"id", "timestamp_created"}),
         )
-        validate_profile_data(
+        cast_serialize_profile(
             profile.model_dump(exclude={"resource_id", "id"}),
         )
         db.expunge(resource)

fractal_server/app/schemas/v2/profile.py

@@ -65,8 +65,14 @@ class ProfileRead(BaseModel):
 
 
 @validate_call
-def validate_profile_data(_data: ProfileCreate):
+def cast_serialize_profile(_data: ProfileCreate) -> dict[str, Any]:
     """
-    We use `@validate_call` because `ProfileCreate` is a `Union` type and it
+    Cast/serialize round-trip for `Profile` data.
+
+    We use `@validate_call` because `ProfileeCreate` is a `Union` type and it
     cannot be instantiated directly.
+
+    Return:
+        Serialized version of a valid profile object.
     """
+    return _data.model_dump()

fractal_server/app/schemas/v2/resource.py

@@ -4,6 +4,7 @@ from typing import Any
 from typing import Literal
 from typing import Self
 
+from pydantic import AfterValidator
 from pydantic import BaseModel
 from pydantic import Discriminator
 from pydantic import model_validator
@@ -25,13 +26,27 @@ class ResourceType(StrEnum):
     LOCAL = "local"
 
 
+def cast_serialize_pixi_settings(
+    v: dict[NonEmptyStr, Any],
+) -> dict[NonEmptyStr, Any]:
+    """
+    Validate current value, and enrich it with default values.
+    """
+    if v != {}:
+        v = TasksPixiSettings(**v).model_dump()
+    return v
+
+
 class _ValidResourceBase(BaseModel):
     type: ResourceType
     name: NonEmptyStr
 
     # Tasks
     tasks_python_config: TasksPythonSettings
-    tasks_pixi_config: dict[NonEmptyStr, Any]
+    tasks_pixi_config: Annotated[
+        dict[NonEmptyStr, Any],
+        AfterValidator(cast_serialize_pixi_settings),
+    ]
     tasks_local_dir: AbsolutePathStr
 
     # Jobs
@@ -40,16 +55,15 @@ class _ValidResourceBase(BaseModel):
     jobs_poll_interval: int = 5
 
     @model_validator(mode="after")
-    def _tasks_configurations(self) -> Self:
-        if self.tasks_pixi_config != {}:
-            pixi_settings = TasksPixiSettings(**self.tasks_pixi_config)
-            if (
-                self.type == ResourceType.SLURM_SSH
-                and pixi_settings.SLURM_CONFIG is None
-            ):
-                raise ValueError(
-                    "`tasks_pixi_config` must include `SLURM_CONFIG`."
-                )
+    def _pixi_slurm_config(self) -> Self:
+        if (
+            self.tasks_pixi_config != {}
+            and self.type == ResourceType.SLURM_SSH
+            and self.tasks_pixi_config["SLURM_CONFIG"] is None
+        ):
+            raise ValueError(
+                "`tasks_pixi_config` must include `SLURM_CONFIG`."
+            )
         return self
 
 
@@ -110,8 +124,14 @@ class ResourceRead(BaseModel):
 
 
 @validate_call
-def validate_resource_data(_data: ResourceCreate):
+def cast_serialize_resource(_data: ResourceCreate) -> dict[str, Any]:
     """
+    Cast/serialize round-trip for `Resource` data.
+
     We use `@validate_call` because `ResourceCreate` is a `Union` type and it
     cannot be instantiated directly.
+
+    Return:
+        Serialized version of a valid resource object.
     """
+    return _data.model_dump()

{fractal_server-2.17.0a0.dist-info → fractal_server-2.17.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.17.0a0
+Version: 2.17.0a1
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE

{fractal_server-2.17.0a0.dist-info → fractal_server-2.17.0a1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fractal_server/__init__.py,sha256=BGNq25uSJ4SBW9OccisNa2dOpWFs57JqU2JTIjfsO7U,25
-fractal_server/__main__.py,sha256=wXTddT2OrcCOcGuIPLXEX6PFYqSbWFLpRUxy8PUDaGo,10668
+fractal_server/__init__.py,sha256=L3Rv58fODvev5pxb4-ztERQa1un75OhiJ3K21aCCoW0,25
+fractal_server/__main__.py,sha256=UubAVie8iODHu1jj3brTFVqzsEZrL070LjnE3XacpF0,10777
 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=sttX0mHVV0ESI1SJ1kcxUKiuEwqeP-BWsst0o_9Yo44,2810
@@ -71,7 +71,7 @@ fractal_server/app/routes/auth/users.py,sha256=tYttZjyrsTLiOb5PZyMiAo4DD2ZEuPhPp
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=nqqdcW5B7fL_PbvHf57_TcifjUfcMgl04tKNvG2sV1U,628
 fractal_server/app/routes/aux/_runner.py,sha256=SDzI7glEfkW_XecWFuRQitbSWSvAPegI-J5c7i5d0_w,957
-fractal_server/app/routes/aux/validate_user_profile.py,sha256=3kJeA9iJ8c7_7H27QXYSx3gY15rc13q7JAfY-KcqVEo,1965
+fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5F9-SDY_4os63R2EUMqODC7eBg,1969
 fractal_server/app/routes/aux/validate_user_settings.py,sha256=C_V5QhnBppyr-YYoni_yVrooU5bKfSTrwM-ea2m5pqU,2405
 fractal_server/app/routes/pagination.py,sha256=IGy8Ll5lYr6ENYE18h3huH5s0GMX1DCs5VdCi6j1cdk,1174
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
@@ -85,9 +85,9 @@ fractal_server/app/schemas/v2/dumps.py,sha256=LCYiNF_FNYiA6HYp5GyFao3IKRX0RpzgNp
 fractal_server/app/schemas/v2/history.py,sha256=pZiMKfh6nMWbTp5MUtrnGySPKbeRFf5tM1VLFaTgGcw,1784
 fractal_server/app/schemas/v2/job.py,sha256=BuiNzAX2Kl-b7LJnAiqCGDC9h6bGEjKvsHQIgf5mjHQ,3330
 fractal_server/app/schemas/v2/manifest.py,sha256=QUpXMDB8WkB1F4UK-yYmm3O8bXoHwDGURnqwn6ayO_I,6674
-fractal_server/app/schemas/v2/profile.py,sha256=_cDT5t4fdbmZnPGWT7Ej5HaOeOAN9lvLetnY0OjvADI,1914
+fractal_server/app/schemas/v2/profile.py,sha256=tqjG3kgoBsNl0It0icZQ0mIab2POmV_K8fsL21-WR8U,2082
 fractal_server/app/schemas/v2/project.py,sha256=7UC0aZLgtmkaAiPykeUj-9OZXhMkoyi3V-475UW_EQs,654
-fractal_server/app/schemas/v2/resource.py,sha256=p2ePDYVTGPBs_wV-jBvK-9J19hL7u9cUS0NssBf01Js,3268
+fractal_server/app/schemas/v2/resource.py,sha256=4iXzZJeHVLcXYY08-okoJM_4gqpzhG4KglRPBm24Jwc,3718
 fractal_server/app/schemas/v2/status_legacy.py,sha256=eQT1zGxbkzSwd0EqclsOdZ60n1x6J3DB1CZ3m4LYyxc,955
 fractal_server/app/schemas/v2/task.py,sha256=IJv8loB4kx9FBkaIHoiMsswQyq02FxvyAnHK1u074fU,4364
 fractal_server/app/schemas/v2/task_collection.py,sha256=BzHQXq2_zLZTbigWauOR5Zi-mlsqCIF2NEF_z12Nqxg,4480
@@ -258,8 +258,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=SYVVUuXe_nWyrJLsy7QA-KJscwc5PHEXjvsW4TK7XQI,2180
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.17.0a0.dist-info/METADATA,sha256=z6kUGelCWLPqV7DwG3I11F2k7kUWxmA4wQBrLJB3M70,4319
-fractal_server-2.17.0a0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.17.0a0.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.17.0a0.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.17.0a0.dist-info/RECORD,,
+fractal_server-2.17.0a1.dist-info/METADATA,sha256=wjRm3y1357YAUgiA9dHf3G-T4FE4gzoqEiHMkmnO9TM,4319
+fractal_server-2.17.0a1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.17.0a1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.17.0a1.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.17.0a1.dist-info/RECORD,,