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

Merge branch 'next' into chainchompa/add-all-scan

Browse Source
This commit is contained in:
chainchompa 2024-02-27 09:44:35 -05:00 committed by GitHub
commit 175cfe41a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
207 changed files with 2371 additions and 5367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/lint-frontend.yml vendored
View File

@ -36,8 +36,10 @@ jobs:
- name: Typescript - name: Typescript
run: 'pnpm run lint:tsc' run: 'pnpm run lint:tsc'
- name: Madge - name: Madge
run: 'pnpm run lint:madge' run: 'pnpm run lint:dpdm'
- name: ESLint - name: ESLint
run: 'pnpm run lint:eslint' run: 'pnpm run lint:eslint'
- name: Prettier - name: Prettier
run: 'pnpm run lint:prettier' run: 'pnpm run lint:prettier'
- name: Knip
run: 'pnpm run lint:knip'

112
invokeai/app/api/routers/model_manager.py
View File

@ -13,7 +13,7 @@ from pydantic import BaseModel, ConfigDict, Field
from starlette.exceptions import HTTPException from starlette.exceptions import HTTPException
from typing_extensions import Annotated from typing_extensions import Annotated
from invokeai.app.services.model_install import ModelInstallJob, ModelSource from invokeai.app.services.model_install import ModelInstallJob
from invokeai.app.services.model_records import ( from invokeai.app.services.model_records import (
DuplicateModelException, DuplicateModelException,
InvalidModelException, InvalidModelException,
@ -439,8 +439,8 @@ async def add_model_record(
@model_manager_router.post( @model_manager_router.post(
"/heuristic_install", "/install",
operation_id="heuristic_install_model", operation_id="install_model",
responses={ responses={
201: {"description": "The model imported successfully"}, 201: {"description": "The model imported successfully"},
415: {"description": "Unrecognized file/folder format"}, 415: {"description": "Unrecognized file/folder format"},
@ -449,8 +449,9 @@ async def add_model_record(
}, },
status_code=201, status_code=201,
) )
async def heuristic_install( async def install_model(
source: str, source: str = Query(description="Model source to install, can be a local path, repo_id, or remote URL"),
# TODO(MM2): Can we type this?
config: Optional[Dict[str, Any]] = Body( config: Optional[Dict[str, Any]] = Body(
description="Dict of fields that override auto-probed values in the model config record, such as name, description and prediction_type ", description="Dict of fields that override auto-probed values in the model config record, such as name, description and prediction_type ",
default=None, default=None,
@ -491,106 +492,7 @@ async def heuristic_install(
result: ModelInstallJob = installer.heuristic_import( result: ModelInstallJob = installer.heuristic_import(
source=source, source=source,
config=config, config=config,
) access_token=access_token,
logger.info(f"Started installation of {source}")
except UnknownModelException as e:
logger.error(str(e))
raise HTTPException(status_code=424, detail=str(e))
except InvalidModelException as e:
logger.error(str(e))
raise HTTPException(status_code=415)
except ValueError as e:
logger.error(str(e))
raise HTTPException(status_code=409, detail=str(e))
return result
@model_manager_router.post(
"/install",
operation_id="import_model",
responses={
201: {"description": "The model imported successfully"},
415: {"description": "Unrecognized file/folder format"},
424: {"description": "The model appeared to import successfully, but could not be found in the model manager"},
409: {"description": "There is already a model corresponding to this path or repo_id"},
},
status_code=201,
)
async def import_model(
source: ModelSource,
config: Optional[Dict[str, Any]] = Body(
description="Dict of fields that override auto-probed values in the model config record, such as name, description and prediction_type ",
default=None,
),
) -> ModelInstallJob:
"""Install a model using its local path, repo_id, or remote URL.
Models will be downloaded, probed, configured and installed in a
series of background threads. The return object has `status` attribute
that can be used to monitor progress.
The source object is a discriminated Union of LocalModelSource,
HFModelSource and URLModelSource. Set the "type" field to the
appropriate value:
* To install a local path using LocalModelSource, pass a source of form:
```
{
"type": "local",
"path": "/path/to/model",
"inplace": false
}
```
The "inplace" flag, if true, will register the model in place in its
current filesystem location. Otherwise, the model will be copied
into the InvokeAI models directory.
* To install a HuggingFace repo_id using HFModelSource, pass a source of form:
```
{
"type": "hf",
"repo_id": "stabilityai/stable-diffusion-2.0",
"variant": "fp16",
"subfolder": "vae",
"access_token": "f5820a918aaf01"
}
```
The `variant`, `subfolder` and `access_token` fields are optional.
* To install a remote model using an arbitrary URL, pass:
```
{
"type": "url",
"url": "http://www.civitai.com/models/123456",
"access_token": "f5820a918aaf01"
}
```
The `access_token` field is optonal
The model's configuration record will be probed and filled in
automatically. To override the default guesses, pass "metadata"
with a Dict containing the attributes you wish to override.
Installation occurs in the background. Either use list_model_install_jobs()
to poll for completion, or listen on the event bus for the following events:
* "model_install_running"
* "model_install_completed"
* "model_install_error"
On successful completion, the event's payload will contain the field "key"
containing the installed ID of the model. On an error, the event's payload
will contain the fields "error_type" and "error" describing the nature of the
error and its traceback, respectively.
"""
logger = ApiDependencies.invoker.services.logger
try:
installer = ApiDependencies.invoker.services.model_manager.install
result: ModelInstallJob = installer.import_model(
source=source,
config=config,
) )
logger.info(f"Started installation of {source}") logger.info(f"Started installation of {source}")
except UnknownModelException as e: except UnknownModelException as e:

3
invokeai/app/services/model_install/model_install_default.py
View File

@ -743,6 +743,7 @@ class ModelInstallService(ModelInstallServiceBase):
self._signal_job_downloading(install_job) self._signal_job_downloading(install_job)
def _download_complete_callback(self, download_job: DownloadJob) -> None: def _download_complete_callback(self, download_job: DownloadJob) -> None:
self._logger.info(f"{download_job.source}: model download complete")
with self._lock: with self._lock:
install_job = self._download_cache[download_job.source] install_job = self._download_cache[download_job.source]
self._download_cache.pop(download_job.source, None) self._download_cache.pop(download_job.source, None)
@ -775,7 +776,7 @@ class ModelInstallService(ModelInstallServiceBase):
if not install_job: if not install_job:
return return
self._downloads_changed_event.set() self._downloads_changed_event.set()
self._logger.warning(f"Download {download_job.source} cancelled.") self._logger.warning(f"{download_job.source}: model download cancelled")
# if install job has already registered an error, then do not replace its status with cancelled # if install job has already registered an error, then do not replace its status with cancelled
if not install_job.errored: if not install_job.errored:
install_job.cancel() install_job.cancel()

33
invokeai/backend/model_manager/config.py
View File

@ -234,37 +234,6 @@ class MainDiffusersConfig(_DiffusersConfig, _MainConfig):
type: Literal[ModelType.Main] = ModelType.Main type: Literal[ModelType.Main] = ModelType.Main
class ONNXSD1Config(_MainConfig):
"""Model config for ONNX format models based on sd-1."""
type: Literal[ModelType.ONNX] = ModelType.ONNX
format: Literal[ModelFormat.Onnx, ModelFormat.Olive]
base: Literal[BaseModelType.StableDiffusion1] = BaseModelType.StableDiffusion1
prediction_type: SchedulerPredictionType = SchedulerPredictionType.Epsilon
upcast_attention: bool = False
class ONNXSD2Config(_MainConfig):
"""Model config for ONNX format models based on sd-2."""
type: Literal[ModelType.ONNX] = ModelType.ONNX
format: Literal[ModelFormat.Onnx, ModelFormat.Olive]
# No yaml config file for ONNX, so these are part of config
base: Literal[BaseModelType.StableDiffusion2] = BaseModelType.StableDiffusion2
prediction_type: SchedulerPredictionType = SchedulerPredictionType.VPrediction
upcast_attention: bool = True
class ONNXSDXLConfig(_MainConfig):
"""Model config for ONNX format models based on sdxl."""
type: Literal[ModelType.ONNX] = ModelType.ONNX
format: Literal[ModelFormat.Onnx, ModelFormat.Olive]
# No yaml config file for ONNX, so these are part of config
base: Literal[BaseModelType.StableDiffusionXL] = BaseModelType.StableDiffusionXL
prediction_type: SchedulerPredictionType = SchedulerPredictionType.VPrediction
class IPAdapterConfig(ModelConfigBase): class IPAdapterConfig(ModelConfigBase):
"""Model config for IP Adaptor format models.""" """Model config for IP Adaptor format models."""
@ -287,7 +256,6 @@ class T2IConfig(ModelConfigBase):
format: Literal[ModelFormat.Diffusers] format: Literal[ModelFormat.Diffusers]
_ONNXConfig = Annotated[Union[ONNXSD1Config, ONNXSD2Config, ONNXSDXLConfig], Field(discriminator="base")]
_ControlNetConfig = Annotated[ _ControlNetConfig = Annotated[
Union[ControlNetDiffusersConfig, ControlNetCheckpointConfig], Union[ControlNetDiffusersConfig, ControlNetCheckpointConfig],
Field(discriminator="format"), Field(discriminator="format"),
@ -297,7 +265,6 @@ _MainModelConfig = Annotated[Union[MainDiffusersConfig, MainCheckpointConfig], F
AnyModelConfig = Union[ AnyModelConfig = Union[
_MainModelConfig, _MainModelConfig,
_ONNXConfig,
_VaeConfig, _VaeConfig,
_ControlNetConfig, _ControlNetConfig,
# ModelConfigBase, # ModelConfigBase,

9
invokeai/frontend/web/.unimportedrc.json
View File

@ -1,9 +0,0 @@
{
"entry": ["src/main.tsx"],
"extensions": [".ts", ".tsx"],
"ignorePatterns": ["**/node_modules/**", "dist/**", "public/**", "**/*.stories.tsx", "config/**"],
"ignoreUnresolved": [],
"ignoreUnimported": ["src/i18.d.ts", "vite.config.ts", "src/vite-env.d.ts"],
"respectGitignore": true,
"ignoreUnused": []
}

27
invokeai/frontend/web/knip.ts Normal file
View File

@ -0,0 +1,27 @@
import type { KnipConfig } from 'knip';
const config: KnipConfig = {
ignore: [
// This file is only used during debugging
'src/app/store/middleware/debugLoggerMiddleware.ts',
// Autogenerated types - shouldn't ever touch these
'src/services/api/schema.ts',
],
ignoreBinaries: ['only-allow'],
rules: {
files: 'warn',
dependencies: 'warn',
unlisted: 'warn',
binaries: 'warn',
unresolved: 'warn',
exports: 'warn',
types: 'warn',
nsExports: 'warn',
nsTypes: 'warn',
enumMembers: 'warn',
classMembers: 'warn',
duplicates: 'warn',
},
};
export default config;

38
invokeai/frontend/web/package.json
View File

@ -24,16 +24,16 @@
"build": "pnpm run lint && vite build", "build": "pnpm run lint && vite build",
"typegen": "node scripts/typegen.js", "typegen": "node scripts/typegen.js",
"preview": "vite preview", "preview": "vite preview",
"lint:madge": "madge --circular src/main.tsx", "lint:knip": "knip",
"lint:dpdm": "dpdm --no-warning --no-tree --transform --exit-code circular:1 src/main.tsx",
"lint:eslint": "eslint --max-warnings=0 .", "lint:eslint": "eslint --max-warnings=0 .",
"lint:prettier": "prettier --check .", "lint:prettier": "prettier --check .",
"lint:tsc": "tsc --noEmit", "lint:tsc": "tsc --noEmit",
"lint": "concurrently -g -n eslint,prettier,tsc,madge -c cyan,green,magenta,yellow \"pnpm run lint:eslint\" \"pnpm run lint:prettier\" \"pnpm run lint:tsc\" \"pnpm run lint:madge\"", "lint": "concurrently -g -c red,green,yellow,blue,magenta pnpm:lint:*",
"fix": "eslint --fix . && prettier --log-level warn --write .", "fix": "knip --fix && eslint --fix . && prettier --log-level warn --write .",
"preinstall": "npx only-allow pnpm", "preinstall": "npx only-allow pnpm",
"storybook": "storybook dev -p 6006", "storybook": "storybook dev -p 6006",
"build-storybook": "storybook build", "build-storybook": "storybook build",
"unimported": "npx unimported",
"test": "vitest", "test": "vitest",
"test:no-watch": "vitest --no-watch" "test:no-watch": "vitest --no-watch"
}, },
@ -58,16 +58,15 @@
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@fontsource-variable/inter": "^5.0.16", "@fontsource-variable/inter": "^5.0.16",
"@invoke-ai/ui-library": "^0.0.21", "@invoke-ai/ui-library": "^0.0.21",
"@mantine/form": "6.0.21",
"@nanostores/react": "^0.7.2", "@nanostores/react": "^0.7.2",
"@reduxjs/toolkit": "2.2.1", "@reduxjs/toolkit": "2.2.1",
"@roarr/browser-log-writer": "^1.3.0", "@roarr/browser-log-writer": "^1.3.0",
"chakra-react-select": "^4.7.6", "chakra-react-select": "^4.7.6",
"compare-versions": "^6.1.0", "compare-versions": "^6.1.0",
"dateformat": "^5.0.3", "dateformat": "^5.0.3",
"framer-motion": "^11.0.5", "framer-motion": "^11.0.6",
"i18next": "^23.9.0", "i18next": "^23.10.0",
"i18next-http-backend": "^2.4.3", "i18next-http-backend": "^2.5.0",
"idb-keyval": "^6.2.1", "idb-keyval": "^6.2.1",
"jsondiffpatch": "^0.6.0", "jsondiffpatch": "^0.6.0",
"konva": "^9.3.3", "konva": "^9.3.3",
@ -76,7 +75,7 @@
"new-github-issue-url": "^1.0.0", "new-github-issue-url": "^1.0.0",
"overlayscrollbars": "^2.5.0", "overlayscrollbars": "^2.5.0",
"overlayscrollbars-react": "^0.5.4", "overlayscrollbars-react": "^0.5.4",
"query-string": "^8.2.0", "query-string": "^9.0.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-colorful": "^5.6.1", "react-colorful": "^5.6.1",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
@ -88,11 +87,10 @@
"react-icons": "^5.0.1", "react-icons": "^5.0.1",
"react-konva": "^18.2.10", "react-konva": "^18.2.10",
"react-redux": "9.1.0", "react-redux": "9.1.0",
"react-resizable-panels": "^2.0.9", "react-resizable-panels": "^2.0.11",
"react-select": "5.8.0", "react-select": "5.8.0",
"react-textarea-autosize": "^8.5.3",
"react-use": "^17.5.0", "react-use": "^17.5.0",
"react-virtuoso": "^4.7.0", "react-virtuoso": "^4.7.1",
"reactflow": "^11.10.4", "reactflow": "^11.10.4",
"redux-dynamic-middlewares": "^2.2.0", "redux-dynamic-middlewares": "^2.2.0",
"redux-remember": "^5.1.0", "redux-remember": "^5.1.0",
@ -114,29 +112,27 @@
"devDependencies": { "devDependencies": {
"@invoke-ai/eslint-config-react": "^0.0.14", "@invoke-ai/eslint-config-react": "^0.0.14",
"@invoke-ai/prettier-config-react": "^0.0.7", "@invoke-ai/prettier-config-react": "^0.0.7",
"@storybook/addon-docs": "^7.6.17",
"@storybook/addon-essentials": "^7.6.17", "@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17", "@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17", "@storybook/addon-links": "^7.6.17",
"@storybook/addon-storysource": "^7.6.17", "@storybook/addon-storysource": "^7.6.17",
"@storybook/blocks": "^7.6.17",
"@storybook/manager-api": "^7.6.17", "@storybook/manager-api": "^7.6.17",
"@storybook/react": "^7.6.17", "@storybook/react": "^7.6.17",
"@storybook/react-vite": "^7.6.17", "@storybook/react-vite": "^7.6.17",
"@storybook/test": "^7.6.17",
"@storybook/theming": "^7.6.17", "@storybook/theming": "^7.6.17",
"@types/dateformat": "^5.0.2", "@types/dateformat": "^5.0.2",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.11.19", "@types/node": "^20.11.20",
"@types/react": "^18.2.57", "@types/react": "^18.2.59",
"@types/react-dom": "^18.2.19", "@types/react-dom": "^18.2.19",
"@types/uuid": "^9.0.8", "@types/uuid": "^9.0.8",
"@vitejs/plugin-react-swc": "^3.6.0", "@vitejs/plugin-react-swc": "^3.6.0",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"eslint": "^8.56.0", "dpdm": "^3.14.0",
"eslint": "^8.57.0",
"eslint-plugin-i18next": "^6.0.3", "eslint-plugin-i18next": "^6.0.3",
"eslint-plugin-path": "^1.2.4", "eslint-plugin-path": "^1.2.4",
"madge": "^6.1.0", "knip": "^5.0.2",
"openapi-types": "^12.1.3", "openapi-types": "^12.1.3",
"openapi-typescript": "^6.7.4", "openapi-typescript": "^6.7.4",
"prettier": "^3.2.5", "prettier": "^3.2.5",
@ -145,9 +141,9 @@
"ts-toolbelt": "^9.6.0", "ts-toolbelt": "^9.6.0",
"tsafe": "^1.6.6", "tsafe": "^1.6.6",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.1.3", "vite": "^5.1.4",
"vite-plugin-css-injected-by-js": "^3.4.0", "vite-plugin-css-injected-by-js": "^3.4.0",
"vite-plugin-dts": "^3.7.2", "vite-plugin-dts": "^3.7.3",
"vite-plugin-eslint": "^1.8.1", "vite-plugin-eslint": "^1.8.1",
"vite-tsconfig-paths": "^4.3.1", "vite-tsconfig-paths": "^4.3.1",
"vitest": "^1.3.1" "vitest": "^1.3.1"

3018
invokeai/frontend/web/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

9
invokeai/frontend/web/public/locales/en.json
View File

@ -674,6 +674,7 @@
"noMetaData": "No metadata found", "noMetaData": "No metadata found",
"noRecallParameters": "No parameters to recall found", "noRecallParameters": "No parameters to recall found",
"parameterSet": "Parameter {{parameter}} set", "parameterSet": "Parameter {{parameter}} set",
"parsingFailed": "Parsing Failed",
"perlin": "Perlin Noise", "perlin": "Perlin Noise",
"positivePrompt": "Positive Prompt", "positivePrompt": "Positive Prompt",
"recallParameters": "Recall Parameters", "recallParameters": "Recall Parameters",
@ -1193,8 +1194,8 @@
"unableToInvoke": "Unable to Invoke" "unableToInvoke": "Unable to Invoke"
}, },
"maskAdjustmentsHeader": "Mask Adjustments", "maskAdjustmentsHeader": "Mask Adjustments",
"maskBlur": "Blur", "maskBlur": "Mask Blur",
"maskBlurMethod": "Blur Method", "maskBlurMethod": "Mask Blur Method",
"maskEdge": "Mask Edge", "maskEdge": "Mask Edge",
"negativePromptPlaceholder": "Negative Prompt", "negativePromptPlaceholder": "Negative Prompt",
"noiseSettings": "Noise", "noiseSettings": "Noise",
@ -1480,8 +1481,8 @@
"Scheduler defines how to iteratively add noise to an image or how to update a sample based on a model's output." "Scheduler defines how to iteratively add noise to an image or how to update a sample based on a model's output."
] ]
}, },
"compositingBlur": { "compositingMaskBlur": {
"heading": "Blur", "heading": "Mask Blur",
"paragraphs": ["The blur radius of the mask."] "paragraphs": ["The blur radius of the mask."]
}, },
"compositingBlurMethod": { "compositingBlurMethod": {

34
invokeai/frontend/web/scripts/colors.js
View File

@ -1,34 +0,0 @@
export const COLORS = {
reset: '\x1b[0m',
bright: '\x1b[1m',
dim: '\x1b[2m',
underscore: '\x1b[4m',
blink: '\x1b[5m',
reverse: '\x1b[7m',
hidden: '\x1b[8m',
fg: {
black: '\x1b[30m',
red: '\x1b[31m',
green: '\x1b[32m',
yellow: '\x1b[33m',
blue: '\x1b[34m',
magenta: '\x1b[35m',
cyan: '\x1b[36m',
white: '\x1b[37m',
gray: '\x1b[90m',
crimson: '\x1b[38m',
},
bg: {
black: '\x1b[40m',
red: '\x1b[41m',
green: '\x1b[42m',
yellow: '\x1b[43m',
blue: '\x1b[44m',
magenta: '\x1b[45m',
cyan: '\x1b[46m',
white: '\x1b[47m',
gray: '\x1b[100m',
crimson: '\x1b[48m',
},
};

2
invokeai/frontend/web/src/app/hooks/useSocketIO.ts
View File

@ -19,7 +19,7 @@ declare global {
} }
export const $socketOptions = map<Partial<ManagerOptions & SocketOptions>>({}); export const $socketOptions = map<Partial<ManagerOptions & SocketOptions>>({});
export const $isSocketInitialized = atom<boolean>(false); const $isSocketInitialized = atom<boolean>(false);
/** /**
* Initializes the socket.io connection and sets up event listeners. * Initializes the socket.io connection and sets up event listeners.

1
invokeai/frontend/web/src/app/logging/logger.ts
View File

@ -12,7 +12,6 @@ ROARR.serializeMessage = serializeMessage;
ROARR.write = createLogWriter(); ROARR.write = createLogWriter();
export const BASE_CONTEXT = {}; export const BASE_CONTEXT = {};
export const log = Roarr.child(BASE_CONTEXT);
export const $logger = atom<Logger>(Roarr.child(BASE_CONTEXT)); export const $logger = atom<Logger>(Roarr.child(BASE_CONTEXT));

3
invokeai/frontend/web/src/app/store/actions.ts
View File

@ -1,10 +1,7 @@
import { createAction } from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import type { InvokeTabName } from 'features/ui/store/tabMap'; import type { InvokeTabName } from 'features/ui/store/tabMap';
import type { BatchConfig } from 'services/api/types';
export const enqueueRequested = createAction<{ export const enqueueRequested = createAction<{
tabName: InvokeTabName; tabName: InvokeTabName;
prepend: boolean; prepend: boolean;
}>('app/enqueueRequested'); }>('app/enqueueRequested');
export const batchEnqueued = createAction<BatchConfig>('app/batchEnqueued');

1
invokeai/frontend/web/src/app/store/constants.ts
View File

@ -1 +1,2 @@
export const STORAGE_PREFIX = '@@invokeai-'; export const STORAGE_PREFIX = '@@invokeai-';
export const EMPTY_ARRAY = [];

18
invokeai/frontend/web/src/app/store/createMemoizedSelector.ts
View File

@ -13,19 +13,9 @@ export const createMemoizedSelector = createSelectorCreator({
argsMemoize: lruMemoize, argsMemoize: lruMemoize,
}); });
/**
* A memoized selector creator that uses LRU cache default shallow equality check.
*/
export const createLruSelector = createSelectorCreator({
memoize: lruMemoize,
argsMemoize: lruMemoize,
});
export const createLruDraftSafeSelector = createDraftSafeSelectorCreator({
memoize: lruMemoize,
argsMemoize: lruMemoize,
});
export const getSelectorsOptions: GetSelectorsOptions = { export const getSelectorsOptions: GetSelectorsOptions = {
createSelector: createLruDraftSafeSelector, createSelector: createDraftSafeSelectorCreator({
memoize: lruMemoize,
argsMemoize: lruMemoize,
}),
}; };

2
invokeai/frontend/web/src/app/store/enhancers/reduxRemember/driver.ts
View File

@ -6,7 +6,7 @@ import { atom } from 'nanostores';
import type { Driver } from 'redux-remember'; import type { Driver } from 'redux-remember';
// Create a custom idb-keyval store (just needed to customize the name) // Create a custom idb-keyval store (just needed to customize the name)
export const $idbKeyValStore = atom<UseStore>(createIDBKeyValStore('invoke', 'invoke-store')); const $idbKeyValStore = atom<UseStore>(createIDBKeyValStore('invoke', 'invoke-store'));
export const clearIdbKeyValStore = () => { export const clearIdbKeyValStore = () => {
clear($idbKeyValStore.get()); clear($idbKeyValStore.get());

2
invokeai/frontend/web/src/app/store/enhancers/reduxRemember/errors.ts
View File

@ -3,7 +3,7 @@ import { parseify } from 'common/util/serialize';
import { PersistError, RehydrateError } from 'redux-remember'; import { PersistError, RehydrateError } from 'redux-remember';
import { serializeError } from 'serialize-error'; import { serializeError } from 'serialize-error';
export type StorageErrorArgs = { type StorageErrorArgs = {
key: string; key: string;
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */ // any is correct /* eslint-disable-next-line @typescript-eslint/no-explicit-any */ // any is correct
value?: any; value?: any;

238
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts
View File

@ -1,82 +1,65 @@
import type { ListenerEffect, TypedAddListener, TypedStartListening, UnknownAction } from '@reduxjs/toolkit'; import type { TypedStartListening } from '@reduxjs/toolkit';
import { addListener, createListenerMiddleware } from '@reduxjs/toolkit'; import { createListenerMiddleware } from '@reduxjs/toolkit';
import { addCommitStagingAreaImageListener } from 'app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener';
import { addFirstListImagesListener } from 'app/store/middleware/listenerMiddleware/listeners/addFirstListImagesListener.ts';
import { addAnyEnqueuedListener } from 'app/store/middleware/listenerMiddleware/listeners/anyEnqueued';
import { addAppConfigReceivedListener } from 'app/store/middleware/listenerMiddleware/listeners/appConfigReceived';
import { addAppStartedListener } from 'app/store/middleware/listenerMiddleware/listeners/appStarted';
import { addBatchEnqueuedListener } from 'app/store/middleware/listenerMiddleware/listeners/batchEnqueued';
import { addDeleteBoardAndImagesFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted';
import { addBoardIdSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/boardIdSelected';
import { addBulkDownloadListeners } from 'app/store/middleware/listenerMiddleware/listeners/bulkDownload'; import { addBulkDownloadListeners } from 'app/store/middleware/listenerMiddleware/listeners/bulkDownload';
import { addCanvasCopiedToClipboardListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasCopiedToClipboard';
import { addCanvasDownloadedAsImageListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasDownloadedAsImage';
import { addCanvasImageToControlNetListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet';
import { addCanvasMaskSavedToGalleryListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasMaskSavedToGallery';
import { addCanvasMaskToControlNetListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet';
import { addCanvasMergedListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasMerged';
import { addCanvasSavedToGalleryListener } from 'app/store/middleware/listenerMiddleware/listeners/canvasSavedToGallery';
import { addControlNetAutoProcessListener } from 'app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess';
import { addControlNetImageProcessedListener } from 'app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed';
import { addEnqueueRequestedCanvasListener } from 'app/store/middleware/listenerMiddleware/listeners/enqueueRequestedCanvas';
import { addEnqueueRequestedLinear } from 'app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear';
import { addEnqueueRequestedNodes } from 'app/store/middleware/listenerMiddleware/listeners/enqueueRequestedNodes';
import { addGalleryImageClickedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryImageClicked'; import { addGalleryImageClickedListener } from 'app/store/middleware/listenerMiddleware/listeners/galleryImageClicked';
import { addGetOpenAPISchemaListener } from 'app/store/middleware/listenerMiddleware/listeners/getOpenAPISchema';
import { addImageAddedToBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageAddedToBoard';
import { addRequestedSingleImageDeletionListener } from 'app/store/middleware/listenerMiddleware/listeners/imageDeleted';
import { addImageDroppedListener } from 'app/store/middleware/listenerMiddleware/listeners/imageDropped';
import { addImageRemovedFromBoardFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageRemovedFromBoard';
import { addImagesStarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesStarred';
import { addImagesUnstarredListener } from 'app/store/middleware/listenerMiddleware/listeners/imagesUnstarred';
import { addImageToDeleteSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected';
import { addImageUploadedFulfilledListener } from 'app/store/middleware/listenerMiddleware/listeners/imageUploaded';
import { addInitialImageSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/initialImageSelected';
import { addModelSelectedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelSelected';
import { addModelsLoadedListener } from 'app/store/middleware/listenerMiddleware/listeners/modelsLoaded';
import { addDynamicPromptsListener } from 'app/store/middleware/listenerMiddleware/listeners/promptChanged';
import { addSocketConnectedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketConnected';
import { addSocketDisconnectedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketDisconnected';
import { addGeneratorProgressEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress';
import { addGraphExecutionStateCompleteEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketGraphExecutionStateComplete';
import { addInvocationCompleteEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationComplete';
import { addInvocationErrorEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationError';
import { addInvocationRetrievalErrorEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationRetrievalError';
import { addInvocationStartedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationStarted';
import { addModelInstallEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall';
import { addModelLoadEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketModelLoad';
import { addSocketQueueItemStatusChangedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged';
import { addSessionRetrievalErrorEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketSessionRetrievalError';
import { addSocketSubscribedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketSubscribed';
import { addSocketUnsubscribedEventListener } from 'app/store/middleware/listenerMiddleware/listeners/socketio/socketUnsubscribed';
import { addStagingAreaImageSavedListener } from 'app/store/middleware/listenerMiddleware/listeners/stagingAreaImageSaved';
import { addUpdateAllNodesRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/updateAllNodesRequested';
import { addUpscaleRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/upscaleRequested';
import { addWorkflowLoadRequestedListener } from 'app/store/middleware/listenerMiddleware/listeners/workflowLoadRequested';
import type { AppDispatch, RootState } from 'app/store/store'; import type { AppDispatch, RootState } from 'app/store/store';
import { addCommitStagingAreaImageListener } from './listeners/addCommitStagingAreaImageListener';
import { addFirstListImagesListener } from './listeners/addFirstListImagesListener.ts';
import { addAnyEnqueuedListener } from './listeners/anyEnqueued';
import { addAppConfigReceivedListener } from './listeners/appConfigReceived';
import { addAppStartedListener } from './listeners/appStarted';
import { addBatchEnqueuedListener } from './listeners/batchEnqueued';
import { addDeleteBoardAndImagesFulfilledListener } from './listeners/boardAndImagesDeleted';
import { addBoardIdSelectedListener } from './listeners/boardIdSelected';
import { addCanvasCopiedToClipboardListener } from './listeners/canvasCopiedToClipboard';
import { addCanvasDownloadedAsImageListener } from './listeners/canvasDownloadedAsImage';
import { addCanvasImageToControlNetListener } from './listeners/canvasImageToControlNet';
import { addCanvasMaskSavedToGalleryListener } from './listeners/canvasMaskSavedToGallery';
import { addCanvasMaskToControlNetListener } from './listeners/canvasMaskToControlNet';
import { addCanvasMergedListener } from './listeners/canvasMerged';
import { addCanvasSavedToGalleryListener } from './listeners/canvasSavedToGallery';
import { addControlNetAutoProcessListener } from './listeners/controlNetAutoProcess';
import { addControlNetImageProcessedListener } from './listeners/controlNetImageProcessed';
import { addEnqueueRequestedCanvasListener } from './listeners/enqueueRequestedCanvas';
import { addEnqueueRequestedLinear } from './listeners/enqueueRequestedLinear';
import { addEnqueueRequestedNodes } from './listeners/enqueueRequestedNodes';
import { addGetOpenAPISchemaListener } from './listeners/getOpenAPISchema';
import {
addImageAddedToBoardFulfilledListener,
addImageAddedToBoardRejectedListener,
} from './listeners/imageAddedToBoard';
import {
addImageDeletedFulfilledListener,
addImageDeletedPendingListener,
addImageDeletedRejectedListener,
addRequestedMultipleImageDeletionListener,
addRequestedSingleImageDeletionListener,
} from './listeners/imageDeleted';
import { addImageDroppedListener } from './listeners/imageDropped';
import {
addImageRemovedFromBoardFulfilledListener,
addImageRemovedFromBoardRejectedListener,
} from './listeners/imageRemovedFromBoard';
import { addImagesStarredListener } from './listeners/imagesStarred';
import { addImagesUnstarredListener } from './listeners/imagesUnstarred';
import { addImageToDeleteSelectedListener } from './listeners/imageToDeleteSelected';
import { addImageUploadedFulfilledListener, addImageUploadedRejectedListener } from './listeners/imageUploaded';
import { addInitialImageSelectedListener } from './listeners/initialImageSelected';
import { addModelSelectedListener } from './listeners/modelSelected';
import { addModelsLoadedListener } from './listeners/modelsLoaded';
import { addDynamicPromptsListener } from './listeners/promptChanged';
import { addSocketConnectedEventListener as addSocketConnectedListener } from './listeners/socketio/socketConnected';
import { addSocketDisconnectedEventListener as addSocketDisconnectedListener } from './listeners/socketio/socketDisconnected';
import { addGeneratorProgressEventListener as addGeneratorProgressListener } from './listeners/socketio/socketGeneratorProgress';
import { addGraphExecutionStateCompleteEventListener as addGraphExecutionStateCompleteListener } from './listeners/socketio/socketGraphExecutionStateComplete';
import { addInvocationCompleteEventListener as addInvocationCompleteListener } from './listeners/socketio/socketInvocationComplete';
import { addInvocationErrorEventListener as addInvocationErrorListener } from './listeners/socketio/socketInvocationError';
import { addInvocationRetrievalErrorEventListener } from './listeners/socketio/socketInvocationRetrievalError';
import { addInvocationStartedEventListener as addInvocationStartedListener } from './listeners/socketio/socketInvocationStarted';
import { addModelInstallEventListener } from './listeners/socketio/socketModelInstall';
import { addModelLoadEventListener } from './listeners/socketio/socketModelLoad';
import { addSocketQueueItemStatusChangedEventListener } from './listeners/socketio/socketQueueItemStatusChanged';
import { addSessionRetrievalErrorEventListener } from './listeners/socketio/socketSessionRetrievalError';
import { addSocketSubscribedEventListener as addSocketSubscribedListener } from './listeners/socketio/socketSubscribed';
import { addSocketUnsubscribedEventListener as addSocketUnsubscribedListener } from './listeners/socketio/socketUnsubscribed';
import { addStagingAreaImageSavedListener } from './listeners/stagingAreaImageSaved';
import { addUpdateAllNodesRequestedListener } from './listeners/updateAllNodesRequested';
import { addUpscaleRequestedListener } from './listeners/upscaleRequested';
import { addWorkflowLoadRequestedListener } from './listeners/workflowLoadRequested';
export const listenerMiddleware = createListenerMiddleware(); export const listenerMiddleware = createListenerMiddleware();
export type AppStartListening = TypedStartListening<RootState, AppDispatch>; export type AppStartListening = TypedStartListening<RootState, AppDispatch>;
export const startAppListening = listenerMiddleware.startListening as AppStartListening; const startAppListening = listenerMiddleware.startListening as AppStartListening;
export const addAppListener = addListener as TypedAddListener<RootState, AppDispatch>;
export type AppListenerEffect = ListenerEffect<UnknownAction, RootState, AppDispatch>;
/** /**
* The RTK listener middleware is a lightweight alternative sagas/observables. * The RTK listener middleware is a lightweight alternative sagas/observables.
@ -85,95 +68,88 @@ export type AppListenerEffect = ListenerEffect<UnknownAction, RootState, AppDisp
*/ */
// Image uploaded // Image uploaded
addImageUploadedFulfilledListener(); addImageUploadedFulfilledListener(startAppListening);
addImageUploadedRejectedListener();
// Image selected // Image selected
addInitialImageSelectedListener(); addInitialImageSelectedListener(startAppListening);
// Image deleted // Image deleted
addRequestedSingleImageDeletionListener(); addRequestedSingleImageDeletionListener(startAppListening);
addRequestedMultipleImageDeletionListener(); addDeleteBoardAndImagesFulfilledListener(startAppListening);
addImageDeletedPendingListener(); addImageToDeleteSelectedListener(startAppListening);
addImageDeletedFulfilledListener();
addImageDeletedRejectedListener();
addDeleteBoardAndImagesFulfilledListener();
addImageToDeleteSelectedListener();
// Image starred // Image starred
addImagesStarredListener(); addImagesStarredListener(startAppListening);
addImagesUnstarredListener(); addImagesUnstarredListener(startAppListening);
// Gallery // Gallery
addGalleryImageClickedListener(); addGalleryImageClickedListener(startAppListening);
// User Invoked // User Invoked
addEnqueueRequestedCanvasListener(); addEnqueueRequestedCanvasListener(startAppListening);
addEnqueueRequestedNodes(); addEnqueueRequestedNodes(startAppListening);
addEnqueueRequestedLinear(); addEnqueueRequestedLinear(startAppListening);
addAnyEnqueuedListener(); addAnyEnqueuedListener(startAppListening);
addBatchEnqueuedListener(); addBatchEnqueuedListener(startAppListening);
// Canvas actions // Canvas actions
addCanvasSavedToGalleryListener(); addCanvasSavedToGalleryListener(startAppListening);
addCanvasMaskSavedToGalleryListener(); addCanvasMaskSavedToGalleryListener(startAppListening);
addCanvasImageToControlNetListener(); addCanvasImageToControlNetListener(startAppListening);
addCanvasMaskToControlNetListener(); addCanvasMaskToControlNetListener(startAppListening);
addCanvasDownloadedAsImageListener(); addCanvasDownloadedAsImageListener(startAppListening);
addCanvasCopiedToClipboardListener(); addCanvasCopiedToClipboardListener(startAppListening);
addCanvasMergedListener(); addCanvasMergedListener(startAppListening);
addStagingAreaImageSavedListener(); addStagingAreaImageSavedListener(startAppListening);
addCommitStagingAreaImageListener(); addCommitStagingAreaImageListener(startAppListening);
// Socket.IO // Socket.IO
addGeneratorProgressListener(); addGeneratorProgressEventListener(startAppListening);
addGraphExecutionStateCompleteListener(); addGraphExecutionStateCompleteEventListener(startAppListening);
addInvocationCompleteListener(); addInvocationCompleteEventListener(startAppListening);
addInvocationErrorListener(); addInvocationErrorEventListener(startAppListening);
addInvocationStartedListener(); addInvocationStartedEventListener(startAppListening);
addSocketConnectedListener(); addSocketConnectedEventListener(startAppListening);
addSocketDisconnectedListener(); addSocketDisconnectedEventListener(startAppListening);
addSocketSubscribedListener(); addSocketSubscribedEventListener(startAppListening);
addSocketUnsubscribedListener(); addSocketUnsubscribedEventListener(startAppListening);
addModelLoadEventListener(); addModelLoadEventListener(startAppListening);
addModelInstallEventListener(); addModelInstallEventListener(startAppListening);
addSessionRetrievalErrorEventListener(); addSessionRetrievalErrorEventListener(startAppListening);
addInvocationRetrievalErrorEventListener(); addInvocationRetrievalErrorEventListener(startAppListening);
addSocketQueueItemStatusChangedEventListener(); addSocketQueueItemStatusChangedEventListener(startAppListening);
addBulkDownloadListeners(); addBulkDownloadListeners(startAppListening);
// ControlNet // ControlNet
addControlNetImageProcessedListener(); addControlNetImageProcessedListener(startAppListening);
addControlNetAutoProcessListener(); addControlNetAutoProcessListener(startAppListening);
// Boards // Boards
addImageAddedToBoardFulfilledListener(); addImageAddedToBoardFulfilledListener(startAppListening);
addImageAddedToBoardRejectedListener(); addImageRemovedFromBoardFulfilledListener(startAppListening);
addImageRemovedFromBoardFulfilledListener(); addBoardIdSelectedListener(startAppListening);
addImageRemovedFromBoardRejectedListener();
addBoardIdSelectedListener();
// Node schemas // Node schemas
addGetOpenAPISchemaListener(); addGetOpenAPISchemaListener(startAppListening);
// Workflows // Workflows
addWorkflowLoadRequestedListener(); addWorkflowLoadRequestedListener(startAppListening);
addUpdateAllNodesRequestedListener(); addUpdateAllNodesRequestedListener(startAppListening);
// DND // DND
addImageDroppedListener(); addImageDroppedListener(startAppListening);
// Models // Models
addModelSelectedListener(); addModelSelectedListener(startAppListening);
// app startup // app startup
addAppStartedListener(); addAppStartedListener(startAppListening);
addModelsLoadedListener(); addModelsLoadedListener(startAppListening);
addAppConfigReceivedListener(); addAppConfigReceivedListener(startAppListening);
addFirstListImagesListener(); addFirstListImagesListener(startAppListening);
// Ad-hoc upscale workflwo // Ad-hoc upscale workflwo
addUpscaleRequestedListener(); addUpscaleRequestedListener(startAppListening);
// Dynamic prompts // Dynamic prompts
addDynamicPromptsListener(); addDynamicPromptsListener(startAppListening);

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener.ts
View File

@ -1,15 +1,14 @@
import { isAnyOf } from '@reduxjs/toolkit'; import { isAnyOf } from '@reduxjs/toolkit';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasBatchIdsReset, commitStagingAreaImage, discardStagedImages } from 'features/canvas/store/canvasSlice'; import { canvasBatchIdsReset, commitStagingAreaImage, discardStagedImages } from 'features/canvas/store/canvasSlice';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import { startAppListening } from '..';
const matcher = isAnyOf(commitStagingAreaImage, discardStagedImages); const matcher = isAnyOf(commitStagingAreaImage, discardStagedImages);
export const addCommitStagingAreaImageListener = () => { export const addCommitStagingAreaImageListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
matcher, matcher,
effect: async (_, { dispatch, getState }) => { effect: async (_, { dispatch, getState }) => {

8
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addFirstListImagesListener.ts.ts
View File

@ -1,15 +1,11 @@
import { createAction } from '@reduxjs/toolkit'; import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { imageSelected } from 'features/gallery/store/gallerySlice'; import { imageSelected } from 'features/gallery/store/gallerySlice';
import { IMAGE_CATEGORIES } from 'features/gallery/store/types'; import { IMAGE_CATEGORIES } from 'features/gallery/store/types';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import type { ImageCache } from 'services/api/types'; import type { ImageCache } from 'services/api/types';
import { getListImagesUrl, imagesSelectors } from 'services/api/util'; import { getListImagesUrl, imagesSelectors } from 'services/api/util';
import { startAppListening } from '..'; export const addFirstListImagesListener = (startAppListening: AppStartListening) => {
export const appStarted = createAction('app/appStarted');
export const addFirstListImagesListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.listImages.matchFulfilled, matcher: imagesApi.endpoints.listImages.matchFulfilled,
effect: async (action, { dispatch, unsubscribe, cancelActiveListeners }) => { effect: async (action, { dispatch, unsubscribe, cancelActiveListeners }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/anyEnqueued.ts
View File

@ -1,8 +1,7 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { queueApi, selectQueueStatus } from 'services/api/endpoints/queue'; import { queueApi, selectQueueStatus } from 'services/api/endpoints/queue';
import { startAppListening } from '..'; export const addAnyEnqueuedListener = (startAppListening: AppStartListening) => {
export const addAnyEnqueuedListener = () => {
startAppListening({ startAppListening({
matcher: queueApi.endpoints.enqueueBatch.matchFulfilled, matcher: queueApi.endpoints.enqueueBatch.matchFulfilled,
effect: async (_, { dispatch, getState }) => { effect: async (_, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/appConfigReceived.ts
View File

@ -1,10 +1,9 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { setInfillMethod } from 'features/parameters/store/generationSlice'; import { setInfillMethod } from 'features/parameters/store/generationSlice';
import { shouldUseNSFWCheckerChanged, shouldUseWatermarkerChanged } from 'features/system/store/systemSlice'; import { shouldUseNSFWCheckerChanged, shouldUseWatermarkerChanged } from 'features/system/store/systemSlice';
import { appInfoApi } from 'services/api/endpoints/appInfo'; import { appInfoApi } from 'services/api/endpoints/appInfo';
import { startAppListening } from '..'; export const addAppConfigReceivedListener = (startAppListening: AppStartListening) => {
export const addAppConfigReceivedListener = () => {
startAppListening({ startAppListening({
matcher: appInfoApi.endpoints.getAppConfig.matchFulfilled, matcher: appInfoApi.endpoints.getAppConfig.matchFulfilled,
effect: async (action, { getState, dispatch }) => { effect: async (action, { getState, dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/appStarted.ts
View File

@ -1,10 +1,9 @@
import { createAction } from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { startAppListening } from '..';
export const appStarted = createAction('app/appStarted'); export const appStarted = createAction('app/appStarted');
export const addAppStartedListener = () => { export const addAppStartedListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: appStarted, actionCreator: appStarted,
effect: async (action, { unsubscribe, cancelActiveListeners }) => { effect: async (action, { unsubscribe, cancelActiveListeners }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/batchEnqueued.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { toast } from 'common/util/toast'; import { toast } from 'common/util/toast';
import { zPydanticValidationError } from 'features/system/store/zodSchemas'; import { zPydanticValidationError } from 'features/system/store/zodSchemas';
@ -6,9 +7,7 @@ import { t } from 'i18next';
import { truncate, upperFirst } from 'lodash-es'; import { truncate, upperFirst } from 'lodash-es';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import { startAppListening } from '..'; export const addBatchEnqueuedListener = (startAppListening: AppStartListening) => {
export const addBatchEnqueuedListener = () => {
// success // success
startAppListening({ startAppListening({
matcher: queueApi.endpoints.enqueueBatch.matchFulfilled, matcher: queueApi.endpoints.enqueueBatch.matchFulfilled,

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardAndImagesDeleted.ts
View File

@ -1,3 +1,4 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { resetCanvas } from 'features/canvas/store/canvasSlice'; import { resetCanvas } from 'features/canvas/store/canvasSlice';
import { controlAdaptersReset } from 'features/controlAdapters/store/controlAdaptersSlice'; import { controlAdaptersReset } from 'features/controlAdapters/store/controlAdaptersSlice';
import { getImageUsage } from 'features/deleteImageModal/store/selectors'; import { getImageUsage } from 'features/deleteImageModal/store/selectors';
@ -5,9 +6,7 @@ import { nodeEditorReset } from 'features/nodes/store/nodesSlice';
import { clearInitialImage } from 'features/parameters/store/generationSlice'; import { clearInitialImage } from 'features/parameters/store/generationSlice';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addDeleteBoardAndImagesFulfilledListener = (startAppListening: AppStartListening) => {
export const addDeleteBoardAndImagesFulfilledListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.deleteBoardAndImages.matchFulfilled, matcher: imagesApi.endpoints.deleteBoardAndImages.matchFulfilled,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/boardIdSelected.ts
View File

@ -1,12 +1,11 @@
import { isAnyOf } from '@reduxjs/toolkit'; import { isAnyOf } from '@reduxjs/toolkit';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { boardIdSelected, galleryViewChanged, imageSelected } from 'features/gallery/store/gallerySlice'; import { boardIdSelected, galleryViewChanged, imageSelected } from 'features/gallery/store/gallerySlice';
import { ASSETS_CATEGORIES, IMAGE_CATEGORIES } from 'features/gallery/store/types'; import { ASSETS_CATEGORIES, IMAGE_CATEGORIES } from 'features/gallery/store/types';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { imagesSelectors } from 'services/api/util'; import { imagesSelectors } from 'services/api/util';
import { startAppListening } from '..'; export const addBoardIdSelectedListener = (startAppListening: AppStartListening) => {
export const addBoardIdSelectedListener = () => {
startAppListening({ startAppListening({
matcher: isAnyOf(boardIdSelected, galleryViewChanged), matcher: isAnyOf(boardIdSelected, galleryViewChanged),
effect: async (action, { getState, dispatch, condition, cancelActiveListeners }) => { effect: async (action, { getState, dispatch, condition, cancelActiveListeners }) => {

4
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/bulkDownload.tsx
View File

@ -1,7 +1,7 @@
import type { UseToastOptions } from '@invoke-ai/ui-library'; import type { UseToastOptions } from '@invoke-ai/ui-library';
import { ExternalLink } from '@invoke-ai/ui-library'; import { ExternalLink } from '@invoke-ai/ui-library';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import { startAppListening } from 'app/store/middleware/listenerMiddleware'; import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { toast } from 'common/util/toast'; import { toast } from 'common/util/toast';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
@ -13,7 +13,7 @@ import {
const log = logger('images'); const log = logger('images');
export const addBulkDownloadListeners = () => { export const addBulkDownloadListeners = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.bulkDownloadImages.matchFulfilled, matcher: imagesApi.endpoints.bulkDownloadImages.matchFulfilled,
effect: async (action) => { effect: async (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasCopiedToClipboard.ts
View File

@ -1,13 +1,12 @@
import { $logger } from 'app/logging/logger'; import { $logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasCopiedToClipboard } from 'features/canvas/store/actions'; import { canvasCopiedToClipboard } from 'features/canvas/store/actions';
import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob'; import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { copyBlobToClipboard } from 'features/system/util/copyBlobToClipboard'; import { copyBlobToClipboard } from 'features/system/util/copyBlobToClipboard';
import { t } from 'i18next'; import { t } from 'i18next';
import { startAppListening } from '..'; export const addCanvasCopiedToClipboardListener = (startAppListening: AppStartListening) => {
export const addCanvasCopiedToClipboardListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasCopiedToClipboard, actionCreator: canvasCopiedToClipboard,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasDownloadedAsImage.ts
View File

@ -1,13 +1,12 @@
import { $logger } from 'app/logging/logger'; import { $logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasDownloadedAsImage } from 'features/canvas/store/actions'; import { canvasDownloadedAsImage } from 'features/canvas/store/actions';
import { downloadBlob } from 'features/canvas/util/downloadBlob'; import { downloadBlob } from 'features/canvas/util/downloadBlob';
import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob'; import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { startAppListening } from '..'; export const addCanvasDownloadedAsImageListener = (startAppListening: AppStartListening) => {
export const addCanvasDownloadedAsImageListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasDownloadedAsImage, actionCreator: canvasDownloadedAsImage,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasImageToControlNet.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasImageToControlAdapter } from 'features/canvas/store/actions'; import { canvasImageToControlAdapter } from 'features/canvas/store/actions';
import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob'; import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob';
import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice';
@ -6,9 +7,7 @@ import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addCanvasImageToControlNetListener = (startAppListening: AppStartListening) => {
export const addCanvasImageToControlNetListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasImageToControlAdapter, actionCreator: canvasImageToControlAdapter,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskSavedToGallery.ts
View File

@ -1,13 +1,12 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasMaskSavedToGallery } from 'features/canvas/store/actions'; import { canvasMaskSavedToGallery } from 'features/canvas/store/actions';
import { getCanvasData } from 'features/canvas/util/getCanvasData'; import { getCanvasData } from 'features/canvas/util/getCanvasData';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addCanvasMaskSavedToGalleryListener = (startAppListening: AppStartListening) => {
export const addCanvasMaskSavedToGalleryListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasMaskSavedToGallery, actionCreator: canvasMaskSavedToGallery,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMaskToControlNet.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasMaskToControlAdapter } from 'features/canvas/store/actions'; import { canvasMaskToControlAdapter } from 'features/canvas/store/actions';
import { getCanvasData } from 'features/canvas/util/getCanvasData'; import { getCanvasData } from 'features/canvas/util/getCanvasData';
import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice'; import { controlAdapterImageChanged } from 'features/controlAdapters/store/controlAdaptersSlice';
@ -6,9 +7,7 @@ import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addCanvasMaskToControlNetListener = (startAppListening: AppStartListening) => {
export const addCanvasMaskToControlNetListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasMaskToControlAdapter, actionCreator: canvasMaskToControlAdapter,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasMerged.ts
View File

@ -1,4 +1,5 @@
import { $logger } from 'app/logging/logger'; import { $logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasMerged } from 'features/canvas/store/actions'; import { canvasMerged } from 'features/canvas/store/actions';
import { $canvasBaseLayer } from 'features/canvas/store/canvasNanostore'; import { $canvasBaseLayer } from 'features/canvas/store/canvasNanostore';
import { setMergedCanvas } from 'features/canvas/store/canvasSlice'; import { setMergedCanvas } from 'features/canvas/store/canvasSlice';
@ -7,9 +8,7 @@ import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addCanvasMergedListener = (startAppListening: AppStartListening) => {
export const addCanvasMergedListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasMerged, actionCreator: canvasMerged,
effect: async (action, { dispatch }) => { effect: async (action, { dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/canvasSavedToGallery.ts
View File

@ -1,13 +1,12 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { canvasSavedToGallery } from 'features/canvas/store/actions'; import { canvasSavedToGallery } from 'features/canvas/store/actions';
import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob'; import { getBaseLayerBlob } from 'features/canvas/util/getBaseLayerBlob';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addCanvasSavedToGalleryListener = (startAppListening: AppStartListening) => {
export const addCanvasSavedToGalleryListener = () => {
startAppListening({ startAppListening({
actionCreator: canvasSavedToGallery, actionCreator: canvasSavedToGallery,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetAutoProcess.ts
View File

@ -1,5 +1,6 @@
import type { AnyListenerPredicate } from '@reduxjs/toolkit'; import type { AnyListenerPredicate } from '@reduxjs/toolkit';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import type { RootState } from 'app/store/store'; import type { RootState } from 'app/store/store';
import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions'; import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions';
import { import {
@ -12,8 +13,6 @@ import {
} from 'features/controlAdapters/store/controlAdaptersSlice'; } from 'features/controlAdapters/store/controlAdaptersSlice';
import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types'; import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types';
import { startAppListening } from '..';
type AnyControlAdapterParamChangeAction = type AnyControlAdapterParamChangeAction =
| ReturnType<typeof controlAdapterProcessorParamsChanged> | ReturnType<typeof controlAdapterProcessorParamsChanged>
| ReturnType<typeof controlAdapterModelChanged> | ReturnType<typeof controlAdapterModelChanged>
@ -67,7 +66,7 @@ const DEBOUNCE_MS = 300;
* *
* The network request is debounced. * The network request is debounced.
*/ */
export const addControlNetAutoProcessListener = () => { export const addControlNetAutoProcessListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
predicate, predicate,
effect: async (action, { dispatch, cancelActiveListeners, delay }) => { effect: async (action, { dispatch, cancelActiveListeners, delay }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/controlNetImageProcessed.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions'; import { controlAdapterImageProcessed } from 'features/controlAdapters/store/actions';
import { import {
@ -16,9 +17,7 @@ import { queueApi } from 'services/api/endpoints/queue';
import type { BatchConfig, ImageDTO } from 'services/api/types'; import type { BatchConfig, ImageDTO } from 'services/api/types';
import { socketInvocationComplete } from 'services/events/actions'; import { socketInvocationComplete } from 'services/events/actions';
import { startAppListening } from '..'; export const addControlNetImageProcessedListener = (startAppListening: AppStartListening) => {
export const addControlNetImageProcessedListener = () => {
startAppListening({ startAppListening({
actionCreator: controlAdapterImageProcessed, actionCreator: controlAdapterImageProcessed,
effect: async (action, { dispatch, getState, take }) => { effect: async (action, { dispatch, getState, take }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedCanvas.ts
View File

@ -1,5 +1,6 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import { enqueueRequested } from 'app/store/actions'; import { enqueueRequested } from 'app/store/actions';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import openBase64ImageInTab from 'common/util/openBase64ImageInTab'; import openBase64ImageInTab from 'common/util/openBase64ImageInTab';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { canvasBatchIdAdded, stagingAreaInitialized } from 'features/canvas/store/canvasSlice'; import { canvasBatchIdAdded, stagingAreaInitialized } from 'features/canvas/store/canvasSlice';
@ -13,8 +14,6 @@ import { imagesApi } from 'services/api/endpoints/images';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import type { ImageDTO } from 'services/api/types'; import type { ImageDTO } from 'services/api/types';
import { startAppListening } from '..';
/** /**
* This listener is responsible invoking the canvas. This involves a number of steps: * This listener is responsible invoking the canvas. This involves a number of steps:
* *
@ -28,7 +27,7 @@ import { startAppListening } from '..';
* 8. Initialize the staging area if not yet initialized * 8. Initialize the staging area if not yet initialized
* 9. Dispatch the sessionReadyToInvoke action to invoke the session * 9. Dispatch the sessionReadyToInvoke action to invoke the session
*/ */
export const addEnqueueRequestedCanvasListener = () => { export const addEnqueueRequestedCanvasListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
predicate: (action): action is ReturnType<typeof enqueueRequested> => predicate: (action): action is ReturnType<typeof enqueueRequested> =>
enqueueRequested.match(action) && action.payload.tabName === 'unifiedCanvas', enqueueRequested.match(action) && action.payload.tabName === 'unifiedCanvas',

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts
View File

@ -1,4 +1,5 @@
import { enqueueRequested } from 'app/store/actions'; import { enqueueRequested } from 'app/store/actions';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig'; import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
import { buildLinearImageToImageGraph } from 'features/nodes/util/graph/buildLinearImageToImageGraph'; import { buildLinearImageToImageGraph } from 'features/nodes/util/graph/buildLinearImageToImageGraph';
import { buildLinearSDXLImageToImageGraph } from 'features/nodes/util/graph/buildLinearSDXLImageToImageGraph'; import { buildLinearSDXLImageToImageGraph } from 'features/nodes/util/graph/buildLinearSDXLImageToImageGraph';
@ -6,9 +7,7 @@ import { buildLinearSDXLTextToImageGraph } from 'features/nodes/util/graph/build
import { buildLinearTextToImageGraph } from 'features/nodes/util/graph/buildLinearTextToImageGraph'; import { buildLinearTextToImageGraph } from 'features/nodes/util/graph/buildLinearTextToImageGraph';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import { startAppListening } from '..'; export const addEnqueueRequestedLinear = (startAppListening: AppStartListening) => {
export const addEnqueueRequestedLinear = () => {
startAppListening({ startAppListening({
predicate: (action): action is ReturnType<typeof enqueueRequested> => predicate: (action): action is ReturnType<typeof enqueueRequested> =>
enqueueRequested.match(action) && (action.payload.tabName === 'txt2img' || action.payload.tabName === 'img2img'), enqueueRequested.match(action) && (action.payload.tabName === 'txt2img' || action.payload.tabName === 'img2img'),

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedNodes.ts
View File

@ -1,12 +1,11 @@
import { enqueueRequested } from 'app/store/actions'; import { enqueueRequested } from 'app/store/actions';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { buildNodesGraph } from 'features/nodes/util/graph/buildNodesGraph'; import { buildNodesGraph } from 'features/nodes/util/graph/buildNodesGraph';
import { buildWorkflowWithValidation } from 'features/nodes/util/workflow/buildWorkflow'; import { buildWorkflowWithValidation } from 'features/nodes/util/workflow/buildWorkflow';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import type { BatchConfig } from 'services/api/types'; import type { BatchConfig } from 'services/api/types';
import { startAppListening } from '..'; export const addEnqueueRequestedNodes = (startAppListening: AppStartListening) => {
export const addEnqueueRequestedNodes = () => {
startAppListening({ startAppListening({
predicate: (action): action is ReturnType<typeof enqueueRequested> => predicate: (action): action is ReturnType<typeof enqueueRequested> =>
enqueueRequested.match(action) && action.payload.tabName === 'nodes', enqueueRequested.match(action) && action.payload.tabName === 'nodes',

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/galleryImageClicked.ts
View File

@ -1,12 +1,11 @@
import { createAction } from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors'; import { selectListImagesQueryArgs } from 'features/gallery/store/gallerySelectors';
import { selectionChanged } from 'features/gallery/store/gallerySlice'; import { selectionChanged } from 'features/gallery/store/gallerySlice';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import type { ImageDTO } from 'services/api/types'; import type { ImageDTO } from 'services/api/types';
import { imagesSelectors } from 'services/api/util'; import { imagesSelectors } from 'services/api/util';
import { startAppListening } from '..';
export const galleryImageClicked = createAction<{ export const galleryImageClicked = createAction<{
imageDTO: ImageDTO; imageDTO: ImageDTO;
shiftKey: boolean; shiftKey: boolean;
@ -25,7 +24,7 @@ export const galleryImageClicked = createAction<{
* is much more responsive. * is much more responsive.
*/ */
export const addGalleryImageClickedListener = () => { export const addGalleryImageClickedListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: galleryImageClicked, actionCreator: galleryImageClicked,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/getOpenAPISchema.ts
View File

@ -1,13 +1,12 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { nodeTemplatesBuilt } from 'features/nodes/store/nodesSlice'; import { nodeTemplatesBuilt } from 'features/nodes/store/nodesSlice';
import { parseSchema } from 'features/nodes/util/schema/parseSchema'; import { parseSchema } from 'features/nodes/util/schema/parseSchema';
import { size } from 'lodash-es'; import { size } from 'lodash-es';
import { appInfoApi } from 'services/api/endpoints/appInfo'; import { appInfoApi } from 'services/api/endpoints/appInfo';
import { startAppListening } from '..'; export const addGetOpenAPISchemaListener = (startAppListening: AppStartListening) => {
export const addGetOpenAPISchemaListener = () => {
startAppListening({ startAppListening({
matcher: appInfoApi.endpoints.getOpenAPISchema.matchFulfilled, matcher: appInfoApi.endpoints.getOpenAPISchema.matchFulfilled,
effect: (action, { dispatch, getState }) => { effect: (action, { dispatch, getState }) => {

7
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageAddedToBoard.ts
View File

@ -1,9 +1,8 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addImageAddedToBoardFulfilledListener = (startAppListening: AppStartListening) => {
export const addImageAddedToBoardFulfilledListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.addImageToBoard.matchFulfilled, matcher: imagesApi.endpoints.addImageToBoard.matchFulfilled,
effect: (action) => { effect: (action) => {
@ -15,9 +14,7 @@ export const addImageAddedToBoardFulfilledListener = () => {
log.debug({ board_id, imageDTO }, 'Image added to board'); log.debug({ board_id, imageDTO }, 'Image added to board');
}, },
}); });
};
export const addImageAddedToBoardRejectedListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.addImageToBoard.matchRejected, matcher: imagesApi.endpoints.addImageToBoard.matchRejected,
effect: (action) => { effect: (action) => {

25
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeleted.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { resetCanvas } from 'features/canvas/store/canvasSlice'; import { resetCanvas } from 'features/canvas/store/canvasSlice';
import { import {
controlAdapterImageChanged, controlAdapterImageChanged,
@ -19,9 +20,7 @@ import { api } from 'services/api';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { imagesSelectors } from 'services/api/util'; import { imagesSelectors } from 'services/api/util';
import { startAppListening } from '..'; export const addRequestedSingleImageDeletionListener = (startAppListening: AppStartListening) => {
export const addRequestedSingleImageDeletionListener = () => {
startAppListening({ startAppListening({
actionCreator: imageDeletionConfirmed, actionCreator: imageDeletionConfirmed,
effect: async (action, { dispatch, getState, condition }) => { effect: async (action, { dispatch, getState, condition }) => {
@ -134,12 +133,7 @@ export const addRequestedSingleImageDeletionListener = () => {
} }
}, },
}); });
};
/**
* Called when the user requests an image deletion
*/
export const addRequestedMultipleImageDeletionListener = () => {
startAppListening({ startAppListening({
actionCreator: imageDeletionConfirmed, actionCreator: imageDeletionConfirmed,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {
@ -224,24 +218,14 @@ export const addRequestedMultipleImageDeletionListener = () => {
} }
}, },
}); });
};
/**
* Called when the actual delete request is sent to the server
*/
export const addImageDeletedPendingListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.deleteImage.matchPending, matcher: imagesApi.endpoints.deleteImage.matchPending,
effect: () => { effect: () => {
// //
}, },
}); });
};
/**
* Called on successful delete
*/
export const addImageDeletedFulfilledListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.deleteImage.matchFulfilled, matcher: imagesApi.endpoints.deleteImage.matchFulfilled,
effect: (action) => { effect: (action) => {
@ -249,12 +233,7 @@ export const addImageDeletedFulfilledListener = () => {
log.debug({ imageDTO: action.meta.arg.originalArgs }, 'Image deleted'); log.debug({ imageDTO: action.meta.arg.originalArgs }, 'Image deleted');
}, },
}); });
};
/**
* Called on failed delete
*/
export const addImageDeletedRejectedListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.deleteImage.matchRejected, matcher: imagesApi.endpoints.deleteImage.matchRejected,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts
View File

@ -1,5 +1,6 @@
import { createAction } from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice'; import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice';
import { import {
@ -12,14 +13,12 @@ import { fieldImageValueChanged } from 'features/nodes/store/nodesSlice';
import { initialImageChanged, selectOptimalDimension } from 'features/parameters/store/generationSlice'; import { initialImageChanged, selectOptimalDimension } from 'features/parameters/store/generationSlice';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '../';
export const dndDropped = createAction<{ export const dndDropped = createAction<{
overData: TypesafeDroppableData; overData: TypesafeDroppableData;
activeData: TypesafeDraggableData; activeData: TypesafeDraggableData;
}>('dnd/dndDropped'); }>('dnd/dndDropped');
export const addImageDroppedListener = () => { export const addImageDroppedListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: dndDropped, actionCreator: dndDropped,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

7
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageRemovedFromBoard.ts
View File

@ -1,9 +1,8 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addImageRemovedFromBoardFulfilledListener = (startAppListening: AppStartListening) => {
export const addImageRemovedFromBoardFulfilledListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.removeImageFromBoard.matchFulfilled, matcher: imagesApi.endpoints.removeImageFromBoard.matchFulfilled,
effect: (action) => { effect: (action) => {
@ -13,9 +12,7 @@ export const addImageRemovedFromBoardFulfilledListener = () => {
log.debug({ imageDTO }, 'Image removed from board'); log.debug({ imageDTO }, 'Image removed from board');
}, },
}); });
};
export const addImageRemovedFromBoardRejectedListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.removeImageFromBoard.matchRejected, matcher: imagesApi.endpoints.removeImageFromBoard.matchRejected,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageToDeleteSelected.ts
View File

@ -1,10 +1,9 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions'; import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions';
import { selectImageUsage } from 'features/deleteImageModal/store/selectors'; import { selectImageUsage } from 'features/deleteImageModal/store/selectors';
import { imagesToDeleteSelected, isModalOpenChanged } from 'features/deleteImageModal/store/slice'; import { imagesToDeleteSelected, isModalOpenChanged } from 'features/deleteImageModal/store/slice';
import { startAppListening } from '..'; export const addImageToDeleteSelectedListener = (startAppListening: AppStartListening) => {
export const addImageToDeleteSelectedListener = () => {
startAppListening({ startAppListening({
actionCreator: imagesToDeleteSelected, actionCreator: imagesToDeleteSelected,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

7
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageUploaded.ts
View File

@ -1,5 +1,6 @@
import type { UseToastOptions } from '@invoke-ai/ui-library'; import type { UseToastOptions } from '@invoke-ai/ui-library';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice'; import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice';
import { import {
controlAdapterImageChanged, controlAdapterImageChanged,
@ -13,9 +14,7 @@ import { omit } from 'lodash-es';
import { boardsApi } from 'services/api/endpoints/boards'; import { boardsApi } from 'services/api/endpoints/boards';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addImageUploadedFulfilledListener = (startAppListening: AppStartListening) => {
export const addImageUploadedFulfilledListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.uploadImage.matchFulfilled, matcher: imagesApi.endpoints.uploadImage.matchFulfilled,
effect: (action, { dispatch, getState }) => { effect: (action, { dispatch, getState }) => {
@ -133,9 +132,7 @@ export const addImageUploadedFulfilledListener = () => {
} }
}, },
}); });
};
export const addImageUploadedRejectedListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.uploadImage.matchRejected, matcher: imagesApi.endpoints.uploadImage.matchRejected,
effect: (action, { dispatch }) => { effect: (action, { dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imagesStarred.ts
View File

@ -1,10 +1,9 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { selectionChanged } from 'features/gallery/store/gallerySlice'; import { selectionChanged } from 'features/gallery/store/gallerySlice';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import type { ImageDTO } from 'services/api/types'; import type { ImageDTO } from 'services/api/types';
import { startAppListening } from '..'; export const addImagesStarredListener = (startAppListening: AppStartListening) => {
export const addImagesStarredListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.starImages.matchFulfilled, matcher: imagesApi.endpoints.starImages.matchFulfilled,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imagesUnstarred.ts
View File

@ -1,10 +1,9 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { selectionChanged } from 'features/gallery/store/gallerySlice'; import { selectionChanged } from 'features/gallery/store/gallerySlice';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import type { ImageDTO } from 'services/api/types'; import type { ImageDTO } from 'services/api/types';
import { startAppListening } from '..'; export const addImagesUnstarredListener = (startAppListening: AppStartListening) => {
export const addImagesUnstarredListener = () => {
startAppListening({ startAppListening({
matcher: imagesApi.endpoints.unstarImages.matchFulfilled, matcher: imagesApi.endpoints.unstarImages.matchFulfilled,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/initialImageSelected.ts
View File

@ -1,12 +1,11 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { initialImageSelected } from 'features/parameters/store/actions'; import { initialImageSelected } from 'features/parameters/store/actions';
import { initialImageChanged } from 'features/parameters/store/generationSlice'; import { initialImageChanged } from 'features/parameters/store/generationSlice';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { makeToast } from 'features/system/util/makeToast'; import { makeToast } from 'features/system/util/makeToast';
import { t } from 'i18next'; import { t } from 'i18next';
import { startAppListening } from '..'; export const addInitialImageSelectedListener = (startAppListening: AppStartListening) => {
export const addInitialImageSelectedListener = () => {
startAppListening({ startAppListening({
actionCreator: initialImageSelected, actionCreator: initialImageSelected,
effect: (action, { dispatch }) => { effect: (action, { dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelSelected.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { import {
controlAdapterIsEnabledChanged, controlAdapterIsEnabledChanged,
selectControlAdapterAll, selectControlAdapterAll,
@ -12,9 +13,7 @@ import { makeToast } from 'features/system/util/makeToast';
import { t } from 'i18next'; import { t } from 'i18next';
import { forEach } from 'lodash-es'; import { forEach } from 'lodash-es';
import { startAppListening } from '..'; export const addModelSelectedListener = (startAppListening: AppStartListening) => {
export const addModelSelectedListener = () => {
startAppListening({ startAppListening({
actionCreator: modelSelected, actionCreator: modelSelected,
effect: (action, { getState, dispatch }) => { effect: (action, { getState, dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/modelsLoaded.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { import {
controlAdapterModelCleared, controlAdapterModelCleared,
selectAllControlNets, selectAllControlNets,
@ -13,9 +14,7 @@ import { forEach, some } from 'lodash-es';
import { mainModelsAdapterSelectors, modelsApi, vaeModelsAdapterSelectors } from 'services/api/endpoints/models'; import { mainModelsAdapterSelectors, modelsApi, vaeModelsAdapterSelectors } from 'services/api/endpoints/models';
import type { TypeGuardFor } from 'services/api/types'; import type { TypeGuardFor } from 'services/api/types';
import { startAppListening } from '..'; export const addModelsLoadedListener = (startAppListening: AppStartListening) => {
export const addModelsLoadedListener = () => {
startAppListening({ startAppListening({
predicate: (action): action is TypeGuardFor<typeof modelsApi.endpoints.getMainModels.matchFulfilled> => predicate: (action): action is TypeGuardFor<typeof modelsApi.endpoints.getMainModels.matchFulfilled> =>
modelsApi.endpoints.getMainModels.matchFulfilled(action) && modelsApi.endpoints.getMainModels.matchFulfilled(action) &&

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/promptChanged.ts
View File

@ -1,4 +1,5 @@
import { isAnyOf } from '@reduxjs/toolkit'; import { isAnyOf } from '@reduxjs/toolkit';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { import {
combinatorialToggled, combinatorialToggled,
isErrorChanged, isErrorChanged,
@ -13,11 +14,9 @@ import { setPositivePrompt } from 'features/parameters/store/generationSlice';
import { utilitiesApi } from 'services/api/endpoints/utilities'; import { utilitiesApi } from 'services/api/endpoints/utilities';
import { socketConnected } from 'services/events/actions'; import { socketConnected } from 'services/events/actions';
import { startAppListening } from '..';
const matcher = isAnyOf(setPositivePrompt, combinatorialToggled, maxPromptsChanged, maxPromptsReset, socketConnected); const matcher = isAnyOf(setPositivePrompt, combinatorialToggled, maxPromptsChanged, maxPromptsReset, socketConnected);
export const addDynamicPromptsListener = () => { export const addDynamicPromptsListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
matcher, matcher,
effect: async (action, { dispatch, getState, cancelActiveListeners, delay }) => { effect: async (action, { dispatch, getState, cancelActiveListeners, delay }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketConnected.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { $baseUrl } from 'app/store/nanostores/baseUrl'; import { $baseUrl } from 'app/store/nanostores/baseUrl';
import { isEqual } from 'lodash-es'; import { isEqual } from 'lodash-es';
import { atom } from 'nanostores'; import { atom } from 'nanostores';
@ -6,13 +7,11 @@ import { api } from 'services/api';
import { queueApi, selectQueueStatus } from 'services/api/endpoints/queue'; import { queueApi, selectQueueStatus } from 'services/api/endpoints/queue';
import { socketConnected } from 'services/events/actions'; import { socketConnected } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
const $isFirstConnection = atom(true); const $isFirstConnection = atom(true);
export const addSocketConnectedEventListener = () => { export const addSocketConnectedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketConnected, actionCreator: socketConnected,
effect: async (action, { dispatch, getState, cancelActiveListeners, delay }) => { effect: async (action, { dispatch, getState, cancelActiveListeners, delay }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketDisconnected.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketDisconnected } from 'services/events/actions'; import { socketDisconnected } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addSocketDisconnectedEventListener = () => { export const addSocketDisconnectedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketDisconnected, actionCreator: socketDisconnected,
effect: () => { effect: () => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGeneratorProgress.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketGeneratorProgress } from 'services/events/actions'; import { socketGeneratorProgress } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addGeneratorProgressEventListener = () => { export const addGeneratorProgressEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketGeneratorProgress, actionCreator: socketGeneratorProgress,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketGraphExecutionStateComplete.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketGraphExecutionStateComplete } from 'services/events/actions'; import { socketGraphExecutionStateComplete } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addGraphExecutionStateCompleteEventListener = () => { export const addGraphExecutionStateCompleteEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketGraphExecutionStateComplete, actionCreator: socketGraphExecutionStateComplete,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationComplete.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { addImageToStagingArea } from 'features/canvas/store/canvasSlice'; import { addImageToStagingArea } from 'features/canvas/store/canvasSlice';
import { boardIdSelected, galleryViewChanged, imageSelected } from 'features/gallery/store/gallerySlice'; import { boardIdSelected, galleryViewChanged, imageSelected } from 'features/gallery/store/gallerySlice';
@ -10,14 +11,12 @@ import { imagesApi } from 'services/api/endpoints/images';
import { imagesAdapter } from 'services/api/util'; import { imagesAdapter } from 'services/api/util';
import { socketInvocationComplete } from 'services/events/actions'; import { socketInvocationComplete } from 'services/events/actions';
import { startAppListening } from '../..';
// These nodes output an image, but do not actually *save* an image, so we don't want to handle the gallery logic on them // These nodes output an image, but do not actually *save* an image, so we don't want to handle the gallery logic on them
const nodeTypeDenylist = ['load_image', 'image']; const nodeTypeDenylist = ['load_image', 'image'];
const log = logger('socketio'); const log = logger('socketio');
export const addInvocationCompleteEventListener = () => { export const addInvocationCompleteEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketInvocationComplete, actionCreator: socketInvocationComplete,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationError.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketInvocationError } from 'services/events/actions'; import { socketInvocationError } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addInvocationErrorEventListener = () => { export const addInvocationErrorEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketInvocationError, actionCreator: socketInvocationError,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationRetrievalError.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketInvocationRetrievalError } from 'services/events/actions'; import { socketInvocationRetrievalError } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addInvocationRetrievalErrorEventListener = () => { export const addInvocationRetrievalErrorEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketInvocationRetrievalError, actionCreator: socketInvocationRetrievalError,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketInvocationStarted.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketInvocationStarted } from 'services/events/actions'; import { socketInvocationStarted } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addInvocationStartedEventListener = () => { export const addInvocationStartedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketInvocationStarted, actionCreator: socketInvocationStarted,
effect: (action) => { effect: (action) => {

11
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelInstall.ts
View File

@ -1,3 +1,4 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { api } from 'services/api'; import { api } from 'services/api';
import { modelsApi } from 'services/api/endpoints/models'; import { modelsApi } from 'services/api/endpoints/models';
import { import {
@ -6,19 +7,18 @@ import {
socketModelInstallError, socketModelInstallError,
} from 'services/events/actions'; } from 'services/events/actions';
import { startAppListening } from '../..'; export const addModelInstallEventListener = (startAppListening: AppStartListening) => {
export const addModelInstallEventListener = () => {
startAppListening({ startAppListening({
actionCreator: socketModelInstallDownloading, actionCreator: socketModelInstallDownloading,
effect: async (action, { dispatch }) => { effect: async (action, { dispatch }) => {
const { bytes, id } = action.payload.data; const { bytes, total_bytes, id } = action.payload.data;
dispatch( dispatch(
modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => { modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => {
const modelImport = draft.find((m) => m.id === id); const modelImport = draft.find((m) => m.id === id);
if (modelImport) { if (modelImport) {
modelImport.bytes = bytes; modelImport.bytes = bytes;
modelImport.total_bytes = total_bytes;
modelImport.status = 'downloading'; modelImport.status = 'downloading';
} }
return draft; return draft;
@ -48,7 +48,7 @@ export const addModelInstallEventListener = () => {
startAppListening({ startAppListening({
actionCreator: socketModelInstallError, actionCreator: socketModelInstallError,
effect: (action, { dispatch }) => { effect: (action, { dispatch }) => {
const { id, error_type } = action.payload.data; const { id, error, error_type } = action.payload.data;
dispatch( dispatch(
modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => { modelsApi.util.updateQueryData('getModelImports', undefined, (draft) => {
@ -56,6 +56,7 @@ export const addModelInstallEventListener = () => {
if (modelImport) { if (modelImport) {
modelImport.status = 'error'; modelImport.status = 'error';
modelImport.error_reason = error_type; modelImport.error_reason = error_type;
modelImport.error = error;
} }
return draft; return draft;
}) })

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketModelLoad.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketModelLoadCompleted, socketModelLoadStarted } from 'services/events/actions'; import { socketModelLoadCompleted, socketModelLoadStarted } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addModelLoadEventListener = () => { export const addModelLoadEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketModelLoadStarted, actionCreator: socketModelLoadStarted,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketQueueItemStatusChanged.ts
View File

@ -1,12 +1,11 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { queueApi, queueItemsAdapter } from 'services/api/endpoints/queue'; import { queueApi, queueItemsAdapter } from 'services/api/endpoints/queue';
import { socketQueueItemStatusChanged } from 'services/events/actions'; import { socketQueueItemStatusChanged } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addSocketQueueItemStatusChangedEventListener = () => { export const addSocketQueueItemStatusChangedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketQueueItemStatusChanged, actionCreator: socketQueueItemStatusChanged,
effect: async (action, { dispatch }) => { effect: async (action, { dispatch }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketSessionRetrievalError.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketSessionRetrievalError } from 'services/events/actions'; import { socketSessionRetrievalError } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addSessionRetrievalErrorEventListener = () => { export const addSessionRetrievalErrorEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketSessionRetrievalError, actionCreator: socketSessionRetrievalError,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketSubscribed.ts
View File

@ -1,11 +1,10 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketSubscribedSession } from 'services/events/actions'; import { socketSubscribedSession } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addSocketSubscribedEventListener = () => { export const addSocketSubscribedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketSubscribedSession, actionCreator: socketSubscribedSession,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/socketio/socketUnsubscribed.ts
View File

@ -1,10 +1,9 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { socketUnsubscribedSession } from 'services/events/actions'; import { socketUnsubscribedSession } from 'services/events/actions';
import { startAppListening } from '../..';
const log = logger('socketio'); const log = logger('socketio');
export const addSocketUnsubscribedEventListener = () => { export const addSocketUnsubscribedEventListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: socketUnsubscribedSession, actionCreator: socketUnsubscribedSession,
effect: (action) => { effect: (action) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/stagingAreaImageSaved.ts
View File

@ -1,11 +1,10 @@
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { stagingAreaImageSaved } from 'features/canvas/store/actions'; import { stagingAreaImageSaved } from 'features/canvas/store/actions';
import { addToast } from 'features/system/store/systemSlice'; import { addToast } from 'features/system/store/systemSlice';
import { t } from 'i18next'; import { t } from 'i18next';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
import { startAppListening } from '..'; export const addStagingAreaImageSavedListener = (startAppListening: AppStartListening) => {
export const addStagingAreaImageSavedListener = () => {
startAppListening({ startAppListening({
actionCreator: stagingAreaImageSaved, actionCreator: stagingAreaImageSaved,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/updateAllNodesRequested.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { updateAllNodesRequested } from 'features/nodes/store/actions'; import { updateAllNodesRequested } from 'features/nodes/store/actions';
import { nodeReplaced } from 'features/nodes/store/nodesSlice'; import { nodeReplaced } from 'features/nodes/store/nodesSlice';
import { NodeUpdateError } from 'features/nodes/types/error'; import { NodeUpdateError } from 'features/nodes/types/error';
@ -8,9 +9,7 @@ import { addToast } from 'features/system/store/systemSlice';
import { makeToast } from 'features/system/util/makeToast'; import { makeToast } from 'features/system/util/makeToast';
import { t } from 'i18next'; import { t } from 'i18next';
import { startAppListening } from '..'; export const addUpdateAllNodesRequestedListener = (startAppListening: AppStartListening) => {
export const addUpdateAllNodesRequestedListener = () => {
startAppListening({ startAppListening({
actionCreator: updateAllNodesRequested, actionCreator: updateAllNodesRequested,
effect: (action, { dispatch, getState }) => { effect: (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/upscaleRequested.ts
View File

@ -1,5 +1,6 @@
import { createAction } from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { buildAdHocUpscaleGraph } from 'features/nodes/util/graph/buildAdHocUpscaleGraph'; import { buildAdHocUpscaleGraph } from 'features/nodes/util/graph/buildAdHocUpscaleGraph';
import { createIsAllowedToUpscaleSelector } from 'features/parameters/hooks/useIsAllowedToUpscale'; import { createIsAllowedToUpscaleSelector } from 'features/parameters/hooks/useIsAllowedToUpscale';
@ -8,11 +9,9 @@ import { t } from 'i18next';
import { queueApi } from 'services/api/endpoints/queue'; import { queueApi } from 'services/api/endpoints/queue';
import type { BatchConfig, ImageDTO } from 'services/api/types'; import type { BatchConfig, ImageDTO } from 'services/api/types';
import { startAppListening } from '..';
export const upscaleRequested = createAction<{ imageDTO: ImageDTO }>(`upscale/upscaleRequested`); export const upscaleRequested = createAction<{ imageDTO: ImageDTO }>(`upscale/upscaleRequested`);
export const addUpscaleRequestedListener = () => { export const addUpscaleRequestedListener = (startAppListening: AppStartListening) => {
startAppListening({ startAppListening({
actionCreator: upscaleRequested, actionCreator: upscaleRequested,
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {

5
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/workflowLoadRequested.ts
View File

@ -1,4 +1,5 @@
import { logger } from 'app/logging/logger'; import { logger } from 'app/logging/logger';
import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
import { parseify } from 'common/util/serialize'; import { parseify } from 'common/util/serialize';
import { workflowLoaded, workflowLoadRequested } from 'features/nodes/store/actions'; import { workflowLoaded, workflowLoadRequested } from 'features/nodes/store/actions';
import { $flow } from 'features/nodes/store/reactFlowInstance'; import { $flow } from 'features/nodes/store/reactFlowInstance';
@ -10,9 +11,7 @@ import { t } from 'i18next';
import { z } from 'zod'; import { z } from 'zod';
import { fromZodError } from 'zod-validation-error'; import { fromZodError } from 'zod-validation-error';
import { startAppListening } from '..'; export const addWorkflowLoadRequestedListener = (startAppListening: AppStartListening) => {
export const addWorkflowLoadRequestedListener = () => {
startAppListening({ startAppListening({
actionCreator: workflowLoadRequested, actionCreator: workflowLoadRequested,
effect: (action, { dispatch, getState }) => { effect: (action, { dispatch, getState }) => {

2
invokeai/frontend/web/src/app/store/nanostores/bulkDownloadId.ts
View File

@ -1,6 +1,6 @@
import { atom } from 'nanostores'; import { atom } from 'nanostores';
export const DEFAULT_BULK_DOWNLOAD_ID = 'default'; const DEFAULT_BULK_DOWNLOAD_ID = 'default';
/** /**
* The download id for a bulk download. Used for socket subscriptions. * The download id for a bulk download. Used for socket subscriptions.

2
invokeai/frontend/web/src/app/store/nanostores/store.ts
View File

@ -11,7 +11,7 @@ declare global {
/** /**
* Raised when the redux store is unable to be retrieved. * Raised when the redux store is unable to be retrieved.
*/ */
export class ReduxStoreNotInitialized extends Error { class ReduxStoreNotInitialized extends Error {
/** /**
* Create ReduxStoreNotInitialized * Create ReduxStoreNotInitialized
* @param {String} message * @param {String} message

3
invokeai/frontend/web/src/app/store/store.ts
View File

@ -136,7 +136,7 @@ const unserialize: UnserializeFunction = (data, key) => {
} }
}; };
export const serialize: SerializeFunction = (data, key) => { const serialize: SerializeFunction = (data, key) => {
const persistConfig = persistConfigs[key as keyof typeof persistConfigs]; const persistConfig = persistConfigs[key as keyof typeof persistConfigs];
if (!persistConfig) { if (!persistConfig) {
throw new Error(`No persist config for slice "${key}"`); throw new Error(`No persist config for slice "${key}"`);
@ -185,7 +185,6 @@ export const createStore = (uniqueStoreKey?: string, persist = true) =>
}, },
}); });
export type AppGetState = ReturnType<ReturnType<typeof createStore>['getState']>;
export type RootState = ReturnType<ReturnType<typeof createStore>['getState']>; export type RootState = ReturnType<ReturnType<typeof createStore>['getState']>;
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
export type AppThunkDispatch = ThunkDispatch<RootState, any, UnknownAction>; export type AppThunkDispatch = ThunkDispatch<RootState, any, UnknownAction>;

2
invokeai/frontend/web/src/app/store/util.ts
View File

@ -1,2 +0,0 @@
export const EMPTY_ARRAY = [];
export const EMPTY_OBJECT = {};

2
invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts
View File

@ -6,7 +6,7 @@ export type Feature =
| 'paramNegativeConditioning' | 'paramNegativeConditioning'
| 'paramPositiveConditioning' | 'paramPositiveConditioning'
| 'paramScheduler' | 'paramScheduler'
| 'compositingBlur' | 'compositingMaskBlur'
| 'compositingBlurMethod' | 'compositingBlurMethod'
| 'compositingCoherencePass' | 'compositingCoherencePass'
| 'compositingCoherenceMode' | 'compositingCoherenceMode'

1
invokeai/frontend/web/src/common/components/Nbsp.tsx
View File

@ -1 +0,0 @@
export const Nbsp = () => <>{'\u00A0'}</>;

102
invokeai/frontend/web/src/common/hooks/useImage.ts
View File

@ -1,102 +0,0 @@
import { useLayoutEffect, useRef, useState } from 'react';
// Adapted from https://github.com/konvajs/use-image
type CrossOrigin = 'anonymous' | 'use-credentials';
type ReferrerPolicy =
| 'no-referrer'
| 'no-referrer-when-downgrade'
| 'origin'
| 'origin-when-cross-origin'
| 'same-origin'
| 'strict-origin'
| 'strict-origin-when-cross-origin'
| 'unsafe-url';
type ImageStatus = 'loaded' | 'loading' | 'failed';
export const useImage = (
url: string,
crossOrigin?: CrossOrigin,
referrerpolicy?: ReferrerPolicy
): [undefined | HTMLImageElement, ImageStatus, Blob | null] => {
// lets use refs for image and status
// so we can update them during render
// to have instant update in status/image when new data comes in
const statusRef = useRef<ImageStatus>('loading');
const imageRef = useRef<HTMLImageElement>();
const blobRef = useRef<Blob | null>(null);
// we are not going to use token
// but we need to just to trigger state update
const [_, setStateToken] = useState(0);
// keep track of old props to trigger changes
const oldUrl = useRef<string>();
const oldCrossOrigin = useRef<string>();
const oldReferrerPolicy = useRef<string>();
if (
oldUrl.current !== url ||
oldCrossOrigin.current !== crossOrigin ||
oldReferrerPolicy.current !== referrerpolicy
) {
statusRef.current = 'loading';
imageRef.current = undefined;
oldUrl.current = url;
oldCrossOrigin.current = crossOrigin;
oldReferrerPolicy.current = referrerpolicy;
}
useLayoutEffect(
function () {
if (!url) {
return;
}
const img = document.createElement('img');
function onload() {
statusRef.current = 'loaded';
imageRef.current = img;
const canvas = document.createElement('canvas');
canvas.width = img.clientWidth;
canvas.height = img.clientHeight;
const context = canvas.getContext('2d');
if (context) {
context.drawImage(img, 0, 0);
canvas.toBlob(function (blob) {
blobRef.current = blob;
}, 'image/png');
}
setStateToken(Math.random());
}
function onerror() {
statusRef.current = 'failed';
imageRef.current = undefined;
setStateToken(Math.random());
}
img.addEventListener('load', onload);
img.addEventListener('error', onerror);
if (crossOrigin) {
img.crossOrigin = crossOrigin;
}
if (referrerpolicy) {
img.referrerPolicy = referrerpolicy;
}
img.src = url;
return function cleanup() {
img.removeEventListener('load', onload);
img.removeEventListener('error', onerror);
};
},
[url, crossOrigin, referrerpolicy]
);
// return array because it is better to use in case of several useImage hooks
// const [background, backgroundStatus] = useImage(url1);
// const [patter] = useImage(url2);
return [imageRef.current, statusRef.current, blobRef.current];
};

2
invokeai/frontend/web/src/common/hooks/useModelCustomSelect.ts
View File

@ -1,6 +1,6 @@
import type { Item } from '@invoke-ai/ui-library'; import type { Item } from '@invoke-ai/ui-library';
import type { EntityState } from '@reduxjs/toolkit'; import type { EntityState } from '@reduxjs/toolkit';
import { EMPTY_ARRAY } from 'app/store/util'; import { EMPTY_ARRAY } from 'app/store/constants';
import type { ModelIdentifierWithBase } from 'features/nodes/types/common'; import type { ModelIdentifierWithBase } from 'features/nodes/types/common';
import { MODEL_TYPE_SHORT_MAP } from 'features/parameters/types/constants'; import { MODEL_TYPE_SHORT_MAP } from 'features/parameters/types/constants';
import { filter } from 'lodash-es'; import { filter } from 'lodash-es';

2
invokeai/frontend/web/src/common/hooks/useSingleAndDoubleClick.ts
View File

@ -1,7 +1,7 @@
// https://stackoverflow.com/a/73731908 // https://stackoverflow.com/a/73731908
import { useCallback, useEffect, useState } from 'react'; import { useCallback, useEffect, useState } from 'react';
export type UseSingleAndDoubleClickOptions = { type UseSingleAndDoubleClickOptions = {
onSingleClick: () => void; onSingleClick: () => void;
onDoubleClick: () => void; onDoubleClick: () => void;
latency?: number; latency?: number;

4
invokeai/frontend/web/src/common/types.ts
View File

@ -1,7 +1,5 @@
export type JSONValue = string | number | boolean | null | JSONValue[] | { [key: string]: JSONValue }; type JSONValue = string | number | boolean | null | JSONValue[] | { [key: string]: JSONValue };
export interface JSONObject { export interface JSONObject {
[k: string]: JSONValue; [k: string]: JSONValue;
} }
export interface JSONArray extends Array<JSONValue> {}

4
invokeai/frontend/web/src/common/util/generateSeeds.ts
View File

@ -1,7 +1,7 @@
import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants'; import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
import { random } from 'lodash-es'; import { random } from 'lodash-es';
export type GenerateSeedsArg = { type GenerateSeedsArg = {
count: number; count: number;
start?: number; start?: number;
min?: number; min?: number;
@ -16,5 +16,3 @@ export const generateSeeds = ({ count, start, min = NUMPY_RAND_MIN, max = NUMPY_
} }
return seeds; return seeds;
}; };
export const generateOneSeed = (min: number = NUMPY_RAND_MIN, max: number = NUMPY_RAND_MAX) => random(min, max);

4
invokeai/frontend/web/src/common/util/roundDownToMultiple.ts
View File

@ -8,7 +8,3 @@ export const roundDownToMultipleMin = (num: number, multiple: number): number =>
export const roundToMultiple = (num: number, multiple: number): number => { export const roundToMultiple = (num: number, multiple: number): number => {
return Math.round(num / multiple) * multiple; return Math.round(num / multiple) * multiple;
}; };
export const roundToMultipleMin = (num: number, multiple: number): number => {
return Math.max(multiple, roundToMultiple(num, multiple));
};

8
invokeai/frontend/web/src/common/util/skipMouseEvent.ts
View File

@ -1,8 +0,0 @@
import type { MouseEvent } from 'react';
/**
* Prevents the default behavior of the event.
*/
export const skipMouseEvent = (e: MouseEvent) => {
e.preventDefault();
};

5
invokeai/frontend/web/src/common/util/stopPastePropagation.ts
View File

@ -1,5 +0,0 @@
import type { ClipboardEvent } from 'react';
export const stopPastePropagation = (e: ClipboardEvent) => {
e.stopPropagation();
};

2
invokeai/frontend/web/src/features/canvas/components/IAICanvasMaskCompositer.tsx
View File

@ -9,7 +9,7 @@ import { isNumber } from 'lodash-es';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Rect } from 'react-konva'; import { Rect } from 'react-konva';
export const canvasMaskCompositerSelector = createMemoizedSelector(selectCanvasSlice, (canvas) => { const canvasMaskCompositerSelector = createMemoizedSelector(selectCanvasSlice, (canvas) => {
return { return {
stageCoordinates: canvas.stageCoordinates, stageCoordinates: canvas.stageCoordinates,
stageDimensions: canvas.stageDimensions, stageDimensions: canvas.stageDimensions,

2
invokeai/frontend/web/src/features/canvas/store/canvasNanostore.ts
View File

@ -8,7 +8,7 @@ export const $tool = atom<CanvasTool>('move');
export const $toolStash = atom<CanvasTool | null>(null); export const $toolStash = atom<CanvasTool | null>(null);
export const $isDrawing = atom<boolean>(false); export const $isDrawing = atom<boolean>(false);
export const $isMouseOverBoundingBox = atom<boolean>(false); export const $isMouseOverBoundingBox = atom<boolean>(false);
export const $isMoveBoundingBoxKeyHeld = atom<boolean>(false); const $isMoveBoundingBoxKeyHeld = atom<boolean>(false);
export const $isMoveStageKeyHeld = atom<boolean>(false); export const $isMoveStageKeyHeld = atom<boolean>(false);
export const $isMovingBoundingBox = atom<boolean>(false); export const $isMovingBoundingBox = atom<boolean>(false);
export const $isMovingStage = atom<boolean>(false); export const $isMovingStage = atom<boolean>(false);

6
invokeai/frontend/web/src/features/canvas/store/canvasSelectors.ts
View File

@ -1,14 +1,8 @@
import { createSelector } from '@reduxjs/toolkit'; import { createSelector } from '@reduxjs/toolkit';
import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
import { selectCanvasSlice } from './canvasSlice'; import { selectCanvasSlice } from './canvasSlice';
import { isCanvasBaseImage } from './canvasTypes';
export const isStagingSelector = createSelector( export const isStagingSelector = createSelector(
selectCanvasSlice, selectCanvasSlice,
(canvas) => canvas.batchIds.length > 0 || canvas.layerState.stagingArea.images.length > 0 (canvas) => canvas.batchIds.length > 0 || canvas.layerState.stagingArea.images.length > 0
); );
export const initialCanvasImageSelector = createMemoizedSelector(selectCanvasSlice, (canvas) =>
canvas.layerState.objects.find(isCanvasBaseImage)
);

30
invokeai/frontend/web/src/features/canvas/store/canvasSlice.ts
View File

@ -38,7 +38,7 @@ import { CANVAS_GRID_SIZE_FINE } from './constants';
*/ */
const MAX_HISTORY = 128; const MAX_HISTORY = 128;
export const initialLayerState: CanvasLayerState = { const initialLayerState: CanvasLayerState = {
objects: [], objects: [],
stagingArea: { stagingArea: {
images: [], images: [],
@ -46,11 +46,10 @@ export const initialLayerState: CanvasLayerState = {
}, },
}; };
export const initialCanvasState: CanvasState = { const initialCanvasState: CanvasState = {
_version: 1, _version: 1,
boundingBoxCoordinates: { x: 0, y: 0 }, boundingBoxCoordinates: { x: 0, y: 0 },
boundingBoxDimensions: { width: 512, height: 512 }, boundingBoxDimensions: { width: 512, height: 512 },
boundingBoxPreviewFill: { r: 0, g: 0, b: 0, a: 0.5 },
boundingBoxScaleMethod: 'auto', boundingBoxScaleMethod: 'auto',
brushColor: { r: 90, g: 90, b: 255, a: 1 }, brushColor: { r: 90, g: 90, b: 255, a: 1 },
brushSize: 50, brushSize: 50,
@ -215,9 +214,6 @@ export const canvasSlice = createSlice({
setStageCoordinates: (state, action: PayloadAction<Vector2d>) => { setStageCoordinates: (state, action: PayloadAction<Vector2d>) => {
state.stageCoordinates = action.payload; state.stageCoordinates = action.payload;
}, },
setBoundingBoxPreviewFill: (state, action: PayloadAction<RgbaColor>) => {
state.boundingBoxPreviewFill = action.payload;
},
setStageScale: (state, action: PayloadAction<number>) => { setStageScale: (state, action: PayloadAction<number>) => {
state.stageScale = action.payload; state.stageScale = action.payload;
}, },
@ -231,9 +227,6 @@ export const canvasSlice = createSlice({
setShouldLockBoundingBox: (state, action: PayloadAction<boolean>) => { setShouldLockBoundingBox: (state, action: PayloadAction<boolean>) => {
state.shouldLockBoundingBox = action.payload; state.shouldLockBoundingBox = action.payload;
}, },
toggleShouldLockBoundingBox: (state) => {
state.shouldLockBoundingBox = !state.shouldLockBoundingBox;
},
setShouldShowBoundingBox: (state, action: PayloadAction<boolean>) => { setShouldShowBoundingBox: (state, action: PayloadAction<boolean>) => {
state.shouldShowBoundingBox = action.payload; state.shouldShowBoundingBox = action.payload;
}, },
@ -573,19 +566,6 @@ export const canvasSlice = createSlice({
}, },
}), }),
}, },
scaledBoundingBoxDimensionsReset: {
reducer: (state, action: PayloadActionWithOptimalDimension) => {
const scaledDimensions = getScaledBoundingBoxDimensions(
state.boundingBoxDimensions,
action.meta.optimalDimension
);
state.scaledBoundingBoxDimensions = scaledDimensions;
},
prepare: (payload: void, optimalDimension: number) => ({
payload: undefined,
meta: { optimalDimension },
}),
},
setShouldShowStagingImage: (state, action: PayloadAction<boolean>) => { setShouldShowStagingImage: (state, action: PayloadAction<boolean>) => {
state.shouldShowStagingImage = action.payload; state.shouldShowStagingImage = action.payload;
}, },
@ -682,7 +662,6 @@ export const {
resetCanvasView, resetCanvasView,
setBoundingBoxCoordinates, setBoundingBoxCoordinates,
setBoundingBoxDimensions, setBoundingBoxDimensions,
setBoundingBoxPreviewFill,
setBoundingBoxScaleMethod, setBoundingBoxScaleMethod,
setBrushColor, setBrushColor,
setBrushSize, setBrushSize,
@ -695,7 +674,6 @@ export const {
setShouldAutoSave, setShouldAutoSave,
setShouldCropToBoundingBoxOnSave, setShouldCropToBoundingBoxOnSave,
setShouldDarkenOutsideBoundingBox, setShouldDarkenOutsideBoundingBox,
setShouldLockBoundingBox,
setShouldPreserveMaskedArea, setShouldPreserveMaskedArea,
setShouldShowBoundingBox, setShouldShowBoundingBox,
setShouldShowCanvasDebugInfo, setShouldShowCanvasDebugInfo,
@ -706,7 +684,6 @@ export const {
setShouldSnapToGrid, setShouldSnapToGrid,
setStageCoordinates, setStageCoordinates,
setStageScale, setStageScale,
toggleShouldLockBoundingBox,
undo, undo,
setScaledBoundingBoxDimensions, setScaledBoundingBoxDimensions,
setShouldRestrictStrokesToBox, setShouldRestrictStrokesToBox,
@ -716,13 +693,12 @@ export const {
canvasBatchIdAdded, canvasBatchIdAdded,
canvasBatchIdsReset, canvasBatchIdsReset,
aspectRatioChanged, aspectRatioChanged,
scaledBoundingBoxDimensionsReset,
} = canvasSlice.actions; } = canvasSlice.actions;
export const selectCanvasSlice = (state: RootState) => state.canvas; export const selectCanvasSlice = (state: RootState) => state.canvas;
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */ /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
export const migrateCanvasState = (state: any): any => { const migrateCanvasState = (state: any): any => {
if (!('_version' in state)) { if (!('_version' in state)) {
state._version = 1; state._version = 1;
state.aspectRatio = initialAspectRatioState; state.aspectRatio = initialAspectRatioState;

18
invokeai/frontend/web/src/features/canvas/store/canvasTypes.ts
View File

@ -10,14 +10,12 @@ export const LAYER_NAMES_DICT: { label: string; value: CanvasLayer }[] = [
{ label: 'Mask', value: 'mask' }, { label: 'Mask', value: 'mask' },
]; ];
export const LAYER_NAMES = ['base', 'mask'] as const; const zBoundingBoxScaleMethod = z.enum(['none', 'auto', 'manual']);
export const zBoundingBoxScaleMethod = z.enum(['none', 'auto', 'manual']);
export type BoundingBoxScaleMethod = z.infer<typeof zBoundingBoxScaleMethod>; export type BoundingBoxScaleMethod = z.infer<typeof zBoundingBoxScaleMethod>;
export const isBoundingBoxScaleMethod = (v: unknown): v is BoundingBoxScaleMethod => export const isBoundingBoxScaleMethod = (v: unknown): v is BoundingBoxScaleMethod =>
zBoundingBoxScaleMethod.safeParse(v).success; zBoundingBoxScaleMethod.safeParse(v).success;
export type CanvasDrawingTool = 'brush' | 'eraser'; type CanvasDrawingTool = 'brush' | 'eraser';
export type CanvasTool = CanvasDrawingTool | 'move' | 'colorPicker'; export type CanvasTool = CanvasDrawingTool | 'move' | 'colorPicker';
@ -55,7 +53,7 @@ export type CanvasBaseLine = {
clip?: IRect; clip?: IRect;
}; };
export type CanvasFillRect = { type CanvasFillRect = {
kind: 'fillRect'; kind: 'fillRect';
layer: 'base'; layer: 'base';
x: number; x: number;
@ -65,7 +63,7 @@ export type CanvasFillRect = {
color: RgbaColor; color: RgbaColor;
}; };
export type CanvasEraseRect = { type CanvasEraseRect = {
kind: 'eraseRect'; kind: 'eraseRect';
layer: 'base'; layer: 'base';
x: number; x: number;
@ -74,7 +72,7 @@ export type CanvasEraseRect = {
height: number; height: number;
}; };
export type CanvasObject = CanvasImage | CanvasBaseLine | CanvasMaskLine | CanvasFillRect | CanvasEraseRect; type CanvasObject = CanvasImage | CanvasBaseLine | CanvasMaskLine | CanvasFillRect | CanvasEraseRect;
export type CanvasLayerState = { export type CanvasLayerState = {
objects: CanvasObject[]; objects: CanvasObject[];
@ -85,11 +83,6 @@ export type CanvasLayerState = {
}; };
}; };
export type CanvasSession = {
sessionId: string;
boundingBox: IRect;
};
// type guards // type guards
export const isCanvasMaskLine = (obj: CanvasObject): obj is CanvasMaskLine => export const isCanvasMaskLine = (obj: CanvasObject): obj is CanvasMaskLine =>
obj.kind === 'line' && obj.layer === 'mask'; obj.kind === 'line' && obj.layer === 'mask';
@ -112,7 +105,6 @@ export interface CanvasState {
_version: 1; _version: 1;
boundingBoxCoordinates: Vector2d; boundingBoxCoordinates: Vector2d;
boundingBoxDimensions: Dimensions; boundingBoxDimensions: Dimensions;
boundingBoxPreviewFill: RgbaColor;
boundingBoxScaleMethod: BoundingBoxScaleMethod; boundingBoxScaleMethod: BoundingBoxScaleMethod;
brushColor: RgbaColor; brushColor: RgbaColor;
brushSize: number; brushSize: number;

12
invokeai/frontend/web/src/features/canvas/util/colorToString.ts
View File

@ -1,16 +1,6 @@
import type { RgbaColor, RgbColor } from 'react-colorful'; import type { RgbaColor } from 'react-colorful';
export const rgbaColorToString = (color: RgbaColor): string => { export const rgbaColorToString = (color: RgbaColor): string => {
const { r, g, b, a } = color; const { r, g, b, a } = color;
return `rgba(${r}, ${g}, ${b}, ${a})`; return `rgba(${r}, ${g}, ${b}, ${a})`;
}; };
export const rgbaColorToRgbString = (color: RgbaColor): string => {
const { r, g, b } = color;
return `rgba(${r}, ${g}, ${b})`;
};
export const rgbColorToString = (color: RgbColor): string => {
const { r, g, b } = color;
return `rgba(${r}, ${g}, ${b})`;
};

3
invokeai/frontend/web/src/features/canvas/util/constants.ts
View File

@ -1,6 +1,3 @@
// bounding box anchor size
export const TRANSFORMER_ANCHOR_SIZE = 15;
// canvas wheel zoom exponential scale factor // canvas wheel zoom exponential scale factor
export const CANVAS_SCALE_BY = 0.999; export const CANVAS_SCALE_BY = 0.999;

11
invokeai/frontend/web/src/features/canvas/util/roundDimensionsToMultiple.ts
View File

@ -1,11 +0,0 @@
import { roundToMultiple } from 'common/util/roundDownToMultiple';
import type { Dimensions } from 'features/canvas/store/canvasTypes';
const roundDimensionsToMultiple = (dimensions: Dimensions, multiple: number): Dimensions => {
return {
width: roundToMultiple(dimensions.width, multiple),
height: roundToMultiple(dimensions.height, multiple),
};
};
export default roundDimensionsToMultiple;

1
invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterConfig.tsx
View File

@ -1,5 +1,6 @@
import { Box, Flex, FormControl, FormLabel, Icon, IconButton, Switch } from '@invoke-ai/ui-library'; import { Box, Flex, FormControl, FormLabel, Icon, IconButton, Switch } from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import ParamControlAdapterModel from 'features/controlAdapters/components/parameters/ParamControlAdapterModel';
import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled'; import { useControlAdapterIsEnabled } from 'features/controlAdapters/hooks/useControlAdapterIsEnabled';
import { useControlAdapterType } from 'features/controlAdapters/hooks/useControlAdapterType'; import { useControlAdapterType } from 'features/controlAdapters/hooks/useControlAdapterType';
import { import {

2
invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx
View File

@ -17,7 +17,7 @@ import NormalBaeProcessor from './processors/NormalBaeProcessor';
import PidiProcessor from './processors/PidiProcessor'; import PidiProcessor from './processors/PidiProcessor';
import ZoeDepthProcessor from './processors/ZoeDepthProcessor'; import ZoeDepthProcessor from './processors/ZoeDepthProcessor';
export type Props = { type Props = {
id: string; id: string;
}; };

21
invokeai/frontend/web/src/features/controlAdapters/hooks/useControlAdapter.ts
View File

@ -1,21 +0,0 @@
import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
import { useAppSelector } from 'app/store/storeHooks';
import {
selectControlAdapterById,
selectControlAdaptersSlice,
} from 'features/controlAdapters/store/controlAdaptersSlice';
import { useMemo } from 'react';
export const useControlAdapter = (id: string) => {
const selector = useMemo(
() =>
createMemoizedSelector(selectControlAdaptersSlice, (controlAdapters) =>
selectControlAdapterById(controlAdapters, id)
),
[id]
);
const controlAdapter = useAppSelector(selector);
return controlAdapter;
};

33
invokeai/frontend/web/src/features/controlAdapters/store/controlAdaptersSlice.ts
View File

@ -30,20 +30,18 @@ import type {
} from './types'; } from './types';
import { isControlNet, isControlNetOrT2IAdapter, isIPAdapter, isT2IAdapter } from './types'; import { isControlNet, isControlNetOrT2IAdapter, isIPAdapter, isT2IAdapter } from './types';
export const caAdapter = createEntityAdapter<ControlAdapterConfig, string>({ const caAdapter = createEntityAdapter<ControlAdapterConfig, string>({
selectId: (ca) => ca.id, selectId: (ca) => ca.id,
}); });
export const caAdapterSelectors = caAdapter.getSelectors(undefined, getSelectorsOptions); const caAdapterSelectors = caAdapter.getSelectors(undefined, getSelectorsOptions);
export const { export const {
selectById: selectControlAdapterById, selectById: selectControlAdapterById,
selectAll: selectControlAdapterAll, selectAll: selectControlAdapterAll,
selectEntities: selectControlAdapterEntities,
selectIds: selectControlAdapterIds, selectIds: selectControlAdapterIds,
selectTotal: selectControlAdapterTotal,
} = caAdapterSelectors; } = caAdapterSelectors;
export const initialControlAdaptersState: ControlAdaptersState = caAdapter.getInitialState<{ const initialControlAdaptersState: ControlAdaptersState = caAdapter.getInitialState<{
_version: 1; _version: 1;
pendingControlImages: string[]; pendingControlImages: string[];
}>({ }>({
@ -131,22 +129,6 @@ export const controlAdaptersSlice = createSlice({
return { payload: { id, newId: uuidv4() } }; return { payload: { id, newId: uuidv4() } };
}, },
}, },
controlAdapterAddedFromImage: {
reducer: (
state,
action: PayloadAction<{
id: string;
type: ControlAdapterType;
controlImage: string;
}>
) => {
const { id, type, controlImage } = action.payload;
caAdapter.addOne(state, buildControlAdapter(id, type, { controlImage }));
},
prepare: (payload: { type: ControlAdapterType; controlImage: string }) => {
return { payload: { ...payload, id: uuidv4() } };
},
},
controlAdapterRemoved: (state, action: PayloadAction<{ id: string }>) => { controlAdapterRemoved: (state, action: PayloadAction<{ id: string }>) => {
caAdapter.removeOne(state, action.payload.id); caAdapter.removeOne(state, action.payload.id);
}, },
@ -407,7 +389,6 @@ export const {
controlAdapterAdded, controlAdapterAdded,
controlAdapterRecalled, controlAdapterRecalled,
controlAdapterDuplicated, controlAdapterDuplicated,
controlAdapterAddedFromImage,
controlAdapterRemoved, controlAdapterRemoved,
controlAdapterImageChanged, controlAdapterImageChanged,
controlAdapterProcessedImageChanged, controlAdapterProcessedImageChanged,
@ -426,16 +407,12 @@ export const {
controlAdapterModelCleared, controlAdapterModelCleared,
} = controlAdaptersSlice.actions; } = controlAdaptersSlice.actions;
export const isAnyControlAdapterAdded = isAnyOf( export const isAnyControlAdapterAdded = isAnyOf(controlAdapterAdded, controlAdapterRecalled);
controlAdapterAdded,
controlAdapterAddedFromImage,
controlAdapterRecalled
);
export const selectControlAdaptersSlice = (state: RootState) => state.controlAdapters; export const selectControlAdaptersSlice = (state: RootState) => state.controlAdapters;
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */ /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
export const migrateControlAdaptersState = (state: any): any => { const migrateControlAdaptersState = (state: any): any => {
if (!('_version' in state)) { if (!('_version' in state)) {
state._version = 1; state._version = 1;
} }

147
invokeai/frontend/web/src/features/controlAdapters/store/types.ts
View File

@ -4,7 +4,6 @@ import type {
ParameterIPAdapterModel, ParameterIPAdapterModel,
ParameterT2IAdapterModel, ParameterT2IAdapterModel,
} from 'features/parameters/types/parameterSchemas'; } from 'features/parameters/types/parameterSchemas';
import { isObject } from 'lodash-es';
import type { components } from 'services/api/schema'; import type { components } from 'services/api/schema';
import type { import type {
CannyImageProcessorInvocation, CannyImageProcessorInvocation,
@ -81,7 +80,7 @@ export type RequiredDepthAnythingImageProcessorInvocation = O.Required<
'type' | 'model_size' | 'resolution' | 'offload' 'type' | 'model_size' | 'resolution' | 'offload'
>; >;
export const zDepthAnythingModelSize = z.enum(['large', 'base', 'small']); const zDepthAnythingModelSize = z.enum(['large', 'base', 'small']);
export type DepthAnythingModelSize = z.infer<typeof zDepthAnythingModelSize>; export type DepthAnythingModelSize = z.infer<typeof zDepthAnythingModelSize>;
export const isDepthAnythingModelSize = (v: unknown): v is DepthAnythingModelSize => export const isDepthAnythingModelSize = (v: unknown): v is DepthAnythingModelSize =>
zDepthAnythingModelSize.safeParse(v).success; zDepthAnythingModelSize.safeParse(v).success;
@ -186,151 +185,9 @@ export type RequiredControlAdapterProcessorNode =
> >
| { type: 'none' }; | { type: 'none' };
/**
* Type guard for CannyImageProcessorInvocation
*/
export const isCannyImageProcessorInvocation = (obj: unknown): obj is CannyImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'canny_image_processor') {
return true;
}
return false;
};
/**
* Type guard for ColorMapImageProcessorInvocation
*/
export const isColorMapImageProcessorInvocation = (obj: unknown): obj is ColorMapImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'color_map_image_processor') {
return true;
}
return false;
};
/**
* Type guard for ContentShuffleImageProcessorInvocation
*/
export const isContentShuffleImageProcessorInvocation = (
obj: unknown
): obj is ContentShuffleImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'content_shuffle_image_processor') {
return true;
}
return false;
};
/**
* Type guard for DepthAnythingImageProcessorInvocation
*/
export const isDepthAnythingImageProcessorInvocation = (obj: unknown): obj is DepthAnythingImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'depth_anything_image_processor') {
return true;
}
return false;
};
/**
* Type guard for HedImageprocessorInvocation
*/
export const isHedImageprocessorInvocation = (obj: unknown): obj is HedImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'hed_image_processor') {
return true;
}
return false;
};
/**
* Type guard for LineartAnimeImageProcessorInvocation
*/
export const isLineartAnimeImageProcessorInvocation = (obj: unknown): obj is LineartAnimeImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'lineart_anime_image_processor') {
return true;
}
return false;
};
/**
* Type guard for LineartImageProcessorInvocation
*/
export const isLineartImageProcessorInvocation = (obj: unknown): obj is LineartImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'lineart_image_processor') {
return true;
}
return false;
};
/**
* Type guard for MediapipeFaceProcessorInvocation
*/
export const isMediapipeFaceProcessorInvocation = (obj: unknown): obj is MediapipeFaceProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'mediapipe_face_processor') {
return true;
}
return false;
};
/**
* Type guard for MidasDepthImageProcessorInvocation
*/
export const isMidasDepthImageProcessorInvocation = (obj: unknown): obj is MidasDepthImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'midas_depth_image_processor') {
return true;
}
return false;
};
/**
* Type guard for MlsdImageProcessorInvocation
*/
export const isMlsdImageProcessorInvocation = (obj: unknown): obj is MlsdImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'mlsd_image_processor') {
return true;
}
return false;
};
/**
* Type guard for NormalbaeImageProcessorInvocation
*/
export const isNormalbaeImageProcessorInvocation = (obj: unknown): obj is NormalbaeImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'normalbae_image_processor') {
return true;
}
return false;
};
/**
* Type guard for DWOpenposeImageProcessorInvocation
*/
export const isDWOpenposeImageProcessorInvocation = (obj: unknown): obj is DWOpenposeImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'dw_openpose_image_processor') {
return true;
}
return false;
};
/**
* Type guard for PidiImageProcessorInvocation
*/
export const isPidiImageProcessorInvocation = (obj: unknown): obj is PidiImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'pidi_image_processor') {
return true;
}
return false;
};
/**
* Type guard for ZoeDepthImageProcessorInvocation
*/
export const isZoeDepthImageProcessorInvocation = (obj: unknown): obj is ZoeDepthImageProcessorInvocation => {
if (isObject(obj) && 'type' in obj && obj.type === 'zoe_depth_image_processor') {
return true;
}
return false;
};
export type ControlMode = NonNullable<components['schemas']['ControlNetInvocation']['control_mode']>; export type ControlMode = NonNullable<components['schemas']['ControlNetInvocation']['control_mode']>;
export const zResizeMode = z.enum(['just_resize', 'crop_resize', 'fill_resize', 'just_resize_simple']); const zResizeMode = z.enum(['just_resize', 'crop_resize', 'fill_resize', 'just_resize_simple']);
export type ResizeMode = z.infer<typeof zResizeMode>; export type ResizeMode = z.infer<typeof zResizeMode>;
export const isResizeMode = (v: unknown): v is ResizeMode => zResizeMode.safeParse(v).success; export const isResizeMode = (v: unknown): v is ResizeMode => zResizeMode.safeParse(v).success;

22
invokeai/frontend/web/src/features/dnd/types/index.ts
View File

@ -18,30 +18,26 @@ type BaseDropData = {
id: string; id: string;
}; };
export type CurrentImageDropData = BaseDropData & { type CurrentImageDropData = BaseDropData & {
actionType: 'SET_CURRENT_IMAGE'; actionType: 'SET_CURRENT_IMAGE';
}; };
export type InitialImageDropData = BaseDropData & { type InitialImageDropData = BaseDropData & {
actionType: 'SET_INITIAL_IMAGE'; actionType: 'SET_INITIAL_IMAGE';
}; };
export type ControlAdapterDropData = BaseDropData & { type ControlAdapterDropData = BaseDropData & {
actionType: 'SET_CONTROL_ADAPTER_IMAGE'; actionType: 'SET_CONTROL_ADAPTER_IMAGE';
context: { context: {
id: string; id: string;
}; };
}; };
export type IPAdapterImageDropData = BaseDropData & {
actionType: 'SET_IP_ADAPTER_IMAGE';
};
export type CanvasInitialImageDropData = BaseDropData & { export type CanvasInitialImageDropData = BaseDropData & {
actionType: 'SET_CANVAS_INITIAL_IMAGE'; actionType: 'SET_CANVAS_INITIAL_IMAGE';
}; };
export type NodesImageDropData = BaseDropData & { type NodesImageDropData = BaseDropData & {
actionType: 'SET_NODES_IMAGE'; actionType: 'SET_NODES_IMAGE';
context: { context: {
nodeId: string; nodeId: string;
@ -71,7 +67,7 @@ type BaseDragData = {
id: string; id: string;
}; };
export type NodeFieldDraggableData = BaseDragData & { type NodeFieldDraggableData = BaseDragData & {
payloadType: 'NODE_FIELD'; payloadType: 'NODE_FIELD';
payload: { payload: {
nodeId: string; nodeId: string;
@ -114,7 +110,7 @@ export interface TypesafeActive extends Omit<Active, 'data'> {
data: React.MutableRefObject<TypesafeDraggableData | undefined>; data: React.MutableRefObject<TypesafeDraggableData | undefined>;
} }
export interface TypesafeOver extends Omit<Over, 'data'> { interface TypesafeOver extends Omit<Over, 'data'> {
data: React.MutableRefObject<TypesafeDroppableData | undefined>; data: React.MutableRefObject<TypesafeDroppableData | undefined>;
} }
@ -127,10 +123,10 @@ interface DragEvent {
} }
export interface DragStartEvent extends Pick<DragEvent, 'active'> {} export interface DragStartEvent extends Pick<DragEvent, 'active'> {}
export interface DragMoveEvent extends DragEvent {} interface DragMoveEvent extends DragEvent {}
export interface DragOverEvent extends DragMoveEvent {} interface DragOverEvent extends DragMoveEvent {}
export interface DragEndEvent extends DragEvent {} export interface DragEndEvent extends DragEvent {}
export interface DragCancelEvent extends DragEndEvent {} interface DragCancelEvent extends DragEndEvent {}
export interface DndContextTypesafeProps export interface DndContextTypesafeProps
extends Omit<DndContextProps, 'onDragStart' | 'onDragMove' | 'onDragOver' | 'onDragEnd' | 'onDragCancel'> { extends Omit<DndContextProps, 'onDragStart' | 'onDragMove' | 'onDragOver' | 'onDragEnd' | 'onDragCancel'> {

24
invokeai/frontend/web/src/features/dynamicPrompts/components/ParamDynamicPromptsCombinatorial.tsx
View File

@ -1,24 +0,0 @@
import { FormControl, FormLabel, Switch } from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { combinatorialToggled } from 'features/dynamicPrompts/store/dynamicPromptsSlice';
import { memo, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
const ParamDynamicPromptsCombinatorial = () => {
const combinatorial = useAppSelector((s) => s.dynamicPrompts.combinatorial);
const dispatch = useAppDispatch();
const { t } = useTranslation();
const handleChange = useCallback(() => {
dispatch(combinatorialToggled());
}, [dispatch]);
return (
<FormControl>
<FormLabel>{t('dynamicPrompts.combinatorial')}</FormLabel>
<Switch isChecked={combinatorial} onChange={handleChange} />
</FormControl>
);
};
export default memo(ParamDynamicPromptsCombinatorial);

Some files were not shown because too many files have changed in this diff Show More