Merge pull request #2604 from rommapp/task-page-cleanup

Task page cleanup

Author: gantoine

backend/endpoints/responses/__init__.py

@@ -75,7 +75,8 @@ class TaskExecutionResponse(TypedDict):
     task_name: str
     task_id: str
     status: JobStatus
-    queued_at: str
+    created_at: str | None
+    enqueued_at: str | None
 
 
 class BaseTaskStatusResponse(TaskExecutionResponse):

backend/endpoints/tasks.py

@@ -121,15 +121,17 @@ def _build_task_status_response(
     task_type = job_meta.get("task_type")
 
     # Convert datetime objects to ISO format strings
-    queued_at = job.created_at.isoformat() if job.created_at else None
+    created_at = job.created_at.isoformat() if job.created_at else None
     started_at = job.started_at.isoformat() if job.started_at else None
     ended_at = job.ended_at.isoformat() if job.ended_at else None
+    enqueued_at = job.enqueued_at.isoformat() if job.enqueued_at else None
 
     common_data = {
         "task_name": task_name,
         "task_id": job.get_id(),
         "status": job.get_status(),
-        "queued_at": queued_at or "",
+        "created_at": created_at,
+        "enqueued_at": enqueued_at,
         "started_at": started_at,
         "ended_at": ended_at,
     }
@@ -275,7 +277,10 @@ async def get_tasks_status(request: Request) -> list[TaskStatusResponse]:
             job = Job.fetch(job_id, connection=redis_client)
             all_tasks.append(_build_task_status_response(job))
 
-    all_tasks.sort(key=lambda x: x["started_at"] or x["queued_at"], reverse=True)
+    all_tasks.sort(
+        key=lambda x: x["started_at"] or x["enqueued_at"] or x["created_at"] or "",
+        reverse=True,
+    )
 
     return all_tasks
 
@@ -344,7 +349,12 @@ async def run_all_tasks(request: Request) -> list[TaskExecutionResponse]:
             task_name=task_name,
             task_id=job.get_id(),
             status=job.get_status() or JobStatus.QUEUED,
-            queued_at=datetime.now(timezone.utc).isoformat(),
+            created_at=(
+                job.created_at.isoformat()
+                if job.created_at
+                else datetime.now(timezone.utc).isoformat()
+            ),
+            enqueued_at=job.enqueued_at.isoformat() if job.enqueued_at else None,
         )
         for (task_name, job) in jobs
     ]
@@ -390,5 +400,10 @@ async def run_single_task(request: Request, task_name: str) -> TaskExecutionResp
         "task_name": task_instance.title,
         "task_id": job.get_id(),
         "status": job.get_status() or JobStatus.QUEUED,
-        "queued_at": datetime.now(timezone.utc).isoformat(),
+        "created_at": (
+            job.created_at.isoformat()
+            if job.created_at
+            else datetime.now(timezone.utc).isoformat()
+        ),
+        "enqueued_at": job.enqueued_at.isoformat() if job.enqueued_at else None,
     }

backend/tests/endpoints/test_tasks.py

@@ -56,6 +56,26 @@ def mock_non_manual_task():
     return task
 
 
+def create_mock_job(job_id="1", status="queued"):
+    """Helper function to create a mock job with proper datetime attributes"""
+    from datetime import datetime
+
+    mock_job = Mock()
+    mock_job.get_id.return_value = job_id
+    mock_job.get_status.return_value = status
+
+    # Create mock datetime objects with isoformat methods
+    mock_created_at = Mock()
+    mock_created_at.isoformat = lambda: datetime.now().isoformat()
+    mock_job.created_at = mock_created_at
+
+    mock_enqueued_at = Mock()
+    mock_enqueued_at.isoformat = lambda: datetime.now().isoformat()
+    mock_job.enqueued_at = mock_enqueued_at
+
+    return mock_job
+
+
 class TestListTasks:
     """Test suite for the list_tasks endpoint"""
 
@@ -192,12 +212,7 @@ def test_list_tasks_insufficient_scope(self, client, admin_user):
 class TestRunAllTasks:
     """Test suite for the run_all_tasks endpoint"""
 
-    @patch(
-        "endpoints.tasks.low_prio_queue.enqueue",
-        return_value=Mock(
-            get_id=Mock(return_value="1"), get_status=Mock(return_value="queued")
-        ),
-    )
+    @patch("endpoints.tasks.low_prio_queue.enqueue", return_value=create_mock_job())
     @patch(
         "endpoints.tasks.manual_tasks",
         [
@@ -332,12 +347,7 @@ def test_run_all_tasks_unauthorized(self, client):
 class TestRunSingleTask:
     """Test suite for the run_single_task endpoint"""
 
-    @patch(
-        "endpoints.tasks.low_prio_queue.enqueue",
-        return_value=Mock(
-            get_id=Mock(return_value="1"), get_status=Mock(return_value="queued")
-        ),
-    )
+    @patch("endpoints.tasks.low_prio_queue.enqueue", return_value=create_mock_job())
     @patch(
         "endpoints.tasks.manual_tasks",
         [
@@ -370,7 +380,8 @@ def test_run_single_task_success(self, mock_queue, client, access_token):
         assert data["task_name"] == "Test Task"
         assert data["task_id"] == "1"
         assert data["status"] == "queued"
-        assert "queued_at" in data
+        assert "created_at" in data
+        assert "enqueued_at" in data
 
         mock_queue.assert_called_once()
 
@@ -466,6 +477,8 @@ def test_get_task_by_id_success(
         """Test successful retrieval of a task by job ID"""
         # Mock job object with all necessary attributes
         mock_job = Mock()
+        mock_job.enqueued_at = Mock()
+        mock_job.enqueued_at.isoformat.return_value = "2023-01-01T00:00:00"
         mock_job.created_at = Mock()
         mock_job.created_at.isoformat.return_value = "2023-01-01T00:00:00"
         mock_job.started_at = Mock()
@@ -494,7 +507,8 @@ def test_get_task_by_id_success(
         assert data["task_name"] == "test_task"
         assert data["task_id"] == "test-job-id-123"
         assert data["status"] == "finished"
-        assert data["queued_at"] == "2023-01-01T00:00:00"
+        assert data["created_at"] == "2023-01-01T00:00:00"
+        assert data["enqueued_at"] == "2023-01-01T00:00:00"
         assert data["started_at"] == "2023-01-01T00:01:00"
         assert data["ended_at"] == "2023-01-01T00:02:00"
 
@@ -526,6 +540,8 @@ def test_get_task_by_id_with_exception_info(
     ):
         """Test retrieval of a task that failed with exception"""
         mock_job = Mock()
+        mock_job.enqueued_at = Mock()
+        mock_job.enqueued_at.isoformat.return_value = "2023-01-01T00:00:00"
         mock_job.created_at = Mock()
         mock_job.created_at.isoformat.return_value = "2023-01-01T00:00:00"
         mock_job.started_at = Mock()
@@ -611,9 +627,7 @@ class TestIntegration:
     @patch("endpoints.tasks.RESCAN_ON_FILESYSTEM_CHANGE_DELAY", 5)
     @patch(
         "endpoints.tasks.low_prio_queue.enqueue",
-        return_value=Mock(
-            get_id=Mock(return_value="1"), get_status=Mock(return_value="queued")
-        ),
+        return_value=create_mock_job(),
     )
     def test_full_workflow(self, mock_queue, client, access_token):
         """Test a complete workflow: list tasks, then run a specific task"""