From df7241004a9065c2de765cf8626d360b8e675685 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:01:02 +0200
Subject: [PATCH 01/18] Add celery_task_id to Job model and store the id when
 job is created

---
 ...-ec09219baf8d_add_celery_task_id_to_job.py | 32 +++++++++++++++++++
 server/src/crud/job_crud.py                   | 11 ++++++-
 server/src/db/models/job.py                   |  1 +
 server/src/services/job_service.py            |  4 ++-
 4 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 server/migrations/versions/1771854934-ec09219baf8d_add_celery_task_id_to_job.py

diff --git a/server/migrations/versions/1771854934-ec09219baf8d_add_celery_task_id_to_job.py b/server/migrations/versions/1771854934-ec09219baf8d_add_celery_task_id_to_job.py
new file mode 100644
index 0000000..7725e10
--- /dev/null
+++ b/server/migrations/versions/1771854934-ec09219baf8d_add_celery_task_id_to_job.py
@@ -0,0 +1,32 @@
+"""add_celery_task_id_to_job
+
+Revision ID: ec09219baf8d
+Revises: a7d869b16346
+Create Date: 2026-02-23 13:55:34.097658
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ec09219baf8d'
+down_revision: Union[str, None] = 'a7d869b16346'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('job', sa.Column('celery_task_id', sa.UUID(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('job', 'celery_task_id')
+    # ### end Alembic commands ###
diff --git a/server/src/crud/job_crud.py b/server/src/crud/job_crud.py
index eeebc36..10eb525 100644
--- a/server/src/crud/job_crud.py
+++ b/server/src/crud/job_crud.py
@@ -1,7 +1,7 @@
 from typing import List
 from uuid import UUID
 
-from sqlalchemy import select
+from sqlalchemy import select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.db.models.job import Job
@@ -63,6 +63,15 @@ async def fetch_job_by_uuid(self, uuid: UUID) -> JobRead:
         # TODO: Fix
         return job  # type: ignore
 
+    async def update_celery_task_id(self, job_uuid: UUID, celery_task_id: UUID):
+        stmt = (
+            update(Job)
+            .where(Job.uuid == job_uuid)
+            .values(celery_task_id=celery_task_id)
+        )
+        await self.db.execute(stmt)
+        await self.db.flush()
+
     async def create_job(self, job_data: JobCreate):
         stmt = select(Project).where(Project.uuid == job_data.project_uuid)
         result = await self.db.execute(stmt)
diff --git a/server/src/db/models/job.py b/server/src/db/models/job.py
index 37c0efb..83002de 100644
--- a/server/src/db/models/job.py
+++ b/server/src/db/models/job.py
@@ -22,6 +22,7 @@ class Job(Base, TimestampMixin):
     uuid: Mapped[PyUUID] = mapped_column(
         UUID(as_uuid=True), default=uuid.uuid4, unique=True, nullable=False
     )
+    celery_task_id: Mapped[PyUUID] = mapped_column(UUID(as_uuid=True), nullable=True)
     project_id: Mapped[int] = mapped_column(
         ForeignKey("project.id", ondelete="CASCADE"), nullable=False
     )
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index e409038..9f0bee3 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -83,7 +83,9 @@ async def create(self, job_data: JobCreate):
             created_at=new_job.created_at,
             updated_at=new_job.updated_at,
         )
-        await self.jobtask_service.start_job_tasks(new_job.id, job_read.model_dump())
+        task = await self.jobtask_service.start_job_tasks(new_job.id, job_read.model_dump())
+
+        await self.job_crud.update_celery_task_id(new_job.uuid, UUID(task.id))
 
         return job_read
 

From 196f4c30ca5176643a53e54f9249e9edf4ecce24 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:41:22 +0200
Subject: [PATCH 02/18] Add base route and service logic for task cancelling

---
 server/src/api/controllers/job.py  | 18 ++++++++++++++----
 server/src/celery/tasks.py         |  5 +++++
 server/src/crud/job_crud.py        |  5 +++++
 server/src/services/job_service.py | 15 ++++++++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/server/src/api/controllers/job.py b/server/src/api/controllers/job.py
index 78e2b8a..96f32e8 100644
--- a/server/src/api/controllers/job.py
+++ b/server/src/api/controllers/job.py
@@ -8,10 +8,7 @@
 from src.schemas.job import FewShotPromptingConfig, JobCreate, JobRead
 from src.schemas.project import FewShotPreferences
 from src.services.job_service import create_job_service
-from src.services.project_service import (
-    ProjectPreferences,
-    create_project_service,
-)
+from src.services.project_service import ProjectPreferences, create_project_service
 
 router = APIRouter()
 
@@ -100,3 +97,16 @@ async def create_job(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=f"Job creation failed: {str(e)}",
         )
+
+
+@router.post("/job/{uuid}/cancel", status_code=status.HTTP_200_OK, tags=["Job"])
+async def cancel_job(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
+    job_service = create_job_service(db_ctx)
+    try:
+        res = await job_service.cancel_job(uuid)
+        return res
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to cancel job: {str(e)}",
+        ) from e
diff --git a/server/src/celery/tasks.py b/server/src/celery/tasks.py
index 83c6298..f9bc2bd 100644
--- a/server/src/celery/tasks.py
+++ b/server/src/celery/tasks.py
@@ -1,6 +1,7 @@
 import asyncio
 import logging
 from typing import Dict
+from uuid import UUID
 
 from httpx import AsyncClient, HTTPStatusError
 from pydantic_ai.retries import AsyncTenacityTransport, RetryConfig, wait_retry_after
@@ -218,3 +219,7 @@ async def process_job(
     await asyncio.gather(*tasks)
 
     return {"result": "all job tasks processed"}
+
+
+def cancel_task(task_id: UUID):
+    celery_app.control.revoke(str(task_id), terminate=True)
diff --git a/server/src/crud/job_crud.py b/server/src/crud/job_crud.py
index 10eb525..e25c9ea 100644
--- a/server/src/crud/job_crud.py
+++ b/server/src/crud/job_crud.py
@@ -63,6 +63,11 @@ async def fetch_job_by_uuid(self, uuid: UUID) -> JobRead:
         # TODO: Fix
         return job  # type: ignore
 
+    async def fetch_celery_task_id(self, job_uuid: UUID) -> UUID | None:
+        stmt = select(Job.celery_task_id).where(Job.uuid == job_uuid)
+        result = await self.db.execute(stmt)
+        return result.scalar_one_or_none()
+
     async def update_celery_task_id(self, job_uuid: UUID, celery_task_id: UUID):
         stmt = (
             update(Job)
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index 9f0bee3..d7301b8 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -1,6 +1,7 @@
 import logging
 from uuid import UUID
 
+from src.celery.tasks import cancel_task
 from src.crud.job_crud import JobCrud
 from src.db.db_context import DBContext
 from src.schemas.job import JobCreate, JobRead
@@ -83,12 +84,24 @@ async def create(self, job_data: JobCreate):
             created_at=new_job.created_at,
             updated_at=new_job.updated_at,
         )
-        task = await self.jobtask_service.start_job_tasks(new_job.id, job_read.model_dump())
+        task = await self.jobtask_service.start_job_tasks(
+            new_job.id, job_read.model_dump()
+        )
 
         await self.job_crud.update_celery_task_id(new_job.uuid, UUID(task.id))
 
         return job_read
 
+    async def cancel_job(self, job_uuid: UUID):
+        task_id = await self.job_crud.fetch_celery_task_id(job_uuid)
+
+        if task_id is None:
+            raise RuntimeError(f"No task associated with job {job_uuid}")
+
+        cancel_task(task_id)
+
+        return {f"task {task_id} cancelled"}
+
 
 def create_job_service(db_ctx: DBContext) -> JobService:
     jobtask_service = create_jobtask_service(db_ctx)

From a8228c6a2524dcf613c4beffbc45862a8b6a46b9 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Tue, 24 Feb 2026 13:56:03 +0200
Subject: [PATCH 03/18] Add task cancel button to front and fix project delete
 bug

/project/delete was returning 204 when content was expected
---
 client/src/components/DropDownMenus.tsx |  2 ++
 client/src/pages/ProjectPage.tsx        | 37 +++++++++++++++++++++++--
 client/src/services/jobService.ts       | 10 +++++++
 server/src/api/controllers/job.py       |  4 +--
 server/src/api/controllers/project.py   |  2 +-
 5 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/client/src/components/DropDownMenus.tsx b/client/src/components/DropDownMenus.tsx
index 0eebcea..f94e7f8 100644
--- a/client/src/components/DropDownMenus.tsx
+++ b/client/src/components/DropDownMenus.tsx
@@ -4,6 +4,7 @@ import { Ellipsis } from "lucide-react";
 
 type EllipsisItem = {
   label: React.ElementType;
+  disabled: boolean;
   onClick: () => void;
 };
 
@@ -47,6 +48,7 @@ export const DropdownMenuEllipsis: React.FC<EllipsisProps> = ({ items }) => {
               as="button"
               onClick={item.onClick}
               className="block w-full px-4 py-2 text-left text-sm text-gray-700 data-focus:bg-gray-100 focus:outline-none cursor-pointer data-disabled:opacity-50"
+              disabled={item.disabled}
             >
               <Label />
             </MenuItem>
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 5e7bb27..41b7f58 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -3,12 +3,12 @@ import { useEffect, useState, useCallback, useMemo } from "react";
 import { toast } from "react-toastify";
 import { Layout } from "../components/Layout";
 import { H6 } from "../components/Typography";
-import { DropdownMenuText, DropdownOption } from "../components/DropDownMenus";
+import { DropdownMenuText, DropdownOption, DropdownMenuEllipsis } from "../components/DropDownMenus";
 import { FileDropArea } from "../components/FileDropArea";
 import { ExpandableToast } from "../components/ExpandableToast";
 import { TruncatedFileNames } from "../components/TruncatedFileNames";
 import { fetchJobTasksFromBackend } from "../services/jobTaskService";
-import { createJob, fetchJobsForProject } from "../services/jobService";
+import { createJob, fetchJobsForProject, cancelJob } from "../services/jobService";
 import {
   fileUploadToBackend,
   fileFetchFromBackend,
@@ -39,6 +39,7 @@ import {
   Square,
   SquareCheckBig,
   TriangleAlert,
+  XCircle
 } from "lucide-react";
 import { Card } from "../components/Card";
 import { TabButton } from "../components/TabButton";
@@ -531,6 +532,20 @@ export const ProjectPage = () => {
     fetchJobs();
   }, [fetchJobs, projectUuid]);
 
+  const handleJobCancel = useCallback(
+    async (jobUuid: string) => {
+      try {
+        await cancelJob(jobUuid);
+        fetchJobs();
+        toast.success("Task canceled successfully", { autoClose: 1500 });
+      } catch (error) {
+        console.error("Error canceling job:", error);
+        toast.error(`Error canceling job: ${error}`);
+      }
+    },
+    [fetchJobs]
+  );
+
   const fetchModels = useCallback(() => {
     async function fetch_models() {
       if (selectedLlmProvider && selectedLlmProvider.value) {
@@ -855,7 +870,7 @@ export const ProjectPage = () => {
 
             return (
               <Card key={job.uuid} className="flex-row justify-between">
-                <div className="grid grid-cols-[50px_1fr_auto] gap-4 w-full">
+                <div className="grid grid-cols-[50px_1fr_auto_auto] gap-4 w-full">
                   <>
                     {job.prompting_config.screening_type ==
                       JobPromptingType.ZERO_SHOT && <Badge text="ZS" invert />}
@@ -921,6 +936,22 @@ export const ProjectPage = () => {
                       </div>
                     </div>
                   </div>
+                  <div>
+                    <DropdownMenuEllipsis
+                      items={[
+                        {
+                          label: () => (
+                            <div className="text-red-700 flex flex-row gap-3 items-center">
+                              <XCircle />
+                              <span>Cancel</span>
+                            </div>
+                          ),
+                          onClick: () => handleJobCancel(job.uuid),
+                          disabled: progress === 100,
+                        },
+                      ]}
+                    />
+                  </div>
                 </div>
               </Card>
             );
diff --git a/client/src/services/jobService.ts b/client/src/services/jobService.ts
index 58fddea..b85f36f 100644
--- a/client/src/services/jobService.ts
+++ b/client/src/services/jobService.ts
@@ -29,3 +29,13 @@ export const fetchJobsForProject = async (projectUuid: string) => {
     throw error;
   }
 };
+
+export const cancelJob = async (jobUuid: string) => {
+  try {
+    const res = await api.post(`/api/v1/job/${jobUuid}/cancel`);
+    return res.data
+  } catch (error) {
+    console.error("Canceling task unsuccessful:", error);
+    throw error;
+  }
+};
diff --git a/server/src/api/controllers/job.py b/server/src/api/controllers/job.py
index 96f32e8..05a8657 100644
--- a/server/src/api/controllers/job.py
+++ b/server/src/api/controllers/job.py
@@ -103,8 +103,8 @@ async def create_job(
 async def cancel_job(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
     job_service = create_job_service(db_ctx)
     try:
-        res = await job_service.cancel_job(uuid)
-        return res
+        await job_service.cancel_job(uuid)
+        return {"detail": "Task cancelled successfully"}
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
diff --git a/server/src/api/controllers/project.py b/server/src/api/controllers/project.py
index 663635a..b14a98e 100644
--- a/server/src/api/controllers/project.py
+++ b/server/src/api/controllers/project.py
@@ -71,7 +71,7 @@ async def create_new_project(
 
 
 @router.delete(
-    "/project/{uuid}", status_code=status.HTTP_204_NO_CONTENT, tags=["Project"]
+    "/project/{uuid}", status_code=status.HTTP_200_OK, tags=["Project"]
 )
 async def delete_project(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
     projects = create_project_service(db_ctx)

From 981898005462e5ae31d0e2986ea7edbcf97be59f Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Tue, 24 Feb 2026 19:59:13 +0200
Subject: [PATCH 04/18] Change /job/uuid/cancel to accept delete_data option
 and update unfinished job_task statuses to cancelled when task is cancelled

---
 ..._add_cancelled_status_option_to_jobtask.py | 32 +++++++++++++++++++
 server/src/api/controllers/job.py             |  7 ++--
 server/src/crud/job_crud.py                   | 29 ++++++++++++++++-
 server/src/crud/jobtask_crud.py               | 17 +++++++++-
 server/src/db/models/jobtask.py               |  1 +
 server/src/schemas/jobtask.py                 |  1 +
 server/src/services/job_service.py            | 11 +++++--
 server/src/services/jobtask_service.py        |  3 ++
 8 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py

diff --git a/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py b/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py
new file mode 100644
index 0000000..e62b61c
--- /dev/null
+++ b/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py
@@ -0,0 +1,32 @@
+"""add cancelled status option to JobTask
+
+Revision ID: 9504be6616f4
+Revises: ec09219baf8d
+Create Date: 2026-02-24 16:46:44.301649
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9504be6616f4'
+down_revision: Union[str, None] = 'ec09219baf8d'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute("ALTER TYPE jobtaskstatus ADD VALUE 'CANCELLED'")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
diff --git a/server/src/api/controllers/job.py b/server/src/api/controllers/job.py
index 05a8657..dad6ebd 100644
--- a/server/src/api/controllers/job.py
+++ b/server/src/api/controllers/job.py
@@ -100,10 +100,13 @@ async def create_job(
 
 
 @router.post("/job/{uuid}/cancel", status_code=status.HTTP_200_OK, tags=["Job"])
-async def cancel_job(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
+async def cancel_job(
+    uuid: UUID, delete_data: bool = False, db_ctx: DBContext = Depends(get_db_ctx)
+):
     job_service = create_job_service(db_ctx)
     try:
-        await job_service.cancel_job(uuid)
+        await job_service.cancel_job(uuid, delete_data=delete_data)
+        await db_ctx.commit()
         return {"detail": "Task cancelled successfully"}
     except Exception as e:
         raise HTTPException(
diff --git a/server/src/crud/job_crud.py b/server/src/crud/job_crud.py
index e25c9ea..1c886be 100644
--- a/server/src/crud/job_crud.py
+++ b/server/src/crud/job_crud.py
@@ -1,7 +1,7 @@
 from typing import List
 from uuid import UUID
 
-from sqlalchemy import select, update
+from sqlalchemy import delete, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.db.models.job import Job
@@ -63,6 +63,29 @@ async def fetch_job_by_uuid(self, uuid: UUID) -> JobRead:
         # TODO: Fix
         return job  # type: ignore
 
+    # Quick fix to not mess with fetch_job_by_uuid()
+    async def fetch_job_by_uuid_with_ids(self, uuid: UUID):
+        stmt = (
+            select(
+                Job.id,
+                Job.uuid,
+                Project.uuid.label("project_uuid"),
+                Job.llm_config,
+                Job.prompting_config,
+                Job.created_at,
+                Job.updated_at,
+                Job.celery_task_id,
+            )
+            .join(Project, Project.id == Job.project_id)
+            .where(Job.uuid == uuid)
+        )
+        result = await self.db.execute(stmt)
+        job = result.mappings().one_or_none()
+
+        if not job:
+            raise ValueError(f"Job with uuid {uuid} not found")
+        return job
+
     async def fetch_celery_task_id(self, job_uuid: UUID) -> UUID | None:
         stmt = select(Job.celery_task_id).where(Job.uuid == job_uuid)
         result = await self.db.execute(stmt)
@@ -77,6 +100,10 @@ async def update_celery_task_id(self, job_uuid: UUID, celery_task_id: UUID):
         await self.db.execute(stmt)
         await self.db.flush()
 
+    async def delete_job(self, job_uuid: UUID):
+        stmt = delete(Job).where(Job.uuid == job_uuid)
+        await self.db.execute(stmt)
+
     async def create_job(self, job_data: JobCreate):
         stmt = select(Project).where(Project.uuid == job_data.project_uuid)
         result = await self.db.execute(stmt)
diff --git a/server/src/crud/jobtask_crud.py b/server/src/crud/jobtask_crud.py
index 0c28b33..7b612fe 100644
--- a/server/src/crud/jobtask_crud.py
+++ b/server/src/crud/jobtask_crud.py
@@ -7,7 +7,7 @@
 from src.db.models.job import Job
 from src.db.models.jobtask import JobTask
 from src.db.models.paper import Paper
-from src.schemas.jobtask import JobTaskCreate, JobTaskHumanResult
+from src.schemas.jobtask import JobTaskCreate, JobTaskHumanResult, JobTaskStatus
 from src.schemas.llm import StructuredResponse
 from src.schemas.paper import PaperCreate
 
@@ -67,6 +67,21 @@ async def update_job_tasks_status(self, job_id: int, status: str):
         await self.db.execute(stmt)
         await self.db.flush()
 
+    """
+    Sets status to CANCELLED for all unfinished job tasks.
+    Should be called after canceling the job.
+    """
+    async def update_job_tasks_status_to_cancelled(self, job_id: int):
+        stmt = (
+                update(JobTask)
+                .where(
+                    JobTask.job_id == job_id,
+                    JobTask.status.in_([JobTaskStatus.NOT_STARTED, JobTaskStatus.PENDING, JobTaskStatus.RUNNING])
+                    )
+                    .values(status=JobTaskStatus.CANCELLED)
+                )
+        await self.db.execute(stmt)
+
     async def update_job_task_result(
         self, job_task_id: int, result: StructuredResponse
     ):
diff --git a/server/src/db/models/jobtask.py b/server/src/db/models/jobtask.py
index 03d2d9b..d4943c0 100644
--- a/server/src/db/models/jobtask.py
+++ b/server/src/db/models/jobtask.py
@@ -19,6 +19,7 @@ class Status(enum.Enum):
     RUNNING = "RUNNING"
     DONE = "DONE"
     ERROR = "ERROR"
+    CANCELLED = "CANCELLED"
 
 
 class HumanResult(enum.Enum):
diff --git a/server/src/schemas/jobtask.py b/server/src/schemas/jobtask.py
index 06219da..bef74a9 100644
--- a/server/src/schemas/jobtask.py
+++ b/server/src/schemas/jobtask.py
@@ -21,6 +21,7 @@ class JobTaskStatus(str, Enum):
     RUNNING = "RUNNING"
     DONE = "DONE"
     ERROR = "ERROR"
+    CANCELLED = "CANCELLED"
 
 
 class JobTaskCreate(BaseModel):
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index d7301b8..3dc7434 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -92,14 +92,21 @@ async def create(self, job_data: JobCreate):
 
         return job_read
 
-    async def cancel_job(self, job_uuid: UUID):
-        task_id = await self.job_crud.fetch_celery_task_id(job_uuid)
+    async def cancel_job(self, job_uuid: UUID, delete_data: bool = False):
+        job = await self.job_crud.fetch_job_by_uuid_with_ids(job_uuid)
 
+        # FIX: fetch_job_by_uuid() and JobRead
+        task_id = job.get("celery_task_id")
         if task_id is None:
             raise RuntimeError(f"No task associated with job {job_uuid}")
 
         cancel_task(task_id)
 
+        if delete_data:
+            await self.job_crud.delete_job(job_uuid)
+        else:
+            await self.jobtask_service.set_unfinished_to_cancelled(job.get("id")) # type: ignore
+
         return {f"task {task_id} cancelled"}
 
 
diff --git a/server/src/services/jobtask_service.py b/server/src/services/jobtask_service.py
index 6853b88..2b8305c 100644
--- a/server/src/services/jobtask_service.py
+++ b/server/src/services/jobtask_service.py
@@ -78,6 +78,9 @@ async def bulk_create(self, job_id: int, project_uuid: UUID):
         ]
         return await self.jobtask_crud.bulk_create_jobtasks(jobtasks)
 
+    async def set_unfinished_to_cancelled(self, job_id: int):
+        await self.jobtask_crud.update_job_tasks_status_to_cancelled(job_id)
+
     async def start_job_tasks(self, job_id: int, job_data: dict):
         # job_data is of type JobCreate
         print(f"start_job_tasks: Processing job {job_id}")

From ea643e1ae55a909f9d7eb925c07c1071c1b1d94e Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Fri, 27 Feb 2026 16:13:43 +0200
Subject: [PATCH 05/18] Add confirmation modal on cancel and add option for
 task data deletion

---
 client/src/components/CancelJobModal.tsx | 92 ++++++++++++++++++++++++
 client/src/pages/ProjectPage.tsx         | 37 +++++++++-
 client/src/services/jobService.ts        |  6 +-
 client/src/state/store.ts                | 25 ++++++-
 4 files changed, 153 insertions(+), 7 deletions(-)
 create mode 100644 client/src/components/CancelJobModal.tsx

diff --git a/client/src/components/CancelJobModal.tsx b/client/src/components/CancelJobModal.tsx
new file mode 100644
index 0000000..07972a5
--- /dev/null
+++ b/client/src/components/CancelJobModal.tsx
@@ -0,0 +1,92 @@
+import {
+  Dialog,
+  DialogPanel,
+  DialogTitle,
+  Description,
+} from "@headlessui/react";
+import { ArrowLeft, CircleStop, Trash2, X } from "lucide-react";
+import { Button } from "./Button";
+
+type CancelJobModalProps = {
+  open: boolean;
+  completedCount: number;
+  totalCount: number;
+  onClose: () => void;
+  onKeepData: () => void;
+  onDeleteData: () => void;
+};
+
+export const CancelJobModal: React.FC<CancelJobModalProps> = ({
+  open,
+  completedCount,
+  totalCount,
+  onClose,
+  onKeepData,
+  onDeleteData,
+}) => {
+
+  return (
+    <Dialog
+      open={open}
+      onClose={onClose}
+      className="fixed inset-0 z-50 flex items-center justify-center p-4"
+    >
+      <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
+
+      <DialogPanel className="relative bg-white shadow-2xl rounded-xl w-full max-w-md p-8">
+        <X
+          onClick={onClose}
+          className="absolute top-4 right-4 h-5 w-5 cursor-pointer text-gray-500 hover:text-gray-700 transition duration-200"
+        />
+
+        <DialogTitle className="text-lg font-bold mb-3">
+          Cancel screening task?
+        </DialogTitle>
+
+        <Description className="text-sm text-gray-600 mb-6 leading-relaxed">
+          This will stop the job immediately.
+          <br />
+          <br />
+          <span className="font-medium">
+            {completedCount} of {totalCount} papers
+          </span>{" "}
+          have already been screened.
+          <br />
+          You can keep the completed results or delete all associated data.
+        </Description>
+
+        <div className="flex flex-col gap-3">
+          <Button
+            variant="yellow"
+            onClick={onKeepData}
+          >
+            <div className="flex items-center justify-center gap-2 font-semibold">
+              <CircleStop size={16} />
+              <span>Keep screened data</span>
+            </div>
+          </Button>
+
+          <Button
+            variant="red"
+            onClick={onDeleteData}
+          >
+            <div className="flex items-center justify-center gap-2 font-semibold">
+              <Trash2 size={16} />
+              <span>Delete data</span>
+            </div>
+          </Button>
+
+          <Button
+            variant="gray"
+            onClick={onClose}
+          >
+            <div className="flex items-center justify-center gap-2 font-semibold">
+              <ArrowLeft size={16} />
+              <span>Go back</span>
+            </div>
+          </Button>
+        </div>
+      </DialogPanel>
+    </Dialog>
+  )
+}
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 002a436..83cf470 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -7,7 +7,8 @@ import { DropdownMenuText, DropdownOption, DropdownMenuEllipsis } from "../compo
 import { FileDropArea } from "../components/FileDropArea";
 import { ExpandableToast } from "../components/ExpandableToast";
 import { TruncatedFileNames } from "../components/TruncatedFileNames";
-import { createJob, cancelJob } from "../services/jobService";
+import { CancelJobModal } from "../components/CancelJobModal";
+import { createJob } from "../services/jobService";
 import {
   fileUploadToBackend,
   fileFetchFromBackend,
@@ -418,6 +419,14 @@ export const ProjectPage = () => {
   const getPapers = useTypedStoreState((state) => state.getPapersForProject);
   const papers = getPapers(projectUuid);
 
+  const [jobToCancel, setJobToCancel] = useState<{
+    jobUuid: string,
+    completedCount: number;
+    totalCount: number;
+  } | null>(null);
+
+  const cancelJob = useTypedStoreActions((actions) => actions.cancelJob);
+
   const [fetchedFiles, setFetchedFiles] = useState<FetchedFile[]>([]);
   const [availableModels, setAvailableModels] = useState<
     Array<{ id: string; created: number; object: "model"; owned_by: string }>
@@ -896,7 +905,7 @@ export const ProjectPage = () => {
                               <span>Cancel</span>
                             </div>
                           ),
-                          onClick: () => handleJobCancel(job.uuid),
+                          onClick: () => setJobToCancel({jobUuid: job.uuid, completedCount, totalCount}),
                           disabled: progress === 100,
                         },
                       ]}
@@ -1138,6 +1147,30 @@ export const ProjectPage = () => {
           onClose={() => navigate(`/project/${projectUuid}`)}
         />
       )}
