Skip to content

Less task deletion #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julien-nc merged 2 commits into from
Mar 25, 2026
Merged

Less task deletion #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334f878
do not delete task when user cancels in the UI, just cancel
julien-nc Mar 25, 2026
a5061d3
stop deleting tasks when deleting chat sessions/msgs and when regener…
julien-nc Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 3 additions & 41 deletions lib/Controller/ChattyLLMController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public function deleteSession(int $sessionId): JSONResponse {
}

try {
$this->deleteSessionTasks($this->userId, $sessionId);
// we don't delete the tasks
$this->sessionMapper->deleteSession($this->userId, $sessionId);
$this->messageMapper->deleteMessagesBySession($sessionId);
return new JSONResponse();
Expand All @@ -265,27 +265,6 @@ public function deleteSession(int $sessionId): JSONResponse {
}
}

private function deleteSessionTasks(string $userId, int $sessionId): void {
$sessionExists = $this->sessionMapper->exists($this->userId, $sessionId);
if (!$sessionExists) {
return;
}
$messages = $this->messageMapper->getMessages($sessionId, 0, 0);
foreach ($messages as $message) {
$ocpTaskId = $message->getOcpTaskId();
if ($ocpTaskId !== 0) {
try {
$task = $this->taskProcessingManager->getTask($ocpTaskId);
$this->taskProcessingManager->deleteTask($task);
} catch (\OCP\TaskProcessing\Exception\Exception) {
// silent failure here because:
// if the task is not found: all good nothing to delete
// if the task couldn't be deleted, it will be deleted by the task processing cleanup job later anyway
}
}
}
}

/**
* Get chat sessions
*
Expand Down Expand Up @@ -493,18 +472,10 @@ public function deleteMessage(int $messageId, int $sessionId): JSONResponse {
return new JSONResponse(['error' => $this->l10n->t('Session not found')], Http::STATUS_NOT_FOUND);
}
$message = $this->messageMapper->getMessageById($sessionId, $messageId);
$ocpTaskId = $message->getOcpTaskId();

// do not delete the related task
$this->messageMapper->deleteMessageById($sessionId, $messageId);

// delete the related task
if ($ocpTaskId !== 0) {
try {
$task = $this->taskProcessingManager->getTask($ocpTaskId);
$this->taskProcessingManager->deleteTask($task);
} catch (\OCP\TaskProcessing\Exception\Exception) {
}
}
return new JSONResponse();
} catch (\OCP\DB\Exception|\RuntimeException $e) {
$this->logger->warning('Failed to delete a chat message', ['exception' => $e]);
Expand Down Expand Up @@ -688,24 +659,15 @@ public function regenerateForSession(int $sessionId, int $messageId): JSONRespon
}

$message = $this->messageMapper->getMessageById($sessionId, $messageId);
$ocpTaskId = $message->getOcpTaskId();

// we don't delete the related task
try {
$this->messageMapper->deleteMessageById($sessionId, $messageId);
} catch (\OCP\DB\Exception|\RuntimeException $e) {
$this->logger->warning('Failed to delete the last message', ['exception' => $e]);
return new JSONResponse(['error' => $this->l10n->t('Failed to delete the last message')], Http::STATUS_INTERNAL_SERVER_ERROR);
}

// delete the related task
if ($ocpTaskId !== 0) {
try {
$task = $this->taskProcessingManager->getTask($ocpTaskId);
$this->taskProcessingManager->deleteTask($task);
} catch (\OCP\TaskProcessing\Exception\Exception) {
}
}

return $this->generateForSession($sessionId);
}

Expand Down
4 changes: 2 additions & 2 deletions src/assistant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ export async function setNotifyReady(taskId, enable) {
export async function cancelTask(taskId) {
const { default: axios } = await import('@nextcloud/axios')
const { generateOcsUrl } = await import('@nextcloud/router')
const url = generateOcsUrl('taskprocessing/task/{taskId}', { taskId })
return axios.delete(url, {})
const url = generateOcsUrl('taskprocessing/tasks/{taskId}/cancel', { taskId })
return axios.post(url, {})
}

/**
Expand Down
Loading