fractal-server 2.11.0a5__py3-none-any.whl → 2.11.0a7__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.11.0a5"
+__VERSION__ = "2.11.0a7"

fractal_server/app/schemas/_filter_validators.py

@@ -22,14 +22,10 @@ def validate_attribute_filters(
 
     attribute_filters = valdict_keys("attribute_filters")(attribute_filters)
     for key, values in attribute_filters.items():
-        if values is None:
-            # values=None corresponds to not applying any filter for
-            # attribute `key`
-            pass
-        elif values == []:
-            # WARNING: in this case, no image can match with the current
-            # filter. In the future we may deprecate this possibility.
-            pass
+        if values == []:
+            raise ValueError(
+                f"attribute_filters[{key}] cannot be an empty list."
+            )
         else:
             # values is a non-empty list, and its items must all be of the
             # same scalar non-None type

fractal_server/data_migrations/2_11_0.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Union
 
 from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import select
@@ -6,24 +7,67 @@ 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)
 
 
-def fix_db():
+def dict_values_to_list(
+    input_dict: dict[str, Union[int, float, bool, str, None]],
+    identifier: 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}' "
+                "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."
+            )
+            was_there_a_warning = True
+        else:
+            input_dict[k] = [v]
+    return input_dict, was_there_a_warning
+
 
+def fix_db():
     logger.info("START execution of fix_db function")
 
     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:
-            ds.attribute_filters = ds.filters["attributes"]
+            logger.info(f"DatasetV2[{ds.id}] START")
+            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):
@@ -31,37 +75,83 @@ def fix_db():
                     "workflowtask"
                 ]["input_filters"]["types"]
             flag_modified(ds, "history")
+            DatasetReadV2(
+                **ds.model_dump(),
+                project=ProjectReadV2(**ds.project.model_dump()),
+            )
             db.add(ds)
-            logger.info(f"Fixed filters in DatasetV2[{ds.id}]")
+            logger.info(f"DatasetV2[{ds.id}] END - fixed filters")
+
+        logger.info("------ switch from dataset to workflowtasks ------")
 
         # WorkflowTaskV2.input_filters
         stm = select(WorkflowTaskV2).order_by(WorkflowTaskV2.id)
         wftasks = db.execute(stm).scalars().all()
         for wft in wftasks:
+            logger.info(f"WorkflowTaskV2[{wft.id}] START")
             wft.type_filters = wft.input_filters["types"]
             if wft.input_filters["attributes"]:
                 logger.warning(
-                    f"Removing WorkflowTaskV2[{wft.id}].input_filters"
-                    f"['attributes'] = {wft.input_filters['attributes']}"
+                    "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(
+                **wft.model_dump(),
+                task=TaskReadV2(**wft.task.model_dump()),
+            )
             db.add(wft)
-            logger.info(f"Fixed filters in WorkflowTaskV2[{wft.id}]")
+            logger.info(f"WorkflowTaskV2[{wft.id}] END - fixed filters")
+
+        logger.info("------ switch from workflowtasks to jobs ------")
 
         # JOBS V2
         stm = select(JobV2).order_by(JobV2.id)
         jobs = db.execute(stm).scalars().all()
         for job in jobs:
+            logger.info(f"JobV2[{job.id}] START")
             job.dataset_dump["type_filters"] = job.dataset_dump["filters"][
                 "types"
             ]