+      {jobToCancel && (
+        <CancelJobModal
+          open={true}
+          completedCount={jobToCancel.completedCount}
+          totalCount={jobToCancel.totalCount}
+          onClose={() => setJobToCancel(null)}
+          onKeepData={async () => {
+            await cancelJob({
+              jobUuid: jobToCancel.jobUuid,
+              deleteData: false,
+              projectUuid: projectUuid,
+            });
+            setJobToCancel(null);
+          }}
+          onDeleteData={async () => {
+            await cancelJob({
+              jobUuid: jobToCancel.jobUuid,
+              deleteData: true,
+              projectUuid: projectUuid,
+            });
+            setJobToCancel(null);
+          }}
+        />
+      )}
     </Layout>
   );
 };
diff --git a/client/src/services/jobService.ts b/client/src/services/jobService.ts
index b85f36f..ebdbdea 100644
--- a/client/src/services/jobService.ts
+++ b/client/src/services/jobService.ts
@@ -30,10 +30,10 @@ export const fetchJobsForProject = async (projectUuid: string) => {
   }
 };
 
-export const cancelJob = async (jobUuid: string) => {
+export const cancelJob = async (jobUuid: string, deleteData: boolean) => {
   try {
-    const res = await api.post(`/api/v1/job/${jobUuid}/cancel`);
-    return res.data
+    const res = await api.post(`/api/v1/job/${jobUuid}/cancel?delete_data=${deleteData}`);
+    return res.data;
   } catch (error) {
     console.error("Canceling task unsuccessful:", error);
     throw error;
diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index 77c287f..efb0cec 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -8,6 +8,7 @@ import {
   Computed,
   computed,
 } from "easy-peasy";
+import { toast } from "react-toastify";
 import * as projectsService from "../services/projectService";
 import * as paperService from "../services/paperService";
 import * as providerService from "../services/providerService";
@@ -60,10 +61,13 @@ interface JobModel {
     StoreModel,
     { projectUuid: string; jobs: JobWithStats[] }
   >;
-
   updateJobStats: Action<StoreModel, { jobId: string; stats: JobStats }>;
-
   fetchJobsForProject: Thunk<StoreModel, string, Injections>;
+  cancelJob: Thunk<
+    StoreModel,
+    { jobUuid: string; deleteData: boolean; projectUuid: string },
+    Injections
+  >;
 }
 
 interface PaperModel {
@@ -297,6 +301,23 @@ export const model = {
       jobs,
     });
   }),
+  cancelJob: thunk(
+    async (actions, { jobUuid, deleteData, projectUuid }, { injections }) => {
+      const { jobService } = injections;
+
+      try {
+        await jobService.cancelJob(jobUuid, deleteData);
+        await actions.fetchJobsForProject(projectUuid);
+
+        toast.success("Task canceled successfully", {
+          autoClose: 1500,
+        });
+      } catch (error: any) {
+        toast.error(`Error canceling job: ${error?.message ?? error}`);
+        throw error;
+      }
+    },
+  ),
 } satisfies StoreModel;
 
 export const store = createStore<StoreModel>(model, {

From 6a632aba0c3a1224d2f21a02f86ac3fec2236d56 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Wed, 4 Mar 2026 08:02:02 +0200
Subject: [PATCH 06/18] WIP: handle cancelled state

---
 client/src/pages/ProjectPage.tsx         | 35 +++++++++++++-----------
 client/src/state/types.ts                |  1 +
 server/src/crud/jobtask_crud.py          |  3 ++
 server/src/helpers/resolve_job_status.py |  5 +++-
 server/src/schemas/job.py                |  1 +
 server/src/services/job_service.py       |  3 +-
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 83cf470..610e3a5 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -13,6 +13,7 @@ import {
   fileUploadToBackend,
   fileFetchFromBackend,
 } from "../services/fileService";
+import { JobStatus } from "../state/types";
 import { ManualEvaluationModal } from "../components/ManualEvaluationModal";
 import { Button } from "../components/Button";
 import {
@@ -532,20 +533,6 @@ export const ProjectPage = () => {
 
   const evaluationFinished = jobs.length === 0 && pendingTasks.length === 0;
 
-  const handleJobCancel = useCallback(
-    async (jobUuid: string) => {
-      try {
-        await cancelJob(jobUuid);
-        fetchJobsForProject(projectUuid);
-        toast.success("Task canceled successfully", { autoClose: 1500 });
-      } catch (error) {
-        console.error("Error canceling job:", error);
-        toast.error(`Error canceling job: ${error}`);
-      }
-    },
-    [fetchJobsForProject]
-  );
-
   const fetchModels = useCallback(() => {
     async function fetch_models() {
       if (selectedLlmProvider && selectedLlmProvider.value) {
@@ -826,6 +813,8 @@ export const ProjectPage = () => {
               totalCount === 0
                 ? 0
                 : Math.round((completedCount / totalCount) * 100);
+            const status = job.stats.status;
+            console.log(status);
 
             return (
               <Card key={job.uuid} className="flex-row justify-between">
@@ -847,6 +836,19 @@ export const ProjectPage = () => {
                   </div>
                   <div className="flex justify-end items-end w-full">
                     <div className="relative w-56 h-8">
+                      <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
+                        {status === JobStatus.CANCELLED && (
+                          <>
+                            <TriangleAlert
+                              size={14}
+                              className="text-orange-600"
+                            />
+                            <span className="text-orange-600">
+                              Task Cancelled ({completedCount}/{totalCount})
+                            </span>
+                          </>
+                        )}
+                      </div>
                       {progress !== 100 && (
                         <progress
                           value={progress}
@@ -863,6 +865,7 @@ export const ProjectPage = () => {
                         />
                       )}
                       <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
+                        {/* TODO: Change to use status */}
                         {progress < 100 && (
                           <>
                             <Loader
@@ -905,8 +908,8 @@ export const ProjectPage = () => {
                               <span>Cancel</span>
                             </div>
                           ),
-                          onClick: () => setJobToCancel({jobUuid: job.uuid, completedCount, totalCount}),
-                          disabled: progress === 100,
+                          onClick: () => setJobToCancel({ jobUuid: job.uuid, completedCount, totalCount }),
+                          disabled: progress === 100 || status === JobStatus.CANCELLED,
                         },
                       ]}
                     />
diff --git a/client/src/state/types.ts b/client/src/state/types.ts
index a59c767..007862f 100644
--- a/client/src/state/types.ts
+++ b/client/src/state/types.ts
@@ -78,6 +78,7 @@ export enum JobStatus {
   PARTIAL_SUCCESS = "PARTIAL_SUCCESS",
   SUCCESS = "SUCCESS",
   FAILED = "FAILED",
+  CANCELLED = "CANCELLED",
 }
 
 export type JobTask = {
diff --git a/server/src/crud/jobtask_crud.py b/server/src/crud/jobtask_crud.py
index 298c0f8..54898c9 100644
--- a/server/src/crud/jobtask_crud.py
+++ b/server/src/crud/jobtask_crud.py
@@ -69,6 +69,9 @@ async def fetch_tasks_stats_by_project(self, project_uuid):
                 func.coalesce(
                     func.sum(case((JobTask.status == JobTaskStatus.ERROR, 1), else_=0))
                 ).label("failed_count"),
+                func.coalesce(
+                    func.sum(case((JobTask.status == JobTaskStatus.CANCELLED, 1), else_=0))
+                ).label("cancelled_count"),
             )
             .join(Job, JobTask.job_id == Job.id)
             .join(Project, Project.id == Job.project_id)
diff --git a/server/src/helpers/resolve_job_status.py b/server/src/helpers/resolve_job_status.py
index 8da79b1..49dbceb 100644
--- a/server/src/helpers/resolve_job_status.py
+++ b/server/src/helpers/resolve_job_status.py
@@ -1,12 +1,15 @@
 from src.schemas.job import JobStatus
 
 
-def resolve_job_status(total: int, success: int, failed: int) -> JobStatus:
+def resolve_job_status(total: int, success: int, failed: int, cancelled: int) -> JobStatus:
     if total == 0:
         return JobStatus.NOT_STARTED
 
     finished = success + failed
 
+    if cancelled > 0:
+        return JobStatus.CANCELLED
+
     if finished < total:
         return JobStatus.RUNNING
 
diff --git a/server/src/schemas/job.py b/server/src/schemas/job.py
index 932773d..fcf518a 100644
--- a/server/src/schemas/job.py
+++ b/server/src/schemas/job.py
@@ -18,6 +18,7 @@ class JobStatus(str, Enum):
     PARTIAL_SUCCESS = "PARTIAL_SUCCESS"
     SUCCESS = "SUCCESS"
     FAILED = "FAILED"
+    CANCELLED = "CANCELLED"
 
 
 class JobStats(BaseModel):
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index 15838d5..9eb0bbf 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -49,8 +49,9 @@ async def fetch_by_project(self, project_uuid: UUID) -> list[JobReadWithStats]:
             total = stats["total_count"] if stats else 0
             success = stats["success_count"] if stats else 0
             failed = stats["failed_count"] if stats else 0
+            cancelled = stats["cancelled_count"] if stats else 0
 
-            job_status = resolve_job_status(total, success, failed)
+            job_status = resolve_job_status(total, success, failed, cancelled)
             result.append(
                 JobReadWithStats(
                     **job,

From 7583d9ddff4b08d947565b90d606e73d7c1908d8 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:01:27 +0200
Subject: [PATCH 07/18] Fix task canceled label showing on top of progress bar
 and celery task not passing cancelled count to resolve_job_status()

---
 client/src/pages/ProjectPage.tsx | 101 ++++++++++++++++---------------
 server/src/celery/tasks.py       |   2 +-
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 610e3a5..020f872 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -836,8 +836,8 @@ export const ProjectPage = () => {
                   </div>
                   <div className="flex justify-end items-end w-full">
                     <div className="relative w-56 h-8">
-                      <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
-                        {status === JobStatus.CANCELLED && (
+                      {status === JobStatus.CANCELLED ? (
+                        <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
                           <>
                             <TriangleAlert
                               size={14}
@@ -847,55 +847,58 @@ export const ProjectPage = () => {
                               Task Cancelled ({completedCount}/{totalCount})
                             </span>
                           </>
-                        )}
-                      </div>
-                      {progress !== 100 && (
-                        <progress
-                          value={progress}
-                          max={100}
-                          className={classNames(
-                            "h-full w-full [&::-webkit-progress-bar]:rounded-xl [&::-webkit-progress-bar]:bg-gray-400 [&::-webkit-progress-value]:bg-blue-200 [&::-webkit-progress-value]:rounded-xl",
-                            {
-                              "[&::-webkit-progress-bar]:bg-yellow-200 [&::-webkit-progress-value]:bg-yellow-400":
-                                progress < 100,
-                              "[&::-webkit-progress-value]:bg-green-400":
-                                progress === 100,
-                            },
+                        </div>
+                      ) : (
+                        <>
+                          {progress !== 100 && (
+                            <progress
+                              value={progress}
+                              max={100}
+                              className={classNames(
+                                "h-full w-full [&::-webkit-progress-bar]:rounded-xl [&::-webkit-progress-bar]:bg-gray-400 [&::-webkit-progress-value]:bg-blue-200 [&::-webkit-progress-value]:rounded-xl",
+                                {
+                                  "[&::-webkit-progress-bar]:bg-yellow-200 [&::-webkit-progress-value]:bg-yellow-400":
+                                    progress < 100,
+                                  "[&::-webkit-progress-value]:bg-green-400":
+                                    progress === 100,
+                                },
+                              )}
+                            />
                           )}
-                        />
+                          <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
+                            {/* TODO: Change to use status */}
+                            {progress < 100 && (
+                              <>
+                                <Loader
+                                  className="animate-spin"
+                                  size={16}
+                                  strokeWidth={2}
+                                />
+                                <span>
+                                  Screening paper {completedCount} of {totalCount}
+                                </span>
+                              </>
+                            )}
+                            {progress === 100 && errorCount === 0 && (
+                              <>
+                                <CircleCheck size={14} className="text-green-600" />
+                                <span className="text-green-600">Done</span>
+                              </>
+                            )}
+                            {progress === 100 && errorCount > 0 && (
+                              <>
+                                <TriangleAlert
+                                  size={14}
+                                  className="text-orange-600"
+                                />
+                                <span className="text-orange-600">
+                                  Done with errors ({errorCount})
+                                </span>
+                              </>
+                            )}
+                          </div>
+                        </>
                       )}
-                      <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
-                        {/* TODO: Change to use status */}
-                        {progress < 100 && (
-                          <>
-                            <Loader
-                              className="animate-spin"
-                              size={16}
-                              strokeWidth={2}
-                            />
-                            <span>
-                              Screening paper {completedCount} of {totalCount}
-                            </span>
-                          </>
-                        )}
-                        {progress === 100 && errorCount === 0 && (
-                          <>
-                            <CircleCheck size={14} className="text-green-600" />
-                            <span className="text-green-600">Done</span>
-                          </>
-                        )}
-                        {progress === 100 && errorCount > 0 && (
-                          <>
-                            <TriangleAlert
-                              size={14}
-                              className="text-orange-600"
-                            />
-                            <span className="text-orange-600">
-                              Done with errors ({errorCount})
-                            </span>
-                          </>
-                        )}
-                      </div>
                     </div>
                   </div>
                   <div>
diff --git a/server/src/celery/tasks.py b/server/src/celery/tasks.py
index 832d7a0..a23bccb 100644
--- a/server/src/celery/tasks.py
+++ b/server/src/celery/tasks.py
@@ -171,7 +171,7 @@ async def _process_job_task(
                 success = counter["success"]
                 failed = counter["failed"]
 
-            status = resolve_job_status(total, success, failed)
+            status = resolve_job_status(total, success, failed, cancelled=0)
 
             # TODO: maybe buffer to avoid spamming
             await _publish_redis_event(

From f9587f46f4aa6fdfc9cb05a0bf0ae69616f2c269 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Wed, 4 Mar 2026 15:04:52 +0200
Subject: [PATCH 08/18] Add check when canceling if job has already been
 cancelled

---
 ..._add_cancelled_status_option_to_jobtask.py |  2 +-
 server/src/crud/jobtask_crud.py               | 28 +++++++++++++++++--
 server/src/services/job_service.py            |  8 +++++-
 server/src/services/jobtask_service.py        |  4 +++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py b/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py
index e62b61c..4ca8950 100644
--- a/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py
+++ b/server/migrations/versions/1771951604-9504be6616f4_add_cancelled_status_option_to_jobtask.py
@@ -8,7 +8,7 @@
 from typing import Sequence, Union
 
 from alembic import op
-import sqlalchemy as sa
+# import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
diff --git a/server/src/crud/jobtask_crud.py b/server/src/crud/jobtask_crud.py
index 54898c9..5159709 100644
--- a/server/src/crud/jobtask_crud.py
+++ b/server/src/crud/jobtask_crud.py
@@ -70,7 +70,9 @@ async def fetch_tasks_stats_by_project(self, project_uuid):
                     func.sum(case((JobTask.status == JobTaskStatus.ERROR, 1), else_=0))
                 ).label("failed_count"),
                 func.coalesce(
-                    func.sum(case((JobTask.status == JobTaskStatus.CANCELLED, 1), else_=0))
+                    func.sum(
+                        case((JobTask.status == JobTaskStatus.CANCELLED, 1), else_=0)
+                    )
                 ).label("cancelled_count"),
             )
             .join(Job, JobTask.job_id == Job.id)
@@ -81,6 +83,29 @@ async def fetch_tasks_stats_by_project(self, project_uuid):
         result = await self.db.execute(stmt)
         return result.mappings().all()
 
+    async def fetch_task_stats_by_job(self, job_id: int):
+        stmt = (
+            select(
+                func.count(JobTask.id).label("total_count"),
+                func.coalesce(
+                    func.sum(case((JobTask.status == JobTaskStatus.DONE, 1), else_=0))
+                ).label("success_count"),
+                func.coalesce(
+                    func.sum(case((JobTask.status == JobTaskStatus.ERROR, 1), else_=0))
+                ).label("failed_count"),
+                func.coalesce(
+                    func.sum(
+                        case((JobTask.status == JobTaskStatus.CANCELLED, 1), else_=0)
+                    )
+                ).label("cancelled_count"),
+            )
+            .join(Job, JobTask.job_id == Job.id)
+            .where(Job.id == job_id)
+            .group_by(Job.uuid)
+        )
+        result = await self.db.execute(stmt)
+        return result.mappings().first()
+
     async def update_job_task_status(self, job_task_id: int, status: str):
         stmt = update(JobTask).where(JobTask.id == job_task_id).values(status=status)
         await self.db.execute(stmt)
@@ -95,7 +120,6 @@ async def update_job_tasks_status(self, job_id: int, status: str):
     Sets status to CANCELLED for all unfinished job tasks.
     Should be called after canceling the job.
     """
-
     async def update_job_tasks_status_to_cancelled(self, job_id: int):
         stmt = (
             update(JobTask)
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index 9eb0bbf..c8bdd57 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -119,6 +119,12 @@ async def create(self, job_data: JobCreate):
 
     async def cancel_job(self, job_uuid: UUID, delete_data: bool = False):
         job = await self.job_crud.fetch_job_by_uuid_with_ids(job_uuid)
+        job_id = job.get("id")
+
+        job_stats = await self.jobtask_service.fetch_task_stats_by_job(job_id)
+
+        if job_stats.get("cancelled_count") > 0:
+            raise RuntimeError("Task already cancelled")
 
         # FIX: fetch_job_by_uuid() and JobRead
         task_id = job.get("celery_task_id")
@@ -130,7 +136,7 @@ async def cancel_job(self, job_uuid: UUID, delete_data: bool = False):
         if delete_data:
             await self.job_crud.delete_job(job_uuid)
         else:
-            await self.jobtask_service.set_unfinished_to_cancelled(job.get("id")) # type: ignore
+            await self.jobtask_service.set_unfinished_to_cancelled(job_id)
 
         return {f"task {task_id} cancelled"}
 
diff --git a/server/src/services/jobtask_service.py b/server/src/services/jobtask_service.py
index 3063ffe..949d8a0 100644
--- a/server/src/services/jobtask_service.py
+++ b/server/src/services/jobtask_service.py
@@ -63,6 +63,10 @@ async def fetch_task_stats_by_project(self, project_uuid: UUID):
         stats = await self.jobtask_crud.fetch_tasks_stats_by_project(project_uuid)
         return stats
 
+    async def fetch_task_stats_by_job(self, job_id: int):
+        job_stats = await self.jobtask_crud.fetch_task_stats_by_job(job_id)
+        return job_stats
+
     async def add_human_result(self, uuid: UUID, human_result: JobTaskHumanResult):
         await self.jobtask_crud.add_jobtask_human_result(uuid, human_result)
 

From 475a8a7ff2340c8b39104724e87ef28b0b5e3e1b Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:01:38 +0200
Subject: [PATCH 09/18] Change frontend job status branching to use JobStatus

---
 client/src/pages/ProjectPage.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 020f872..7311be3 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -814,7 +814,6 @@ export const ProjectPage = () => {
                 ? 0
                 : Math.round((completedCount / totalCount) * 100);
             const status = job.stats.status;
-            console.log(status);
 
             return (
               <Card key={job.uuid} className="flex-row justify-between">
@@ -850,7 +849,7 @@ export const ProjectPage = () => {
                         </div>
                       ) : (
                         <>
-                          {progress !== 100 && (
+                          {status === JobStatus.RUNNING && (
                             <progress
                               value={progress}
                               max={100}
@@ -866,8 +865,7 @@ export const ProjectPage = () => {
                             />
                           )}
                           <div className="absolute inset-0 flex gap-2 items-center justify-center text-xs font-semibold select-none">
-                            {/* TODO: Change to use status */}
-                            {progress < 100 && (
+                            {status === JobStatus.RUNNING && (
                               <>
                                 <Loader
                                   className="animate-spin"
@@ -879,13 +877,13 @@ export const ProjectPage = () => {
                                 </span>
                               </>
                             )}
-                            {progress === 100 && errorCount === 0 && (
+                            {status === JobStatus.SUCCESS && (
                               <>
                                 <CircleCheck size={14} className="text-green-600" />
                                 <span className="text-green-600">Done</span>
                               </>
                             )}
-                            {progress === 100 && errorCount > 0 && (
+                            {status === JobStatus.PARTIAL_SUCCESS && (
                               <>
                                 <TriangleAlert
                                   size={14}

From 7e05689325f90250123e280e66a803c58da76003 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:29:15 +0200
Subject: [PATCH 10/18] Fix type check

---
 client/src/components/DropDownMenus.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/DropDownMenus.tsx b/client/src/components/DropDownMenus.tsx
index f94e7f8..ceb304f 100644
--- a/client/src/components/DropDownMenus.tsx
+++ b/client/src/components/DropDownMenus.tsx
@@ -4,7 +4,7 @@ import { Ellipsis } from "lucide-react";
 
 type EllipsisItem = {
   label: React.ElementType;
-  disabled: boolean;
+  disabled?: boolean;
   onClick: () => void;
 };
 

From 9a575bd41317f659a301b208b6737e4b7da4d73a Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Fri, 6 Mar 2026 16:36:30 +0200
Subject: [PATCH 11/18] Add eslint ignore for error any type

---
 client/src/state/store.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index efb0cec..b666dae 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -312,6 +312,7 @@ export const model = {
         toast.success("Task canceled successfully", {
           autoClose: 1500,
         });
+        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
       } catch (error: any) {
         toast.error(`Error canceling job: ${error?.message ?? error}`);
         throw error;

From aebc472e8366352b9be465dac61d77931117a623 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Wed, 11 Mar 2026 10:37:44 +0200
Subject: [PATCH 12/18] Change task canceling to use useCallback

---
 client/src/pages/ProjectPage.tsx | 43 +++++++++++++++++++-------------
 client/src/state/store.ts        | 16 ++----------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 7311be3..13d61d3 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -533,6 +533,29 @@ export const ProjectPage = () => {
 
   const evaluationFinished = jobs.length === 0 && pendingTasks.length === 0;
 
+  const handleTaskCancel = useCallback((deleteData: boolean) => {
+    if (!jobToCancel) {
+      return;
+    }
+
+    cancelJob({
+      jobUuid: jobToCancel.jobUuid,
+      deleteData,
+      projectUuid: projectUuid,
+    })
+      .then(() => {
+        toast.success("Task cancelled successfully", { autoClose: 1500 });
+        setJobToCancel(null);
+      })
+      .catch((error: unknown) => {
+        toast.error(`Error canceling task: ${error instanceof Error ? error.message : String(error)}`);
+      })
+  }, [jobToCancel, projectUuid, cancelJob])
+
+  const handleCancelModalClose = useCallback(() => {
+    setJobToCancel(null);
+  }, [])
+
   const fetchModels = useCallback(() => {
     async function fetch_models() {
       if (selectedLlmProvider && selectedLlmProvider.value) {
@@ -1156,23 +1179,9 @@ export const ProjectPage = () => {
           open={true}
           completedCount={jobToCancel.completedCount}
           totalCount={jobToCancel.totalCount}
-          onClose={() => setJobToCancel(null)}
-          onKeepData={async () => {
-            await cancelJob({
-              jobUuid: jobToCancel.jobUuid,
-              deleteData: false,
-              projectUuid: projectUuid,
-            });
-            setJobToCancel(null);
-          }}
-          onDeleteData={async () => {
-            await cancelJob({
-              jobUuid: jobToCancel.jobUuid,
-              deleteData: true,
-              projectUuid: projectUuid,
-            });
-            setJobToCancel(null);
-          }}
+          onClose={handleCancelModalClose}
+          onKeepData={() => handleTaskCancel(false)}
+          onDeleteData={() => handleTaskCancel(true)}
         />
       )}
     </Layout>
diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index b666dae..51ba638 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -8,7 +8,6 @@ import {
   Computed,
   computed,
 } from "easy-peasy";
-import { toast } from "react-toastify";
 import * as projectsService from "../services/projectService";
 import * as paperService from "../services/paperService";
 import * as providerService from "../services/providerService";
@@ -304,19 +303,8 @@ export const model = {
   cancelJob: thunk(
     async (actions, { jobUuid, deleteData, projectUuid }, { injections }) => {
       const { jobService } = injections;
-
-      try {
-        await jobService.cancelJob(jobUuid, deleteData);
-        await actions.fetchJobsForProject(projectUuid);
-
-        toast.success("Task canceled successfully", {
-          autoClose: 1500,
-        });
-        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-      } catch (error: any) {
-        toast.error(`Error canceling job: ${error?.message ?? error}`);
-        throw error;
-      }
+      await jobService.cancelJob(jobUuid, deleteData);
+      await actions.fetchJobsForProject(projectUuid);
     },
   ),
 } satisfies StoreModel;

From bb7dab8730c894259fe370e125d7227a2b8b481e Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Wed, 11 Mar 2026 11:46:21 +0200
Subject: [PATCH 13/18] Add separate button for task deletion

---
 client/src/components/CancelJobModal.tsx | 94 ++++++++++++------------
 client/src/pages/ProjectPage.tsx         | 35 ++++++---
 client/src/services/jobService.ts        | 14 +++-
 client/src/state/store.ts                | 20 ++++-
 server/src/api/controllers/job.py        | 27 +++++--
 server/src/celery/tasks.py               | 20 ++---
 server/src/services/job_service.py       | 49 ++++++++----
 7 files changed, 165 insertions(+), 94 deletions(-)

diff --git a/client/src/components/CancelJobModal.tsx b/client/src/components/CancelJobModal.tsx
index 07972a5..da830fb 100644
--- a/client/src/components/CancelJobModal.tsx
+++ b/client/src/components/CancelJobModal.tsx
@@ -4,25 +4,19 @@ import {
   DialogTitle,
   Description,
 } from "@headlessui/react";
-import { ArrowLeft, CircleStop, Trash2, X } from "lucide-react";
+import { CircleStop, X } from "lucide-react";
 import { Button } from "./Button";
 
 type CancelJobModalProps = {
   open: boolean;
-  completedCount: number;
-  totalCount: number;
   onClose: () => void;
-  onKeepData: () => void;
-  onDeleteData: () => void;
+  onCancel: () => void;
 };
 
 export const CancelJobModal: React.FC<CancelJobModalProps> = ({
   open,
-  completedCount,
-  totalCount,
   onClose,
-  onKeepData,
-  onDeleteData,
+  onCancel,
 }) => {
 
   return (
@@ -44,49 +38,51 @@ export const CancelJobModal: React.FC<CancelJobModalProps> = ({
         </DialogTitle>
 
         <Description className="text-sm text-gray-600 mb-6 leading-relaxed">
-          This will stop the job immediately.
-          <br />
-          <br />
-          <span className="font-medium">
-            {completedCount} of {totalCount} papers
-          </span>{" "}
-          have already been screened.
-          <br />
-          You can keep the completed results or delete all associated data.
+          This will cancel running and scheduled screening jobs.
         </Description>
 
-        <div className="flex flex-col gap-3">
-          <Button
-            variant="yellow"
-            onClick={onKeepData}
-          >
-            <div className="flex items-center justify-center gap-2 font-semibold">
-              <CircleStop size={16} />
-              <span>Keep screened data</span>
-            </div>
-          </Button>
+        <Button
+          variant="yellow"
+          onClick={onCancel}
+        >
+          <div className="flex items-center justify-center gap-2 font-semibold">
+            <CircleStop size={16} />
+            <span>Cancel task</span>
+          </div>
+        </Button>
 
-          <Button
-            variant="red"
-            onClick={onDeleteData}
-          >
-            <div className="flex items-center justify-center gap-2 font-semibold">
-              <Trash2 size={16} />
-              <span>Delete data</span>
-            </div>
-          </Button>
-
-          <Button
-            variant="gray"
-            onClick={onClose}
-          >
-            <div className="flex items-center justify-center gap-2 font-semibold">
-              <ArrowLeft size={16} />
-              <span>Go back</span>
-            </div>
-          </Button>
-        </div>
+        {/* <div className="flex flex-col gap-3"> */}
+        {/*   <Button */}
+        {/*     variant="yellow" */}
+        {/*     onClick={onKeepData} */}
+        {/*   > */}
+        {/*     <div className="flex items-center justify-center gap-2 font-semibold"> */}
+        {/*       <CircleStop size={16} /> */}
+        {/*       <span>Keep screened data</span> */}
+        {/*     </div> */}
+        {/*   </Button> */}
+        {/**/}
+        {/*   <Button */}
+        {/*     variant="red" */}
+        {/*     onClick={onDeleteData} */}
+        {/*   > */}
+        {/*     <div className="flex items-center justify-center gap-2 font-semibold"> */}
+        {/*       <Trash2 size={16} /> */}
+        {/*       <span>Delete data</span> */}
+        {/*     </div> */}
+        {/*   </Button> */}
+        {/**/}
+        {/* <Button */}
+        {/*   variant="gray" */}
+        {/*   onClick={onClose} */}
+        {/* > */}
+        {/*   <div className="flex items-center justify-center gap-2 font-semibold"> */}
+        {/*     <ArrowLeft size={16} /> */}
+        {/*     <span>Go back</span> */}
+        {/*   </div> */}
+        {/* </Button> */}
+        {/* </div> */}
       </DialogPanel>
-    </Dialog>
+    </Dialog >
   )
 }
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 13d61d3..78ec9c6 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -30,6 +30,7 @@ import {
   ChartCandlestick,
   CircleAlert,
   CircleCheck,
+  CircleStop,
   Download,
   FileText,
   Loader,
@@ -426,7 +427,9 @@ export const ProjectPage = () => {
     totalCount: number;
   } | null>(null);
 
+
   const cancelJob = useTypedStoreActions((actions) => actions.cancelJob);
+  const deleteJob = useTypedStoreActions((actions) => actions.deleteJob);
 
   const [fetchedFiles, setFetchedFiles] = useState<FetchedFile[]>([]);
   const [availableModels, setAvailableModels] = useState<
@@ -533,14 +536,12 @@ export const ProjectPage = () => {
 
   const evaluationFinished = jobs.length === 0 && pendingTasks.length === 0;
 
-  const handleTaskCancel = useCallback((deleteData: boolean) => {
+  const handleTaskCancel = useCallback(() => {
     if (!jobToCancel) {
       return;
     }
-
     cancelJob({
       jobUuid: jobToCancel.jobUuid,
-      deleteData,
       projectUuid: projectUuid,
     })
       .then(() => {
@@ -556,6 +557,16 @@ export const ProjectPage = () => {
     setJobToCancel(null);
   }, [])
 
+  const handleTaskDelete = useCallback((jobUuid: string) => {
+    deleteJob({ jobUuid, projectUuid: projectUuid })
+      .then(() => {
+        toast.success("Task deleted successfully", { autoClose: 1500 });
+      })
+      .catch((error: unknown) => {
+        toast.error(`Error deleting task: ${error instanceof Error ? error.message : String(error)}`);
+      })
+  }, [deleteJob])
+
   const fetchModels = useCallback(() => {
     async function fetch_models() {
       if (selectedLlmProvider && selectedLlmProvider.value) {
@@ -927,14 +938,23 @@ export const ProjectPage = () => {
                       items={[
                         {
                           label: () => (
-                            <div className="text-red-700 flex flex-row gap-3 items-center">
-                              <XCircle />
+                            <div className="text-yellow-700 flex flex-row gap-3 items-center">
+                              <CircleStop />
                               <span>Cancel</span>
                             </div>
                           ),
                           onClick: () => setJobToCancel({ jobUuid: job.uuid, completedCount, totalCount }),
                           disabled: progress === 100 || status === JobStatus.CANCELLED,
                         },
+                        {
+                          label: () => (
+                            <div className="text-red-700 flex flex-row gap-3 items-center">
+                              <XCircle />
+                              <span>Delete</span>
+                            </div>
+                          ),
+                          onClick: () => handleTaskDelete(job.uuid),
+                        },
                       ]}
                     />
                   </div>
@@ -1177,11 +1197,8 @@ export const ProjectPage = () => {
       {jobToCancel && (
         <CancelJobModal
           open={true}
-          completedCount={jobToCancel.completedCount}
-          totalCount={jobToCancel.totalCount}
           onClose={handleCancelModalClose}
-          onKeepData={() => handleTaskCancel(false)}
-          onDeleteData={() => handleTaskCancel(true)}
+          onCancel={handleTaskCancel}
         />
       )}
     </Layout>
diff --git a/client/src/services/jobService.ts b/client/src/services/jobService.ts
index ebdbdea..22d7ea2 100644
--- a/client/src/services/jobService.ts
+++ b/client/src/services/jobService.ts
@@ -30,12 +30,22 @@ export const fetchJobsForProject = async (projectUuid: string) => {
   }
 };
 
-export const cancelJob = async (jobUuid: string, deleteData: boolean) => {
+export const cancelJob = async (jobUuid: string) => {
   try {
-    const res = await api.post(`/api/v1/job/${jobUuid}/cancel?delete_data=${deleteData}`);
+    const res = await api.post(`/api/v1/job/${jobUuid}/cancel`);
     return res.data;
   } catch (error) {
     console.error("Canceling task unsuccessful:", error);
     throw error;
   }
 };
+
+export const deleteJob = async (jobUuid: string) => {
+  try {
+    const res = await api.delete(`/api/v1/job/${jobUuid}`);
+    return res.data;
+  } catch (error) {
+    console.error("Task deletion unsuccessful:", error);
+    throw error;
+  }
+}
diff --git a/client/src/state/store.ts b/client/src/state/store.ts
index 51ba638..6b912ba 100644
--- a/client/src/state/store.ts
+++ b/client/src/state/store.ts
@@ -64,7 +64,12 @@ interface JobModel {
   fetchJobsForProject: Thunk<StoreModel, string, Injections>;
   cancelJob: Thunk<
     StoreModel,
-    { jobUuid: string; deleteData: boolean; projectUuid: string },
+    { jobUuid: string; projectUuid: string },
+    Injections
+  >;
+  deleteJob: Thunk<
+    StoreModel,
+    { jobUuid: string; projectUuid: string },
     Injections
   >;
 }
@@ -301,10 +306,17 @@ export const model = {
     });
   }),
   cancelJob: thunk(
-    async (actions, { jobUuid, deleteData, projectUuid }, { injections }) => {
+    async (actions, { jobUuid, projectUuid }, { injections }) => {
+      const { jobService } = injections;
+      await jobService.cancelJob(jobUuid);
+      await actions.fetchJobsForProject(projectUuid); // TODO: Maybe no fetch here
+    },
+  ),
+  deleteJob: thunk(
+    async (actions, { jobUuid, projectUuid }, { injections }) => {
       const { jobService } = injections;
-      await jobService.cancelJob(jobUuid, deleteData);
-      await actions.fetchJobsForProject(projectUuid);
+      await jobService.deleteJob(jobUuid);
+      await actions.fetchJobsForProject(projectUuid); // TODO: Maybe no fetch here
     },
   ),
 } satisfies StoreModel;
diff --git a/server/src/api/controllers/job.py b/server/src/api/controllers/job.py
index b81e1ed..6b08c36 100644
--- a/server/src/api/controllers/job.py
+++ b/server/src/api/controllers/job.py
@@ -14,7 +14,10 @@
 
 
 @router.get(
-    "/job", status_code=status.HTTP_200_OK, response_model=list[JobReadWithStats], tags=["Job"]
+    "/job",
+    status_code=status.HTTP_200_OK,
+    response_model=list[JobReadWithStats],
+    tags=["Job"],
 )
 async def get_jobs(
     project: Optional[UUID] = None, db_ctx: DBContext = Depends(get_db_ctx)
@@ -100,16 +103,28 @@ async def create_job(
 
 
 @router.post("/job/{uuid}/cancel", status_code=status.HTTP_200_OK, tags=["Job"])
-async def cancel_job(
-    uuid: UUID, delete_data: bool = False, db_ctx: DBContext = Depends(get_db_ctx)
-):
+async def cancel_job(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
     job_service = create_job_service(db_ctx)
     try:
-        await job_service.cancel_job(uuid, delete_data=delete_data)
+        await job_service.cancel_job(uuid)
         await db_ctx.commit()
         return {"detail": "Task cancelled successfully"}
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to cancel job: {str(e)}",
+            detail=f"Failed to cancel task: {str(e)}",
+        ) from e
+
+
+@router.delete("/job/{uuid}", status_code=status.HTTP_200_OK, tags=["Job"])
+async def delete_job(uuid: UUID, db_ctx: DBContext = Depends(get_db_ctx)):
+    job_service = create_job_service(db_ctx)
+    try:
+        await job_service.delete_job(uuid)
+        await db_ctx.commit()
+        return {"detail": "Job deleted successfully"}
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Failed to delete job: {str(e)}",
         ) from e
diff --git a/server/src/celery/tasks.py b/server/src/celery/tasks.py
index a23bccb..2c4fb08 100644
--- a/server/src/celery/tasks.py
+++ b/server/src/celery/tasks.py
@@ -94,11 +94,11 @@ async def _process_job_task(
                 )
                 await task_db_ctx.commit()
 
-                await _publish_redis_event(
-                    redis,
-                    EventName.JOB_TASK_RUNNING,
-                    {"job_task_id": job_task.id, "status": JobTaskStatus.RUNNING},
-                )
+                # await _publish_redis_event(
+                #     redis,
+                #     EventName.JOB_TASK_RUNNING,
+                #     {"job_task_id": job_task.id, "status": JobTaskStatus.RUNNING},
+                # )
 
                 llm_result = await get_structured_response(
                     llm_service,
@@ -118,11 +118,11 @@ async def _process_job_task(
                 async with counter_lock:
                     counter["success"] += 1
 
-                await _publish_redis_event(
-                    redis,
-                    EventName.JOB_TASK_DONE,
-                    {"job_task_id": job_task.id, "status": JobTaskStatus.DONE},
-                )
+                # await _publish_redis_event(
+                #     redis,
+                #     EventName.JOB_TASK_DONE,
+                #     {"job_task_id": job_task.id, "status": JobTaskStatus.DONE},
+                # )
 
         except Exception as e:
             try:
diff --git a/server/src/services/job_service.py b/server/src/services/job_service.py
index c8bdd57..a6f4730 100644
--- a/server/src/services/job_service.py
+++ b/server/src/services/job_service.py
@@ -5,7 +5,7 @@
 from src.crud.job_crud import JobCrud
 from src.db.db_context import DBContext
 from src.helpers.resolve_job_status import resolve_job_status
-from src.schemas.job import JobCreate, JobRead, JobReadWithStats, JobStats
+from src.schemas.job import JobCreate, JobRead, JobReadWithStats, JobStats, JobStatus
 from src.schemas.jobtask import JobTaskRead
 from src.services.jobtask_service import JobTaskService, create_jobtask_service
 
@@ -117,29 +117,50 @@ async def create(self, job_data: JobCreate):
 
         return job_read
 
-    async def cancel_job(self, job_uuid: UUID, delete_data: bool = False):
+    async def delete_job(self, job_uuid: UUID):
         job = await self.job_crud.fetch_job_by_uuid_with_ids(job_uuid)
         job_id = job.get("id")
+        task_id = job.get("celery_task_id")
 
-        job_stats = await self.jobtask_service.fetch_task_stats_by_job(job_id)
+        try:
+            await self._cancel_running_job(job_id, task_id)
+        except RuntimeError:
+            pass
 
-        if job_stats.get("cancelled_count") > 0:
-            raise RuntimeError("Task already cancelled")
+        await self.job_crud.delete_job(job_uuid)
 
-        # FIX: fetch_job_by_uuid() and JobRead
+    async def cancel_job(self, job_uuid: UUID):
+        job = await self.job_crud.fetch_job_by_uuid_with_ids(job_uuid)
+        job_id = job.get("id")
         task_id = job.get("celery_task_id")
-        if task_id is None:
-            raise RuntimeError(f"No task associated with job {job_uuid}")
-
-        cancel_task(task_id)
 
-        if delete_data:
-            await self.job_crud.delete_job(job_uuid)
-        else:
-            await self.jobtask_service.set_unfinished_to_cancelled(job_id)
+        await self._cancel_running_job(job_id, task_id)
+        await self.jobtask_service.set_unfinished_to_cancelled(job_id)
 
         return {f"task {task_id} cancelled"}
 
+    async def _cancel_running_job(self, job_id: int, celery_task_id: UUID):
+        job_stats = await self.jobtask_service.fetch_task_stats_by_job(job_id)
+
+        total = job_stats["total_count"] if job_stats else 0
+        success = job_stats["success_count"] if job_stats else 0
+        failed = job_stats["failed_count"] if job_stats else 0
+        cancelled = job_stats["cancelled_count"] if job_stats else 0
+
+        job_status = resolve_job_status(total, success, failed, cancelled)
+        completed_statuses = [
+            JobStatus.FAILED,
+            JobStatus.PARTIAL_SUCCESS,
+            JobStatus.SUCCESS,
+        ]
+
+        if job_status == JobStatus.CANCELLED:
+            raise RuntimeError("Task already cancelled")
+        elif job_status in completed_statuses:
+            raise RuntimeError(f"Task already completed with status: {job_status}")
+
+        cancel_task(celery_task_id)
+
 
 def create_job_service(db_ctx: DBContext) -> JobService:
     jobtask_service = create_jobtask_service(db_ctx)

From 98c53df7afecee389f0523a19c4907e0e3b9fa78 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Thu, 12 Mar 2026 15:37:04 +0200
Subject: [PATCH 14/18] Make confirmation modal reusable and confirmation
 dialog for task deletion

---
 client/src/components/CancelJobModal.tsx    | 88 ---------------------
 client/src/components/ConfirmationModal.tsx | 74 +++++++++++++++++
 client/src/pages/ProjectPage.tsx            | 53 +++++++++----
 3 files changed, 112 insertions(+), 103 deletions(-)
 delete mode 100644 client/src/components/CancelJobModal.tsx
 create mode 100644 client/src/components/ConfirmationModal.tsx

diff --git a/client/src/components/CancelJobModal.tsx b/client/src/components/CancelJobModal.tsx
deleted file mode 100644
index da830fb..0000000
--- a/client/src/components/CancelJobModal.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import {
-  Dialog,
-  DialogPanel,
-  DialogTitle,
-  Description,
-} from "@headlessui/react";
-import { CircleStop, X } from "lucide-react";
-import { Button } from "./Button";
-
-type CancelJobModalProps = {
-  open: boolean;
-  onClose: () => void;
-  onCancel: () => void;
-};
-
-export const CancelJobModal: React.FC<CancelJobModalProps> = ({
-  open,
-  onClose,
-  onCancel,
-}) => {
-
-  return (
-    <Dialog
-      open={open}
-      onClose={onClose}
-      className="fixed inset-0 z-50 flex items-center justify-center p-4"
-    >
-      <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
-
-      <DialogPanel className="relative bg-white shadow-2xl rounded-xl w-full max-w-md p-8">
-        <X
-          onClick={onClose}
-          className="absolute top-4 right-4 h-5 w-5 cursor-pointer text-gray-500 hover:text-gray-700 transition duration-200"
-        />
-
-        <DialogTitle className="text-lg font-bold mb-3">
-          Cancel screening task?
-        </DialogTitle>
-
-        <Description className="text-sm text-gray-600 mb-6 leading-relaxed">
-          This will cancel running and scheduled screening jobs.
-        </Description>
-
-        <Button
-          variant="yellow"
-          onClick={onCancel}
-        >
-          <div className="flex items-center justify-center gap-2 font-semibold">
-            <CircleStop size={16} />
-            <span>Cancel task</span>
-          </div>
-        </Button>
-
-        {/* <div className="flex flex-col gap-3"> */}
-        {/*   <Button */}
-        {/*     variant="yellow" */}
-        {/*     onClick={onKeepData} */}
-        {/*   > */}
-        {/*     <div className="flex items-center justify-center gap-2 font-semibold"> */}
-        {/*       <CircleStop size={16} /> */}
-        {/*       <span>Keep screened data</span> */}
-        {/*     </div> */}
-        {/*   </Button> */}
-        {/**/}
-        {/*   <Button */}
-        {/*     variant="red" */}
-        {/*     onClick={onDeleteData} */}
-        {/*   > */}
-        {/*     <div className="flex items-center justify-center gap-2 font-semibold"> */}
-        {/*       <Trash2 size={16} /> */}
-        {/*       <span>Delete data</span> */}
-        {/*     </div> */}
-        {/*   </Button> */}
-        {/**/}
-        {/* <Button */}
-        {/*   variant="gray" */}
-        {/*   onClick={onClose} */}
-        {/* > */}
-        {/*   <div className="flex items-center justify-center gap-2 font-semibold"> */}
-        {/*     <ArrowLeft size={16} /> */}
-        {/*     <span>Go back</span> */}
-        {/*   </div> */}
-        {/* </Button> */}
-        {/* </div> */}
-      </DialogPanel>
-    </Dialog >
-  )
-}
diff --git a/client/src/components/ConfirmationModal.tsx b/client/src/components/ConfirmationModal.tsx
new file mode 100644
index 0000000..9f77426
--- /dev/null
+++ b/client/src/components/ConfirmationModal.tsx
@@ -0,0 +1,74 @@
+import {
+  Dialog,
+  DialogPanel,
+  DialogTitle,
+  Description,
+} from "@headlessui/react";
+import { X } from "lucide-react";
+import { Button } from "./Button";
+
+type ConfirmationModalProps = {
+  open: boolean;
+  onClose: () => void;
+  onConfirm: () => void;
+  title: string;
+  description: string;
+  confirmButtonLabel: string;
+  confirmButtonVariant: "green" | "yellow" | "red" | "purple" | "gray" | "slate";
+  confirmButtonIcon: React.ReactNode;
+};
+
+export const ConrimationModal: React.FC<ConfirmationModalProps> = ({
+  open,
+  onClose,
+  onConfirm,
+  title,
+  description,
+  confirmButtonLabel,
+  confirmButtonVariant,
+  confirmButtonIcon,
+}) => {
+
+  return (
+    <Dialog
+      open={open}
+      onClose={onClose}
+      className="fixed inset-0 z-50 flex items-center justify-center p-4"
+    >
+      <div className="fixed inset-0 bg-black/30" aria-hidden="true" />
+
+      <DialogPanel className="relative bg-white shadow-2xl rounded-xl w-full max-w-md p-8">
+        <X
+          onClick={onClose}
+          className="absolute top-4 right-4 h-5 w-5 cursor-pointer text-gray-500 hover:text-gray-700 transition duration-200"
+        />
+
+        <DialogTitle className="text-lg font-bold mb-3">
+          {title}
+        </DialogTitle>
+
+        <Description className="text-sm text-gray-600 mb-6 leading-relaxed">
+          {description}
+        </Description>
+
+        <div className="flex gap-3 justify-end">
+          <Button
+            variant="gray"
+            onClick={onClose}
+          >
+            Go back
+          </Button>
+          <Button
+            variant={confirmButtonVariant}
+            onClick={onConfirm}
+          >
+            <div className="flex items-center justify-center gap-2 font-semibold">
+              {confirmButtonIcon}
+              <span>{confirmButtonLabel}</span>
+            </div>
+          </Button>
+        </div>
+      </DialogPanel>
+    </Dialog >
+  )
+}
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 78ec9c6..f10ae6f 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -7,7 +7,7 @@ import { DropdownMenuText, DropdownOption, DropdownMenuEllipsis } from "../compo
 import { FileDropArea } from "../components/FileDropArea";
 import { ExpandableToast } from "../components/ExpandableToast";
 import { TruncatedFileNames } from "../components/TruncatedFileNames";
-import { CancelJobModal } from "../components/CancelJobModal";
+import { ConrimationModal } from "../components/ConfirmationModal";
 import { createJob } from "../services/jobService";
 import {
   fileUploadToBackend,
@@ -37,6 +37,7 @@ import {
   Sparkles,
   Square,
   SquareCheckBig,
+  Trash2,
   TriangleAlert,
   XCircle
 } from "lucide-react";
@@ -421,12 +422,8 @@ export const ProjectPage = () => {
   const getPapers = useTypedStoreState((state) => state.getPapersForProject);
   const papers = getPapers(projectUuid);
 
-  const [jobToCancel, setJobToCancel] = useState<{
-    jobUuid: string,
-    completedCount: number;
-    totalCount: number;
-  } | null>(null);
-
+  const [jobToCancel, setJobToCancel] = useState<string | null>(null);
+  const [jobToDelete, setJobToDelete] = useState<string | null>(null);
 
   const cancelJob = useTypedStoreActions((actions) => actions.cancelJob);
   const deleteJob = useTypedStoreActions((actions) => actions.deleteJob);
@@ -541,7 +538,7 @@ export const ProjectPage = () => {
       return;
     }
     cancelJob({
-      jobUuid: jobToCancel.jobUuid,
+      jobUuid: jobToCancel,
       projectUuid: projectUuid,
     })
       .then(() => {
@@ -557,15 +554,24 @@ export const ProjectPage = () => {
     setJobToCancel(null);
   }, [])
 
-  const handleTaskDelete = useCallback((jobUuid: string) => {
-    deleteJob({ jobUuid, projectUuid: projectUuid })
+  const handleTaskDelete = useCallback(() => {
+    if (!jobToDelete) {
+      return;
+    }
+    deleteJob({ jobUuid: jobToDelete, projectUuid: projectUuid })
       .then(() => {
         toast.success("Task deleted successfully", { autoClose: 1500 });
+        setJobToDelete(null);
       })
       .catch((error: unknown) => {
         toast.error(`Error deleting task: ${error instanceof Error ? error.message : String(error)}`);
       })
-  }, [deleteJob])
+  }, [jobToDelete, projectUuid, deleteJob])
+
+  const handleDeleteModalClose = useCallback(() => {
+    setJobToDelete(null);
+  }, [])
+
 
   const fetchModels = useCallback(() => {
     async function fetch_models() {
@@ -943,7 +949,7 @@ export const ProjectPage = () => {
                               <span>Cancel</span>
                             </div>
                           ),
-                          onClick: () => setJobToCancel({ jobUuid: job.uuid, completedCount, totalCount }),
+                          onClick: () => setJobToCancel(job.uuid),
                           disabled: progress === 100 || status === JobStatus.CANCELLED,
                         },
                         {
@@ -953,7 +959,7 @@ export const ProjectPage = () => {
                               <span>Delete</span>
                             </div>
                           ),
-                          onClick: () => handleTaskDelete(job.uuid),
+                          onClick: () => setJobToDelete(job.uuid),
                         },
                       ]}
                     />
@@ -1195,10 +1201,27 @@ export const ProjectPage = () => {
         />
       )}
       {jobToCancel && (
-        <CancelJobModal
+        <ConrimationModal
           open={true}
           onClose={handleCancelModalClose}
-          onCancel={handleTaskCancel}
+          onConfirm={handleTaskCancel}
+          title="Cancel screening task?"
+          description="This will cancel running and scheduled screening jobs."
+          confirmButtonLabel="Cancel task"
+          confirmButtonVariant="yellow"
+          confirmButtonIcon={<CircleStop size={16} />}
+        />
+      )}
+      {jobToDelete && (
+        <ConrimationModal
+          open={true}
+          onClose={handleDeleteModalClose}
+          onConfirm={handleTaskDelete}
+          title="Delete screening task?"
+          description="This action cannot be undone. All data related to this task will be permanently deleted."
+          confirmButtonLabel="Delete"
+          confirmButtonVariant="red"
+          confirmButtonIcon={<Trash2 size={16} />}
         />
       )}
     </Layout>

From 85e4e818726f45ca4c2e8ae61df95ed3fb120198 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Thu, 12 Mar 2026 16:00:32 +0200
Subject: [PATCH 15/18] Quick fix typecheck. ModelSuggestion types should be
 fixed properly later

---
 client/src/components/ManualEvaluationModal.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/components/ManualEvaluationModal.tsx b/client/src/components/ManualEvaluationModal.tsx
index 68a0804..f5cdfdc 100644
--- a/client/src/components/ManualEvaluationModal.tsx
+++ b/client/src/components/ManualEvaluationModal.tsx
@@ -20,7 +20,7 @@ import {
 import axios from "axios";
 import { AlertMessage } from "./AlertMessage";
 
-type JobTaskHumanResult = "INCLUDE" | "EXCLUDE" | "UNSURE";
+// type JobTaskHumanResult = "INCLUDE" | "EXCLUDE" | "UNSURE";
 
 type LLMResult = {
   overall_decision: {
@@ -135,6 +135,9 @@ export const ManualEvaluationModal: React.FC<ManualEvaluationProps> = ({
     if (paperUuid != null) {
       getModelSuggestions(paperUuid).then((s) => {
         // console.log("Fetched suggestions", s);
+
+        // FIX: types break due to the pathing in getModelSuggestions()
+        // @ts-expect-error
         setModelSuggestions(s);
       });
     }

From a15e28108d7cfb598c769e2320aa7c28a275d8e6 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Thu, 12 Mar 2026 16:06:12 +0200
Subject: [PATCH 16/18] Add comment regarding the temporary ts-expect-error

---
 client/src/components/ManualEvaluationModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/ManualEvaluationModal.tsx b/client/src/components/ManualEvaluationModal.tsx
index f5cdfdc..b51c755 100644
--- a/client/src/components/ManualEvaluationModal.tsx
+++ b/client/src/components/ManualEvaluationModal.tsx
@@ -136,8 +136,8 @@ export const ManualEvaluationModal: React.FC<ManualEvaluationProps> = ({
       getModelSuggestions(paperUuid).then((s) => {
         // console.log("Fetched suggestions", s);
 
-        // FIX: types break due to the pathing in getModelSuggestions()
-        // @ts-expect-error
+        // FIX: ModelSuggestion types
+        // @ts-expect-error - temp fix since types break due to the pathing in getModelSuggestions()
         setModelSuggestions(s);
       });
     }

From 9ddaf5ced01de92cfad4699e7c4b51384c4c1e43 Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Thu, 19 Mar 2026 15:06:19 +0200
Subject: [PATCH 17/18] Remove unused ts-expect-error after types fix

---
 client/src/components/ManualEvaluationModal.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/components/ManualEvaluationModal.tsx b/client/src/components/ManualEvaluationModal.tsx
index 5cbe156..9c0a43b 100644
--- a/client/src/components/ManualEvaluationModal.tsx
+++ b/client/src/components/ManualEvaluationModal.tsx
@@ -133,9 +133,6 @@ export const ManualEvaluationModal: React.FC<ManualEvaluationProps> = ({
     if (paperUuid != null) {
       getModelSuggestions(paperUuid).then((s) => {
         // console.log("Fetched suggestions", s);
-
-        // FIX: ModelSuggestion types
-        // @ts-expect-error - temp fix since types break due to the pathing in getModelSuggestions()
         setModelSuggestions(s);
       });
     }

From 506b447d36af36dd9599281c38cfa1f064880f6f Mon Sep 17 00:00:00 2001
From: simo <49877847+saimouu@users.noreply.github.com>
Date: Fri, 20 Mar 2026 13:24:29 +0200
Subject: [PATCH 18/18] Fix typo and clean unused commented out code

---
 client/src/components/ConfirmationModal.tsx |  2 +-
 client/src/pages/ProjectPage.tsx            |  6 +++---
 server/src/celery/tasks.py                  | 19 -------------------
 server/src/schemas/job.py                   |  4 ----
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/client/src/components/ConfirmationModal.tsx b/client/src/components/ConfirmationModal.tsx
index 9f77426..0ae847a 100644
--- a/client/src/components/ConfirmationModal.tsx
+++ b/client/src/components/ConfirmationModal.tsx
@@ -18,7 +18,7 @@ type ConfirmationModalProps = {
   confirmButtonIcon: React.ReactNode;
 };
 
-export const ConrimationModal: React.FC<ConfirmationModalProps> = ({
+export const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
   open,
   onClose,
   onConfirm,
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 0e595cd..e33bea8 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -7,7 +7,7 @@ import { DropdownMenuText, DropdownOption, DropdownMenuEllipsis } from "../compo
 import { FileDropArea } from "../components/FileDropArea";
 import { ExpandableToast } from "../components/ExpandableToast";
 import { TruncatedFileNames } from "../components/TruncatedFileNames";
-import { ConrimationModal } from "../components/ConfirmationModal";
+import { ConfirmationModal } from "../components/ConfirmationModal";
 import { createJob } from "../services/jobService";
 import {
   fileUploadToBackend,
@@ -1204,7 +1204,7 @@ export const ProjectPage = () => {
         />
       )}
       {jobToCancel && (
-        <ConrimationModal
+        <ConfirmationModal
           open={true}
           onClose={handleCancelModalClose}
           onConfirm={handleTaskCancel}
@@ -1216,7 +1216,7 @@ export const ProjectPage = () => {
         />
       )}
       {jobToDelete && (
-        <ConrimationModal
+        <ConfirmationModal
           open={true}
           onClose={handleDeleteModalClose}
           onConfirm={handleTaskDelete}
diff --git a/server/src/celery/tasks.py b/server/src/celery/tasks.py
index 2c4fb08..70b1521 100644
--- a/server/src/celery/tasks.py
+++ b/server/src/celery/tasks.py
@@ -94,12 +94,6 @@ async def _process_job_task(
                 )
                 await task_db_ctx.commit()
 
-                # await _publish_redis_event(
-                #     redis,
-                #     EventName.JOB_TASK_RUNNING,
-                #     {"job_task_id": job_task.id, "status": JobTaskStatus.RUNNING},
-                # )
-
                 llm_result = await get_structured_response(
                     llm_service,
                     paper_service,
@@ -118,12 +112,6 @@ async def _process_job_task(
                 async with counter_lock:
                     counter["success"] += 1
 
-                # await _publish_redis_event(
-                #     redis,
-                #     EventName.JOB_TASK_DONE,
-                #     {"job_task_id": job_task.id, "status": JobTaskStatus.DONE},
-                # )
-
         except Exception as e:
             try:
                 async with DBContext() as task_err_db_ctx:
@@ -156,13 +144,6 @@ async def _process_job_task(
                 )
             except Exception:
                 logger.exception("Failed to publish error %s", job_task_id)
-
-            # try:
-            #     celery_task.update_state(state="FAILURE", meta={"error": str(e)})
-            # except Exception:
-            #     logger.exception(
-            #         "Failed to update celery state for job_task %s", job_task_id
-            #     )
         finally:
             async with counter_lock:
                 counter["completed"] += 1
diff --git a/server/src/schemas/job.py b/server/src/schemas/job.py
index fcf518a..4e9b790 100644
--- a/server/src/schemas/job.py
+++ b/server/src/schemas/job.py
@@ -84,9 +84,5 @@ class JobReadWithStats(BaseModel):
     updated_at: datetime
 
     stats: JobStats
-    # total_tasks: int = 0
-    # success_tasks: int = 0
-    # failed_tasks: int = 0
-    # status: JobStatus = JobStatus.NOT_STARTED
 
     model_config = ConfigDict(from_attributes=True)