github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): migrate from lodash.isEqual to objectEquals

Browse Source
This commit is contained in:
psychedelicious
2025-06-25 18:36:17 +10:00
parent 7aefa8f36b
commit b5acc204a8
19 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/src/features/nodes/hooks/useInputFieldDefaultValue.ts
View File

@@ -1,10 +1,10 @@
import { objectEquals } from '@observ33r/object-equals';
import { createSelector } from '@reduxjs/toolkit';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { useInputFieldTemplateOrThrow } from 'features/nodes/hooks/useInputFieldTemplateOrThrow';
import { fieldValueReset } from 'features/nodes/store/nodesSlice';
import { selectNodesSlice } from 'features/nodes/store/selectors';
import { isInvocationNode } from 'features/nodes/types/invocation';
import { isEqual } from 'lodash-es';
import { useCallback, useMemo } from 'react';
export const useInputFieldDefaultValue = (nodeId: string, fieldName: string) => {
@@ -19,7 +19,7 @@ export const useInputFieldDefaultValue = (nodeId: string, fieldName: string) =>
return;
}
const value = node.data.inputs[fieldName]?.value;
return !isEqual(value, fieldTemplate.default);
return !objectEquals(value, fieldTemplate.default);
}),
[fieldName, fieldTemplate.default, nodeId]
);

4
invokeai/frontend/web/src/features/nodes/hooks/useInputFieldInitialFormValue.ts
View File

@@ -1,9 +1,9 @@
import { objectEquals } from '@observ33r/object-equals';
import { createSelector } from '@reduxjs/toolkit';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { fieldValueReset } from 'features/nodes/store/nodesSlice';
import { selectNodesSlice } from 'features/nodes/store/selectors';
import { isInvocationNode } from 'features/nodes/types/invocation';
import { isEqual } from 'lodash-es';
import { useCallback, useMemo } from 'react';
const uniqueNonexistentValue = Symbol('uniqueNonexistentValue');
@@ -32,7 +32,7 @@ export const useInputFieldInitialFormValue = (elementId: string, nodeId: string,
return;
}
const value = node.data.inputs[fieldName]?.value;
return !isEqual(value, initialValue);
return !objectEquals(value, initialValue);
}),
[fieldName, initialValue, nodeId]
);

