fractal-server 2.11.0a6__py3-none-any.whl → 2.11.0a8__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.11.0a6"
+__VERSION__ = "2.11.0a8"

fractal_server/data_migrations/2_11_0.py

@@ -7,12 +7,15 @@ from sqlmodel import select
 from fractal_server.app.db import get_sync_db
 from fractal_server.app.models import DatasetV2
 from fractal_server.app.models import JobV2
+from fractal_server.app.models import ProjectV2
 from fractal_server.app.models import WorkflowTaskV2
+from fractal_server.app.models import WorkflowV2
 from fractal_server.app.schemas.v2 import DatasetReadV2
 from fractal_server.app.schemas.v2 import JobReadV2
 from fractal_server.app.schemas.v2 import ProjectReadV2
 from fractal_server.app.schemas.v2 import TaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
+from fractal_server.images.models import AttributeFiltersType
 
 logger = logging.getLogger("fix_db")
 logger.setLevel(logging.INFO)
@@ -21,23 +24,25 @@ logger.setLevel(logging.INFO)
 def dict_values_to_list(
     input_dict: dict[str, Union[int, float, bool, str, None]],
     identifier: str,
-) -> dict[str, list[Union[int, float, bool, str]]]:
+) -> tuple[AttributeFiltersType, bool]:
+    was_there_a_warning = False
     for k, v in input_dict.items():
         if not isinstance(v, (int, float, bool, str, type(None))):
             error_msg = (
                 f"Attribute '{k}' from '{identifier}' "
-                f"has invalid type '{type(v)}'."
+                "has invalid type '{type(v)}'."
             )
             logger.error(error_msg)
             raise RuntimeError(error_msg)
         elif v is None:
             logger.warning(
-                f"Attribute '{k}' from '{identifier}' is None and it "
-                "will be removed."
+                f"Attribute '{k}' from '{identifier}' is "
+                "None and it will be removed."
             )
+            was_there_a_warning = True
         else:
             input_dict[k] = [v]
-    return input_dict
+    return input_dict, was_there_a_warning
 
 
 def fix_db():
@@ -45,15 +50,28 @@ def fix_db():
 
     with next(get_sync_db()) as db:
         # DatasetV2.filters
-        # DatasetV2.history[].workflowtask.input_filters
         stm = select(DatasetV2).order_by(DatasetV2.id)
         datasets = db.execute(stm).scalars().all()
         for ds in datasets:
             logger.info(f"DatasetV2[{ds.id}] START")
