fractal-server 2.18.0a5__tar.gz → 2.18.0a6__tar.gz

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/PKG-INFO

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

fractal_server-2.18.0a6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.18.0a6"

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/fractal_server/app/routes/api/v2/dataset.py

@@ -279,16 +279,6 @@ async def import_dataset(
             ),
         )
 
-    for image in dataset.images:
-        if not image.zarr_url.startswith(dataset.zarr_dir):
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                detail=(
-                    f"Cannot import dataset: zarr_url {image.zarr_url} is not "
-                    f"relative to zarr_dir={dataset.zarr_dir}."
-                ),
-            )
-
     # Create new Dataset
     db_dataset = DatasetV2(
         project_id=project_id,

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/fractal_server/app/schemas/v2/dataset.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from pathlib import Path
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
@@ -100,6 +101,15 @@ class DatasetImport(BaseModel):
     zarr_dir: ZarrDirStr
     images: list[SingleImage] = Field(default_factory=list)
 
+    @model_validator(mode="after")
+    def validate_image_zarr_url(self):
+        for image in self.images:
+            if not Path(image.zarr_url).is_relative_to(self.zarr_dir):
+                raise ValueError(
+                    f"{image.zarr_url=} is not relative to {self.zarr_dir=}."
+                )
+        return self
+
 
 class DatasetExport(BaseModel):
     """

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/fractal_server/images/models.py

@@ -5,7 +5,6 @@ from fractal_server.types import DictStrAny
 from fractal_server.types import ImageAttributes
 from fractal_server.types import ImageAttributesWithNone
 from fractal_server.types import ImageTypes
-from fractal_server.types import ZarrDirStr
 from fractal_server.types import ZarrUrlStr
 
 
@@ -21,7 +20,7 @@ class SingleImageBase(BaseModel):
     """
 
     zarr_url: ZarrUrlStr
-    origin: ZarrDirStr | None = None
+    origin: ZarrUrlStr | None = None
 
     attributes: DictStrAny = Field(default_factory=dict)
     types: ImageTypes = Field(default_factory=dict)

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/fractal_server/main.py

@@ -135,14 +135,25 @@ async def lifespan(app: FastAPI):
 slow_response_logger = set_logger("slow-response")
 
 
+def _endpoint_has_background_task(method: str, path: str) -> bool:
+    has_background_task = (method == "POST") and (
+        "/job/submit/" in path
+        or "/task/collect/pi" in path  # "/pip" and "/pixi"
+        or "/task-group/" in path
+    )
+    return has_background_task
+
+
 class SlowResponseMiddleware:
     def __init__(self, app: FastAPI, time_threshold: float):
         self.app = app
         self.time_threshold = time_threshold
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send):
-        # Filter out any non-http scope (e.g. `type="lifespan"`)
-        if scope["type"] != "http":
+        if (
+            scope["type"] != "http"  # e.g. `scope["type"] == "lifespan"`
+            or _endpoint_has_background_task(scope["method"], scope["path"])
+        ):
             await self.app(scope, receive, send)
             return
 

{fractal_server-2.18.0a5 → fractal_server-2.18.0a6}/pyproject.toml

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

fractal_server-2.18.0a5/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.18.0a5"