fractal-server 2.11.0a2__tar.gz → 2.11.0a3__tar.gz

{fractal_server-2.11.0a2 → fractal_server-2.11.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.11.0a2
+Version: 2.11.0a3
 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.0a3/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.11.0a3"

{fractal_server-2.11.0a2 → fractal_server-2.11.0a3}/fractal_server/app/schemas/v2/dataset.py

@@ -116,6 +116,7 @@ class DatasetImportV2(BaseModel, extra=Extra.forbid):
         name:
         zarr_dir:
         images:
+        filters:
         type_filters:
         attribute_filters:
     """
@@ -124,14 +125,40 @@ class DatasetImportV2(BaseModel, extra=Extra.forbid):
     zarr_dir: str
     images: list[SingleImage] = Field(default_factory=list)
 
+    filters: Optional[dict[str, Any]] = None
     type_filters: dict[str, bool] = Field(default_factory=dict)
     attribute_filters: AttributeFiltersType = Field(default_factory=dict)
 
-    # Validators
+    @root_validator(pre=True)
+    def update_legacy_filters(cls, values: dict):
+        """
+        Transform legacy filters (created with fractal-server<2.11.0)
+        into attribute/type filters
+        """
+        if values.get("filters") is not None:
+            if (
+                "type_filters" in values.keys()
+                or "attribute_filters" in values.keys()
+            ):
+                raise ValueError(
+                    "Cannot set filters both through the legacy field "
+                    "('filters') and the new ones ('type_filters' and/or "
+                    "'attribute_filters')."
+                )
+
+            else:
+                # Convert legacy filters.types into new type_filters
+                values["type_filters"] = values["filters"].get("types", {})
+                values["attribute_filters"] = {
+                    key: [value]
+                    for key, value in values["filters"]
+                    .get("attributes", {})
+                    .items()
+                }
+                values["filters"] = None
+
+        return values
 
-    _dict_keys = root_validator(pre=True, allow_reuse=True)(
-        root_validate_dict_keys
-    )
     _type_filters = validator("type_filters", allow_reuse=True)(
         validate_type_filters
     )

{fractal_server-2.11.0a2 → fractal_server-2.11.0a3}/fractal_server/app/schemas/v2/workflowtask.py

@@ -179,14 +179,38 @@ class WorkflowTaskImportV2(BaseModel, extra=Extra.forbid):
     meta_parallel: Optional[dict[str, Any]] = None
     args_non_parallel: Optional[dict[str, Any]] = None
     args_parallel: Optional[dict[str, Any]] = None
-
     type_filters: Optional[dict[str, bool]] = None
+    filters: Optional[dict[str, Any]] = None
 
     task: Union[TaskImportV2, TaskImportV2Legacy]
 
-    _dict_keys = root_validator(pre=True, allow_reuse=True)(
-        root_validate_dict_keys
-    )
+    # Validators
+    @root_validator(pre=True)
+    def update_legacy_filters(cls, values: dict):
+        """
+        Transform legacy filters (created with fractal-server<2.11.0)
+        into type filters
+        """
+        if values.get("filters") is not None:
+            if "type_filters" in values.keys():
+                raise ValueError(
+                    "Cannot set filters both through the legacy field "
+                    "('filters') and the new one ('type_filters')."
+                )
+
+            else:
+                # As of 2.11.0, WorkflowTask do not have attribute filters
+                # any more.
+                if values["filters"]["attributes"] != {}:
+                    raise ValueError(
+                        "Cannot set attribute filters for WorkflowTasks."
+                    )
+                # Convert legacy filters.types into new type_filters
+                values["type_filters"] = values["filters"].get("types", {})
+                values["filters"] = None
+
+        return values
+
     _type_filters = validator("type_filters", allow_reuse=True)(
         validate_type_filters
     )

{fractal_server-2.11.0a2 → fractal_server-2.11.0a3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.11.0a2"
+version = "2.11.0a3"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -95,7 +95,7 @@ filterwarnings = [
 ]
 
 [tool.bumpver]
-current_version = "2.11.0a2"
+current_version = "2.11.0a3"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.11.0a2/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.11.0a2"