Fix for task id as valid UUID

rocky/rocky/scheduler.py

@@ -322,15 +322,19 @@ def list_tasks(self, **kwargs) -> PaginatedTasksResponse:
             filter_key = "filters"
             params = {k: v for k, v in kwargs.items() if v is not None if k != filter_key}  # filter Nones from kwargs
             endpoint = "/tasks"
-            res = self._client.post(endpoint, params=params, json=kwargs.get(filter_key, None))
+            res = self._client.post(endpoint, params=params, json=kwargs.get(filter_key))
             return PaginatedTasksResponse.model_validate_json(res.content)
         except ValidationError:
             raise SchedulerValidationError(extra_message=_("Task list: "))
         except ConnectError:
             raise SchedulerConnectError(extra_message=_("Task list: "))
 
     def get_task_details(self, task_id: str) -> Task:
-        return Task.model_validate_json(self._get(f"/tasks/{task_id}", "content"))
+        try:
+            task_id = str(uuid.UUID(task_id))
+            return Task.model_validate_json(self._get(f"/tasks/{task_id}", "content"))
+        except ValueError:
+            raise SchedulerBadRequestError()
 
     def push_task(self, item: Task) -> None:
         try:

rocky/rocky/views/task_detail.py

@@ -57,6 +57,7 @@ def get_context_data(self, **kwargs):
 class NormalizerTaskJSONView(TaskDetailView):
     task_type = "normalizer"
     plugin_type = "normalizer"
+    template_name = "tasks/normalizer_task_detail.html"
 
     def get(self, request, *args, **kwargs) -> JsonResponse | HttpResponse:
         task = self.get_json_task_details()

rocky/tests/scheduler/test_scheduler_errors.py

@@ -1,4 +1,5 @@
 from rocky.scheduler import SchedulerConnectError, SchedulerTooManyRequestError, SchedulerValidationError
+from rocky.views.task_detail import NormalizerTaskJSONView
 from rocky.views.tasks import BoefjesTaskListView
 from tests.conftest import setup_request
 
@@ -37,3 +38,27 @@ def test_tasks_view_too_many_requests_error(rf, client_member, mock_scheduler):
         list(request._messages)[0].message
         == "Scheduler is receiving too many requests. Increase SCHEDULER_PQ_MAXSIZE or wait for task to finish."
     )
+
+
+def test_get_task_details_json_bad_task_id(rf, client_member, mock_scheduler):
+    request = setup_request(rf.get("normalizer_task_view"), client_member.user)
+
+    response = NormalizerTaskJSONView.as_view()(
+        request, organization_code=client_member.organization.code, task_id="/delete"
+    )
+
+    assert response.status_code == 200
+
+    assert list(request._messages)[0].message == "Task could not be found."
+
+
+def test_reschedule_task_bad_task_id(rf, client_member, mock_bytes_client, mock_scheduler):
+    request = setup_request(
+        rf.post("task_list", {"action": "reschedule_task", "task_id": "/delete"}), client_member.user
+    )
+
+    response = BoefjesTaskListView.as_view()(request, organization_code=client_member.organization.code)
+
+    assert response.status_code == 200
+
+    assert list(request._messages)[0].message == "Task could not be found."