ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-12 07:38:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support status_message and status_reason in tasks.delete

Browse Source
This commit is contained in:
allegroai 2022-02-13 19:20:31 +02:00
parent 3d046ac282
commit a377a7e315
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apiserver/bll/task/task_operations.py
View File

@ -162,6 +162,8 @@ def delete_task(
force: bool, force: bool,
return_file_urls: bool, return_file_urls: bool,
delete_output_models: bool, delete_output_models: bool,
status_message: str,
status_reason: str,
) -> Tuple[int, Task, CleanupResult]: ) -> Tuple[int, Task, CleanupResult]:
task = TaskBLL.get_task_with_access( task = TaskBLL.get_task_with_access(
task_id, company_id=company_id, requires_write_access=True task_id, company_id=company_id, requires_write_access=True
@ -179,6 +181,17 @@ def delete_task(
current=task.status, current=task.status,
) )
try:
TaskBLL.dequeue_and_change_status(
task,
company_id=company_id,
status_message=status_message,
status_reason=status_reason,
)
except APIError:
# dequeue may fail if the task was not enqueued
pass
cleanup_res = cleanup_task( cleanup_res = cleanup_task(
task, task,
force=force, force=force,
@ -354,6 +367,7 @@ def stop_task(
"system_tags", "system_tags",
"last_worker", "last_worker",
"last_update", "last_update",
"execution.queue",
), ),
requires_write_access=True, requires_write_access=True,
) )

4
apiserver/services/tasks.py
View File

@ -1050,6 +1050,8 @@ def delete(call: APICall, company_id, request: DeleteRequest):
force=request.force, force=request.force,
return_file_urls=request.return_file_urls, return_file_urls=request.return_file_urls,
delete_output_models=request.delete_output_models, delete_output_models=request.delete_output_models,
status_message=request.status_message,
status_reason=request.status_reason,
) )
if deleted: if deleted:
_reset_cached_tags(company_id, projects=[task.project] if task.project else []) _reset_cached_tags(company_id, projects=[task.project] if task.project else [])
@ -1066,6 +1068,8 @@ def delete_many(call: APICall, company_id, request: DeleteManyRequest):
force=request.force, force=request.force,
return_file_urls=request.return_file_urls, return_file_urls=request.return_file_urls,
delete_output_models=request.delete_output_models, delete_output_models=request.delete_output_models,
status_message=request.status_message,
status_reason=request.status_reason,
), ),
ids=request.ids, ids=request.ids,
) )