Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix canvas soft-lock if canceled before first generation

Browse Source 
The canvas needs to be set to staging mode as soon as a canvas-destined batch is enqueued. If the batch is is fully canceled before an image is generated, we need to remove that batch from the canvas `batchIds` watchlist, else canvas gets stuck in staging mode with no way to exit.

The changes here allow the batch status to be tracked, and if a batch has all its items completed, we can remove it from the `batchIds` watchlist. The `batchIds` watchlist now accurately represents *incomplete* canvas batches, fixing this cause of soft lock.
This commit is contained in:
psychedelicious
2023-10-09 11:15:19 +11:00
parent 55b40a9425
commit ca95a3bd0d
8 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
invokeai/frontend/web/src/services/api/endpoints/queue.ts
View File

@ -135,12 +135,7 @@ export const queueApi = api.injectEndpoints({
url: `queue/${$queueId.get()}/prune`,
method: 'PUT',
}),
invalidatesTags: [
'SessionQueueStatus',
'BatchStatus',
'SessionQueueItem',
'SessionQueueItemDTO',
],
invalidatesTags: ['SessionQueueStatus', 'BatchStatus'],
onQueryStarted: async (arg, api) => {
const { dispatch, queryFulfilled } = api;
try {
@ -165,8 +160,6 @@ export const queueApi = api.injectEndpoints({
'BatchStatus',
'CurrentSessionQueueItem',
'NextSessionQueueItem',
'SessionQueueItem',
'SessionQueueItemDTO',
],
onQueryStarted: async (arg, api) => {
const { dispatch, queryFulfilled } = api;
@ -218,7 +211,6 @@ export const queueApi = api.injectEndpoints({
url: `queue/${$queueId.get()}/status`,
method: 'GET',
}),
providesTags: ['SessionQueueStatus'],
}),
getBatchStatus: build.query<
@ -269,7 +261,11 @@ export const queueApi = api.injectEndpoints({
(draft) => {
queueItemsAdapter.updateOne(draft, {
id: item_id,
changes: { status: data.status },
changes: {
status: data.status,
completed_at: data.completed_at,
updated_at: data.updated_at,
},
});
}
)
@ -284,7 +280,6 @@ export const queueApi = api.injectEndpoints({
}
return [
{ type: 'SessionQueueItem', id: result.item_id },
{ type: 'SessionQueueItemDTO', id: result.item_id },
{ type: 'BatchStatus', id: result.batch_id },
];
},
@ -307,11 +302,7 @@ export const queueApi = api.injectEndpoints({
// no-op
}
},
invalidatesTags: [
'SessionQueueItem',
'SessionQueueItemDTO',
'BatchStatus',
],
invalidatesTags: ['SessionQueueStatus', 'BatchStatus'],
}),
listQueueItems: build.query<
EntityState<components['schemas']['SessionQueueItemDTO']> & {