Skip to content

Commit ec35d0d

Browse files
feat(ui): remove unnecessary type casts
1 parent af7d96d commit ec35d0d

File tree

2 files changed

+14
-28
lines changed

2 files changed

+14
-28
lines changed

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { RootState } from 'app/store/store';
2-
import type { CanvasEntityAdapterInpaintMask } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterInpaintMask';
32
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
43
import { getPrefixedId } from 'features/controlLayers/konva/util';
54
import { selectCanvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
@@ -15,7 +14,7 @@ import type {
1514
VaeSourceNodes,
1615
} from 'features/nodes/util/graph/types';
1716
import { isEqual } from 'lodash-es';
18-
import type { Invocation } from 'services/api/types';
17+
import type { ImageDTO, Invocation } from 'services/api/types';
1918

2019
type AddInpaintArg = {
2120
state: RootState;
@@ -68,23 +67,17 @@ export const addInpaint = async ({
6867
const noiseMaskAdapters = inpaintMaskAdapters.filter((adapter) => adapter.state.noiseLevel !== undefined);
6968

7069
// Create a composite noise mask if we have any adapters with noise settings
71-
let noiseMaskImage = null;
70+
let noiseMaskImage: ImageDTO | null = null;
7271
if (noiseMaskAdapters.length > 0) {
73-
// Use the grayscale mask composite method with proper typing
74-
noiseMaskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(
75-
noiseMaskAdapters as CanvasEntityAdapterInpaintMask[],
76-
rect,
77-
'noiseLevel',
78-
{
79-
is_intermediate: true,
80-
silent: true,
81-
}
82-
);
72+
noiseMaskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(noiseMaskAdapters, rect, 'noiseLevel', {
73+
is_intermediate: true,
74+
silent: true,
75+
});
8376
}
8477

8578
// Create a composite denoise limit mask
8679
const maskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(
87-
inpaintMaskAdapters as CanvasEntityAdapterInpaintMask[], // denoise limit defaults to 1 for masks that don't have it
80+
inpaintMaskAdapters, // denoise limit defaults to 1 for masks that don't have it
8881
rect,
8982
'denoiseLimit',
9083
{

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { RootState } from 'app/store/store';
2-
import type { CanvasEntityAdapterInpaintMask } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterInpaintMask';
32
import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
43
import { getPrefixedId } from 'features/controlLayers/konva/util';
54
import { selectCanvasSettingsSlice } from 'features/controlLayers/store/canvasSettingsSlice';
@@ -16,7 +15,7 @@ import type {
1615
VaeSourceNodes,
1716
} from 'features/nodes/util/graph/types';
1817
import { isEqual } from 'lodash-es';
19-
import type { Invocation } from 'services/api/types';
18+
import type { ImageDTO, Invocation } from 'services/api/types';
2019

2120
type AddOutpaintArg = {
2221
state: RootState;
@@ -71,23 +70,17 @@ export const addOutpaint = async ({
7170
const noiseMaskAdapters = inpaintMaskAdapters.filter((adapter) => adapter.state.noiseLevel !== undefined);
7271

7372
// Create a composite noise mask if we have any adapters with noise settings
74-
let noiseMaskImage = null;
73+
let noiseMaskImage: ImageDTO | null = null;
7574
if (noiseMaskAdapters.length > 0) {
76-
// Use the grayscale mask composite method with proper typing
77-
noiseMaskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(
78-
noiseMaskAdapters as CanvasEntityAdapterInpaintMask[],
79-
rect,
80-
'noiseLevel',
81-
{
82-
is_intermediate: true,
83-
silent: true,
84-
}
85-
);
75+
noiseMaskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(noiseMaskAdapters, rect, 'noiseLevel', {
76+
is_intermediate: true,
77+
silent: true,
78+
});
8679
}
8780

8881
// Create a composite denoise limit mask
8982
const maskImage = await manager.compositor.getGrayscaleMaskCompositeImageDTO(
90-
inpaintMaskAdapters as CanvasEntityAdapterInpaintMask[], // denoise limit defaults to 1 for masks that don't have it
83+
inpaintMaskAdapters, // denoise limit defaults to 1 for masks that don't have it
9184
rect,
9285
'denoiseLimit',
9386
{

0 commit comments

Comments
 (0)