Skip to content

Commit 9311065

Browse files
maryhippMary Hipp
andauthored
Change feature to disable apiModels to chatGPT4oModels only (#7996)
* display credit column in queue list if shouldShowCredits is true * change apiModels feature to chatGPT4oModels feature * empty --------- Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
1 parent ff0c48d commit 9311065

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

invokeai/frontend/web/src/app/types/invokeai.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export type AppFeature =
2929
| 'hfToken'
3030
| 'retryQueueItem'
3131
| 'cancelAndClearAll'
32-
| 'apiModels';
32+
| 'chatGPT4oModels';
3333
/**
3434
* A disable-able Stable Diffusion feature
3535
*/

invokeai/frontend/web/src/features/parameters/components/MainModel/DisabledModelWarning.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@ import { Flex, Link, Text } from '@invoke-ai/ui-library';
22
import { useStore } from '@nanostores/react';
33
import { $accountSettingsLink } from 'app/store/nanostores/accountSettingsLink';
44
import { useAppSelector } from 'app/store/storeHooks';
5-
import { selectIsChatGTP4o, selectIsImagen3, selectModel } from 'features/controlLayers/store/paramsSlice';
5+
import { selectIsChatGTP4o, selectModel } from 'features/controlLayers/store/paramsSlice';
66
import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus';
77
import { useMemo } from 'react';
88
import { Trans, useTranslation } from 'react-i18next';
99

1010
export const DisabledModelWarning = () => {
1111
const { t } = useTranslation();
1212
const model = useAppSelector(selectModel);
13-
const isImagen3 = useAppSelector(selectIsImagen3);
1413
const isChatGPT4o = useAppSelector(selectIsChatGTP4o);
15-
const areApiModelsEnabled = useFeatureStatus('apiModels');
14+
const areChatGPT4oModelsEnabled = useFeatureStatus('chatGPT4oModels');
1615
const accountSettingsLink = useStore($accountSettingsLink);
1716

1817
const isModelDisabled = useMemo(() => {
19-
return (isImagen3 || isChatGPT4o) && !areApiModelsEnabled;
20-
}, [isImagen3, isChatGPT4o, areApiModelsEnabled]);
18+
return isChatGPT4o && !areChatGPT4oModelsEnabled;
19+
}, [isChatGPT4o, areChatGPT4oModelsEnabled]);
2120

2221
if (!isModelDisabled) {
2322
return null;

invokeai/frontend/web/src/features/queue/store/readiness.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const debouncedUpdateReasons = debounce(
8989
config: AppConfig,
9090
store: AppStore,
9191
isInPublishFlow: boolean,
92-
areApiModelsEnabled: boolean
92+
areChatGPT4oModelsEnabled: boolean
9393
) => {
9494
if (tab === 'canvas') {
9595
const model = selectMainModelConfig(store.getState());
@@ -104,7 +104,7 @@ const debouncedUpdateReasons = debounce(
104104
canvasIsRasterizing,
105105
canvasIsCompositing,
106106
canvasIsSelectingObject,
107-
areApiModelsEnabled,
107+
areChatGPT4oModelsEnabled,
108108
});
109109
$reasonsWhyCannotEnqueue.set(reasons);
110110
} else if (tab === 'workflows') {
@@ -152,7 +152,7 @@ export const useReadinessWatcher = () => {
152152
const canvasIsSelectingObject = useStore(canvasManager?.stateApi.$isSegmenting ?? $true);
153153
const canvasIsCompositing = useStore(canvasManager?.compositor.$isBusy ?? $true);
154154
const isInPublishFlow = useStore($isInPublishFlow);
155-
const areApiModelsEnabled = useFeatureStatus('apiModels');
155+
const areChatGPT4oModelsEnabled = useFeatureStatus('chatGPT4oModels');
156156

157157
useEffect(() => {
158158
debouncedUpdateReasons(
@@ -173,7 +173,7 @@ export const useReadinessWatcher = () => {
173173
config,
174174
store,
175175
isInPublishFlow,
176-
areApiModelsEnabled
176+
areChatGPT4oModelsEnabled
177177
);
178178
}, [
179179
store,
@@ -193,7 +193,7 @@ export const useReadinessWatcher = () => {
193193
upscale,
194194
workflowSettings,
195195
isInPublishFlow,
196-
areApiModelsEnabled,
196+
areChatGPT4oModelsEnabled,
197197
]);
198198
};
199199

@@ -341,7 +341,7 @@ const getReasonsWhyCannotEnqueueCanvasTab = (arg: {
341341
canvasIsRasterizing: boolean;
342342
canvasIsCompositing: boolean;
343343
canvasIsSelectingObject: boolean;
344-
areApiModelsEnabled: boolean;
344+
areChatGPT4oModelsEnabled: boolean;
345345
}) => {
346346
const {
347347
isConnected,
@@ -354,7 +354,7 @@ const getReasonsWhyCannotEnqueueCanvasTab = (arg: {
354354
canvasIsRasterizing,
355355
canvasIsCompositing,
356356
canvasIsSelectingObject,
357-
areApiModelsEnabled,
357+
areChatGPT4oModelsEnabled,
358358
} = arg;
359359
const { positivePrompt } = params;
360360
const reasons: Reason[] = [];
@@ -487,7 +487,7 @@ const getReasonsWhyCannotEnqueueCanvasTab = (arg: {
487487
}
488488
}
489489

490-
if ((model?.base === 'imagen3' || model?.base === 'chatgpt-4o') && !areApiModelsEnabled) {
490+
if (model?.base === 'chatgpt-4o' && !areChatGPT4oModelsEnabled) {
491491
reasons.push({ content: i18n.t('parameters.invoke.modelDisabledForTrial', { modelName: model.name }) });
492492
}
493493

0 commit comments

Comments
 (0)