Skip to content

Commit 2e81b98

Browse files
committed
enh: stop polling task position when we stop polling the task (task finished or failed)
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent d2e67ac commit 2e81b98

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

src/assistant.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,15 @@ export async function openAssistantForm({
233233
view.loading = false
234234
view.showSyncTaskRunning = false
235235
view.taskPosition = null
236+
cancelTaskPositionPolling()
236237
emit('assistant:task:updated', finishedTask)
237238
}).catch(error => {
238239
console.debug('[assistant] poll error', error.message)
239240
if (error.message === 'task-not-found') {
240241
view.loading = false
241242
view.showSyncTaskRunning = false
242243
view.taskPosition = null
244+
cancelTaskPositionPolling()
243245
view.isNotifyEnabled = false
244246
view.outputs = null
245247
view.selectedTaskId = null
@@ -342,13 +344,15 @@ export async function openAssistantForm({
342344
view.loading = false
343345
view.showSyncTaskRunning = false
344346
view.taskPosition = null
347+
cancelTaskPositionPolling()
345348
emit('assistant:task:updated', finishedTask)
346349
}).catch(error => {
347350
console.debug('[assistant] poll error', error)
348351
if (error.message === 'task-not-found') {
349352
view.loading = false
350353
view.showSyncTaskRunning = false
351354
view.taskPosition = null
355+
cancelTaskPositionPolling()
352356
view.isNotifyEnabled = false
353357
view.outputs = null
354358
view.selectedTaskId = null
@@ -843,6 +847,7 @@ export async function openAssistantTask(
843847
view.loading = false
844848
view.showSyncTaskRunning = false
845849
view.taskPosition = null
850+
cancelTaskPositionPolling()
846851
emit('assistant:task:updated', finishedTask)
847852
}).catch(error => {
848853
console.debug('[assistant] poll error', error)
@@ -851,6 +856,7 @@ export async function openAssistantTask(
851856
view.loading = false
852857
view.showSyncTaskRunning = false
853858
view.taskPosition = null
859+
cancelTaskPositionPolling()
854860
view.isNotifyEnabled = false
855861
view.selectedTaskId = null
856862
lastTask = null
@@ -948,13 +954,15 @@ export async function openAssistantTask(
948954
view.loading = false
949955
view.showSyncTaskRunning = false
950956
view.taskPosition = null
957+
cancelTaskPositionPolling()
951958
emit('assistant:task:updated', finishedTask)
952959
}).catch(error => {
953960
console.debug('[assistant] poll error', error)
954961
if (error.message === 'task-not-found') {
955962
view.loading = false
956963
view.showSyncTaskRunning = false
957964
view.taskPosition = null
965+
cancelTaskPositionPolling()
958966
view.isNotifyEnabled = false
959967
view.outputs = null
960968
view.selectedTaskId = null

src/views/AssistantPage.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,16 @@ export default {
198198
this.loading = false
199199
this.showSyncTaskRunning = false
200200
this.taskPosition = null
201+
// the position polling would stop on the next request but why not stopping it right now
202+
cancelTaskPositionPolling()
201203
emit('assistant:task:updated', finishedTask)
202204
}).catch(error => {
203205
console.debug('[assistant] poll error', error)
204206
if (error.message === 'task-not-found') {
205207
this.loading = false
206208
this.showSyncTaskRunning = false
207209
this.taskPosition = null
210+
cancelTaskPositionPolling()
208211
this.isNotifyEnabled = false
209212
this.task.status = TASK_STATUS_STRING.unknown
210213
this.task.output = null
@@ -294,13 +297,15 @@ export default {
294297
this.loading = false
295298
this.showSyncTaskRunning = false
296299
this.taskPosition = null
300+
cancelTaskPositionPolling()
297301
emit('assistant:task:updated', finishedTask)
298302
}).catch(error => {
299303
console.debug('Assistant poll error', error)
300304
if (error.message === 'task-not-found') {
301305
this.loading = false
302306
this.showSyncTaskRunning = false
303307
this.taskPosition = null
308+
cancelTaskPositionPolling()
304309
this.isNotifyEnabled = false
305310
this.task.status = TASK_STATUS_STRING.unknown
306311
this.task.output = null

0 commit comments

Comments
 (0)