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

feat(ui): use unique id for metadata in Graph class

Browse Source
This commit is contained in:
psychedelicious 2024-08-23 14:48:42 +10:00
parent 96f6e9e683
commit d9f4266630
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.test.ts
View File

@ -549,7 +549,7 @@ describe('Graph', () => {
it("should get the metadata node, creating it if it doesn't exist", () => { it("should get the metadata node, creating it if it doesn't exist", () => {
const g = new Graph(); const g = new Graph();
const metadata = g.getMetadataNode(); const metadata = g.getMetadataNode();
expect(metadata.id).toBe('core_metadata'); expect(metadata.id).toBe(g._metadataNodeId);
expect(metadata.type).toBe('core_metadata'); expect(metadata.type).toBe('core_metadata');
g.upsertMetadata({ test: 'test' }); g.upsertMetadata({ test: 'test' });
const metadata2 = g.getMetadataNode(); const metadata2 = g.getMetadataNode();

7
invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.ts
View File

@ -1,5 +1,5 @@
import { getPrefixedId } from 'features/controlLayers/konva/util';
import { type ModelIdentifierField, zModelIdentifierField } from 'features/nodes/types/common'; import { type ModelIdentifierField, zModelIdentifierField } from 'features/nodes/types/common';
import { METADATA } from 'features/nodes/util/graph/constants';
import { forEach, groupBy, isEqual, unset, values } from 'lodash-es'; import { forEach, groupBy, isEqual, unset, values } from 'lodash-es';
import type { import type {
AnyInvocation, AnyInvocation,
@ -31,6 +31,7 @@ export type GraphType = { id: string; nodes: Record<string, AnyInvocation>; edge
export class Graph { export class Graph {
_graph: GraphType; _graph: GraphType;
_metadataNodeId = getPrefixedId('core_metadata');
constructor(id?: string) { constructor(id?: string) {
this._graph = { this._graph = {
@ -361,11 +362,11 @@ export class Graph {
*/ */
getMetadataNode(): S['CoreMetadataInvocation'] { getMetadataNode(): S['CoreMetadataInvocation'] {
try { try {
const node = this.getNode(METADATA) as AnyInvocationIncMetadata; const node = this.getNode(this._metadataNodeId) as AnyInvocationIncMetadata;
assert(node.type === 'core_metadata'); assert(node.type === 'core_metadata');
return node; return node;
} catch { } catch {
const node: S['CoreMetadataInvocation'] = { id: METADATA, type: 'core_metadata' }; const node: S['CoreMetadataInvocation'] = { id: this._metadataNodeId, type: 'core_metadata' };
// @ts-expect-error `Graph` excludes `core_metadata` nodes due to its excessively wide typing // @ts-expect-error `Graph` excludes `core_metadata` nodes due to its excessively wide typing
return this.addNode(node); return this.addNode(node);
} }