fractal-server 2.18.4__py3-none-any.whl → 2.18.5__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- fractal_server/__init__.py +1 -1
- fractal_server/app/routes/auth/viewer_paths.py +11 -7
- fractal_server/app/security/signup_email.py +2 -1
- fractal_server/images/tools.py +1 -1
- {fractal_server-2.18.4.dist-info → fractal_server-2.18.5.dist-info}/METADATA +5 -5
- {fractal_server-2.18.4.dist-info → fractal_server-2.18.5.dist-info}/RECORD +9 -9
- {fractal_server-2.18.4.dist-info → fractal_server-2.18.5.dist-info}/WHEEL +1 -1
- {fractal_server-2.18.4.dist-info → fractal_server-2.18.5.dist-info}/entry_points.txt +0 -0
- {fractal_server-2.18.4.dist-info → fractal_server-2.18.5.dist-info}/licenses/LICENSE +0 -0
fractal_server/__init__.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__VERSION__ = "2.18.
|
|
1
|
+
__VERSION__ = "2.18.5"
|
|
@@ -23,9 +23,12 @@ async def get_current_user_allowed_viewer_paths(
|
|
|
23
23
|
) -> list[str]:
|
|
24
24
|
"""
|
|
25
25
|
Returns the allowed viewer paths for current user.
|
|
26
|
-
"""
|
|
27
|
-
authorized_paths = current_user.project_dirs.copy()
|
|
28
26
|
|
|
27
|
+
NOTE: `include_shared_projects` is an obsolete query-parameter name,
|
|
28
|
+
because it does not make a difference between owners/guests. A better
|
|
29
|
+
naming would be e.g. `include_zarr_dirs`, but it would require a fix
|
|
30
|
+
in `fractal-web` as well.
|
|
31
|
+
"""
|
|
29
32
|
if include_shared_projects:
|
|
30
33
|
res = await db.execute(
|
|
31
34
|
select(DatasetV2.zarr_dir)
|
|
@@ -36,8 +39,9 @@ async def get_current_user_allowed_viewer_paths(
|
|
|
36
39
|
.where(LinkUserProjectV2.user_id == current_user.id)
|
|
37
40
|
.where(LinkUserProjectV2.is_verified.is_(True))
|
|
38
41
|
)
|
|
39
|
-
|
|
40
|
-
# Note that `project_dirs` and the `
|
|
41
|
-
# common elements, and then
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
authorized_zarr_dirs = list(res.unique().scalars().all())
|
|
43
|
+
# Note that `project_dirs` and the `authorized_zarr_dirs` may have some
|
|
44
|
+
# common elements, and then the response may include non-unique items.
|
|
45
|
+
return current_user.project_dirs + authorized_zarr_dirs
|
|
46
|
+
else:
|
|
47
|
+
return current_user.project_dirs
|
|
@@ -13,7 +13,7 @@ def send_fractal_email_or_log_failure(
|
|
|
13
13
|
subject: str,
|
|
14
14
|
msg: str,
|
|
15
15
|
email_settings: PublicEmailSettings | None,
|
|
16
|
-
):
|
|
16
|
+
) -> None:
|
|
17
17
|
"""
|
|
18
18
|
Send an email using the specified settings, or log about failure.
|
|
19
19
|
"""
|
|
@@ -22,6 +22,7 @@ def send_fractal_email_or_log_failure(
|
|
|
22
22
|
logger.error(
|
|
23
23
|
f"Cannot send email with {subject=}, because {email_settings=}."
|
|
24
24
|
)
|
|
25
|
+
return
|
|
25
26
|
|
|
26
27
|
try:
|
|
27
28
|
logger.info(f"START sending email with {subject=}.")
|
fractal_server/images/tools.py
CHANGED
|
@@ -117,7 +117,7 @@ def merge_type_filters(
|
|
|
117
117
|
f"`{task_input_types}` (from task) "
|
|
118
118
|
f"and `{wftask_type_filters}` (from workflowtask)."
|
|
119
119
|
)
|
|
120
|
-
merged_dict = task_input_types
|
|
120
|
+
merged_dict = task_input_types.copy()
|
|
121
121
|
merged_dict.update(wftask_type_filters)
|
|
122
122
|
return merged_dict
|
|
123
123
|
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: fractal-server
|
|
3
|
-
Version: 2.18.
|
|
3
|
+
Version: 2.18.5
|
|
4
4
|
Summary: Backend component of the Fractal analytics platform
|
|
5
5
|
Author: Tommaso Comparin, Marco Franzon, Yuri Chiucconi, Jacopo Nespolo
|
|
6
6
|
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>
|
|
7
7
|
License-Expression: BSD-3-Clause
|
|
8
8
|
License-File: LICENSE
|
|
9
|
-
Requires-Dist: fastapi>=0.
|
|
10
|
-
Requires-Dist: sqlmodel==0.0.
|
|
9
|
+
Requires-Dist: fastapi>=0.128.0,<0.129.0
|
|
10
|
+
Requires-Dist: sqlmodel==0.0.31
|
|
11
11
|
Requires-Dist: sqlalchemy[asyncio]>=2.0.23,<2.1
|
|
12
12
|
Requires-Dist: fastapi-users[oauth]>=15,<16
|
|
13
13
|
Requires-Dist: alembic>=1.13.1,<2.0.0
|
|
14
|
-
Requires-Dist: uvicorn>=0.
|
|
14
|
+
Requires-Dist: uvicorn>=0.40.0,<0.41.0
|
|
15
15
|
Requires-Dist: uvicorn-worker==0.4.0
|
|
16
16
|
Requires-Dist: pydantic>=2.12.0,<2.13.0
|
|
17
|
-
Requires-Dist: pydantic-settings==2.
|
|
17
|
+
Requires-Dist: pydantic-settings==2.12.0
|
|
18
18
|
Requires-Dist: packaging>=25.0.0,<26.0.0
|
|
19
19
|
Requires-Dist: fabric>=3.2.2,<3.3.0
|
|
20
20
|
Requires-Dist: gunicorn>=23.0,<24.0
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
fractal_server/__init__.py,sha256=
|
|
1
|
+
fractal_server/__init__.py,sha256=cQV4638eWwLhBQkTr44aa2pnEcL34eFRIcbR9JV3Bhw,23
|
|
2
2
|
fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
|
|
3
3
|
fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
|
|
4
4
|
fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -69,7 +69,7 @@ fractal_server/app/routes/auth/oauth.py,sha256=ocQjyy6OfuEORDYVVzQSgcisSwL-YLZxa
|
|
|
69
69
|
fractal_server/app/routes/auth/register.py,sha256=IiUJhgY0ZrTs0RlBRRjoTv4wF5Gb3eXTInFV-dXkpsE,615
|
|
70
70
|
fractal_server/app/routes/auth/router.py,sha256=Zip_fw9qJWtoXWjluznschyrCKb2n_rf3xWarSXMkgI,692
|
|
71
71
|
fractal_server/app/routes/auth/users.py,sha256=5BagdH1dz-ZoXdvTgIo9QWBNFPW3p1pIZfY9BBu4eds,7397
|
|
72
|
-
fractal_server/app/routes/auth/viewer_paths.py,sha256=
|
|
72
|
+
fractal_server/app/routes/auth/viewer_paths.py,sha256=uDIwP3AWjLOskG2ZSMUokmn6DWJX2NSviG6k4hiJRSU,1911
|
|
73
73
|
fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
74
74
|
fractal_server/app/routes/aux/_job.py,sha256=n-UhONvomKyKkQDDqd0lFh2kCMhlCGXpfdMNW39R1E4,644
|
|
75
75
|
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
|
|
|
96
96
|
fractal_server/app/schemas/v2/workflow.py,sha256=87Aa92H6ceBbkDUsDhDqVNJyuBZuVRRAgFqNeg_djwE,1738
|
|
97
97
|
fractal_server/app/schemas/v2/workflowtask.py,sha256=1k56KHwzZDZGjl7FG1yslj-MKtKKR5fZ5RKGlJbopNc,3608
|
|
98
98
|
fractal_server/app/security/__init__.py,sha256=sblIH9DFCt_iyk22WzV6k4LuKdbvNPtS1HqPCHIiBJ4,18363
|
|
99
|
-
fractal_server/app/security/signup_email.py,sha256=
|
|
99
|
+
fractal_server/app/security/signup_email.py,sha256=R69U5eTi9X7gZHSTfZ26SaHMQAeqReYEpGnB8r3AVig,1992
|
|
100
100
|
fractal_server/app/shutdown.py,sha256=bfEmf6Xdc906ES0zDDWsihmd6neQpGFyIc7qnadnNu8,2283
|
|
101
101
|
fractal_server/config/__init__.py,sha256=WvcoE3qiY1qnkumv3qspcemCFw5iFG5NkSFR78vN4ks,562
|
|
102
102
|
fractal_server/config/_data.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -111,7 +111,7 @@ fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_
|
|
|
111
111
|
fractal_server/images/__init__.py,sha256=-_wjoKtSX02P1KjDxDP_EXKvmbONTRmbf7iGVTsyBpM,154
|
|
112
112
|
fractal_server/images/models.py,sha256=5wtUmX3hRy8vyOb4SgezuIWcwUaB69HyXHg4zFMJkvk,1198
|
|
113
113
|
fractal_server/images/status_tools.py,sha256=Is2QWThbLCrVJuI0NpGv7TcWs1T8z8q_8Qsidr3TdBU,4932
|
|
114
|
-
fractal_server/images/tools.py,sha256=
|
|
114
|
+
fractal_server/images/tools.py,sha256=4U5Sc5f9ci55W4VLJ7diQrO6gPcw7WKunZQkp3AefMk,4161
|
|
115
115
|
fractal_server/logger.py,sha256=9EhRdgPnGdbJ51vxhOD42K0iaDRhKx7wuikpHoh9kzY,5302
|
|
116
116
|
fractal_server/main.py,sha256=vCDvUndmLIkxUX8EAtyA4Wu9YiIHGZge5J37Yn2U5R4,6537
|
|
117
117
|
fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
|
|
@@ -267,8 +267,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
|
|
|
267
267
|
fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
|
|
268
268
|
fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
|
|
269
269
|
fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
|
|
270
|
-
fractal_server-2.18.
|
|
271
|
-
fractal_server-2.18.
|
|
272
|
-
fractal_server-2.18.
|
|
273
|
-
fractal_server-2.18.
|
|
274
|
-
fractal_server-2.18.
|
|
270
|
+
fractal_server-2.18.5.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
|
|
271
|
+
fractal_server-2.18.5.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
|
|
272
|
+
fractal_server-2.18.5.dist-info/entry_points.txt,sha256=3TpdcjmETRYWJxFyAh3z-9955EWua9jdkSnBwxES1uE,60
|
|
273
|
+
fractal_server-2.18.5.dist-info/METADATA,sha256=HeRLXpOOQoXqQTOpDio4bKBHa8zK2JxdQcATFlKv8sc,4183
|
|
274
|
+
fractal_server-2.18.5.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|