5
invokeai/frontend/web/src/features/nodes/hooks/useNodeCopyPaste.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import type { EdgeChange, NodeChange } from '@xyflow/react';
import { logger } from 'app/logging/logger';
import { getStore } from 'app/store/nanostores/store';
@@ -16,7 +17,7 @@ import { findUnoccupiedPosition } from 'features/nodes/store/util/findUnoccupied
import { validateConnection } from 'features/nodes/store/util/validateConnection';
import type { AnyEdge, AnyNode } from 'features/nodes/types/invocation';
import { t } from 'i18next';
import { isEqual, uniqWith } from 'lodash-es';
import { uniqWith } from 'lodash-es';
import { v4 as uuidv4 } from 'uuid';
const log = logger('workflows');
@@ -44,7 +45,7 @@ const _pasteSelection = (withEdgesToCopiedNodes?: boolean) => {
if (withEdgesToCopiedNodes) {
const edgesToCopiedNodes = deepClone($edgesToCopiedNodes.get());
copiedEdges = uniqWith([...copiedEdges, ...edgesToCopiedNodes], isEqual);
copiedEdges = uniqWith([...copiedEdges, ...edgesToCopiedNodes], objectEquals);
}
// Calculate an offset to reposition nodes to surround the cursor position, maintaining relative positioning

11
invokeai/frontend/web/src/features/nodes/store/util/areTypesEqual.ts
View File

@@ -1,5 +1,6 @@
import { objectEquals } from '@observ33r/object-equals';
import type { FieldType } from 'features/nodes/types/field';
import { isEqual, omit } from 'lodash-es';
import { omit } from 'lodash-es';
/**
* Checks if two types are equal. If the field types have original types, those are also compared. Any match is
@@ -13,16 +14,16 @@ export const areTypesEqual = (firstType: FieldType, secondType: FieldType) => {
const _secondType = 'originalType' in secondType ? omit(secondType, 'originalType') : secondType;
const _originalFirstType = 'originalType' in firstType ? firstType.originalType : null;
const _originalSecondType = 'originalType' in secondType ? secondType.originalType : null;
if (isEqual(_firstType, _secondType)) {
if (objectEquals(_firstType, _secondType)) {
return true;
}
if (_originalSecondType && isEqual(_firstType, _originalSecondType)) {
if (_originalSecondType && objectEquals(_firstType, _originalSecondType)) {
return true;
}
if (_originalFirstType && isEqual(_originalFirstType, _secondType)) {
if (_originalFirstType && objectEquals(_originalFirstType, _secondType)) {
return true;
}
if (_originalFirstType && _originalSecondType && isEqual(_originalFirstType, _originalSecondType)) {
if (_originalFirstType && _originalSecondType && objectEquals(_originalFirstType, _originalSecondType)) {
return true;
}
return false;

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

@@ -1,6 +1,7 @@
import { objectEquals } from '@observ33r/object-equals';
import { getPrefixedId } from 'features/controlLayers/konva/util';
import { type ModelIdentifierField, zModelIdentifierField } from 'features/nodes/types/common';
import { forEach, groupBy, isEqual, unset, values } from 'lodash-es';
import { forEach, groupBy, unset, values } from 'lodash-es';
import type {
AnyInvocation,
AnyInvocationIncMetadata,
@@ -169,7 +170,7 @@ export class Graph {
source: { node_id: fromNode.id, field: fromField },
destination: { node_id: toNode.id, field: toField },
};
const edgeAlreadyExists = this._graph.edges.some((e) => isEqual(e, edge));
const edgeAlreadyExists = this._graph.edges.some((e) => objectEquals(e, edge));
assert(!edgeAlreadyExists, `Edge ${Graph.edgeToString(edge)} already exists`);
this._graph.edges.push(edge);
return edge;
@@ -182,7 +183,7 @@ export class Graph {
* @raises `AssertionError` if an edge with the same source and destination already exists.
*/
addEdgeFromObj(edge: Edge): Edge {
const edgeAlreadyExists = this._graph.edges.some((e) => isEqual(e, edge));
const edgeAlreadyExists = this._graph.edges.some((e) => objectEquals(e, edge));
assert(!edgeAlreadyExists, `Edge ${Graph.edgeToString(edge)} already exists`);
this._graph.edges.push(edge);
return edge;
@@ -275,11 +276,11 @@ export class Graph {
}
/**
* INTERNAL: Delete _all_ matching edges from the graph. Uses _.isEqual for comparison.
* INTERNAL: Delete _all_ matching edges from the graph. Uses _.objectEquals for comparison.
* @param edge The edge to delete
*/
private _deleteEdge(edge: Edge): void {
this._graph.edges = this._graph.edges.filter((e) => !isEqual(e, edge));
this._graph.edges = this._graph.edges.filter((e) => !objectEquals(e, edge));
}
/**
@@ -317,7 +318,7 @@ export class Graph {
this.getNode(edge.source.node_id);
this.getNode(edge.destination.node_id);
assert(
!this._graph.edges.filter((e) => e !== edge).find((e) => isEqual(e, edge)),
!this._graph.edges.filter((e) => e !== edge).find((e) => objectEquals(e, edge)),
`Duplicate edge: ${Graph.edgeToString(edge)}`
);
}

4
invokeai/frontend/web/src/features/nodes/util/graph/generation/addFLUXFill.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import type { RootState } from 'app/store/store';
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
import { getPrefixedId } from 'features/controlLayers/konva/util';
@@ -6,7 +7,6 @@ import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
import type { Dimensions } from 'features/controlLayers/store/types';
import type { Graph } from 'features/nodes/util/graph/generation/Graph';
import { isEqual } from 'lodash-es';
import type { Invocation } from 'services/api/types';
type AddFLUXFillArg = {
@@ -52,7 +52,7 @@ export const addFLUXFill = async ({
const fluxFill = g.addNode({ type: 'flux_fill', id: getPrefixedId('flux_fill') });
const needsScaleBeforeProcessing = !isEqual(scaledSize, originalSize);
const needsScaleBeforeProcessing = !objectEquals(scaledSize, originalSize);
if (needsScaleBeforeProcessing) {
// Scale before processing requires some resizing

4
invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
import { getPrefixedId } from 'features/controlLayers/konva/util';
import type { CanvasState, Dimensions } from 'features/controlLayers/store/types';
@@ -8,7 +9,6 @@ import type {
MainModelLoaderNodes,
VaeSourceNodes,
} from 'features/nodes/util/graph/types';
import { isEqual } from 'lodash-es';
import type { Invocation } from 'services/api/types';
type AddImageToImageArg = {
@@ -45,7 +45,7 @@ export const addImageToImage = async ({
silent: true,
});
if (!isEqual(scaledSize, originalSize)) {
if (!objectEquals(scaledSize, originalSize)) {
// Resize the initial image to the scaled size, denoise, then resize back to the original size
const resizeImageToScaledSize = g.addNode({
type: 'img_resize',

4
invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import type { RootState } from 'app/store/store';
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
import { getPrefixedId } from 'features/controlLayers/konva/util';
@@ -13,7 +14,6 @@ import type {
MainModelLoaderNodes,
VaeSourceNodes,
} from 'features/nodes/util/graph/types';
import { isEqual } from 'lodash-es';
import type { ImageDTO, Invocation } from 'services/api/types';
type AddInpaintArg = {
@@ -93,7 +93,7 @@ export const addInpaint = async ({
}
);
const needsScaleBeforeProcessing = !isEqual(scaledSize, originalSize);
const needsScaleBeforeProcessing = !objectEquals(scaledSize, originalSize);
if (needsScaleBeforeProcessing) {
// Scale before processing requires some resizing

4
invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import type { RootState } from 'app/store/store';
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
import { getPrefixedId } from 'features/controlLayers/konva/util';
@@ -14,7 +15,6 @@ import type {
MainModelLoaderNodes,
VaeSourceNodes,
} from 'features/nodes/util/graph/types';
import { isEqual } from 'lodash-es';
import type { ImageDTO, Invocation } from 'services/api/types';
type AddOutpaintArg = {
@@ -98,7 +98,7 @@ export const addOutpaint = async ({
const infill = getInfill(g, params);
const needsScaleBeforeProcessing = !isEqual(scaledSize, originalSize);
const needsScaleBeforeProcessing = !objectEquals(scaledSize, originalSize);
if (needsScaleBeforeProcessing) {
// Scale before processing requires some resizing

4
invokeai/frontend/web/src/features/nodes/util/graph/generation/addTextToImage.ts
View File

@@ -1,8 +1,8 @@
import { objectEquals } from '@observ33r/object-equals';
import { getPrefixedId } from 'features/controlLayers/konva/util';
import type { Dimensions } from 'features/controlLayers/store/types';
import type { Graph } from 'features/nodes/util/graph/generation/Graph';
import type { LatentToImageNodes } from 'features/nodes/util/graph/types';
import { isEqual } from 'lodash-es';
import type { Invocation } from 'services/api/types';
type AddTextToImageArg = {
@@ -18,7 +18,7 @@ export const addTextToImage = ({
originalSize,
scaledSize,
}: AddTextToImageArg): Invocation<'img_resize' | 'l2i' | 'flux_vae_decode' | 'sd3_l2i' | 'cogview4_l2i'> => {
if (!isEqual(scaledSize, originalSize)) {
if (!objectEquals(scaledSize, originalSize)) {
// We need to resize the output image back to the original size
const resizeImageToOriginalSize = g.addNode({
id: getPrefixedId('resize_image_to_original_size'),

7
invokeai/frontend/web/src/features/nodes/util/schema/parseSchema.ts
View File

@@ -1,3 +1,4 @@
import { objectEquals } from '@observ33r/object-equals';
import { logger } from 'app/logging/logger';
import { deepClone } from 'common/util/deepClone';
import { parseify } from 'common/util/serialize';
@@ -17,7 +18,7 @@ import {
isInvocationSchemaObject,
} from 'features/nodes/types/openapi';
import { t } from 'i18next';
import { isEqual, reduce } from 'lodash-es';
import { reduce } from 'lodash-es';
import type { OpenAPIV3_1 } from 'openapi-types';
import { serializeError } from 'serialize-error';
import type { JsonObject } from 'type-fest';
@@ -153,7 +154,7 @@ export const parseSchema = (
return inputsAccumulator;
}
if (isStatefulFieldType(fieldType) && originalFieldType && !isEqual(originalFieldType, fieldType)) {
if (isStatefulFieldType(fieldType) && originalFieldType && !objectEquals(originalFieldType, fieldType)) {
fieldType.originalType = deepClone(originalFieldType);
}
@@ -225,7 +226,7 @@ export const parseSchema = (
return outputsAccumulator;
}
if (isStatefulFieldType(fieldType) && originalFieldType && !isEqual(originalFieldType, fieldType)) {
if (isStatefulFieldType(fieldType) && originalFieldType && !objectEquals(originalFieldType, fieldType)) {
fieldType.originalType = deepClone(originalFieldType);
}