ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-05-29 17:48:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix TaskScheduler weekdays, and change default execute_immediately to False

Browse Source
This commit is contained in:
allegroai 2021-08-30 17:46:48 +03:00
parent 9a2d091849
commit cab63faef3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clearml/automation/scheduler.py
View File

@ -147,7 +147,11 @@ class ScheduleJob(BaseScheduleJob):
if self.weekdays:
# get previous weekday
_weekdays = [self.get_weekday_ord(w) for w in self.weekdays]
prev_weekday_ind = _weekdays.index(self._last_executed.weekday()) if self._last_executed else -1
try:
prev_weekday_ind = _weekdays.index(self._last_executed.weekday()) if self._last_executed else -1
except ValueError:
# in case previous execution was not in the weekday (for example executed immediately at scheduling)
prev_weekday_ind = -1
weekday = _weekdays[(prev_weekday_ind+1) % len(_weekdays)]
# check if we have a specific day of the week
@ -518,7 +522,7 @@ class TaskScheduler(BaseScheduler):
limit_execution_time=None, # type: Optional[float]
single_instance=False, # type: bool
recurring=True, # type: bool
execute_immediately=True, # type: bool
execute_immediately=False, # type: bool
reuse_task=False, # type: bool
task_parameters=None, # type: Optional[dict]
task_overrides=None, # type: Optional[dict]
@ -567,10 +571,10 @@ class TaskScheduler(BaseScheduler):
(skip until the next scheduled time period). Default False.
:param recurring: If False only launch the Task once (default: True, repeat)
:param execute_immediately: If True, schedule the Task to be execute immediately
then recurring based on the timing schedule arguments
then recurring based on the timing schedule arguments. Default False.
:param reuse_task: If True, re-enqueue the same Task (i.e. do not clone it) every time, default False.
:param task_parameters: Configuration parameters to the executed Task.
for example: {'Args/batch': '12'} Notice: not available when reuse_task=True/
for example: {'Args/batch': '12'} Notice: not available when reuse_task=True
:param task_overrides: Change task definition.
for example {'script.version_num': None, 'script.branch': 'main'} Notice: not available when reuse_task=True

5
clearml/backend_interface/util.py
View File

@ -160,4 +160,7 @@ def datetime_from_isoformat(o):
return None
if isinstance(o, datetime):
return o
return datetime.strptime(o.split('+')[0], "%Y-%m-%dT%H:%M:%S.%f")
try:
return datetime.strptime(o.split('+')[0], "%Y-%m-%dT%H:%M:%S.%f")
except ValueError:
return datetime.strptime(o.split('+')[0], "%Y-%m-%dT%H:%M:%S")