Skip to content

Fix stop polling when needed #356

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
merged 4 commits into from
Sep 9, 2025
Merged

Fix stop polling when needed #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a07368
fix(polling): stop polling when the assistant is closed
julien-nc Sep 8, 2025
4a71970
fix(polling): stop polling chat task when the assistant is closed (an…
julien-nc Sep 8, 2025
391f310
fix(ChattyLLMInputForm): get rid of eslint warning about importing ax…
julien-nc Sep 8, 2025
52ac775
fix(polling): reset assistantPollTimerId when task is not found and w…
julien-nc Sep 9, 2025
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
3 changes: 3 additions & 0 deletions src/assistant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export async function openAssistantForm({
let lastTask = null

modalMountPoint.addEventListener('cancel', () => {
cancelTaskPolling()
app.unmount()
reject(new Error('User cancellation'))
})
Expand Down Expand Up @@ -312,6 +313,7 @@ export async function pollTask(taskId, obj, callback = updateTask) {
console.debug('[assistant] poll request failed', error)
if (error.status === 404) {
clearInterval(window.assistantPollTimerId)
window.assistantPollTimerId = null
reject(new Error('task-not-found'))
return
}
Expand Down Expand Up @@ -521,6 +523,7 @@ export async function openAssistantTask(
let lastTask = task

modalMountPoint.addEventListener('cancel', () => {
cancelTaskPolling()
app.unmount()
})
modalMountPoint.addEventListener('submit', (data) => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/ChattyLLM/ChattyLLMInputForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ import InputArea from './InputArea.vue'
import NoSession from './NoSession.vue'
import AgencyConfirmation from './AgencyConfirmation.vue'

import axios from '@nextcloud/axios'
import axios, { isCancel } from '@nextcloud/axios'
import { showError } from '@nextcloud/dialogs'
import { generateUrl, generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
Expand Down Expand Up @@ -345,7 +345,7 @@ export default {
},
},

onDestroy() {
beforeUnmount() {
if (this.pollMessageGenerationTimerId) {
clearInterval(this.pollMessageGenerationTimerId)
}
Expand Down Expand Up @@ -591,7 +591,7 @@ export default {
this.loading.initialMessages = false
this.messagesAxiosController = null
} catch (error) {
if (axios.isCancel(error)) {
if (isCancel(error)) {
console.debug('fetchMessages cancelled')
return
}
Expand Down
Loading