diff --git a/invokeai/frontend/web/src/features/nodes/components/sidePanel/inspector/InspectorOutputsTab.tsx b/invokeai/frontend/web/src/features/nodes/components/sidePanel/inspector/InspectorOutputsTab.tsx index 59a603e7f1..b0c6d778b8 100644 --- a/invokeai/frontend/web/src/features/nodes/components/sidePanel/inspector/InspectorOutputsTab.tsx +++ b/invokeai/frontend/web/src/features/nodes/components/sidePanel/inspector/InspectorOutputsTab.tsx @@ -11,7 +11,7 @@ import { selectLastSelectedNode } from 'features/nodes/store/selectors'; import { isInvocationNode } from 'features/nodes/types/invocation'; import { memo, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import type { ImageOutput, S } from 'services/api/types'; +import type { AnyInvocationOutput, ImageOutput } from 'services/api/types'; import ImageOutputPreview from './outputs/ImageOutputPreview'; @@ -65,4 +65,4 @@ const InspectorOutputsTab = () => { export default memo(InspectorOutputsTab); -const getKey = (result: S['AnyInvocationOutput'], i: number) => `${result.type}-${i}`; +const getKey = (result: AnyInvocationOutput, i: number) => `${result.type}-${i}`; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildNodesGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildNodesGraph.ts index 8f880a46a7..094dc529de 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildNodesGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildNodesGraph.ts @@ -1,7 +1,7 @@ import type { NodesState } from 'features/nodes/store/types'; import { isInvocationNode } from 'features/nodes/types/invocation'; import { omit, reduce } from 'lodash-es'; -import type { Graph, S } from 'services/api/types'; +import type { AnyInvocation, Graph } from 'services/api/types'; import { v4 as uuidv4 } from 'uuid'; /** @@ -81,7 +81,7 @@ export const buildNodesGraph = (nodesState: NodesState): Graph => { parsedEdges.forEach((edge) => { const destination_node = parsedNodes[edge.destination.node_id]; const field = edge.destination.field; - parsedNodes[edge.destination.node_id] = omit(destination_node, field) as S['AnyInvocation']; + parsedNodes[edge.destination.node_id] = omit(destination_node, field) as AnyInvocation; }); // Assemble! diff --git a/invokeai/frontend/web/src/services/api/types.ts b/invokeai/frontend/web/src/services/api/types.ts index 17b63f6f7c..90ddf3cca1 100644 --- a/invokeai/frontend/web/src/services/api/types.ts +++ b/invokeai/frontend/web/src/services/api/types.ts @@ -131,14 +131,14 @@ export type WorkflowRecordListItemDTO = S['WorkflowRecordListItemDTO']; type KeysOfUnion = T extends T ? keyof T : never; export type AnyInvocation = Exclude< - S['AnyInvocation'], + NonNullable[string], S['CoreMetadataInvocation'] | S['MetadataInvocation'] | S['MetadataItemInvocation'] | S['MergeMetadataInvocation'] >; -export type AnyInvocationIncMetadata = S['AnyInvocation']; +export type AnyInvocationIncMetadata = NonNullable[string]; export type InvocationType = AnyInvocation['type']; type InvocationOutputMap = S['InvocationOutputMap']; -type AnyInvocationOutput = InvocationOutputMap[InvocationType]; +export type AnyInvocationOutput = InvocationOutputMap[InvocationType]; export type Invocation = Extract; // export type InvocationOutput = InvocationOutputMap[T];