fractal-server 2.3.5__py3-none-any.whl → 2.3.6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.3.5"
+__VERSION__ = "2.3.6"

fractal_server/app/models/v2/task.py

@@ -1,5 +1,3 @@
-import json
-import logging
 from typing import Any
 from typing import Optional
 
@@ -41,53 +39,3 @@ class TaskV2(SQLModel, table=True):
 
     input_types: dict[str, bool] = Field(sa_column=Column(JSON), default={})
     output_types: dict[str, bool] = Field(sa_column=Column(JSON), default={})
-
-    @property
-    def default_args_non_parallel_from_args_schema(self) -> dict[str, Any]:
-        """
-        Extract default arguments from args_schema
-        """
-        # Return {} if there is no args_schema
-        if self.args_schema_non_parallel is None:
-            return {}
-        # Try to construct default_args
-        try:
-            default_args = {}
-            properties = self.args_schema_non_parallel["properties"]
-            for prop_name, prop_schema in properties.items():
-                default_value = prop_schema.get("default", None)
-                if default_value is not None:
-                    default_args[prop_name] = default_value
-            return default_args
-        except KeyError as e:
-            logging.warning(
-                "Cannot set default_args from args_schema_non_parallel="
-                f"{json.dumps(self.args_schema_non_parallel)}\n"
-                f"Original KeyError: {str(e)}"
-            )
-            return {}
-
-    @property
-    def default_args_parallel_from_args_schema(self) -> dict[str, Any]:
-        """
-        Extract default arguments from args_schema
-        """
-        # Return {} if there is no args_schema
-        if self.args_schema_parallel is None:
-            return {}
-        # Try to construct default_args
-        try:
-            default_args = {}
-            properties = self.args_schema_parallel["properties"]
-            for prop_name, prop_schema in properties.items():
-                default_value = prop_schema.get("default", None)
-                if default_value is not None:
-                    default_args[prop_name] = default_value
-            return default_args
-        except KeyError as e:
-            logging.warning(
-                "Cannot set default_args from args_schema_parallel="
-                f"{json.dumps(self.args_schema_parallel)}\n"
-                f"Original KeyError: {str(e)}"
-            )
-            return {}

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

