fractal-server 2.18.3a2__py3-none-any.whl → 2.18.5__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.3a2"
+__VERSION__ = "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/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/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.dist-info → fractal_server-2.18.5.dist-info}/METADATA

@@ -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.3a2.dist-info → fractal_server-2.18.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=Rzw6TOYnnUFPK6rCXCcX9YI2QCykuOzwafCf3c0dUAk,25
+fractal_server/__init__.py,sha256=cQV4638eWwLhBQkTr44aa2pnEcL34eFRIcbR9JV3Bhw,23
 fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -69,7 +69,7 @@ fractal_server/app/routes/auth/oauth.py,sha256=ocQjyy6OfuEORDYVVzQSgcisSwL-YLZxa
 fractal_server/app/routes/auth/register.py,sha256=IiUJhgY0ZrTs0RlBRRjoTv4wF5Gb3eXTInFV-dXkpsE,615
 fractal_server/app/routes/auth/router.py,sha256=Zip_fw9qJWtoXWjluznschyrCKb2n_rf3xWarSXMkgI,692
 fractal_server/app/routes/auth/users.py,sha256=5BagdH1dz-ZoXdvTgIo9QWBNFPW3p1pIZfY9BBu4eds,7397
-fractal_server/app/routes/auth/viewer_paths.py,sha256=aW1QM4fdCM-WFEOXNf7I7V7_XQuuRrOHvd32nr08Ofs,1618
+fractal_server/app/routes/auth/viewer_paths.py,sha256=uDIwP3AWjLOskG2ZSMUokmn6DWJX2NSviG6k4hiJRSU,1911
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=n-UhONvomKyKkQDDqd0lFh2kCMhlCGXpfdMNW39R1E4,644
 fractal_server/app/routes/aux/_runner.py,sha256=-SvcXCVEV7Mb6q4PbbxuTCCruX6sAlR5QGXk9CzBVv8,979
@@ -96,7 +96,7 @@ fractal_server/app/schemas/v2/task_group.py,sha256=sbg6AkvonU7F_-QC4G9kDxO6YVcz7
 fractal_server/app/schemas/v2/workflow.py,sha256=87Aa92H6ceBbkDUsDhDqVNJyuBZuVRRAgFqNeg_djwE,1738
 fractal_server/app/schemas/v2/workflowtask.py,sha256=1k56KHwzZDZGjl7FG1yslj-MKtKKR5fZ5RKGlJbopNc,3608
 fractal_server/app/security/__init__.py,sha256=sblIH9DFCt_iyk22WzV6k4LuKdbvNPtS1HqPCHIiBJ4,18363
-fractal_server/app/security/signup_email.py,sha256=ZnwwjpL6jyIkegHBebTqYYGGVtllLI0_x48K-yJtkNk,1969
+fractal_server/app/security/signup_email.py,sha256=R69U5eTi9X7gZHSTfZ26SaHMQAeqReYEpGnB8r3AVig,1992
 fractal_server/app/shutdown.py,sha256=bfEmf6Xdc906ES0zDDWsihmd6neQpGFyIc7qnadnNu8,2283
 fractal_server/config/__init__.py,sha256=WvcoE3qiY1qnkumv3qspcemCFw5iFG5NkSFR78vN4ks,562
 fractal_server/config/_data.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,7 +111,7 @@ fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_
 fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
 fractal_server/images/models.py,sha256=5wtUmX3hRy8vyOb4SgezuIWcwUaB69HyXHg4zFMJkvk,1198
 fractal_server/images/status_tools.py,sha256=Is2QWThbLCrVJuI0NpGv7TcWs1T8z8q_8Qsidr3TdBU,4932
-fractal_server/images/tools.py,sha256=37jVIU6RiAGbiyucNDlKe9J3yN3Y47NOvv-RJor9Jm0,4154
+fractal_server/images/tools.py,sha256=4U5Sc5f9ci55W4VLJ7diQrO6gPcw7WKunZQkp3AefMk,4161
 fractal_server/logger.py,sha256=9EhRdgPnGdbJ51vxhOD42K0iaDRhKx7wuikpHoh9kzY,5302
 fractal_server/main.py,sha256=vCDvUndmLIkxUX8EAtyA4Wu9YiIHGZge5J37Yn2U5R4,6537
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
@@ -267,7 +267,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.18.3a2.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
-fractal_server-2.18.3a2.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
-fractal_server-2.18.3a2.dist-info/METADATA,sha256=gaWGl_yrUyqMMTGt-z2Aw53MAlLURTYVObPvmskNmY8,4163
-fractal_server-2.18.3a2.dist-info/RECORD,,
+fractal_server-2.18.5.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.18.5.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+fractal_server-2.18.5.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
+fractal_server-2.18.5.dist-info/METADATA,sha256=HeRLXpOOQoXqQTOpDio4bKBHa8zK2JxdQcATFlKv8sc,4183
+fractal_server-2.18.5.dist-info/RECORD,,

{fractal_server-2.18.3a2.dist-info → fractal_server-2.18.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.18
+Generator: uv 0.9.22
 Root-Is-Purelib: true
 Tag: py3-none-any

fractal_server-2.18.5.dist-info/licenses/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.