ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-11 23:34:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update the task execution queue in queues.add_task

Browse Source
This commit is contained in:
clearml 2024-12-05 22:14:03 +02:00
parent f94cda4e9d
commit 2332b8589b
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/apimodels/queues.py
View File

@ -56,6 +56,10 @@ class TaskRequest(QueueRequest):
task = StringField(required=True) task = StringField(required=True)
class AddTaskRequest(TaskRequest):
update_execution_queue = BoolField(default=True)
class MoveTaskRequest(TaskRequest): class MoveTaskRequest(TaskRequest):
count = IntField(default=1) count = IntField(default=1)

7
apiserver/schema/services/queues.conf
View File

@ -447,6 +447,13 @@ add_task {
} }
} }
} }
"999.0": ${add_task."2.4"} {
request.properties.update_execution_queue {
description: If set to false then the task 'execution.queue' is not updated
type: boolean
default: true
}
}
} }
get_next_task { get_next_task {
"2.4" { "2.4" {

16
apiserver/services/queues.py
View File

@ -20,6 +20,7 @@ from apiserver.apimodels.queues import (
GetNextTaskRequest, GetNextTaskRequest,
GetByIdRequest, GetByIdRequest,
GetAllRequest, GetAllRequest,
AddTaskRequest,
) )
from apiserver.bll.model import Metadata from apiserver.bll.model import Metadata
from apiserver.bll.queue import QueueBLL from apiserver.bll.queue import QueueBLL
@ -154,13 +155,16 @@ def delete(call: APICall, company_id, req_model: DeleteRequest):
call.result.data = {"deleted": 1} call.result.data = {"deleted": 1}
@endpoint("queues.add_task", min_version="2.4", request_data_model=TaskRequest) @endpoint("queues.add_task", min_version="2.4")
def add_task(call: APICall, company_id, req_model: TaskRequest): def add_task(call: APICall, company_id, request: AddTaskRequest):
call.result.data = { added = queue_bll.add_task(
"added": queue_bll.add_task( company_id=company_id, queue_id=request.queue, task_id=request.task
company_id=company_id, queue_id=req_model.queue, task_id=req_model.task
) )
} if added and request.update_execution_queue:
Task.objects(id=request.task).update(
execution__queue=request.queue, multi=False
)
call.result.data = {"added": added}
@endpoint("queues.get_next_task", request_data_model=GetNextTaskRequest) @endpoint("queues.get_next_task", request_data_model=GetNextTaskRequest)