@@ -422,6 +422,8 @@ async def _workflow_insert_task(
 
     # Get task from db, and extract default arguments via a Task property
     # method
+    # NOTE: this logic remains there for V1 tasks only. When we deprecate V1
+    # tasks, we can simplify this block
     if is_legacy_task is True:
         db_task = await db.get(Task, task_id)
         if db_task is None:
@@ -439,12 +441,8 @@ async def _workflow_insert_task(
             raise ValueError(f"TaskV2 {task_id} not found.")
         task_type = db_task.type
 
-        final_args_non_parallel = (
-            db_task.default_args_non_parallel_from_args_schema.copy()
-        )
-        final_args_parallel = (
-            db_task.default_args_parallel_from_args_schema.copy()
-        )
+        final_args_non_parallel = {}
+        final_args_parallel = {}
         final_meta_parallel = (db_task.meta_parallel or {}).copy()
         final_meta_non_parallel = (db_task.meta_non_parallel or {}).copy()
 

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

@@ -186,34 +186,17 @@ async def update_workflowtask(
                 default_args = (
                     db_wf_task.task_legacy.default_args_from_args_schema
                 )
+                actual_args = deepcopy(default_args)
+                if value is not None:
+                    for k, v in value.items():
+                        actual_args[k] = v
             else:
-                default_args = (
-                    db_wf_task.task.default_args_parallel_from_args_schema
-                )
-            # Override default_args with args value items
-            actual_args = deepcopy(default_args)
-            if value is not None:
-                for k, v in value.items():
-                    actual_args[k] = v
+                actual_args = deepcopy(value)
             if not actual_args:
                 actual_args = None
             setattr(db_wf_task, key, actual_args)
         elif key == "args_non_parallel":
-            # Get default arguments via a Task property method
-            if db_wf_task.is_legacy_task:
-                # This is only needed so that we don't have to modify the rest
-                # of this block, but legacy task cannot take any non-parallel
-                # args (see checks above).
-                default_args = {}
-            else:
-                default_args = deepcopy(
-                    db_wf_task.task.default_args_non_parallel_from_args_schema
-                )
-            # Override default_args with args value items
-            actual_args = default_args.copy()
-            if value is not None:
-                for k, v in value.items():
-                    actual_args[k] = v
+            actual_args = deepcopy(value)
             if not actual_args:
                 actual_args = None
             setattr(db_wf_task, key, actual_args)

{fractal_server-2.3.5.dist-info → fractal_server-2.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.3.5
+Version: 2.3.6
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause
@@ -33,7 +33,7 @@ Requires-Dist: psycopg[binary] (>=3.1.0,<4.0.0) ; extra == "postgres-psycopg-bin
 Requires-Dist: pydantic (>=1.10.8,<2)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
-Requires-Dist: sqlmodel (>=0.0.19,<0.0.20)
+Requires-Dist: sqlmodel (>=0.0.21,<0.0.22)
 Requires-Dist: uvicorn (>=0.29.0,<0.30.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-2.3.5.dist-info → fractal_server-2.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=RqyrrNV86fgXA3ZGY013Ddl0XCyYA-YaiOneKISOYXc,22
+fractal_server/__init__.py,sha256=lCtPuZps1Hbf7xTBL9gN0BnZZFuDzV5N5mezQVbB9lA,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
@@ -18,7 +18,7 @@ fractal_server/app/models/v2/collection_state.py,sha256=nxb042i8tt8rCpmgbFJoBCYW
 fractal_server/app/models/v2/dataset.py,sha256=-7sxHEw4IIAvF_uSan7tA3o8hvoakBkQ0SRvqS2iOQU,1455
 fractal_server/app/models/v2/job.py,sha256=ypJmN-qspkKBGhBG7Mt-HypSQqcQ2EmB4Bzzb2-y550,1535
 fractal_server/app/models/v2/project.py,sha256=CRBnZ8QITNp6u1f5bMxvi1_mcvEfXpWyitsWB5f7gn8,759
-fractal_server/app/models/v2/task.py,sha256=9ZPhug3VWyeqgT8wQ9_8ZXQ2crSiiicRipxrxTslOso,3257
+fractal_server/app/models/v2/task.py,sha256=Esf2j9c-0pGYjdbb__Ptpdx7NCAKVxqbQMoza524miU,1286
 fractal_server/app/models/v2/workflow.py,sha256=YBgFGCziUgU0aJ5EM3Svu9W2c46AewZO9VBlFCHiSps,1069
 fractal_server/app/models/v2/workflowtask.py,sha256=3jEkObsSnlI05Pur_dSsXYdJxRqPL60Z7tK5-EJLOks,1532
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ fractal_server/app/routes/api/v1/task_collection.py,sha256=82XBsJHlPiDPCbpLa-16o
 fractal_server/app/routes/api/v1/workflow.py,sha256=7r9IoIevg_rvYCrerMOsIsUabSOQatxdPCfLdkP0dRs,10942
 fractal_server/app/routes/api/v1/workflowtask.py,sha256=qcHQlzlSFf_k8gtId-mA3tnyzgSR7i1m7pvR4R86blE,5582
 fractal_server/app/routes/api/v2/__init__.py,sha256=JrPWfKIJy9btRCP-zw2nZwLpSdBxEKY5emuCuJbqG0s,1813
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=tYJr5EPaA0CVGp-Y4jottFJUVToWvjcSY6PJqN_d--s,14938
+fractal_server/app/routes/api/v2/_aux_functions.py,sha256=yeA0650pBk43M5ZQGpVQ17nH5D97NIGY-3tNNLQIW1M,14901
 fractal_server/app/routes/api/v2/dataset.py,sha256=_HjKNP9XsMGoqyubGdF2ZyeW7vXC3VdK_0_TaUxgIF0,8248
 fractal_server/app/routes/api/v2/images.py,sha256=4r_HblPWyuKSZSJZfn8mbDaLv1ncwZU0gWdKneZcNG4,7894
 fractal_server/app/routes/api/v2/job.py,sha256=RkIj7ANK-nkxUvcG9K2r4dFdPnvGomx7jdB6U9bqOVQ,5202
@@ -48,7 +48,7 @@ fractal_server/app/routes/api/v2/task_collection.py,sha256=BiZ5s6DwdQbM79s_dPivg
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=cvZorN_Xt57Rj-2JATRrdtSw6I_5befB0ua3FWh6hW4,5988
 fractal_server/app/routes/api/v2/task_legacy.py,sha256=P_VJv9v0yzFUBuS-DQHhMVSOe20ecGJJcFBqiiFciOM,1628
 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/api/v2/workflowtask.py,sha256=l_eQPniK1zR0u249bJj4c2hFlyDwsSJgsFR6hxJaOjs,8007
 fractal_server/app/routes/auth.py,sha256=Xv80iqdyfY3lyicYs2Y8B6zEDEnyUu_H6_6psYtv3R4,4885
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=HUItNm0SZFAYsyL1rXSjBre1-rXSe6x51qH9KAQWS1w,1361
@@ -193,8 +193,8 @@ fractal_server/tasks/v2/templates/_5_pip_show.sh,sha256=GrJ19uHYQxANEy9JaeNJZVTq
 fractal_server/tasks/v2/utils.py,sha256=JOyCacb6MNvrwfLNTyLwcz8y79J29YuJeJ2MK5kqXRM,1657
 fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
 fractal_server/utils.py,sha256=b7WwFdcFZ8unyT65mloFToYuEDXpQoHRcmRNqrhd_dQ,2115
-fractal_server-2.3.5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.3.5.dist-info/METADATA,sha256=dElt7KKeyH2IIRToMdsTiVKeIEww0ZsbFzlQcCskrKE,4425
-fractal_server-2.3.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fractal_server-2.3.5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.3.5.dist-info/RECORD,,
+fractal_server-2.3.6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.3.6.dist-info/METADATA,sha256=WrV14I1NR6DeXCeuHJTZqsnJfCf4EqdY-IZSeeGPAPM,4425
+fractal_server-2.3.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fractal_server-2.3.6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.3.6.dist-info/RECORD,,