fractal-server 2.18.0a7__py3-none-any.whl → 2.18.0a9__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.
@@ -1 +1 @@
1
- __VERSION__ = "2.18.0a7"
1
+ __VERSION__ = "2.18.0a9"
@@ -52,7 +52,9 @@ async def get_task_group_activity_list(
52
52
  page = pagination.page
53
53
  page_size = pagination.page_size
54
54
 
55
- stm = select(TaskGroupActivityV2)
55
+ stm = select(TaskGroupActivityV2).order_by(
56
+ TaskGroupActivityV2.timestamp_started.desc()
57
+ )
56
58
  stm_count = select(func.count(TaskGroupActivityV2.id))
57
59
  if task_group_activity_id is not None:
58
60
  stm = stm.where(TaskGroupActivityV2.id == task_group_activity_id)
@@ -34,10 +34,7 @@ class SlurmConfigSet(BaseModel):
34
34
  account:
35
35
  extra_lines:
36
36
  gpus:
37
- sleep_after_srun:
38
- Add a `sleep` command in the SLURM submission script, after the
39
- `srun .. &` lines, and before the `wait` one. This may mitigate
40
- an issue observed on SLURM 25.05.4.
37
+ shebang_line: The shell shebang to use for SLURM jobs.
41
38
  """
42
39
 
43
40
  model_config = ConfigDict(extra="forbid")
@@ -53,7 +50,7 @@ class SlurmConfigSet(BaseModel):
53
50
  account: NonEmptyStr | None = None
54
51
  extra_lines: list[NonEmptyStr] = Field(default_factory=list)
55
52
  gpus: NonEmptyStr | None = None
56
- sleep_after_srun: int = 0
53
+ shebang_line: str = "#!/bin/sh"
57
54
 
58
55
 
59
56
  class BatchingConfigSet(BaseModel):
@@ -396,8 +396,6 @@ class BaseSlurmRunner(BaseRunner):
396
396
  f"--mem={mem_per_task_MB}MB "
397
397
  f"{cmd} &"
398
398
  )
399
- if slurm_config.sleep_after_srun > 0:
400
- script_lines.append(f"sleep {slurm_config.sleep_after_srun}\n")
401
399
  script_lines.append("wait\n\n")
402
400
  script_lines.append('echo "End time: $(date +"%Y-%m-%dT%H:%M:%S%z")"')
403
401
  script = "\n".join(script_lines)
@@ -60,10 +60,7 @@ class SlurmConfig(BaseModel):
60
60
  Key-value pairs to be included as `export`-ed variables in SLURM
61
61
  submission script, after prepending values with the user's cache
62
62
  directory.
63
- sleep_after_srun:
64
- Add a `sleep` command in the SLURM submission script, after the
65
- `srun .. &` lines, and before the `wait` one. This may mitigate
66
- an issue observed on SLURM 25.05.4.
63
+
67
64
  """
68
65
 
69
66
  model_config = ConfigDict(extra="forbid")
@@ -103,8 +100,6 @@ class SlurmConfig(BaseModel):
103
100
  target_num_jobs: int
104
101
  max_num_jobs: int
105
102
 
106
- sleep_after_srun: int = 0
107
-
108
103
  def _sorted_extra_lines(self) -> list[str]:
109
104
  """
110
105
  Return a copy of `self.extra_lines`, where lines starting with
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: fractal-server
3
- Version: 2.18.0a7
3
+ Version: 2.18.0a9
4
4
  Summary: Backend component of the Fractal analytics platform
5
5
  License-Expression: BSD-3-Clause
6
6
  License-File: LICENSE
@@ -1,4 +1,4 @@
1
- fractal_server/__init__.py,sha256=DuwF9p41_x2O2lnB3pphTsGrOZmbrzmtU02F_hsYOHo,25
1
+ fractal_server/__init__.py,sha256=vSgwVVk65ixAjcQXYQvUCMCu-rptRXj7Icz8W84_MRE,25
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
@@ -30,7 +30,7 @@ fractal_server/app/routes/admin/v2/profile.py,sha256=DwLlA9K3hkl9BqzyifIDiaWeHOM
30
30
  fractal_server/app/routes/admin/v2/resource.py,sha256=c2z6b_D_W6_dqVnxNF8F8OdlI5Z4asex8Zgfwzjbi2Q,6330
31
31
  fractal_server/app/routes/admin/v2/sharing.py,sha256=x7RtbDPapyENEU_s4-glPoEeEOxxj2VBgduVQ1V7wkE,3796
32
32
  fractal_server/app/routes/admin/v2/task.py,sha256=M4cetPkzn73-6faftk49AU_PeaPLqKE_dZxrrQ_x_98,6087
33
- fractal_server/app/routes/admin/v2/task_group.py,sha256=k2F0NZADEonGK47m4E4h8TpY3E6FOTFqTDLOBf7rCWY,9308
33
+ fractal_server/app/routes/admin/v2/task_group.py,sha256=3LxH2LEstj7L9qGNN3kkLo4JdFw4GXDlnlM6s4ulc_0,9377
34
34
  fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=LkHSQVXRRUkicpIDQpc7dwT944uabtCTTrZCoESHjik,9935
35
35
  fractal_server/app/routes/api/__init__.py,sha256=GaNOm1elJLldHNWZ482qlvETLAXhdJ8u_X6kGxMmwQs,1409
36
36
  fractal_server/app/routes/api/v2/__init__.py,sha256=_J8ekQqNGJ3DC1mKum8m8SNOcv66oZ7A260MFjcEtGE,2710
@@ -177,7 +177,7 @@ fractal_server/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
177
177
  fractal_server/runner/components.py,sha256=-Ii5l8d_V6f5DFOd-Zsr8VYmOsyqw0Hox9fEFQiuqxY,66
178
178
  fractal_server/runner/config/__init__.py,sha256=a-vSrvWBeMVnxTtYoy-f5Ibt_mM8MM3F7jqnPvvjHSY,108
179
179
  fractal_server/runner/config/_local.py,sha256=IHWtxpKuJDdsQNpk8Q5bNL4DEJunNkNJkLfetfnwmQM,788
180
- fractal_server/runner/config/_slurm.py,sha256=FtWQi74e_9nolpKF07zMsOr3R1_yZKqNhC_cIo9MTUk,3892
180
+ fractal_server/runner/config/_slurm.py,sha256=eFtfo9mXAoo-MEk-XZIK7OfwD21KjLAtdMzWfSvaypA,3735
181
181
  fractal_server/runner/config/slurm_mem_to_MB.py,sha256=6KmrIC-NymQjb9-bIQjNYQx6mE0OoKoZxdi6WQnWOHw,2003
182
182
  fractal_server/runner/exceptions.py,sha256=N8DLn7tuV8zMSdr8xdJN0aIdytPveSCeQ1Y5IoxXW-8,1778
183
183
  fractal_server/runner/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -189,10 +189,10 @@ fractal_server/runner/executors/local/runner.py,sha256=0s0u5ONasXdsvS2WD5zxksQgv
189
189
  fractal_server/runner/executors/slurm_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
190
190
  fractal_server/runner/executors/slurm_common/_batching.py,sha256=YQjWRTDI1e6NeLe1R-1QWlt49i42M9ILeExEjdjgy48,8348
191
191
  fractal_server/runner/executors/slurm_common/_job_states.py,sha256=nuV-Zba38kDrRESOVB3gaGbrSPZc4q7YGichQaeqTW0,238
192
- fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=vHm5wjZ-VkRUuVIhbrpUJqtpxOZDlFHwTT0OmTv3CAw,41995
192
+ fractal_server/runner/executors/slurm_common/base_slurm_runner.py,sha256=pU2Szcg3tv7vinLJXbzSgYlfEPLY_b0R0YDR-FSYLc8,41873
193
193
  fractal_server/runner/executors/slurm_common/get_slurm_config.py,sha256=B6EKjob8Y-DiJ8YbXf2CeoY7B8cwvkpKvlW8Ce6bbx0,7115
194
194
  fractal_server/runner/executors/slurm_common/remote.py,sha256=8pTMTRp_LjzoUr3FtFTfdvDhuLnqzY6HT-T9pzrVLw4,3845
195
- fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=rF-9Q1gWDBqtNbs9hji6oTvIQ2uV36FqCc04DdAqtHA,8153
195
+ fractal_server/runner/executors/slurm_common/slurm_config.py,sha256=JcAV1xNhzBjpZFTRRbQm0EN9Ti4udNOjseGQcFlFnuM,7897
196
196
  fractal_server/runner/executors/slurm_common/slurm_job_task_models.py,sha256=VeX40CvU5fckUpSyXlzb3EDE9xxPXkT2sZKLXq_6Ooc,3493
197
197
  fractal_server/runner/executors/slurm_ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
198
198
  fractal_server/runner/executors/slurm_ssh/run_subprocess.py,sha256=SyW6t4egvbiARph2YkFjc88Hj94fCamZVi50L7ph8VM,996
@@ -268,8 +268,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt
268
268
  fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
269
269
  fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
270
270
  fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
271
- fractal_server-2.18.0a7.dist-info/METADATA,sha256=8gfu8aos4ki_fVT2imS8dopTKPdsTnGzSQa0ah-kU1o,4277
272
- fractal_server-2.18.0a7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
273
- fractal_server-2.18.0a7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
274
- fractal_server-2.18.0a7.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
275
- fractal_server-2.18.0a7.dist-info/RECORD,,
271
+ fractal_server-2.18.0a9.dist-info/METADATA,sha256=68oxr2Sxc8Kr0m6yZEnfki369h06fyzKRlj1HKrl50Q,4277
272
+ fractal_server-2.18.0a9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
273
+ fractal_server-2.18.0a9.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
274
+ fractal_server-2.18.0a9.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
275
+ fractal_server-2.18.0a9.dist-info/RECORD,,