Skip to content

display credit column in queue list if shouldShowCredits is true #7991

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.

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
May 5, 2025
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 @@ -257,6 +257,7 @@ class SessionQueueItemWithoutGraph(BaseModel):
api_output_fields: Optional[list[FieldIdentifier]] = Field(
default=None, description="The nodes that were used as output from the API"
)
credits: Optional[int] = Field(default=None, description="The total credits used for this queue item")

@classmethod
def queue_item_dto_from_dict(cls, queue_item_dict: dict) -> "SessionQueueItemDTO":
Expand Down
1 change: 1 addition & 0 deletions invokeai/frontend/web/public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@
"status": "Status",
"total": "Total",
"time": "Time",
"credits": "Credits",
"pending": "Pending",
"in_progress": "In Progress",
"completed": "Completed",
Expand Down
1 change: 1 addition & 0 deletions invokeai/frontend/web/src/app/types/invokeai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export type AppConfig = {
metadataFetchDebounce?: number;
workflowFetchDebounce?: number;
isLocal?: boolean;
shouldShowCredits: boolean;
sd: {
defaultModel?: string;
disabledControlNetModels: string[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ import { useCancelQueueItem } from 'features/queue/hooks/useCancelQueueItem';
import { useRetryQueueItem } from 'features/queue/hooks/useRetryQueueItem';
import { getSecondsFromTimestamps } from 'features/queue/util/getSecondsFromTimestamps';
import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
import { selectShouldShowCredits } from 'features/system/store/configSlice';
import type { MouseEvent } from 'react';
import { memo, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { PiArrowCounterClockwiseBold, PiXBold } from 'react-icons/pi';
import { useSelector } from 'react-redux';
import type { SessionQueueItemDTO } from 'services/api/types';

import { COLUMN_WIDTHS } from './constants';
Expand Down Expand Up @@ -62,6 +64,8 @@ const QueueItemComponent = ({ index, item, context }: InnerItemProps) => {
return `${seconds}s`;
}, [item]);

const shouldShowCredits = useSelector(selectShouldShowCredits);

const isCanceled = useMemo(() => ['canceled', 'completed', 'failed'].includes(item.status), [item.status]);
const isFailed = useMemo(() => ['canceled', 'failed'].includes(item.status), [item.status]);
const isValidationRun = useMemo(() => item.is_api_validation_run === true, [item.is_api_validation_run]);
Expand Down Expand Up @@ -98,6 +102,11 @@ const QueueItemComponent = ({ index, item, context }: InnerItemProps) => {
<Flex w={COLUMN_WIDTHS.time} alignItems="center" flexShrink={0}>
{executionTime || '-'}
</Flex>
{shouldShowCredits && (
<Flex w={COLUMN_WIDTHS.credits} alignItems="center" flexShrink={0}>
{item.credits || '-'}
</Flex>
)}
<Flex w={COLUMN_WIDTHS.batchId} flexShrink={0}>
<Text overflow="hidden" textOverflow="ellipsis" whiteSpace="nowrap" alignItems="center">
{item.batch_id}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { Flex, Text } from '@invoke-ai/ui-library';
import { selectShouldShowCredits } from 'features/system/store/configSlice';
import { memo } from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';

import { COLUMN_WIDTHS } from './constants';

const QueueListHeader = () => {
const { t } = useTranslation();
const shouldShowCredits = useSelector(selectShouldShowCredits);
return (
<Flex
alignItems="center"
Expand All @@ -31,6 +35,11 @@ const QueueListHeader = () => {
<Flex ps={0.5} w={COLUMN_WIDTHS.time} alignItems="center">
<Text variant="subtext">{t('queue.time')}</Text>
</Flex>
{shouldShowCredits && (
<Flex ps={0.5} w={COLUMN_WIDTHS.credits} alignItems="center">
<Text variant="subtext">{t('queue.credits')}</Text>
</Flex>
)}
<Flex ps={0.5} w={COLUMN_WIDTHS.batchId} alignItems="center">
<Text variant="subtext">{t('queue.batch')}</Text>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const COLUMN_WIDTHS = {
statusBadge: '5.7rem',
statusDot: 2,
time: '4rem',
credits: '4rem',
origin: '5rem',
destination: '6rem',
batchId: '5rem',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const initialConfigState: AppConfig = {
allowPrivateStylePresets: false,
allowClientSideUpload: false,
allowPublishWorkflows: false,
shouldShowCredits: false,
disabledTabs: [],
disabledFeatures: ['lightbox', 'faceRestore', 'batches'],
disabledSDFeatures: ['variation', 'symmetry', 'hires', 'perlinNoise', 'noiseThreshold'],
Expand Down Expand Up @@ -223,3 +224,4 @@ export const selectIsModelsTabDisabled = createConfigSelector((config) => config
export const selectIsClientSideUploadEnabled = createConfigSelector((config) => config.allowClientSideUpload);
export const selectAllowPublishWorkflows = createConfigSelector((config) => config.allowPublishWorkflows);
export const selectIsLocal = createSelector(selectConfigSlice, (config) => config.isLocal);
export const selectShouldShowCredits = createConfigSelector((config) => config.shouldShowCredits);
10 changes: 10 additions & 0 deletions invokeai/frontend/web/src/services/api/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18999,6 +18999,11 @@ export type components = {
* @description The nodes that were used as output from the API
*/
api_output_fields?: components["schemas"]["FieldIdentifier"][] | null;
/**
* Credits
* @description The total credits used for this queue item
*/
credits?: number | null;
/** @description The fully-populated session to be executed */
session: components["schemas"]["GraphExecutionState"];
/** @description The workflow associated with this queue item */
Expand Down Expand Up @@ -19115,6 +19120,11 @@ export type components = {
* @description The nodes that were used as output from the API
*/
api_output_fields?: components["schemas"]["FieldIdentifier"][] | null;
/**
* Credits
* @description The total credits used for this queue item
*/
credits?: number | null;
};
/** SessionQueueStatus */
SessionQueueStatus: {
Expand Down