-            job.dataset_dump["attribute_filters"] = job.dataset_dump[
-                "filters"
-            ]["attributes"]
+            (
+                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")
-            logger.info(f"Fixed filters in JobV2[{job.id}].datasetdump")
+            JobReadV2(**job.model_dump())
+            db.add(job)
+            logger.info(f"JobV2[{job.id}] END - fixed filters")
 
         db.commit()
         logger.info("Changes committed.")

fractal_server/images/models.py

@@ -9,7 +9,7 @@ from pydantic import validator
 from fractal_server.app.schemas._validators import valdict_keys
 from fractal_server.urls import normalize_url
 
-AttributeFiltersType = dict[str, Optional[list[Any]]]
+AttributeFiltersType = dict[str, list[Any]]
 
 
 class _SingleImageBase(BaseModel):

fractal_server/images/tools.py

@@ -57,8 +57,6 @@ def match_filter(
 
     # Verify match with attributes (only for not-None filters)
     for key, values in attribute_filters.items():
-        if values is None:
-            continue
         if image["attributes"].get(key) not in values:
             return False
 

{fractal_server-2.11.0a5.dist-info → fractal_server-2.11.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a5
+Version: 2.11.0a7
 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.0a5.dist-info → fractal_server-2.11.0a7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=P2nIVsQnIcZXk3AZLCDwdPsHsGyWJzqhBzjjXpYldU0,25
+fractal_server/__init__.py,sha256=mM9PejPd0ZnCDoi6-w05W_qaatAjbN_mn-vxn7wialA,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
@@ -134,7 +134,7 @@ fractal_server/app/runner/v2/runner_functions_low_level.py,sha256=1fWvQ6YZUUnDhO
 fractal_server/app/runner/v2/task_interface.py,sha256=d6HPwPzrytUMVjExTU6fuCEwtvvWGRaSje0iXcRD45w,1728
 fractal_server/app/runner/versions.py,sha256=dSaPRWqmFPHjg20kTCHmi_dmGNcCETflDtDLronNanU,852
 fractal_server/app/schemas/__init__.py,sha256=stURAU_t3AOBaH0HSUbV-GKhlPKngnnIMoqWc3orFyI,135
-fractal_server/app/schemas/_filter_validators.py,sha256=WcfQ3ARc-2pj2oQFB4lWA0X5wtoOPGzpD4hJq4BblXs,1727
+fractal_server/app/schemas/_filter_validators.py,sha256=0wJuZzMa-hJsMCEMxtBalW3lSk1Qey25uSVmS7GVcPM,1534
 fractal_server/app/schemas/_validators.py,sha256=3dotVxUHWKAmUO3aeoluYDLRKrw1OS-NxcZ4Fg_HOYk,3560
 fractal_server/app/schemas/user.py,sha256=icjox9gK_invW44Nh_L4CvqfRa92qghyQhmevyg09nQ,2243
 fractal_server/app/schemas/user_group.py,sha256=t30Kd07PY43G_AqFDb8vjdInTeLeU9WvFZDx8fVLPSI,1750
@@ -165,13 +165,13 @@ 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=glS3BkhumrA6SpHiE_QFBgA7Bm2cbDCUlQyY3BjEub8,2464
+fractal_server/data_migrations/2_11_0.py,sha256=Zlmo4e39q5IiSM8p38T5NCnUEAsUxe08lt6TeUx-fRE,5997
 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
 fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
-fractal_server/images/models.py,sha256=fAecChXhs4utRX4123Lgz5e_b_H0YtHrvNHCenR7tOs,3359
-fractal_server/images/tools.py,sha256=iqFx_pp46OoHsHjXxX6GrkXJPPfTo_c1WYvRur0olaE,3455
+fractal_server/images/models.py,sha256=t4zcUFmWxhAzGgy7kkxs9Ctq8SAhVs0v910UcXcHIUw,3349
+fractal_server/images/tools.py,sha256=4kfPAFJJnvg7fM-cL0JMx97Dc1Npva_0ghitEji3JUU,3407
 fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
 fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
 fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
@@ -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.0a5.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.11.0a5.dist-info/METADATA,sha256=i_O42zmSGOyXWu-sT-rHUCDZ-flG0SiuK3oVNKwrmpE,4564
-fractal_server-2.11.0a5.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-fractal_server-2.11.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.11.0a5.dist-info/RECORD,,
+fractal_server-2.11.0a7.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.11.0a7.dist-info/METADATA,sha256=3j0iczgnV5Ok6R3O8Zq56z41Hto-jwVnx8ujk2ikeUQ,4564
+fractal_server-2.11.0a7.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+fractal_server-2.11.0a7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.11.0a7.dist-info/RECORD,,