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): improve schema parsing error handling

Browse Source
This commit is contained in:
psychedelicious 2023-04-27 14:54:54 +10:00
parent 2b5ccdc55f
commit a8cec4c7e6
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
invokeai/frontend/web/src/features/nodes/store/nodesSlice.ts
View File

@ -82,10 +82,19 @@ const nodesSlice = createSlice({
shouldShowGraphOverlayChanged: (state, action: PayloadAction<boolean>) => { shouldShowGraphOverlayChanged: (state, action: PayloadAction<boolean>) => {
state.shouldShowGraphOverlay = action.payload; state.shouldShowGraphOverlay = action.payload;
}, },
parsedOpenAPISchema: (state, action: PayloadAction<OpenAPIV3.Document>) => {
try {
const parsedSchema = parseSchema(action.payload);
console.debug('Parsed schema: ', parsedSchema);
state.invocationTemplates = parsedSchema;
} catch (err) {
console.error(err);
}
},
}, },
extraReducers(builder) { extraReducers(builder) {
builder.addCase(receivedOpenAPISchema.fulfilled, (state, action) => { builder.addCase(receivedOpenAPISchema.fulfilled, (state, action) => {
state.invocationTemplates = action.payload; state.schema = action.payload;
}); });
builder.addMatcher(isFulfilledAnyGraphBuilt, (state, action) => { builder.addMatcher(isFulfilledAnyGraphBuilt, (state, action) => {
@ -103,6 +112,7 @@ export const {
connectionStarted, connectionStarted,
connectionEnded, connectionEnded,
shouldShowGraphOverlayChanged, shouldShowGraphOverlayChanged,
parsedOpenAPISchema,
} = nodesSlice.actions; } = nodesSlice.actions;
export default nodesSlice.reducer; export default nodesSlice.reducer;

9
invokeai/frontend/web/src/features/system/store/systemSlice.ts
View File

@ -19,9 +19,8 @@ import { ProgressImage } from 'services/events/types';
import { initialImageSelected } from 'features/parameters/store/generationSlice'; import { initialImageSelected } from 'features/parameters/store/generationSlice';
import { makeToast } from '../hooks/useToastWatcher'; import { makeToast } from '../hooks/useToastWatcher';
import { sessionCanceled, sessionInvoked } from 'services/thunks/session'; import { sessionCanceled, sessionInvoked } from 'services/thunks/session';
import { InvokeTabName } from 'features/ui/store/tabMap';
import { receivedModels } from 'services/thunks/model'; import { receivedModels } from 'services/thunks/model';
import { receivedOpenAPISchema } from 'services/thunks/schema'; import { parsedOpenAPISchema } from 'features/nodes/store/nodesSlice';
export type LogLevel = 'info' | 'warning' | 'error'; export type LogLevel = 'info' | 'warning' | 'error';
@ -546,14 +545,14 @@ export const systemSlice = createSlice({
/** /**
* Received available models from the backend * Received available models from the backend
*/ */
builder.addCase(receivedModels.fulfilled, (state, action) => { builder.addCase(receivedModels.fulfilled, (state) => {
state.wereModelsReceived = true; state.wereModelsReceived = true;
}); });
/** /**
* OpenAPI schema was received and parsed * OpenAPI schema was parsed
*/ */
builder.addCase(receivedOpenAPISchema.fulfilled, (state, action) => { builder.addCase(parsedOpenAPISchema, (state) => {
state.wasSchemaParsed = true; state.wasSchemaParsed = true;
}); });
}, },

14
invokeai/frontend/web/src/services/thunks/schema.ts
View File

@ -1,19 +1,17 @@
import { createAsyncThunk } from '@reduxjs/toolkit'; import { createAsyncThunk } from '@reduxjs/toolkit';
import { parseSchema } from 'features/nodes/util/parseSchema'; import { parsedOpenAPISchema } from 'features/nodes/store/nodesSlice';
import { OpenAPIV3 } from 'openapi-types'; import { OpenAPIV3 } from 'openapi-types';
export const receivedOpenAPISchema = createAsyncThunk( export const receivedOpenAPISchema = createAsyncThunk(
'nodes/receivedOpenAPISchema', 'nodes/receivedOpenAPISchema',
async () => { async (_, { dispatch }): Promise<OpenAPIV3.Document> => {
const response = await fetch(`openapi.json`); const response = await fetch(`openapi.json`);
const jsonData = (await response.json()) as OpenAPIV3.Document; const openAPISchema = (await response.json()) as OpenAPIV3.Document;
console.debug('OpenAPI schema: ', jsonData); console.debug('OpenAPI schema: ', openAPISchema);
const parsedSchema = parseSchema(jsonData); dispatch(parsedOpenAPISchema(openAPISchema));
console.debug('Parsed schema: ', parsedSchema); return openAPISchema;
return parsedSchema;
} }
); );