fractal-server 2.10.5__py3-none-any.whl → 2.10.6__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/logger.py +4 -1
- fractal_server/tasks/v2/local/collect.py +2 -2
- fractal_server/tasks/v2/local/deactivate.py +2 -2
- fractal_server/tasks/v2/local/reactivate.py +2 -3
- fractal_server/tasks/v2/ssh/collect.py +2 -2
- fractal_server/tasks/v2/ssh/deactivate.py +2 -2
- fractal_server/tasks/v2/ssh/reactivate.py +2 -2
- {fractal_server-2.10.5.dist-info → fractal_server-2.10.6.dist-info}/METADATA +1 -1
- {fractal_server-2.10.5.dist-info → fractal_server-2.10.6.dist-info}/RECORD +13 -13
- {fractal_server-2.10.5.dist-info → fractal_server-2.10.6.dist-info}/LICENSE +0 -0
- {fractal_server-2.10.5.dist-info → fractal_server-2.10.6.dist-info}/WHEEL +0 -0
- {fractal_server-2.10.5.dist-info → fractal_server-2.10.6.dist-info}/entry_points.txt +0 -0
fractal_server/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
__VERSION__ = "2.10.
|
1
|
+
__VERSION__ = "2.10.6"
|
fractal_server/logger.py
CHANGED
@@ -109,7 +109,10 @@ def set_logger(
|
|
109
109
|
if isinstance(handler, logging.FileHandler)
|
110
110
|
]
|
111
111
|
if len(current_file_handlers) > 1:
|
112
|
-
logger.warning(
|
112
|
+
logger.warning(
|
113
|
+
f"Logger {logger_name} has multiple file handlers: "
|
114
|
+
f"{current_file_handlers}"
|
115
|
+
)
|
113
116
|
|
114
117
|
return logger
|
115
118
|
|
@@ -33,8 +33,6 @@ from fractal_server.tasks.v2.utils_templates import (
|
|
33
33
|
from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
34
34
|
from fractal_server.utils import get_timestamp
|
35
35
|
|
36
|
-
LOGGER_NAME = __name__
|
37
|
-
|
38
36
|
|
39
37
|
def collect_local(
|
40
38
|
*,
|
@@ -59,6 +57,8 @@ def collect_local(
|
|
59
57
|
wheel_file:
|
60
58
|
"""
|
61
59
|
|
60
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
61
|
+
|
62
62
|
with TemporaryDirectory() as tmpdir:
|
63
63
|
log_file_path = get_log_path(Path(tmpdir))
|
64
64
|
logger = set_logger(
|
@@ -21,8 +21,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
|
|
21
21
|
from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
22
22
|
from fractal_server.utils import get_timestamp
|
23
23
|
|
24
|
-
LOGGER_NAME = __name__
|
25
|
-
|
26
24
|
|
27
25
|
def deactivate_local(
|
28
26
|
*,
|
@@ -40,6 +38,8 @@ def deactivate_local(
|
|
40
38
|
task_group_activity_id:
|
41
39
|
"""
|
42
40
|
|
41
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
42
|
+
|
43
43
|
with TemporaryDirectory() as tmpdir:
|
44
44
|
log_file_path = get_log_path(Path(tmpdir))
|
45
45
|
logger = set_logger(
|
@@ -23,9 +23,6 @@ from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
|
23
23
|
from fractal_server.utils import get_timestamp
|
24
24
|
|
25
25
|
|
26
|
-
LOGGER_NAME = __name__
|
27
|
-
|
28
|
-
|
29
26
|
def reactivate_local(
|
30
27
|
*,
|
31
28
|
task_group_activity_id: int,
|
@@ -42,6 +39,8 @@ def reactivate_local(
|
|
42
39
|
task_group_activity_id:
|
43
40
|
"""
|
44
41
|
|
42
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
43
|
+
|
45
44
|
with TemporaryDirectory() as tmpdir:
|
46
45
|
log_file_path = get_log_path(Path(tmpdir))
|
47
46
|
logger = set_logger(
|
@@ -30,8 +30,6 @@ from fractal_server.tasks.v2.utils_templates import (
|
|
30
30
|
from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
31
31
|
from fractal_server.utils import get_timestamp
|
32
32
|
|
33
|
-
LOGGER_NAME = __name__
|
34
|
-
|
35
33
|
|
36
34
|
def collect_ssh(
|
37
35
|
*,
|
@@ -62,6 +60,8 @@ def collect_ssh(
|
|
62
60
|
wheel_file:
|
63
61
|
"""
|
64
62
|
|
63
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
64
|
+
|
65
65
|
# Work within a temporary folder, where also logs will be placed
|
66
66
|
with TemporaryDirectory() as tmpdir:
|
67
67
|
LOGGER_NAME = "task_collection_ssh"
|
@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_background import get_current_log
|
|
22
22
|
from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
23
23
|
from fractal_server.utils import get_timestamp
|
24
24
|
|
25
|
-
LOGGER_NAME = __name__
|
26
|
-
|
27
25
|
|
28
26
|
def deactivate_ssh(
|
29
27
|
*,
|
@@ -47,6 +45,8 @@ def deactivate_ssh(
|
|
47
45
|
`user_settings.ssh_tasks_dir`.
|
48
46
|
"""
|
49
47
|
|
48
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
49
|
+
|
50
50
|
with TemporaryDirectory() as tmpdir:
|
51
51
|
log_file_path = get_log_path(Path(tmpdir))
|
52
52
|
logger = set_logger(
|
@@ -22,8 +22,6 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
|
|
22
22
|
from fractal_server.tasks.v2.utils_templates import SCRIPTS_SUBFOLDER
|
23
23
|
from fractal_server.utils import get_timestamp
|
24
24
|
|
25
|
-
LOGGER_NAME = __name__
|
26
|
-
|
27
25
|
|
28
26
|
def reactivate_ssh(
|
29
27
|
*,
|
@@ -47,6 +45,8 @@ def reactivate_ssh(
|
|
47
45
|
`user_settings.ssh_tasks_dir`.
|
48
46
|
"""
|
49
47
|
|
48
|
+
LOGGER_NAME = f"{__name__}.ID{task_group_activity_id}"
|
49
|
+
|
50
50
|
with TemporaryDirectory() as tmpdir:
|
51
51
|
log_file_path = get_log_path(Path(tmpdir))
|
52
52
|
logger = set_logger(
|
@@ -1,4 +1,4 @@
|
|
1
|
-
fractal_server/__init__.py,sha256=
|
1
|
+
fractal_server/__init__.py,sha256=a7_sazZoCnsqPILpPj1L3cASrJQAtTkPgpVlFA0CJpY,23
|
2
2
|
fractal_server/__main__.py,sha256=D2YTmSowmXNyvqOjW_HeItCZT2UliWlySl_owicaZg0,8026
|
3
3
|
fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
|
4
4
|
fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -170,7 +170,7 @@ fractal_server/gunicorn_fractal.py,sha256=u6U01TLGlXgq1v8QmEpLih3QnsInZD7CqphgJ_
|
|
170
170
|
fractal_server/images/__init__.py,sha256=xO6jTLE4EZKO6cTDdJsBmK9cdeh9hFTaSbSuWgQg7y4,196
|
171
171
|
fractal_server/images/models.py,sha256=UlWazUOFQtpS3pZuROjcJXviG_Ai453jqUDHdzuvD5w,4170
|
172
172
|
fractal_server/images/tools.py,sha256=gxeniYy4Z-cp_ToK2LHPJUTVVUUrdpogYdcBUvBuLiY,2209
|
173
|
-
fractal_server/logger.py,sha256=
|
173
|
+
fractal_server/logger.py,sha256=5Z3rfsFwl8UysVljTOaaIvt8Pyp6CVH492ez3jE8WAw,5113
|
174
174
|
fractal_server/main.py,sha256=gStLT9Du5QMpc9SyvRvtKU21EKwp-dG4HL3zGHzE06A,4908
|
175
175
|
fractal_server/migrations/env.py,sha256=9t_OeKVlhM8WRcukmTrLbWNup-imiBGP_9xNgwCbtpI,2730
|
176
176
|
fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
|
@@ -216,14 +216,14 @@ fractal_server/tasks/v1/utils.py,sha256=HYFyNAyZofmf--mVgdwGC5TJpGShIWIDaS01yRr4
|
|
216
216
|
fractal_server/tasks/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
217
217
|
fractal_server/tasks/v2/local/__init__.py,sha256=9RVItnS7OyLsJOuJjWMCicaky4ASUPQEYD4SzDs0hOE,141
|
218
218
|
fractal_server/tasks/v2/local/_utils.py,sha256=EvhmVwYjqaNyDCUMEsTWYOUXLgEwR1xr6bu32apCEI8,2491
|
219
|
-
fractal_server/tasks/v2/local/collect.py,sha256=
|
220
|
-
fractal_server/tasks/v2/local/deactivate.py,sha256=
|
221
|
-
fractal_server/tasks/v2/local/reactivate.py,sha256=
|
219
|
+
fractal_server/tasks/v2/local/collect.py,sha256=Mr4BzscBY8zBRCzWq8ozTjFYy1-VFPXrMCBF7vd9Ods,12143
|
220
|
+
fractal_server/tasks/v2/local/deactivate.py,sha256=uAV-tBgfKiN4chkfk6dYCZfF67POwhNizyxuCk_WJK8,9935
|
221
|
+
fractal_server/tasks/v2/local/reactivate.py,sha256=DwtOZrSk6jhUHEmAiMcstK3YzqPQ12pfgxmUNdrSgfk,6088
|
222
222
|
fractal_server/tasks/v2/ssh/__init__.py,sha256=aSQbVi6Ummt9QzcSLWNmSqYjfdxrn9ROmqgH6bDpI7k,135
|
223
223
|
fractal_server/tasks/v2/ssh/_utils.py,sha256=LjaEYVUJDChilu3YuhxuGWYRNnVJ_zqNE9SDHdRTIHY,2824
|
224
|
-
fractal_server/tasks/v2/ssh/collect.py,sha256=
|
225
|
-
fractal_server/tasks/v2/ssh/deactivate.py,sha256=
|
226
|
-
fractal_server/tasks/v2/ssh/reactivate.py,sha256=
|
224
|
+
fractal_server/tasks/v2/ssh/collect.py,sha256=yLVcilvU7uMH8woc__qG_3a0wyT2mNTCuq9I93HVKNM,13493
|
225
|
+
fractal_server/tasks/v2/ssh/deactivate.py,sha256=bFlcpZpGiTZcwG845YiLEIIYpiG7vslcSp6_NkXtHGw,11297
|
226
|
+
fractal_server/tasks/v2/ssh/reactivate.py,sha256=RoXM5HpIc0rVz4-8UCr3uWv-9zA8bobGSTNJamYsMOo,7873
|
227
227
|
fractal_server/tasks/v2/templates/1_create_venv.sh,sha256=PK0jdHKtQpda1zULebBaVPORt4t6V17wa4N1ohcj5ac,548
|
228
228
|
fractal_server/tasks/v2/templates/2_pip_install.sh,sha256=Gpk2io8u9YaflFUlQu2NgkDQw5AA4m4AOVG1sB4yrHQ,1822
|
229
229
|
fractal_server/tasks/v2/templates/3_pip_freeze.sh,sha256=JldREScEBI4cD_qjfX4UK7V4aI-FnX9ZvVNxgpSOBFc,168
|
@@ -238,8 +238,8 @@ fractal_server/tasks/v2/utils_templates.py,sha256=07TZpJ0Mh_A4lXVXrrH2o1VLFFGwxe
|
|
238
238
|
fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
|
239
239
|
fractal_server/utils.py,sha256=utvmBx8K9I8hRWFquxna2pBaOqe0JifDL_NVPmihEJI,3525
|
240
240
|
fractal_server/zip_tools.py,sha256=GjDgo_sf6V_DDg6wWeBlZu5zypIxycn_l257p_YVKGc,4876
|
241
|
-
fractal_server-2.10.
|
242
|
-
fractal_server-2.10.
|
243
|
-
fractal_server-2.10.
|
244
|
-
fractal_server-2.10.
|
245
|
-
fractal_server-2.10.
|
241
|
+
fractal_server-2.10.6.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
|
242
|
+
fractal_server-2.10.6.dist-info/METADATA,sha256=51h1I8zU4HexWwOkqbObhEXf6pFk7mqi0ET7uUUxW2g,4562
|
243
|
+
fractal_server-2.10.6.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
|
244
|
+
fractal_server-2.10.6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
|
245
|
+
fractal_server-2.10.6.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|