fractal-server 2.18.3a2__tar.gz → 2.18.5__tar.gz

fractal_server-2.18.5/LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and University of Zurich
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{fractal_server-2.18.3a2 → fractal_server-2.18.5}/PKG-INFO

@@ -1,19 +1,20 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.3a2
+Version: 2.18.5
 Summary: Backend component of the Fractal analytics platform
 Author: Tommaso Comparin, Marco Franzon, Yuri Chiucconi, Jacopo Nespolo
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>, Marco Franzon <marco.franzon@exact-lab.it>, Yuri Chiucconi <yuri.chiucconi@exact-lab.it>, Jacopo Nespolo <jacopo.nespolo@exact-lab.it>
 License-Expression: BSD-3-Clause
-Requires-Dist: fastapi>=0.120.0,<0.121.0
-Requires-Dist: sqlmodel==0.0.27
+License-File: LICENSE
+Requires-Dist: fastapi>=0.128.0,<0.129.0
+Requires-Dist: sqlmodel==0.0.31
 Requires-Dist: sqlalchemy[asyncio]>=2.0.23,<2.1
 Requires-Dist: fastapi-users[oauth]>=15,<16
 Requires-Dist: alembic>=1.13.1,<2.0.0
-Requires-Dist: uvicorn>=0.38.0,<0.39.0
+Requires-Dist: uvicorn>=0.40.0,<0.41.0
 Requires-Dist: uvicorn-worker==0.4.0
 Requires-Dist: pydantic>=2.12.0,<2.13.0
-Requires-Dist: pydantic-settings==2.11.0
+Requires-Dist: pydantic-settings==2.12.0
 Requires-Dist: packaging>=25.0.0,<26.0.0
 Requires-Dist: fabric>=3.2.2,<3.3.0
 Requires-Dist: gunicorn>=23.0,<24.0

fractal_server-2.18.5/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.18.5"

{fractal_server-2.18.3a2 → fractal_server-2.18.5}/fractal_server/app/routes/auth/viewer_paths.py

@@ -23,9 +23,12 @@ async def get_current_user_allowed_viewer_paths(
 ) -> list[str]:
     """
     Returns the allowed viewer paths for current user.
-    """
-    authorized_paths = current_user.project_dirs.copy()
 
+    NOTE: `include_shared_projects` is an obsolete query-parameter name,
+    because it does not make a difference between owners/guests. A better
+    naming would be e.g. `include_zarr_dirs`, but it would require a fix
+    in `fractal-web` as well.
+    """
     if include_shared_projects:
         res = await db.execute(
             select(DatasetV2.zarr_dir)
@@ -36,8 +39,9 @@ async def get_current_user_allowed_viewer_paths(
             .where(LinkUserProjectV2.user_id == current_user.id)
             .where(LinkUserProjectV2.is_verified.is_(True))
         )
-        authorized_paths.extend(res.unique().scalars().all())
-        # Note that `project_dirs` and the `db.execute` result may have some
-        # common elements, and then this list may have non-unique items.
-
-    return authorized_paths
+        authorized_zarr_dirs = list(res.unique().scalars().all())
+        # Note that `project_dirs` and the `authorized_zarr_dirs` may have some
+        # common elements, and then the response may include non-unique items.
+        return current_user.project_dirs + authorized_zarr_dirs
+    else:
+        return current_user.project_dirs

{fractal_server-2.18.3a2 → fractal_server-2.18.5}/fractal_server/app/security/signup_email.py

@@ -13,7 +13,7 @@ def send_fractal_email_or_log_failure(
     subject: str,
     msg: str,
     email_settings: PublicEmailSettings | None,
-):
+) -> None:
     """
     Send an email using the specified settings, or log about failure.
     """
@@ -22,6 +22,7 @@ def send_fractal_email_or_log_failure(
         logger.error(
             f"Cannot send email with {subject=}, because {email_settings=}."
         )
+        return
 
     try:
         logger.info(f"START sending email with {subject=}.")

{fractal_server-2.18.3a2 → fractal_server-2.18.5}/fractal_server/images/tools.py

@@ -117,7 +117,7 @@ def merge_type_filters(
                 f"`{task_input_types}` (from task) "
                 f"and `{wftask_type_filters}` (from workflowtask)."
             )
-    merged_dict = task_input_types
+    merged_dict = task_input_types.copy()
     merged_dict.update(wftask_type_filters)
     return merged_dict
 

{fractal_server-2.18.3a2 → fractal_server-2.18.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.18.3a2"
+version = "2.18.5"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -10,17 +10,19 @@ authors = [
 ]
 readme = "README.md"
 license = "BSD-3-Clause"
+license-files = ["LICENSE"]
+
 requires-python = ">=3.11,<3.15"
 dependencies = [
-    "fastapi >= 0.120.0, <0.121.0",
-    "sqlmodel == 0.0.27",
+    "fastapi >= 0.128.0, <0.129.0",
+    "sqlmodel == 0.0.31",
     "sqlalchemy[asyncio] >=2.0.23,<2.1",
     "fastapi-users[oauth] >=15,<16",
     "alembic >=1.13.1, <2.0.0",
-    "uvicorn >= 0.38.0, <0.39.0",
+    "uvicorn >= 0.40.0, <0.41.0",
     "uvicorn-worker == 0.4.0",
     "pydantic >=2.12.0,<2.13.0",
-    "pydantic-settings ==2.11.0",
+    "pydantic-settings ==2.12.0",
     "packaging >= 25.0.0, <26.0.0",
     "fabric >= 3.2.2, <3.3.0",
     "gunicorn >=23.0,<24.0",
@@ -92,7 +94,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos", "oauth"]
 
 [tool.bumpver]
-current_version = "2.18.3a2"
+current_version = "2.18.5"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.18.3a2/fractal_server/__init__.py

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