-            ds.attribute_filters = dict_values_to_list(
+            if ds.filters is None:
+                logger.info(f"DatasetV2[{ds.id}] SKIP")
+                continue
+
+            ds.attribute_filters, warning = dict_values_to_list(
                 ds.filters["attributes"],
                 f"Dataset[{ds.id}].filters.attributes",
             )
+            if warning:
+                proj = db.get(ProjectV2, ds.project_id)
+                logger.warning(
+                    "Additional information: "
+                    f"{proj.id=}, "
+                    f"{proj.name=}, "
+                    f"{proj.user_list[0].email=}, "
+                    f"{ds.id=}, "
+                    f"{ds.name=}"
+                )
             ds.type_filters = ds.filters["types"]
             ds.filters = None
             for i, h in enumerate(ds.history):
@@ -75,12 +93,26 @@ def fix_db():
         wftasks = db.execute(stm).scalars().all()
         for wft in wftasks:
             logger.info(f"WorkflowTaskV2[{wft.id}] START")
+            if wft.input_filters is None:
+                logger.info(f"WorkflowTaskV2[{wft.id}] SKIP")
+                continue
             wft.type_filters = wft.input_filters["types"]
             if wft.input_filters["attributes"]:
                 logger.warning(
                     "Removing input_filters['attributes']. "
                     f"(previous value: {wft.input_filters['attributes']})"
                 )
+                wf = db.get(WorkflowV2, wft.workflow_id)
+                proj = db.get(ProjectV2, wf.project_id)
+                logger.warning(
+                    "Additional information: "
+                    f"{proj.id=}, "
+                    f"{proj.name=}, "
+                    f"{proj.user_list[0].email=}, "
+                    f"{wf.id=}, "
+                    f"{wf.name=}, "
+                    f"{wft.task.name=}"
+                )
             wft.input_filters = None
             flag_modified(wft, "input_filters")
             WorkflowTaskReadV2(
@@ -97,13 +129,34 @@ def fix_db():
         jobs = db.execute(stm).scalars().all()
         for job in jobs:
             logger.info(f"JobV2[{job.id}] START")
+            if "filters" not in job.dataset_dump.keys():
+                logger.info(f"JobV2[{job.id}] SKIP")
+                continue
             job.dataset_dump["type_filters"] = job.dataset_dump["filters"][
                 "types"
             ]
-            job.dataset_dump["attribute_filters"] = dict_values_to_list(
+            (
+                job.dataset_dump["attribute_filters"],
+                warning,
+            ) = dict_values_to_list(
                 job.dataset_dump["filters"]["attributes"],
                 f"JobV2[{job.id}].dataset_dump.filters.attributes",
             )
+            if warning and job.project_id is not None:
+                proj = db.get(ProjectV2, job.project_id)
+                logger.warning(
+                    "Additional information: "
+                    f"{proj.id=}, "
+                    f"{proj.name=}, "
+                    f"{proj.user_list[0].email=}, "
+                    f"{job.id=}, "
+                    f"{job.start_timestamp=}, "
+                    f"{job.end_timestamp=}, "
+                    f"{job.dataset_id=}, "
+                    f"{job.workflow_id=}."
+                )
+                # FIXME
+                pass
             job.dataset_dump.pop("filters")
             flag_modified(job, "dataset_dump")
             JobReadV2(**job.model_dump())

{fractal_server-2.11.0a6.dist-info → fractal_server-2.11.0a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a6
+Version: 2.11.0a8
 Summary: Backend component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

{fractal_server-2.11.0a6.dist-info → fractal_server-2.11.0a8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=aC0yx2HX8xIU9XVrkikksq9g-IXOskfofOk8lZZtKNc,25
+fractal_server/__init__.py,sha256=PK0Z9wSB6mEcd2plsxYsMzHGyRVuGKRbnXG9QlxmJrI,25
 fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -165,7 +165,7 @@ fractal_server/app/security/__init__.py,sha256=qn6idYgl-p5HWea0gTVnz4JnkoxGEkmQj
 fractal_server/app/security/signup_email.py,sha256=DrL51UdTSrgjleynMD5CRZwTSOpPrZ96fasRV0fvxDE,1165
 fractal_server/app/user_settings.py,sha256=OP1yiYKtPadxwM51_Q0hdPk3z90TCN4z1BLpQsXyWiU,1316
 fractal_server/config.py,sha256=9rAzw7OO6ZeHEz-I8NJHuGoHf4xCHxfFLyRNZQD9ytY,27019
-fractal_server/data_migrations/2_11_0.py,sha256=hkOZsvTWi30TqpSsAWuPyL4XxEJlqLwAv02PkVIk4Rw,4337
+fractal_server/data_migrations/2_11_0.py,sha256=yE4yPed6JtBHSs3GHcv0Bj4Zwhe5O9RtMGA6AC7OVwE,6378
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_GrGzc,1230
@@ -241,8 +241,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=PMwrxWFxRTQRl1b9h-NRIbFGPKqpH_hXnkAT3NfZdpY,3571
 fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
-fractal_server-2.11.0a6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.11.0a6.dist-info/METADATA,sha256=jtJXV-kHK3rf-ha0pEYyhIzwCRKox9fHBQ38M1xti38,4564
-fractal_server-2.11.0a6.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.11.0a6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.11.0a6.dist-info/RECORD,,
+fractal_server-2.11.0a8.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.11.0a8.dist-info/METADATA,sha256=uWN7MBiLx7IeFtpLKQUFe4hx4bFUHo_KwgYkIXMpE5Q,4564
+fractal_server-2.11.0a8.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.11.0a8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.11.0a8.dist-info/RECORD,,