Task master dashboard (#244)

* get all task simple

* resolve name and org name

* delete task from task queue db

* model

* Removed unused code

* remove only running

* submodules updated

* Submodules merged

---------

Co-authored-by: LennartSchmidtKern <[email protected]>

Author: lumburovskalina

controller/monitor/manager.py

@@ -1,9 +1,28 @@
 from typing import Any, List
 from submodules.model.business_objects import monitor as task_monitor
+from controller.auth import kratos
+from submodules.model.util import sql_alchemy_to_dict
 
 
-def monitor_all_tasks(project_id: str = None, only_running: bool = True) -> List[Any]:
-    return task_monitor.get_all_tasks(project_id, only_running)
+def monitor_all_tasks(page: int, limit: int) -> List[Any]:
+    tasks = task_monitor.get_all_tasks(page, limit)
+    tasks_dict = sql_alchemy_to_dict(tasks)
+    user_ids = {str(t["created_by"]) for t in tasks}  # set comprehension
+    name_lookup = {u_id: kratos.resolve_user_name_by_id(u_id) for u_id in user_ids}
+
+    for t in tasks_dict:
+        created_by_first_last = name_lookup[str(t["created_by"])]
+        t["created_by"] = (
+            created_by_first_last["first"] + " " + created_by_first_last["last"]
+            if created_by_first_last
+            else "Unknown"
+        )
+
+        # name comes from the join with organization
+        t["organization_name"] = t["name"]
+        del t["name"]
+
+    return tasks_dict
 
 
 def cancel_all_running_tasks(project_id: str = None) -> None:

fast_api/routes/misc.py

@@ -87,36 +87,23 @@ def model_provider_download_model(
 
 
 @router.get("/all-tasks")
-def get_all_tasks(request: Request, only_running: bool):
+def get_all_tasks(request: Request, page: int = 1, limit: int = 100):
     auth.check_admin_access(request.state.info)
-    tasks = controller_manager.monitor_all_tasks(only_running=only_running)
+    tasks = controller_manager.monitor_all_tasks(page=page, limit=limit)
+    return pack_json_result(tasks)
 
-    all_tasks = []
 
-    for task in tasks:
-        started_at = None
-        if task.started_at:
-            started_at = task.started_at.isoformat()
-
-        finished_at = None
-        if task.finished_at:
-            finished_at = task.finished_at.isoformat()
-
-        all_tasks.append(
-            {
-                "projectId": str(task.project_id),
-                "state": task.state,
-                "taskType": task.task_type,
-                "id": str(task.id),
-                "createdBy": task.created_by,
-                "organizationName": task.organization_name,
-                "projectName": task.project_name,
-                "startedAt": started_at,
-                "finishedAt": finished_at,
-            }
-        )
-
-    return pack_json_result({"data": {"allTasks": all_tasks}})
+@router.delete(
+    "/delete-from-task-queue-db",
+)
+def delete_from_task_queue_db(
+    request: Request,
+    task_id: str,
+    org_id: str,
+):
+    auth.check_admin_access(request.state.info)
+    task_master_manager.delete_task(org_id, task_id)
+    return SILENT_SUCCESS_RESPONSE
 
 
 @router.post("/cancel-task")