Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import { useStore } from '@nanostores/react';
import { memo, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
import { $isConnected, $lastProgressEvent } from 'services/events/stores';
import { $isConnected, $lastProgressEvent, $loadingModelsCount } from 'services/events/stores';

const ProgressBar = (props: ProgressProps) => {
const { t } = useTranslation();
const { data: queueStatus } = useGetQueueStatusQuery();
const isConnected = useStore($isConnected);
const lastProgressEvent = useStore($lastProgressEvent);
const loadingModelsCount = useStore($loadingModelsCount);
const value = useMemo(() => {
if (!lastProgressEvent) {
return 0;
Expand All @@ -23,6 +24,10 @@ const ProgressBar = (props: ProgressProps) => {
return false;
}

if (loadingModelsCount > 0) {
return true;
}

if (!queueStatus?.queue.in_progress) {
return false;
}
Expand All @@ -40,7 +45,7 @@ const ProgressBar = (props: ProgressProps) => {
}

return false;
}, [isConnected, lastProgressEvent, queueStatus?.queue.in_progress]);
}, [isConnected, lastProgressEvent, queueStatus?.queue.in_progress, loadingModelsCount]);

return (
<Progress
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import type { ClientToServerEvents, ServerToClientEvents } from 'services/events
import type { Socket } from 'socket.io-client';
import type { JsonObject } from 'type-fest';

import { $lastProgressEvent } from './stores';
import { $lastProgressEvent, $loadingModelsCount } from './stores';

const log = logger('events');

Expand Down Expand Up @@ -73,12 +73,14 @@ export const setEventListeners = ({ socket, store, setIsConnected }: SetEventLis
socket.emit('subscribe_queue', { queue_id: 'default' });
socket.emit('subscribe_bulk_download', { bulk_download_id: 'default' });
$lastProgressEvent.set(null);
$loadingModelsCount.set(0);
});

socket.on('connect_error', (error) => {
log.debug('Connect error');
setIsConnected(false);
$lastProgressEvent.set(null);
$loadingModelsCount.set(0);
if (error && error.message) {
const data: string | undefined = (error as unknown as { data: string | undefined }).data;
if (data === 'ERR_UNAUTHENTICATED') {
Expand All @@ -95,6 +97,7 @@ export const setEventListeners = ({ socket, store, setIsConnected }: SetEventLis
socket.on('disconnect', () => {
log.debug('Disconnected');
$lastProgressEvent.set(null);
$loadingModelsCount.set(0);
setIsConnected(false);
});

Expand Down Expand Up @@ -183,6 +186,7 @@ export const setEventListeners = ({ socket, store, setIsConnected }: SetEventLis
const message = `Model load started: ${name} (${extras.join(', ')})`;

log.debug({ data }, message);
$loadingModelsCount.set($loadingModelsCount.get() + 1);
});

socket.on('model_load_complete', (data) => {
Expand All @@ -197,6 +201,7 @@ export const setEventListeners = ({ socket, store, setIsConnected }: SetEventLis
const message = `Model load complete: ${name} (${extras.join(', ')})`;

log.debug({ data }, message);
$loadingModelsCount.set(Math.max(0, $loadingModelsCount.get() - 1));
});

socket.on('download_started', (data) => {
Expand Down
1 change: 1 addition & 0 deletions invokeai/frontend/web/src/services/events/stores.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { AppSocket } from 'services/events/types';
export const $socket = atom<AppSocket | null>(null);
export const $isConnected = atom<boolean>(false);
export const $lastProgressEvent = atom<S['InvocationProgressEvent'] | null>(null);
export const $loadingModelsCount = atom<number>(0);

export const $lastProgressMessage = computed($lastProgressEvent, (val) => {
if (!val) {
Expand Down
Loading