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 'main' into ryan/spandrel-upscale-tiling

Browse Source
This commit is contained in:
Ryan Dick 2024-07-16 15:40:14 -04:00 committed by GitHub
commit 6b0ca88177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
52 changed files with 4915 additions and 2066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/contributing/MODEL_MANAGER.md
View File

@ -408,7 +408,7 @@ config = get_config()
logger = InvokeAILogger.get_logger(config=config) logger = InvokeAILogger.get_logger(config=config)
db = SqliteDatabase(config.db_path, logger) db = SqliteDatabase(config.db_path, logger)
record_store = ModelRecordServiceSQL(db) record_store = ModelRecordServiceSQL(db, logger)
queue = DownloadQueueService() queue = DownloadQueueService()
queue.start() queue.start()

2
invokeai/app/api/dependencies.py
View File

@ -99,7 +99,7 @@ class ApiDependencies:
model_images_service = ModelImageFileStorageDisk(model_images_folder / "model_images") model_images_service = ModelImageFileStorageDisk(model_images_folder / "model_images")
model_manager = ModelManagerService.build_model_manager( model_manager = ModelManagerService.build_model_manager(
app_config=configuration, app_config=configuration,
model_record_service=ModelRecordServiceSQL(db=db), model_record_service=ModelRecordServiceSQL(db=db, logger=logger),
download_queue=download_queue_service, download_queue=download_queue_service,
events=events, events=events,
) )

24
invokeai/app/api/routers/images.py
View File

@ -233,21 +233,14 @@ async def get_image_workflow(
) )
async def get_image_full( async def get_image_full(
image_name: str = Path(description="The name of full-resolution image file to get"), image_name: str = Path(description="The name of full-resolution image file to get"),
) -> FileResponse: ) -> Response:
"""Gets a full-resolution image file""" """Gets a full-resolution image file"""
try: try:
path = ApiDependencies.invoker.services.images.get_path(image_name) path = ApiDependencies.invoker.services.images.get_path(image_name)
with open(path, "rb") as f:
if not ApiDependencies.invoker.services.images.validate_path(path): content = f.read()
raise HTTPException(status_code=404) response = Response(content, media_type="image/png")
response = FileResponse(
path,
media_type="image/png",
filename=image_name,
content_disposition_type="inline",
)
response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}" response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
return response return response
except Exception: except Exception:
@ -268,15 +261,14 @@ async def get_image_full(
) )
async def get_image_thumbnail( async def get_image_thumbnail(
image_name: str = Path(description="The name of thumbnail image file to get"), image_name: str = Path(description="The name of thumbnail image file to get"),
) -> FileResponse: ) -> Response:
"""Gets a thumbnail image file""" """Gets a thumbnail image file"""
try: try:
path = ApiDependencies.invoker.services.images.get_path(image_name, thumbnail=True) path = ApiDependencies.invoker.services.images.get_path(image_name, thumbnail=True)
if not ApiDependencies.invoker.services.images.validate_path(path): with open(path, "rb") as f:
raise HTTPException(status_code=404) content = f.read()
response = Response(content, media_type="image/webp")
response = FileResponse(path, media_type="image/webp", content_disposition_type="inline")
response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}" response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
return response return response
except Exception: except Exception:

1
invokeai/app/api_app.py
View File

@ -161,6 +161,7 @@ def invoke_api() -> None:
# Taken from https://waylonwalker.com/python-find-available-port/, thanks Waylon! # Taken from https://waylonwalker.com/python-find-available-port/, thanks Waylon!
# https://github.com/WaylonWalker # https://github.com/WaylonWalker
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
s.settimeout(1)
if s.connect_ex(("localhost", port)) == 0: if s.connect_ex(("localhost", port)) == 0:
return find_port(port=port + 1) return find_port(port=port + 1)
else: else:

3
invokeai/app/invocations/fields.py
View File

@ -162,8 +162,7 @@ class FieldDescriptions:
fp32 = "Whether or not to use full float32 precision" fp32 = "Whether or not to use full float32 precision"
precision = "Precision to use" precision = "Precision to use"
tiled = "Processing using overlapping tiles (reduce memory consumption)" tiled = "Processing using overlapping tiles (reduce memory consumption)"
vae_tile_size = "The tile size for VAE tiling in pixels (image space). If set to 0, the default tile size for the " vae_tile_size = "The tile size for VAE tiling in pixels (image space). If set to 0, the default tile size for the model will be used. Larger tile sizes generally produce better results at the cost of higher memory usage."
"model will be used. Larger tile sizes generally produce better results at the cost of higher memory usage."
detect_res = "Pixel resolution for detection" detect_res = "Pixel resolution for detection"
image_res = "Pixel resolution for output image" image_res = "Pixel resolution for output image"
safe_mode = "Whether or not to use safe mode" safe_mode = "Whether or not to use safe mode"

21
invokeai/app/services/model_records/model_records_sql.py
View File

@ -40,11 +40,14 @@ Typical usage:
""" """
import json import json
import logging
import sqlite3 import sqlite3
from math import ceil from math import ceil
from pathlib import Path from pathlib import Path
from typing import List, Optional, Union from typing import List, Optional, Union
import pydantic
from invokeai.app.services.model_records.model_records_base import ( from invokeai.app.services.model_records.model_records_base import (
DuplicateModelException, DuplicateModelException,
ModelRecordChanges, ModelRecordChanges,
@ -67,7 +70,7 @@ from invokeai.backend.model_manager.config import (
class ModelRecordServiceSQL(ModelRecordServiceBase): class ModelRecordServiceSQL(ModelRecordServiceBase):
"""Implementation of the ModelConfigStore ABC using a SQL database.""" """Implementation of the ModelConfigStore ABC using a SQL database."""
def __init__(self, db: SqliteDatabase): def __init__(self, db: SqliteDatabase, logger: logging.Logger):
""" """
Initialize a new object from preexisting sqlite3 connection and threading lock objects. Initialize a new object from preexisting sqlite3 connection and threading lock objects.
@ -76,6 +79,7 @@ class ModelRecordServiceSQL(ModelRecordServiceBase):
super().__init__() super().__init__()
self._db = db self._db = db
self._cursor = db.conn.cursor() self._cursor = db.conn.cursor()
self._logger = logger
@property @property
def db(self) -> SqliteDatabase: def db(self) -> SqliteDatabase:
@ -291,7 +295,20 @@ class ModelRecordServiceSQL(ModelRecordServiceBase):
tuple(bindings), tuple(bindings),
) )
result = self._cursor.fetchall() result = self._cursor.fetchall()
results = [ModelConfigFactory.make_config(json.loads(x[0]), timestamp=x[1]) for x in result]
# Parse the model configs.
results: list[AnyModelConfig] = []
for row in result:
try:
model_config = ModelConfigFactory.make_config(json.loads(row[0]), timestamp=row[1])
except pydantic.ValidationError:
# We catch this error so that the app can still run if there are invalid model configs in the database.
# One reason that an invalid model config might be in the database is if someone had to rollback from a
# newer version of the app that added a new model type.
self._logger.warning(f"Found an invalid model config in the database. Ignoring this model. ({row[0]})")
else:
results.append(model_config)
return results return results
def search_by_path(self, path: Union[str, Path]) -> List[AnyModelConfig]: def search_by_path(self, path: Union[str, Path]) -> List[AnyModelConfig]:

470
invokeai/app/services/workflow_records/default_workflows/ESRGAN Upscaling with Canny ControlNet.json
View File

@ -2,7 +2,7 @@
"name": "ESRGAN Upscaling with Canny ControlNet", "name": "ESRGAN Upscaling with Canny ControlNet",
"author": "InvokeAI", "author": "InvokeAI",
"description": "Sample workflow for using Upscaling with ControlNet with SD1.5", "description": "Sample workflow for using Upscaling with ControlNet with SD1.5",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "upscale, controlnet, default", "tags": "upscale, controlnet, default",
"notes": "", "notes": "",
@ -36,14 +36,13 @@
"version": "3.0.0", "version": "3.0.0",
"category": "default" "category": "default"
}, },
"id": "0e71a27e-a22b-4a9b-b20a-6d789abff2bc",
"nodes": [ "nodes": [
{ {
"id": "e8bf67fe-67de-4227-87eb-79e86afdfc74", "id": "63b6ab7e-5b05-4d1b-a3b1-42d8e53ce16b",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "e8bf67fe-67de-4227-87eb-79e86afdfc74", "id": "63b6ab7e-5b05-4d1b-a3b1-42d8e53ce16b",
"version": "1.1.1", "version": "1.2.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
@ -57,6 +56,10 @@
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": true, "isOpen": true,
@ -65,122 +68,63 @@
}, },
"position": { "position": {
"x": 1250, "x": 1250,
"y": 1500 "y": 1200
} }
}, },
{ {
"id": "d8ace142-c05f-4f1d-8982-88dc7473958d", "id": "5ca498a4-c8c8-4580-a396-0c984317205d",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "d8ace142-c05f-4f1d-8982-88dc7473958d", "id": "5ca498a4-c8c8-4580-a396-0c984317205d",
"version": "1.0.2", "version": "1.1.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "main_model_loader", "type": "i2l",
"inputs": { "inputs": {
"model": { "image": {
"name": "model", "name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "", "label": "",
"value": { "value": false
"key": "5cd43ca0-dd0a-418d-9f7e-35b2b9d5e106",
"hash": "blake3:6987f323017f597213cc3264250edf57056d21a40a0a85d83a1a33a7d44dc41a",
"name": "Deliberate_v5",
"base": "sd-1",
"type": "main"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 700,
"y": 1375
}
},
{
"id": "771bdf6a-0813-4099-a5d8-921a138754d4",
"type": "invocation",
"data": {
"id": "771bdf6a-0813-4099-a5d8-921a138754d4",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "image",
"inputs": {
"image": {
"name": "image",
"label": "Image To Upscale",
"value": {
"image_name": "d2e42ba6-d420-496b-82db-91c9b75956c1.png"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 344.5593065887157,
"y": 1698.161491368619
}
},
{
"id": "f7564dd2-9539-47f2-ac13-190804461f4e",
"type": "invocation",
"data": {
"id": "f7564dd2-9539-47f2-ac13-190804461f4e",
"version": "1.3.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "esrgan",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"model_name": {
"name": "model_name",
"label": "Upscaler Model",
"value": "RealESRGAN_x2plus.pth"
}, },
"tile_size": { "tile_size": {
"name": "tile_size", "name": "tile_size",
"label": "", "label": "",
"value": 400 "value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
} }
}, },
"isOpen": true, "isOpen": false,
"isIntermediate": true, "isIntermediate": true,
"useCache": true "useCache": true
}, },
"position": { "position": {
"x": 717.3863693661265, "x": 1650,
"y": 1721.9215053134815 "y": 1675
} }
}, },
{ {
"id": "1d887701-df21-4966-ae6e-a7d82307d7bd", "id": "3ed9b2ef-f4ec-40a7-94db-92e63b583ec0",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "1d887701-df21-4966-ae6e-a7d82307d7bd", "id": "3ed9b2ef-f4ec-40a7-94db-92e63b583ec0",
"version": "1.3.2", "version": "1.3.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "canny_image_processor", "type": "l2i",
"inputs": { "inputs": {
"board": { "board": {
"name": "board", "name": "board",
@ -190,38 +134,37 @@
"name": "metadata", "name": "metadata",
"label": "" "label": ""
}, },
"image": { "latents": {
"name": "image", "name": "latents",
"label": "" "label": ""
}, },
"detect_resolution": { "vae": {
"name": "detect_resolution", "name": "vae",
"label": "", "label": ""
"value": 512
}, },
"image_resolution": { "tiled": {
"name": "image_resolution", "name": "tiled",
"label": "", "label": "",
"value": 512 "value": false
}, },
"low_threshold": { "tile_size": {
"name": "low_threshold", "name": "tile_size",
"label": "", "label": "",
"value": 100 "value": 0
}, },
"high_threshold": { "fp32": {
"name": "high_threshold", "name": "fp32",
"label": "", "label": "",
"value": 200 "value": false
} }
}, },
"isOpen": true, "isOpen": true,
"isIntermediate": true, "isIntermediate": false,
"useCache": true "useCache": true
}, },
"position": { "position": {
"x": 1200, "x": 2559.4751127537957,
"y": 1900 "y": 1246.6000376741406
} }
}, },
{ {
@ -229,7 +172,7 @@
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "ca1d020c-89a8-4958-880a-016d28775cfa", "id": "ca1d020c-89a8-4958-880a-016d28775cfa",
"version": "1.1.1", "version": "1.1.2",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
@ -285,6 +228,193 @@
"y": 1902.9649340196056 "y": 1902.9649340196056
} }
}, },
{
"id": "1d887701-df21-4966-ae6e-a7d82307d7bd",
"type": "invocation",
"data": {
"id": "1d887701-df21-4966-ae6e-a7d82307d7bd",
"version": "1.3.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "canny_image_processor",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
},
"low_threshold": {
"name": "low_threshold",
"label": "",
"value": 100
},
"high_threshold": {
"name": "high_threshold",
"label": "",
"value": 200
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1200,
"y": 1900
}
},
{
"id": "d8ace142-c05f-4f1d-8982-88dc7473958d",
"type": "invocation",
"data": {
"id": "d8ace142-c05f-4f1d-8982-88dc7473958d",
"version": "1.0.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": "",
"value": {
"key": "5cd43ca0-dd0a-418d-9f7e-35b2b9d5e106",
"hash": "blake3:6987f323017f597213cc3264250edf57056d21a40a0a85d83a1a33a7d44dc41a",
"name": "Deliberate_v5",
"base": "sd-1",
"type": "main"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 700,
"y": 1375
}
},
{
"id": "e8bf67fe-67de-4227-87eb-79e86afdfc74",
"type": "invocation",
"data": {
"id": "e8bf67fe-67de-4227-87eb-79e86afdfc74",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1250,
"y": 1500
}
},
{
"id": "771bdf6a-0813-4099-a5d8-921a138754d4",
"type": "invocation",
"data": {
"id": "771bdf6a-0813-4099-a5d8-921a138754d4",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "image",
"inputs": {
"image": {
"name": "image",
"label": "Image To Upscale"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 344.5593065887157,
"y": 1698.161491368619
}
},
{
"id": "f7564dd2-9539-47f2-ac13-190804461f4e",
"type": "invocation",
"data": {
"id": "f7564dd2-9539-47f2-ac13-190804461f4e",
"version": "1.3.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "esrgan",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"model_name": {
"name": "model_name",
"label": "Upscaler Model",
"value": "RealESRGAN_x2plus.pth"
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 400
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 717.3863693661265,
"y": 1721.9215053134815
}
},
{ {
"id": "f50624ce-82bf-41d0-bdf7-8aab11a80d48", "id": "f50624ce-82bf-41d0-bdf7-8aab11a80d48",
"type": "invocation", "type": "invocation",
@ -413,122 +543,6 @@
"y": 1232.6219060454753 "y": 1232.6219060454753
} }
}, },
{
"id": "3ed9b2ef-f4ec-40a7-94db-92e63b583ec0",
"type": "invocation",
"data": {
"id": "3ed9b2ef-f4ec-40a7-94db-92e63b583ec0",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 2559.4751127537957,
"y": 1246.6000376741406
}
},
{
"id": "5ca498a4-c8c8-4580-a396-0c984317205d",
"type": "invocation",
"data": {
"id": "5ca498a4-c8c8-4580-a396-0c984317205d",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "i2l",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1650,
"y": 1675
}
},
{
"id": "63b6ab7e-5b05-4d1b-a3b1-42d8e53ce16b",
"type": "invocation",
"data": {
"id": "63b6ab7e-5b05-4d1b-a3b1-42d8e53ce16b",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1250,
"y": 1200
}
},
{ {
"id": "eb8f6f8a-c7b1-4914-806e-045ee2717a35", "id": "eb8f6f8a-c7b1-4914-806e-045ee2717a35",
"type": "invocation", "type": "invocation",

654
invokeai/app/services/workflow_records/default_workflows/Face Detailer with IP-Adapter & Canny (See Note in Details).json
View File

@ -2,7 +2,7 @@
"name": "Face Detailer with IP-Adapter & Canny (See Note in Details)", "name": "Face Detailer with IP-Adapter & Canny (See Note in Details)",
"author": "kosmoskatten", "author": "kosmoskatten",
"description": "A workflow to add detail to and improve faces. This workflow is most effective when used with a model that creates realistic outputs. ", "description": "A workflow to add detail to and improve faces. This workflow is most effective when used with a model that creates realistic outputs. ",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "face detailer, IP-Adapter, Canny", "tags": "face detailer, IP-Adapter, Canny",
"notes": "Set this image as the blur mask: https://i.imgur.com/Gxi61zP.png", "notes": "Set this image as the blur mask: https://i.imgur.com/Gxi61zP.png",
@ -37,16 +37,219 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{ {
"id": "44f2c190-eb03-460d-8d11-a94d13b33f19", "id": "c6359181-6479-40ec-bf3a-b7e8451683b8",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "44f2c190-eb03-460d-8d11-a94d13b33f19", "id": "c6359181-6479-40ec-bf3a-b7e8451683b8",
"version": "1.1.1", "version": "1.0.3",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2031.5518710051792,
"y": -492.1742944307074
}
},
{
"id": "8fe598c6-d447-44fa-a165-4975af77d080",
"type": "invocation",
"data": {
"id": "8fe598c6-d447-44fa-a165-4975af77d080",
"version": "1.3.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "canny_image_processor",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
},
"low_threshold": {
"name": "low_threshold",
"label": "",
"value": 100
},
"high_threshold": {
"name": "high_threshold",
"label": "",
"value": 200
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3519.4131037388597,
"y": 576.7946795840575
}
},
{
"id": "f60b6161-8f26-42f6-89ff-545e6011e501",
"type": "invocation",
"data": {
"id": "f60b6161-8f26-42f6-89ff-545e6011e501",
"version": "1.1.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"control_model": {
"name": "control_model",
"label": "Control Model (select canny)",
"value": {
"key": "5bdaacf7-a7a3-4fb8-b394-cc0ffbb8941d",
"hash": "blake3:260c7f8e10aefea9868cfc68d89970e91033bd37132b14b903e70ee05ebf530e",
"name": "sd-controlnet-canny",
"base": "sd-1",
"type": "controlnet"
}
},
"control_weight": {
"name": "control_weight",
"label": "",
"value": 0.5
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 0.5
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "balanced"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3950,
"y": 150
}
},
{
"id": "22b750db-b85e-486b-b278-ac983e329813",
"type": "invocation",
"data": {
"id": "22b750db-b85e-486b-b278-ac983e329813",
"version": "1.4.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "ip_adapter",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"ip_adapter_model": {
"name": "ip_adapter_model",
"label": "IP-Adapter Model (select IP Adapter Face)",
"value": {
"key": "1cc210bb-4d0a-4312-b36c-b5d46c43768e",
"hash": "blake3:3d669dffa7471b357b4df088b99ffb6bf4d4383d5e0ef1de5ec1c89728a3d5a5",
"name": "ip_adapter_sd15",
"base": "sd-1",
"type": "ip_adapter"
}
},
"clip_vision_model": {
"name": "clip_vision_model",
"label": "",
"value": "ViT-H"
},
"weight": {
"name": "weight",
"label": "",
"value": 0.5
},
"method": {
"name": "method",
"label": "",
"value": "full"
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 0.8
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3575,
"y": -200
}
},
{
"id": "f4d15b64-c4a6-42a5-90fc-e4ed07a0ca65",
"type": "invocation",
"data": {
"id": "f4d15b64-c4a6-42a5-90fc-e4ed07a0ca65",
"version": "1.2.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
@ -60,6 +263,140 @@
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2550,
"y": -525
}
},
{
"id": "2224ed72-2453-4252-bd89-3085240e0b6f",
"type": "invocation",
"data": {
"id": "2224ed72-2453-4252-bd89-3085240e0b6f",
"version": "1.3.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 4980.1395106966565,
"y": -255.9158921745602
}
},
{
"id": "de8b1a48-a2e4-42ca-90bb-66058bffd534",
"type": "invocation",
"data": {
"id": "de8b1a48-a2e4-42ca-90bb-66058bffd534",
"version": "1.1.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "i2l",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3100,
"y": -275
}
},
{
"id": "44f2c190-eb03-460d-8d11-a94d13b33f19",
"type": "invocation",
"data": {
"id": "44f2c190-eb03-460d-8d11-a94d13b33f19",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": true, "isOpen": true,
@ -251,45 +588,6 @@
"y": 0 "y": 0
} }
}, },
{
"id": "de8b1a48-a2e4-42ca-90bb-66058bffd534",
"type": "invocation",
"data": {
"id": "de8b1a48-a2e4-42ca-90bb-66058bffd534",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "i2l",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3100,
"y": -275
}
},
{ {
"id": "bd06261d-a74a-4d1f-8374-745ed6194bc2", "id": "bd06261d-a74a-4d1f-8374-745ed6194bc2",
"type": "invocation", "type": "invocation",
@ -418,53 +716,6 @@
"y": -175 "y": -175
} }
}, },
{
"id": "2224ed72-2453-4252-bd89-3085240e0b6f",
"type": "invocation",
"data": {
"id": "2224ed72-2453-4252-bd89-3085240e0b6f",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 4980.1395106966565,
"y": -255.9158921745602
}
},
{ {
"id": "2974e5b3-3d41-4b6f-9953-cd21e8f3a323", "id": "2974e5b3-3d41-4b6f-9953-cd21e8f3a323",
"type": "invocation", "type": "invocation",
@ -692,201 +943,6 @@
"y": -275 "y": -275
} }
}, },
{
"id": "f4d15b64-c4a6-42a5-90fc-e4ed07a0ca65",
"type": "invocation",
"data": {
"id": "f4d15b64-c4a6-42a5-90fc-e4ed07a0ca65",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2550,
"y": -525
}
},
{
"id": "22b750db-b85e-486b-b278-ac983e329813",
"type": "invocation",
"data": {
"id": "22b750db-b85e-486b-b278-ac983e329813",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "ip_adapter",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"ip_adapter_model": {
"name": "ip_adapter_model",
"label": "IP-Adapter Model (select IP Adapter Face)",
"value": {
"key": "1cc210bb-4d0a-4312-b36c-b5d46c43768e",
"hash": "blake3:3d669dffa7471b357b4df088b99ffb6bf4d4383d5e0ef1de5ec1c89728a3d5a5",
"name": "ip_adapter_sd15",
"base": "sd-1",
"type": "ip_adapter"
}
},
"weight": {
"name": "weight",
"label": "",
"value": 0.5
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 0.8
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3575,
"y": -200
}
},
{
"id": "f60b6161-8f26-42f6-89ff-545e6011e501",
"type": "invocation",
"data": {
"id": "f60b6161-8f26-42f6-89ff-545e6011e501",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"control_model": {
"name": "control_model",
"label": "Control Model (select canny)",
"value": {
"key": "5bdaacf7-a7a3-4fb8-b394-cc0ffbb8941d",
"hash": "blake3:260c7f8e10aefea9868cfc68d89970e91033bd37132b14b903e70ee05ebf530e",
"name": "sd-controlnet-canny",
"base": "sd-1",
"type": "controlnet"
}
},
"control_weight": {
"name": "control_weight",
"label": "",
"value": 0.5
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 0.5
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "balanced"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3950,
"y": 150
}
},
{
"id": "8fe598c6-d447-44fa-a165-4975af77d080",
"type": "invocation",
"data": {
"id": "8fe598c6-d447-44fa-a165-4975af77d080",
"version": "1.3.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "canny_image_processor",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
},
"low_threshold": {
"name": "low_threshold",
"label": "",
"value": 100
},
"high_threshold": {
"name": "high_threshold",
"label": "",
"value": 200
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3519.4131037388597,
"y": 576.7946795840575
}
},
{ {
"id": "4bd4ae80-567f-4366-b8c6-3bb06f4fb46a", "id": "4bd4ae80-567f-4366-b8c6-3bb06f4fb46a",
"type": "invocation", "type": "invocation",
@ -1035,30 +1091,6 @@
"x": 2578.2364832140506, "x": 2578.2364832140506,
"y": 78.7948456497351 "y": 78.7948456497351
} }
},
{
"id": "c6359181-6479-40ec-bf3a-b7e8451683b8",
"type": "invocation",
"data": {
"id": "c6359181-6479-40ec-bf3a-b7e8451683b8",
"version": "1.0.2",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2031.5518710051792,
"y": -492.1742944307074
}
} }
], ],
"edges": [ "edges": [

551
invokeai/app/services/workflow_records/default_workflows/Multi ControlNet (Canny & Depth).json
View File

@ -2,7 +2,7 @@
"name": "Multi ControlNet (Canny & Depth)", "name": "Multi ControlNet (Canny & Depth)",
"author": "InvokeAI", "author": "InvokeAI",
"description": "A sample workflow using canny & depth ControlNets to guide the generation process. ", "description": "A sample workflow using canny & depth ControlNets to guide the generation process. ",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "ControlNet, canny, depth", "tags": "ControlNet, canny, depth",
"notes": "", "notes": "",
@ -37,140 +37,104 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{ {
"id": "8e860e51-5045-456e-bf04-9a62a2a5c49e", "id": "9db25398-c869-4a63-8815-c6559341ef12",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "8e860e51-5045-456e-bf04-9a62a2a5c49e", "id": "9db25398-c869-4a63-8815-c6559341ef12",
"version": "1.0.2", "version": "1.3.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "image", "type": "l2i",
"inputs": { "inputs": {
"image": { "board": {
"name": "image", "name": "board",
"label": "Depth Input Image"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3666.135718057363,
"y": 186.66887319822808
}
},
{
"id": "a33199c2-8340-401e-b8a2-42ffa875fc1c",
"type": "invocation",
"data": {
"id": "a33199c2-8340-401e-b8a2-42ffa875fc1c",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": "" "label": ""
}, },
"control_model": { "metadata": {
"name": "control_model", "name": "metadata",
"label": "Control Model (select depth)", "label": ""
"value": {
"key": "87e8855c-671f-4c9e-bbbb-8ed47ccb4aac",
"hash": "blake3:2550bf22a53942dfa28ab2fed9d10d80851112531f44d977168992edf9d0534c",
"name": "control_v11f1p_sd15_depth",
"base": "sd-1",
"type": "controlnet"
}
}, },
"control_weight": { "latents": {
"name": "control_weight", "name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "", "label": "",
"value": 1 "value": false
}, },
"begin_step_percent": { "tile_size": {
"name": "begin_step_percent", "name": "tile_size",
"label": "", "label": "",
"value": 0 "value": 0
}, },
"end_step_percent": { "fp32": {
"name": "end_step_percent", "name": "fp32",
"label": "", "label": "",
"value": 1 "value": false
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "balanced"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
} }
}, },
"isOpen": true, "isOpen": true,
"isIntermediate": true, "isIntermediate": false,
"useCache": true "useCache": true
}, },
"position": { "position": {
"x": 4477.604342844504, "x": 5675,
"y": -49.39005411272677
}
},
{
"id": "273e3f96-49ea-4dc5-9d5b-9660390f14e1",
"type": "invocation",
"data": {
"id": "273e3f96-49ea-4dc5-9d5b-9660390f14e1",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Negative Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4075,
"y": -825 "y": -825
} }
}, },
{ {
"id": "54486974-835b-4d81-8f82-05f9f32ce9e9", "id": "c826ba5e-9676-4475-b260-07b85e88753c",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "54486974-835b-4d81-8f82-05f9f32ce9e9", "id": "c826ba5e-9676-4475-b260-07b85e88753c",
"version": "1.0.2", "version": "1.3.3",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "main_model_loader", "type": "canny_image_processor",
"inputs": { "inputs": {
"model": { "board": {
"name": "model", "name": "board",
"label": "" "label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
},
"low_threshold": {
"name": "low_threshold",
"label": "",
"value": 100
},
"high_threshold": {
"name": "high_threshold",
"label": "",
"value": 200
} }
}, },
"isOpen": true, "isOpen": true,
@ -178,29 +142,52 @@
"useCache": true "useCache": true
}, },
"position": { "position": {
"x": 3600, "x": 4095.757337055795,
"y": -1000 "y": -455.63440891935863
} }
}, },
{ {
"id": "7ce68934-3419-42d4-ac70-82cfc9397306", "id": "018b1214-c2af-43a7-9910-fb687c6726d7",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "7ce68934-3419-42d4-ac70-82cfc9397306", "id": "018b1214-c2af-43a7-9910-fb687c6726d7",
"version": "1.1.1", "version": "1.2.4",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "compel", "type": "midas_depth_image_processor",
"inputs": { "inputs": {
"prompt": { "board": {
"name": "prompt", "name": "board",
"label": "Positive Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": "" "label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"a_mult": {
"name": "a_mult",
"label": "",
"value": 2
},
"bg_th": {
"name": "bg_th",
"label": "",
"value": 0.1
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
} }
}, },
"isOpen": true, "isOpen": true,
@ -208,8 +195,8 @@
"useCache": true "useCache": true
}, },
"position": { "position": {
"x": 4075, "x": 4082.783145980783,
"y": -1125 "y": 0.01629251229994111
} }
}, },
{ {
@ -217,7 +204,7 @@
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "d204d184-f209-4fae-a0a1-d152800844e1", "id": "d204d184-f209-4fae-a0a1-d152800844e1",
"version": "1.1.1", "version": "1.1.2",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
@ -273,6 +260,185 @@
"y": -618.4221638099414 "y": -618.4221638099414
} }
}, },
{
"id": "7ce68934-3419-42d4-ac70-82cfc9397306",
"type": "invocation",
"data": {
"id": "7ce68934-3419-42d4-ac70-82cfc9397306",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4075,
"y": -1125
}
},
{
"id": "54486974-835b-4d81-8f82-05f9f32ce9e9",
"type": "invocation",
"data": {
"id": "54486974-835b-4d81-8f82-05f9f32ce9e9",
"version": "1.0.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3600,
"y": -1000
}
},
{
"id": "273e3f96-49ea-4dc5-9d5b-9660390f14e1",
"type": "invocation",
"data": {
"id": "273e3f96-49ea-4dc5-9d5b-9660390f14e1",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Negative Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4075,
"y": -825
}
},
{
"id": "a33199c2-8340-401e-b8a2-42ffa875fc1c",
"type": "invocation",
"data": {
"id": "a33199c2-8340-401e-b8a2-42ffa875fc1c",
"version": "1.1.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"control_model": {
"name": "control_model",
"label": "Control Model (select depth)",
"value": {
"key": "87e8855c-671f-4c9e-bbbb-8ed47ccb4aac",
"hash": "blake3:2550bf22a53942dfa28ab2fed9d10d80851112531f44d977168992edf9d0534c",
"name": "control_v11f1p_sd15_depth",
"base": "sd-1",
"type": "controlnet"
}
},
"control_weight": {
"name": "control_weight",
"label": "",
"value": 1
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 1
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "balanced"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4477.604342844504,
"y": -49.39005411272677
}
},
{
"id": "8e860e51-5045-456e-bf04-9a62a2a5c49e",
"type": "invocation",
"data": {
"id": "8e860e51-5045-456e-bf04-9a62a2a5c49e",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "image",
"inputs": {
"image": {
"name": "image",
"label": "Depth Input Image"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 3666.135718057363,
"y": 186.66887319822808
}
},
{ {
"id": "c4b23e64-7986-40c4-9cad-46327b12e204", "id": "c4b23e64-7986-40c4-9cad-46327b12e204",
"type": "invocation", "type": "invocation",
@ -322,159 +488,6 @@
"y": -575 "y": -575
} }
}, },
{
"id": "018b1214-c2af-43a7-9910-fb687c6726d7",
"type": "invocation",
"data": {
"id": "018b1214-c2af-43a7-9910-fb687c6726d7",
"version": "1.2.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "midas_depth_image_processor",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"a_mult": {
"name": "a_mult",
"label": "",
"value": 2
},
"bg_th": {
"name": "bg_th",
"label": "",
"value": 0.1
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4082.783145980783,
"y": 0.01629251229994111
}
},
{
"id": "c826ba5e-9676-4475-b260-07b85e88753c",
"type": "invocation",
"data": {
"id": "c826ba5e-9676-4475-b260-07b85e88753c",
"version": "1.3.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "canny_image_processor",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"image": {
"name": "image",
"label": ""
},
"detect_resolution": {
"name": "detect_resolution",
"label": "",
"value": 512
},
"image_resolution": {
"name": "image_resolution",
"label": "",
"value": 512
},
"low_threshold": {
"name": "low_threshold",
"label": "",
"value": 100
},
"high_threshold": {
"name": "high_threshold",
"label": "",
"value": 200
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 4095.757337055795,
"y": -455.63440891935863
}
},
{
"id": "9db25398-c869-4a63-8815-c6559341ef12",
"type": "invocation",
"data": {
"id": "9db25398-c869-4a63-8815-c6559341ef12",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 5675,
"y": -825
}
},
{ {
"id": "ac481b7f-08bf-4a9d-9e0c-3a82ea5243ce", "id": "ac481b7f-08bf-4a9d-9e0c-3a82ea5243ce",
"type": "invocation", "type": "invocation",

2181
invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SDXL (Beta).json Normal file
View File

File diff suppressed because it is too large Load Diff

229
invokeai/app/services/workflow_records/default_workflows/Prompt from File.json
View File

@ -2,7 +2,7 @@
"name": "Prompt from File", "name": "Prompt from File",
"author": "InvokeAI", "author": "InvokeAI",
"description": "Sample workflow using Prompt from File node", "description": "Sample workflow using Prompt from File node",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "text2image, prompt from file, default", "tags": "text2image, prompt from file, default",
"notes": "", "notes": "",
@ -37,16 +37,68 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{ {
"id": "c2eaf1ba-5708-4679-9e15-945b8b432692", "id": "491ec988-3c77-4c37-af8a-39a0c4e7a2a1",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "c2eaf1ba-5708-4679-9e15-945b8b432692", "id": "491ec988-3c77-4c37-af8a-39a0c4e7a2a1",
"version": "1.1.1", "version": "1.3.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2037.861329274915,
"y": -329.8393457509562
}
},
{
"id": "fc9d0e35-a6de-4a19-84e1-c72497c823f6",
"type": "invocation",
"data": {
"id": "fc9d0e35-a6de-4a19-84e1-c72497c823f6",
"version": "1.2.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "", "label": "",
"notes": "", "notes": "",
@ -60,6 +112,69 @@
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 925,
"y": -275
}
},
{
"id": "d6353b7f-b447-4e17-8f2e-80a88c91d426",
"type": "invocation",
"data": {
"id": "d6353b7f-b447-4e17-8f2e-80a88c91d426",
"version": "1.0.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 0,
"y": -375
}
},
{
"id": "c2eaf1ba-5708-4679-9e15-945b8b432692",
"type": "invocation",
"data": {
"id": "c2eaf1ba-5708-4679-9e15-945b8b432692",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": false, "isOpen": false,
@ -141,61 +256,6 @@
"y": -400 "y": -400
} }
}, },
{
"id": "d6353b7f-b447-4e17-8f2e-80a88c91d426",
"type": "invocation",
"data": {
"id": "d6353b7f-b447-4e17-8f2e-80a88c91d426",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 0,
"y": -375
}
},
{
"id": "fc9d0e35-a6de-4a19-84e1-c72497c823f6",
"type": "invocation",
"data": {
"id": "fc9d0e35-a6de-4a19-84e1-c72497c823f6",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 925,
"y": -275
}
},
{ {
"id": "0eb5f3f5-1b91-49eb-9ef0-41d67c7eae77", "id": "0eb5f3f5-1b91-49eb-9ef0-41d67c7eae77",
"type": "invocation", "type": "invocation",
@ -268,53 +328,6 @@
"y": -50 "y": -50
} }
}, },
{
"id": "491ec988-3c77-4c37-af8a-39a0c4e7a2a1",
"type": "invocation",
"data": {
"id": "491ec988-3c77-4c37-af8a-39a0c4e7a2a1",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2037.861329274915,
"y": -329.8393457509562
}
},
{ {
"id": "2fb1577f-0a56-4f12-8711-8afcaaaf1d5e", "id": "2fb1577f-0a56-4f12-8711-8afcaaaf1d5e",
"type": "invocation", "type": "invocation",

225
invokeai/app/services/workflow_records/default_workflows/Text to Image - SD1.5.json
View File

@ -2,7 +2,7 @@
"name": "Text to Image - SD1.5", "name": "Text to Image - SD1.5",
"author": "InvokeAI", "author": "InvokeAI",
"description": "Sample text to image workflow for Stable Diffusion 1.5/2", "description": "Sample text to image workflow for Stable Diffusion 1.5/2",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "text2image, SD1.5, SD2, default", "tags": "text2image, SD1.5, SD2, default",
"notes": "", "notes": "",
@ -33,16 +33,127 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{
"id": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
"type": "invocation",
"data": {
"id": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
"version": "1.3.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 1800,
"y": 25
}
},
{
"id": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
"type": "invocation",
"data": {
"id": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "Positive Compel Prompt",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": "Super cute tiger cub, national geographic award-winning photograph"
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1000,
"y": 25
}
},
{
"id": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
"type": "invocation",
"data": {
"id": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
"version": "1.0.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 600,
"y": 25
}
},
{ {
"id": "93dc02a4-d05b-48ed-b99c-c9b616af3402", "id": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "93dc02a4-d05b-48ed-b99c-c9b616af3402", "id": "93dc02a4-d05b-48ed-b99c-c9b616af3402",
"version": "1.1.1", "version": "1.2.0",
"nodePack": "invokeai", "nodePack": "invokeai",
"label": "Negative Compel Prompt", "label": "Negative Compel Prompt",
"notes": "", "notes": "",
@ -56,6 +167,10 @@
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": true, "isOpen": true,
@ -108,61 +223,6 @@
"y": 325 "y": 325
} }
}, },
{
"id": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
"type": "invocation",
"data": {
"id": "c8d55139-f380-4695-b7f2-8b3d1e1e3db8",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 600,
"y": 25
}
},
{
"id": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
"type": "invocation",
"data": {
"id": "7d8bf987-284f-413a-b2fd-d825445a5d6c",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "Positive Compel Prompt",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": "Super cute tiger cub, national geographic award-winning photograph"
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 1000,
"y": 25
}
},
{ {
"id": "ea94bc37-d995-4a83-aa99-4af42479f2f2", "id": "ea94bc37-d995-4a83-aa99-4af42479f2f2",
"type": "invocation", "type": "invocation",
@ -280,53 +340,6 @@
"x": 1400, "x": 1400,
"y": 25 "y": 25
} }
},
{
"id": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
"type": "invocation",
"data": {
"id": "58c957f5-0d01-41fc-a803-b2bbf0413d4f",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": true
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 1800,
"y": 25
}
} }
], ],
"edges": [ "edges": [

515
invokeai/app/services/workflow_records/default_workflows/Text to Image - SDXL.json
View File

@ -2,7 +2,7 @@
"name": "Text to Image - SDXL", "name": "Text to Image - SDXL",
"author": "InvokeAI", "author": "InvokeAI",
"description": "Sample text to image workflow for SDXL", "description": "Sample text to image workflow for SDXL",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "text2image, SDXL, default", "tags": "text2image, SDXL, default",
"notes": "", "notes": "",
@ -29,10 +29,271 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{
"id": "0093692f-9cf4-454d-a5b8-62f0e3eb3bb8",
"type": "invocation",
"data": {
"id": "0093692f-9cf4-454d-a5b8-62f0e3eb3bb8",
"version": "1.0.3",
"label": "",
"notes": "",
"type": "vae_loader",
"inputs": {
"vae_model": {
"name": "vae_model",
"label": "VAE (use the FP16 model)",
"value": {
"key": "f20f9e5c-1bce-4c46-a84d-34ebfa7df069",
"hash": "blake3:9705ab1c31fa96b308734214fb7571a958621c7a9247eed82b7d277145f8d9fa",
"name": "sdxl-vae-fp16-fix",
"base": "sdxl",
"type": "vae"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 375,
"y": -225
}
},
{
"id": "63e91020-83b2-4f35-b174-ad9692aabb48",
"type": "invocation",
"data": {
"id": "63e91020-83b2-4f35-b174-ad9692aabb48",
"version": "1.3.0",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": false
},
"position": {
"x": 1475,
"y": -500
}
},
{
"id": "faf965a4-7530-427b-b1f3-4ba6505c2a08",
"type": "invocation",
"data": {
"id": "faf965a4-7530-427b-b1f3-4ba6505c2a08",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "SDXL Positive Compel Prompt",
"notes": "",
"type": "sdxl_compel_prompt",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": ""
},
"style": {
"name": "style",
"label": "Positive Style",
"value": ""
},
"original_width": {
"name": "original_width",
"label": "",
"value": 1024
},
"original_height": {
"name": "original_height",
"label": "",
"value": 1024
},
"crop_top": {
"name": "crop_top",
"label": "",
"value": 0
},
"crop_left": {
"name": "crop_left",
"label": "",
"value": 0
},
"target_width": {
"name": "target_width",
"label": "",
"value": 1024
},
"target_height": {
"name": "target_height",
"label": "",
"value": 1024
},
"clip": {
"name": "clip",
"label": ""
},
"clip2": {
"name": "clip2",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 750,
"y": -175
}
},
{
"id": "30d3289c-773c-4152-a9d2-bd8a99c8fd22",
"type": "invocation",
"data": {
"id": "30d3289c-773c-4152-a9d2-bd8a99c8fd22",
"version": "1.0.3",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "sdxl_model_loader",
"inputs": {
"model": {
"name": "model",
"label": "",
"value": {
"key": "4a63b226-e8ff-4da4-854e-0b9f04b562ba",
"hash": "blake3:d279309ea6e5ee6e8fd52504275865cc280dac71cbf528c5b07c98b888bddaba",
"name": "dreamshaper-xl-v2-turbo",
"base": "sdxl",
"type": "main"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 375,
"y": -500
}
},
{
"id": "3193ad09-a7c2-4bf4-a3a9-1c61cc33a204",
"type": "invocation",
"data": {
"id": "3193ad09-a7c2-4bf4-a3a9-1c61cc33a204",
"version": "1.2.0",
"nodePack": "invokeai",
"label": "SDXL Negative Compel Prompt",
"notes": "",
"type": "sdxl_compel_prompt",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Negative Prompt",
"value": ""
},
"style": {
"name": "style",
"label": "Negative Style",
"value": ""
},
"original_width": {
"name": "original_width",
"label": "",
"value": 1024
},
"original_height": {
"name": "original_height",
"label": "",
"value": 1024
},
"crop_top": {
"name": "crop_top",
"label": "",
"value": 0
},
"crop_left": {
"name": "crop_left",
"label": "",
"value": 0
},
"target_width": {
"name": "target_width",
"label": "",
"value": 1024
},
"target_height": {
"name": "target_height",
"label": "",
"value": 1024
},
"clip": {
"name": "clip",
"label": ""
},
"clip2": {
"name": "clip2",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 750,
"y": 200
}
},
{ {
"id": "3774ec24-a69e-4254-864c-097d07a6256f", "id": "3774ec24-a69e-4254-864c-097d07a6256f",
"type": "invocation", "type": "invocation",
@ -88,75 +349,6 @@
"y": -125 "y": -125
} }
}, },
{
"id": "3193ad09-a7c2-4bf4-a3a9-1c61cc33a204",
"type": "invocation",
"data": {
"id": "3193ad09-a7c2-4bf4-a3a9-1c61cc33a204",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "SDXL Negative Compel Prompt",
"notes": "",
"type": "sdxl_compel_prompt",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Negative Prompt",
"value": ""
},
"style": {
"name": "style",
"label": "Negative Style",
"value": ""
},
"original_width": {
"name": "original_width",
"label": "",
"value": 1024
},
"original_height": {
"name": "original_height",
"label": "",
"value": 1024
},
"crop_top": {
"name": "crop_top",
"label": "",
"value": 0
},
"crop_left": {
"name": "crop_left",
"label": "",
"value": 0
},
"target_width": {
"name": "target_width",
"label": "",
"value": 1024
},
"target_height": {
"name": "target_height",
"label": "",
"value": 1024
},
"clip": {
"name": "clip",
"label": ""
},
"clip2": {
"name": "clip2",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 750,
"y": 200
}
},
{ {
"id": "55705012-79b9-4aac-9f26-c0b10309785b", "id": "55705012-79b9-4aac-9f26-c0b10309785b",
"type": "invocation", "type": "invocation",
@ -229,154 +421,6 @@
"y": -50 "y": -50
} }
}, },
{
"id": "30d3289c-773c-4152-a9d2-bd8a99c8fd22",
"type": "invocation",
"data": {
"id": "30d3289c-773c-4152-a9d2-bd8a99c8fd22",
"version": "1.0.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "sdxl_model_loader",
"inputs": {
"model": {
"name": "model",
"label": "",
"value": {
"key": "4a63b226-e8ff-4da4-854e-0b9f04b562ba",
"hash": "blake3:d279309ea6e5ee6e8fd52504275865cc280dac71cbf528c5b07c98b888bddaba",
"name": "dreamshaper-xl-v2-turbo",
"base": "sdxl",
"type": "main"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 375,
"y": -500
}
},
{
"id": "faf965a4-7530-427b-b1f3-4ba6505c2a08",
"type": "invocation",
"data": {
"id": "faf965a4-7530-427b-b1f3-4ba6505c2a08",
"version": "1.1.1",
"nodePack": "invokeai",
"label": "SDXL Positive Compel Prompt",
"notes": "",
"type": "sdxl_compel_prompt",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": ""
},
"style": {
"name": "style",
"label": "Positive Style",
"value": ""
},
"original_width": {
"name": "original_width",
"label": "",
"value": 1024
},
"original_height": {
"name": "original_height",
"label": "",
"value": 1024
},
"crop_top": {
"name": "crop_top",
"label": "",
"value": 0
},
"crop_left": {
"name": "crop_left",
"label": "",
"value": 0
},
"target_width": {
"name": "target_width",
"label": "",
"value": 1024
},
"target_height": {
"name": "target_height",
"label": "",
"value": 1024
},
"clip": {
"name": "clip",
"label": ""
},
"clip2": {
"name": "clip2",
"label": ""
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 750,
"y": -175
}
},
{
"id": "63e91020-83b2-4f35-b174-ad9692aabb48",
"type": "invocation",
"data": {
"id": "63e91020-83b2-4f35-b174-ad9692aabb48",
"version": "1.2.2",
"nodePack": "invokeai",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": false
},
"position": {
"x": 1475,
"y": -500
}
},
{ {
"id": "50a36525-3c0a-4cc5-977c-e4bfc3fd6dfb", "id": "50a36525-3c0a-4cc5-977c-e4bfc3fd6dfb",
"type": "invocation", "type": "invocation",
@ -464,37 +508,6 @@
"y": -500 "y": -500
} }
}, },
{
"id": "0093692f-9cf4-454d-a5b8-62f0e3eb3bb8",
"type": "invocation",
"data": {
"id": "0093692f-9cf4-454d-a5b8-62f0e3eb3bb8",
"version": "1.0.2",
"label": "",
"notes": "",
"type": "vae_loader",
"inputs": {
"vae_model": {
"name": "vae_model",
"label": "VAE (use the FP16 model)",
"value": {
"key": "f20f9e5c-1bce-4c46-a84d-34ebfa7df069",
"hash": "blake3:9705ab1c31fa96b308734214fb7571a958621c7a9247eed82b7d277145f8d9fa",
"name": "sdxl-vae-fp16-fix",
"base": "sdxl",
"type": "vae"
}
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 375,
"y": -225
}
},
{ {
"id": "ade2c0d3-0384-4157-b39b-29ce429cfa15", "id": "ade2c0d3-0384-4157-b39b-29ce429cfa15",
"type": "invocation", "type": "invocation",

185
invokeai/app/services/workflow_records/default_workflows/Text to Image with LoRA.json
View File

@ -2,7 +2,7 @@
"name": "Text to Image with LoRA", "name": "Text to Image with LoRA",
"author": "InvokeAI", "author": "InvokeAI",
"description": "Simple text to image workflow with a LoRA", "description": "Simple text to image workflow with a LoRA",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "text to image, lora, default", "tags": "text to image, lora, default",
"notes": "", "notes": "",
@ -37,28 +37,83 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{ {
"id": "85b77bb2-c67a-416a-b3e8-291abe746c44", "id": "a9683c0a-6b1f-4a5e-8187-c57e764b3400",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "85b77bb2-c67a-416a-b3e8-291abe746c44", "id": "a9683c0a-6b1f-4a5e-8187-c57e764b3400",
"version": "1.1.1", "version": "1.3.0",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 4450,
"y": -550
}
},
{
"id": "c3fa6872-2599-4a82-a596-b3446a66cf8b",
"type": "invocation",
"data": {
"id": "c3fa6872-2599-4a82-a596-b3446a66cf8b",
"version": "1.2.0",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "compel", "type": "compel",
"inputs": { "inputs": {
"prompt": { "prompt": {
"name": "prompt", "name": "prompt",
"label": "Negative Prompt", "label": "Positive Prompt",
"value": "" "value": "super cute tiger cub"
}, },
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": true, "isOpen": true,
@ -67,31 +122,7 @@
}, },
"position": { "position": {
"x": 3425, "x": 3425,
"y": -300 "y": -575
}
},
{
"id": "24e9d7ed-4836-4ec4-8f9e-e747721f9818",
"type": "invocation",
"data": {
"id": "24e9d7ed-4836-4ec4-8f9e-e747721f9818",
"version": "1.0.2",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2500,
"y": -600
} }
}, },
{ {
@ -99,7 +130,7 @@
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "c41e705b-f2e3-4d1a-83c4-e34bb9344966", "id": "c41e705b-f2e3-4d1a-83c4-e34bb9344966",
"version": "1.0.2", "version": "1.0.3",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "lora_loader", "type": "lora_loader",
@ -132,23 +163,51 @@
} }
}, },
{ {
"id": "c3fa6872-2599-4a82-a596-b3446a66cf8b", "id": "24e9d7ed-4836-4ec4-8f9e-e747721f9818",
"type": "invocation", "type": "invocation",
"data": { "data": {
"id": "c3fa6872-2599-4a82-a596-b3446a66cf8b", "id": "24e9d7ed-4836-4ec4-8f9e-e747721f9818",
"version": "1.1.1", "version": "1.0.3",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": 2500,
"y": -600
}
},
{
"id": "85b77bb2-c67a-416a-b3e8-291abe746c44",
"type": "invocation",
"data": {
"id": "85b77bb2-c67a-416a-b3e8-291abe746c44",
"version": "1.2.0",
"label": "", "label": "",
"notes": "", "notes": "",
"type": "compel", "type": "compel",
"inputs": { "inputs": {
"prompt": { "prompt": {
"name": "prompt", "name": "prompt",
"label": "Positive Prompt", "label": "Negative Prompt",
"value": "super cute tiger cub" "value": ""
}, },
"clip": { "clip": {
"name": "clip", "name": "clip",
"label": "" "label": ""
},
"mask": {
"name": "mask",
"label": ""
} }
}, },
"isOpen": true, "isOpen": true,
@ -157,7 +216,7 @@
}, },
"position": { "position": {
"x": 3425, "x": 3425,
"y": -575 "y": -300
} }
}, },
{ {
@ -315,52 +374,6 @@
"x": 3425, "x": 3425,
"y": 0 "y": 0
} }
},
{
"id": "a9683c0a-6b1f-4a5e-8187-c57e764b3400",
"type": "invocation",
"data": {
"id": "a9683c0a-6b1f-4a5e-8187-c57e764b3400",
"version": "1.2.2",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": false,
"useCache": true
},
"position": {
"x": 4450,
"y": -550
}
} }
], ],
"edges": [ "edges": [

590
invokeai/app/services/workflow_records/default_workflows/Tiled Upscaling (Beta).json
View File

@ -2,7 +2,7 @@
"name": "Tiled Upscaling (Beta)", "name": "Tiled Upscaling (Beta)",
"author": "Invoke", "author": "Invoke",
"description": "A workflow to upscale an input image with tiled upscaling. ", "description": "A workflow to upscale an input image with tiled upscaling. ",
"version": "2.0.0", "version": "2.1.0",
"contact": "invoke@invoke.ai", "contact": "invoke@invoke.ai",
"tags": "tiled, upscaling, sd1.5", "tags": "tiled, upscaling, sd1.5",
"notes": "", "notes": "",
@ -41,10 +41,318 @@
} }
], ],
"meta": { "meta": {
"category": "default", "version": "3.0.0",
"version": "3.0.0" "category": "default"
}, },
"nodes": [ "nodes": [
{
"id": "2ff466b8-5e2a-4d8f-923a-a3884c7ecbc5",
"type": "invocation",
"data": {
"id": "2ff466b8-5e2a-4d8f-923a-a3884c7ecbc5",
"version": "1.0.3",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4514.466823162653,
"y": -1235.7908800002283
}
},
{
"id": "287f134f-da8d-41d1-884e-5940e8f7b816",
"type": "invocation",
"data": {
"id": "287f134f-da8d-41d1-884e-5940e8f7b816",
"version": "1.4.1",
"label": "",
"notes": "",
"type": "ip_adapter",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"ip_adapter_model": {
"name": "ip_adapter_model",
"label": "IP-Adapter Model (select ip_adapter_sd15)",
"value": {
"key": "1cc210bb-4d0a-4312-b36c-b5d46c43768e",
"hash": "blake3:3d669dffa7471b357b4df088b99ffb6bf4d4383d5e0ef1de5ec1c89728a3d5a5",
"name": "ip_adapter_sd15",
"base": "sd-1",
"type": "ip_adapter"
}
},
"clip_vision_model": {
"name": "clip_vision_model",
"label": "",
"value": "ViT-H"
},
"weight": {
"name": "weight",
"label": "",
"value": 0.2
},
"method": {
"name": "method",
"label": "",
"value": "full"
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 1
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2855.8555540799207,
"y": -183.58854843775742
}
},
{
"id": "b76fe66f-7884-43ad-b72c-fadc81d7a73c",
"type": "invocation",
"data": {
"id": "b76fe66f-7884-43ad-b72c-fadc81d7a73c",
"version": "1.3.0",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -1999.770193862987,
"y": -1075
}
},
{
"id": "d334f2da-016a-4524-9911-bdab85546888",
"type": "invocation",
"data": {
"id": "d334f2da-016a-4524-9911-bdab85546888",
"version": "1.1.2",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"control_model": {
"name": "control_model",
"label": "Control Model (select contro_v11f1e_sd15_tile)",
"value": {
"key": "773843c8-db1f-4502-8f65-59782efa7960",
"hash": "blake3:f0812e13758f91baf4e54b7dbb707b70642937d3b2098cd2b94cc36d3eba308e",
"name": "control_v11f1e_sd15_tile",
"base": "sd-1",
"type": "controlnet"
}
},
"control_weight": {
"name": "control_weight",
"label": "",
"value": 1
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "Structural Control",
"value": 1
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "more_control"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2481.9569385477016,
"y": -181.06590482739782
}
},
{
"id": "338b883c-3728-4f18-b3a6-6e7190c2f850",
"type": "invocation",
"data": {
"id": "338b883c-3728-4f18-b3a6-6e7190c2f850",
"version": "1.1.0",
"label": "",
"notes": "",
"type": "i2l",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"tile_size": {
"name": "tile_size",
"label": "",
"value": 0
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2908.4791167517287,
"y": -408.87504820159086
}
},
{
"id": "947c3f88-0305-4695-8355-df4abac64b1c",
"type": "invocation",
"data": {
"id": "947c3f88-0305-4695-8355-df4abac64b1c",
"version": "1.2.0",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4014.4136788915944,
"y": -968.5677253775948
}
},
{
"id": "9b2d8c58-ce8f-4162-a5a1-48de854040d6",
"type": "invocation",
"data": {
"id": "9b2d8c58-ce8f-4162-a5a1-48de854040d6",
"version": "1.2.0",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
},
"mask": {
"name": "mask",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4014.4136788915944,
"y": -1243.5677253775948
}
},
{ {
"id": "b875cae6-d8a3-4fdc-b969-4d53cbd03f9a", "id": "b875cae6-d8a3-4fdc-b969-4d53cbd03f9a",
"type": "invocation", "type": "invocation",
@ -181,64 +489,6 @@
"y": 3.422855503409039 "y": 3.422855503409039
} }
}, },
{
"id": "9b2d8c58-ce8f-4162-a5a1-48de854040d6",
"type": "invocation",
"data": {
"id": "9b2d8c58-ce8f-4162-a5a1-48de854040d6",
"version": "1.1.1",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "Positive Prompt",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4014.4136788915944,
"y": -1243.5677253775948
}
},
{
"id": "947c3f88-0305-4695-8355-df4abac64b1c",
"type": "invocation",
"data": {
"id": "947c3f88-0305-4695-8355-df4abac64b1c",
"version": "1.1.1",
"label": "",
"notes": "",
"type": "compel",
"inputs": {
"prompt": {
"name": "prompt",
"label": "",
"value": ""
},
"clip": {
"name": "clip",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4014.4136788915944,
"y": -968.5677253775948
}
},
{ {
"id": "b3513fed-ed42-408d-b382-128fdb0de523", "id": "b3513fed-ed42-408d-b382-128fdb0de523",
"type": "invocation", "type": "invocation",
@ -379,104 +629,6 @@
"y": -29.08699277598673 "y": -29.08699277598673
} }
}, },
{
"id": "338b883c-3728-4f18-b3a6-6e7190c2f850",
"type": "invocation",
"data": {
"id": "338b883c-3728-4f18-b3a6-6e7190c2f850",
"version": "1.0.2",
"label": "",
"notes": "",
"type": "i2l",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": false,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2908.4791167517287,
"y": -408.87504820159086
}
},
{
"id": "d334f2da-016a-4524-9911-bdab85546888",
"type": "invocation",
"data": {
"id": "d334f2da-016a-4524-9911-bdab85546888",
"version": "1.1.1",
"label": "",
"notes": "",
"type": "controlnet",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"control_model": {
"name": "control_model",
"label": "Control Model (select contro_v11f1e_sd15_tile)",
"value": {
"key": "773843c8-db1f-4502-8f65-59782efa7960",
"hash": "blake3:f0812e13758f91baf4e54b7dbb707b70642937d3b2098cd2b94cc36d3eba308e",
"name": "control_v11f1e_sd15_tile",
"base": "sd-1",
"type": "controlnet"
}
},
"control_weight": {
"name": "control_weight",
"label": "",
"value": 1
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "Structural Control",
"value": 1
},
"control_mode": {
"name": "control_mode",
"label": "",
"value": "more_control"
},
"resize_mode": {
"name": "resize_mode",
"label": "",
"value": "just_resize"
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2481.9569385477016,
"y": -181.06590482739782
}
},
{ {
"id": "1011539e-85de-4e02-a003-0b22358491b8", "id": "1011539e-85de-4e02-a003-0b22358491b8",
"type": "invocation", "type": "invocation",
@ -563,52 +715,6 @@
"y": -1006.415909408244 "y": -1006.415909408244
} }
}, },
{
"id": "b76fe66f-7884-43ad-b72c-fadc81d7a73c",
"type": "invocation",
"data": {
"id": "b76fe66f-7884-43ad-b72c-fadc81d7a73c",
"version": "1.2.2",
"label": "",
"notes": "",
"type": "l2i",
"inputs": {
"board": {
"name": "board",
"label": ""
},
"metadata": {
"name": "metadata",
"label": ""
},
"latents": {
"name": "latents",
"label": ""
},
"vae": {
"name": "vae",
"label": ""
},
"tiled": {
"name": "tiled",
"label": "",
"value": false
},
"fp32": {
"name": "fp32",
"label": "",
"value": false
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -1999.770193862987,
"y": -1075
}
},
{ {
"id": "ab6f5dda-4b60-4ddf-99f2-f61fb5937527", "id": "ab6f5dda-4b60-4ddf-99f2-f61fb5937527",
"type": "invocation", "type": "invocation",
@ -779,56 +885,6 @@
"y": -78.2819050861178 "y": -78.2819050861178
} }
}, },
{
"id": "287f134f-da8d-41d1-884e-5940e8f7b816",
"type": "invocation",
"data": {
"id": "287f134f-da8d-41d1-884e-5940e8f7b816",
"version": "1.2.2",
"label": "",
"notes": "",
"type": "ip_adapter",
"inputs": {
"image": {
"name": "image",
"label": ""
},
"ip_adapter_model": {
"name": "ip_adapter_model",
"label": "IP-Adapter Model (select ip_adapter_sd15)",
"value": {
"key": "1cc210bb-4d0a-4312-b36c-b5d46c43768e",
"hash": "blake3:3d669dffa7471b357b4df088b99ffb6bf4d4383d5e0ef1de5ec1c89728a3d5a5",
"name": "ip_adapter_sd15",
"base": "sd-1",
"type": "ip_adapter"
}
},
"weight": {
"name": "weight",
"label": "",
"value": 0.2
},
"begin_step_percent": {
"name": "begin_step_percent",
"label": "",
"value": 0
},
"end_step_percent": {
"name": "end_step_percent",
"label": "",
"value": 1
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -2855.8555540799207,
"y": -183.58854843775742
}
},
{ {
"id": "1f86c8bf-06f9-4e28-abee-02f46f445ac4", "id": "1f86c8bf-06f9-4e28-abee-02f46f445ac4",
"type": "invocation", "type": "invocation",
@ -899,30 +955,6 @@
"y": -41.810810454906914 "y": -41.810810454906914
} }
}, },
{
"id": "2ff466b8-5e2a-4d8f-923a-a3884c7ecbc5",
"type": "invocation",
"data": {
"id": "2ff466b8-5e2a-4d8f-923a-a3884c7ecbc5",
"version": "1.0.2",
"label": "",
"notes": "",
"type": "main_model_loader",
"inputs": {
"model": {
"name": "model",
"label": ""
}
},
"isOpen": true,
"isIntermediate": true,
"useCache": true
},
"position": {
"x": -4514.466823162653,
"y": -1235.7908800002283
}
},
{ {
"id": "f5d9bf3b-2646-4b17-9894-20fd2b4218ea", "id": "f5d9bf3b-2646-4b17-9894-20fd2b4218ea",
"type": "invocation", "type": "invocation",

2
invokeai/backend/image_util/lineart_anime.py
View File

@ -98,7 +98,7 @@ class UnetSkipConnectionBlock(nn.Module):
""" """
super(UnetSkipConnectionBlock, self).__init__() super(UnetSkipConnectionBlock, self).__init__()
self.outermost = outermost self.outermost = outermost
if type(norm_layer) == functools.partial: if isinstance(norm_layer, functools.partial):
use_bias = norm_layer.func == nn.InstanceNorm2d use_bias = norm_layer.func == nn.InstanceNorm2d
else: else:
use_bias = norm_layer == nn.InstanceNorm2d use_bias = norm_layer == nn.InstanceNorm2d

8
invokeai/backend/ip_adapter/ip_adapter.py
View File

@ -124,16 +124,14 @@ class IPAdapter(RawModel):
self.device, dtype=self.dtype self.device, dtype=self.dtype
) )
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None):
self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None, non_blocking: bool = False
):
if device is not None: if device is not None:
self.device = device self.device = device
if dtype is not None: if dtype is not None:
self.dtype = dtype self.dtype = dtype
self._image_proj_model.to(device=self.device, dtype=self.dtype, non_blocking=non_blocking) self._image_proj_model.to(device=self.device, dtype=self.dtype)
self.attn_weights.to(device=self.device, dtype=self.dtype, non_blocking=non_blocking) self.attn_weights.to(device=self.device, dtype=self.dtype)
def calc_size(self) -> int: def calc_size(self) -> int:
# HACK(ryand): Fix this issue with circular imports. # HACK(ryand): Fix this issue with circular imports.

94
invokeai/backend/lora.py
View File

@ -11,7 +11,6 @@ from typing_extensions import Self
from invokeai.backend.model_manager import BaseModelType from invokeai.backend.model_manager import BaseModelType
from invokeai.backend.raw_model import RawModel from invokeai.backend.raw_model import RawModel
from invokeai.backend.util.devices import TorchDevice
class LoRALayerBase: class LoRALayerBase:
@ -57,14 +56,9 @@ class LoRALayerBase:
model_size += val.nelement() * val.element_size() model_size += val.nelement() * val.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
if self.bias is not None: if self.bias is not None:
self.bias = self.bias.to(device=device, dtype=dtype, non_blocking=non_blocking) self.bias = self.bias.to(device=device, dtype=dtype)
# TODO: find and debug lora/locon with bias # TODO: find and debug lora/locon with bias
@ -106,19 +100,14 @@ class LoRALayer(LoRALayerBase):
model_size += val.nelement() * val.element_size() model_size += val.nelement() * val.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self, super().to(device=device, dtype=dtype)
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
super().to(device=device, dtype=dtype, non_blocking=non_blocking)
self.up = self.up.to(device=device, dtype=dtype, non_blocking=non_blocking) self.up = self.up.to(device=device, dtype=dtype)
self.down = self.down.to(device=device, dtype=dtype, non_blocking=non_blocking) self.down = self.down.to(device=device, dtype=dtype)
if self.mid is not None: if self.mid is not None:
self.mid = self.mid.to(device=device, dtype=dtype, non_blocking=non_blocking) self.mid = self.mid.to(device=device, dtype=dtype)
class LoHALayer(LoRALayerBase): class LoHALayer(LoRALayerBase):
@ -167,23 +156,18 @@ class LoHALayer(LoRALayerBase):
model_size += val.nelement() * val.element_size() model_size += val.nelement() * val.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
super().to(device=device, dtype=dtype) super().to(device=device, dtype=dtype)
self.w1_a = self.w1_a.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w1_a = self.w1_a.to(device=device, dtype=dtype)
self.w1_b = self.w1_b.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w1_b = self.w1_b.to(device=device, dtype=dtype)
if self.t1 is not None: if self.t1 is not None:
self.t1 = self.t1.to(device=device, dtype=dtype, non_blocking=non_blocking) self.t1 = self.t1.to(device=device, dtype=dtype)
self.w2_a = self.w2_a.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w2_a = self.w2_a.to(device=device, dtype=dtype)
self.w2_b = self.w2_b.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w2_b = self.w2_b.to(device=device, dtype=dtype)
if self.t2 is not None: if self.t2 is not None:
self.t2 = self.t2.to(device=device, dtype=dtype, non_blocking=non_blocking) self.t2 = self.t2.to(device=device, dtype=dtype)
class LoKRLayer(LoRALayerBase): class LoKRLayer(LoRALayerBase):
@ -264,12 +248,7 @@ class LoKRLayer(LoRALayerBase):
model_size += val.nelement() * val.element_size() model_size += val.nelement() * val.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
super().to(device=device, dtype=dtype) super().to(device=device, dtype=dtype)
if self.w1 is not None: if self.w1 is not None:
@ -277,19 +256,19 @@ class LoKRLayer(LoRALayerBase):
else: else:
assert self.w1_a is not None assert self.w1_a is not None
assert self.w1_b is not None assert self.w1_b is not None
self.w1_a = self.w1_a.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w1_a = self.w1_a.to(device=device, dtype=dtype)
self.w1_b = self.w1_b.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w1_b = self.w1_b.to(device=device, dtype=dtype)
if self.w2 is not None: if self.w2 is not None:
self.w2 = self.w2.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w2 = self.w2.to(device=device, dtype=dtype)
else: else:
assert self.w2_a is not None assert self.w2_a is not None
assert self.w2_b is not None assert self.w2_b is not None
self.w2_a = self.w2_a.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w2_a = self.w2_a.to(device=device, dtype=dtype)
self.w2_b = self.w2_b.to(device=device, dtype=dtype, non_blocking=non_blocking) self.w2_b = self.w2_b.to(device=device, dtype=dtype)
if self.t2 is not None: if self.t2 is not None:
self.t2 = self.t2.to(device=device, dtype=dtype, non_blocking=non_blocking) self.t2 = self.t2.to(device=device, dtype=dtype)
class FullLayer(LoRALayerBase): class FullLayer(LoRALayerBase):
@ -319,15 +298,10 @@ class FullLayer(LoRALayerBase):
model_size += self.weight.nelement() * self.weight.element_size() model_size += self.weight.nelement() * self.weight.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
super().to(device=device, dtype=dtype) super().to(device=device, dtype=dtype)
self.weight = self.weight.to(device=device, dtype=dtype, non_blocking=non_blocking) self.weight = self.weight.to(device=device, dtype=dtype)
class IA3Layer(LoRALayerBase): class IA3Layer(LoRALayerBase):
@ -359,16 +333,11 @@ class IA3Layer(LoRALayerBase):
model_size += self.on_input.nelement() * self.on_input.element_size() model_size += self.on_input.nelement() * self.on_input.element_size()
return model_size return model_size
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None):
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
):
super().to(device=device, dtype=dtype) super().to(device=device, dtype=dtype)
self.weight = self.weight.to(device=device, dtype=dtype, non_blocking=non_blocking) self.weight = self.weight.to(device=device, dtype=dtype)
self.on_input = self.on_input.to(device=device, dtype=dtype, non_blocking=non_blocking) self.on_input = self.on_input.to(device=device, dtype=dtype)
AnyLoRALayer = Union[LoRALayer, LoHALayer, LoKRLayer, FullLayer, IA3Layer] AnyLoRALayer = Union[LoRALayer, LoHALayer, LoKRLayer, FullLayer, IA3Layer]
@ -390,15 +359,10 @@ class LoRAModelRaw(RawModel): # (torch.nn.Module):
def name(self) -> str: def name(self) -> str:
return self._name return self._name
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
# TODO: try revert if exception? # TODO: try revert if exception?
for _key, layer in self.layers.items(): for _key, layer in self.layers.items():
layer.to(device=device, dtype=dtype, non_blocking=non_blocking) layer.to(device=device, dtype=dtype)
def calc_size(self) -> int: def calc_size(self) -> int:
model_size = 0 model_size = 0
@ -521,7 +485,7 @@ class LoRAModelRaw(RawModel): # (torch.nn.Module):
# lower memory consumption by removing already parsed layer values # lower memory consumption by removing already parsed layer values
state_dict[layer_key].clear() state_dict[layer_key].clear()
layer.to(device=device, dtype=dtype, non_blocking=TorchDevice.get_non_blocking(device)) layer.to(device=device, dtype=dtype)
model.layers[layer_key] = layer model.layers[layer_key] = layer
return model return model

6
invokeai/backend/model_manager/load/model_cache/model_cache_default.py
View File

@ -289,11 +289,9 @@ class ModelCache(ModelCacheBase[AnyModel]):
else: else:
new_dict: Dict[str, torch.Tensor] = {} new_dict: Dict[str, torch.Tensor] = {}
for k, v in cache_entry.state_dict.items(): for k, v in cache_entry.state_dict.items():
new_dict[k] = v.to( new_dict[k] = v.to(target_device, copy=True)
target_device, copy=True, non_blocking=TorchDevice.get_non_blocking(target_device)
)
cache_entry.model.load_state_dict(new_dict, assign=True) cache_entry.model.load_state_dict(new_dict, assign=True)
cache_entry.model.to(target_device, non_blocking=TorchDevice.get_non_blocking(target_device)) cache_entry.model.to(target_device)
cache_entry.device = target_device cache_entry.device = target_device
except Exception as e: # blow away cache entry except Exception as e: # blow away cache entry
self._delete_cache_entry(cache_entry) self._delete_cache_entry(cache_entry)

15
invokeai/backend/model_patcher.py
View File

@ -139,15 +139,12 @@ class ModelPatcher:
# We intentionally move to the target device first, then cast. Experimentally, this was found to # We intentionally move to the target device first, then cast. Experimentally, this was found to
# be significantly faster for 16-bit CPU tensors being moved to a CUDA device than doing the # be significantly faster for 16-bit CPU tensors being moved to a CUDA device than doing the
# same thing in a single call to '.to(...)'. # same thing in a single call to '.to(...)'.
layer.to(device=device, non_blocking=TorchDevice.get_non_blocking(device)) layer.to(device=device)
layer.to(dtype=torch.float32, non_blocking=TorchDevice.get_non_blocking(device)) layer.to(dtype=torch.float32)
# TODO(ryand): Using torch.autocast(...) over explicit casting may offer a speed benefit on CUDA # TODO(ryand): Using torch.autocast(...) over explicit casting may offer a speed benefit on CUDA
# devices here. Experimentally, it was found to be very slow on CPU. More investigation needed. # devices here. Experimentally, it was found to be very slow on CPU. More investigation needed.
layer_weight = layer.get_weight(module.weight) * (lora_weight * layer_scale) layer_weight = layer.get_weight(module.weight) * (lora_weight * layer_scale)
layer.to( layer.to(device=TorchDevice.CPU_DEVICE)
device=TorchDevice.CPU_DEVICE,
non_blocking=TorchDevice.get_non_blocking(TorchDevice.CPU_DEVICE),
)
assert isinstance(layer_weight, torch.Tensor) # mypy thinks layer_weight is a float|Any ??! assert isinstance(layer_weight, torch.Tensor) # mypy thinks layer_weight is a float|Any ??!
if module.weight.shape != layer_weight.shape: if module.weight.shape != layer_weight.shape:
@ -156,7 +153,7 @@ class ModelPatcher:
layer_weight = layer_weight.reshape(module.weight.shape) layer_weight = layer_weight.reshape(module.weight.shape)
assert isinstance(layer_weight, torch.Tensor) # mypy thinks layer_weight is a float|Any ??! assert isinstance(layer_weight, torch.Tensor) # mypy thinks layer_weight is a float|Any ??!
module.weight += layer_weight.to(dtype=dtype, non_blocking=TorchDevice.get_non_blocking(device)) module.weight += layer_weight.to(dtype=dtype)
yield # wait for context manager exit yield # wait for context manager exit
@ -164,9 +161,7 @@ class ModelPatcher:
assert hasattr(model, "get_submodule") # mypy not picking up fact that torch.nn.Module has get_submodule() assert hasattr(model, "get_submodule") # mypy not picking up fact that torch.nn.Module has get_submodule()
with torch.no_grad(): with torch.no_grad():
for module_key, weight in original_weights.items(): for module_key, weight in original_weights.items():
model.get_submodule(module_key).weight.copy_( model.get_submodule(module_key).weight.copy_(weight)
weight, non_blocking=TorchDevice.get_non_blocking(weight.device)
)
@classmethod @classmethod
@contextmanager @contextmanager

7
invokeai/backend/onnx/onnx_runtime.py
View File

@ -190,12 +190,7 @@ class IAIOnnxRuntimeModel(RawModel):
return self.session.run(None, inputs) return self.session.run(None, inputs)
# compatability with RawModel ABC # compatability with RawModel ABC
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
pass pass
# compatability with diffusers load code # compatability with diffusers load code

7
invokeai/backend/raw_model.py
View File

@ -18,10 +18,5 @@ class RawModel(ABC):
""" """
@abstractmethod @abstractmethod
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
pass pass

9
invokeai/backend/textual_inversion.py
View File

@ -65,17 +65,12 @@ class TextualInversionModelRaw(RawModel):
return result return result
def to( def to(self, device: Optional[torch.device] = None, dtype: Optional[torch.dtype] = None) -> None:
self,
device: Optional[torch.device] = None,
dtype: Optional[torch.dtype] = None,
non_blocking: bool = False,
) -> None:
if not torch.cuda.is_available(): if not torch.cuda.is_available():
return return
for emb in [self.embedding, self.embedding_2]: for emb in [self.embedding, self.embedding_2]:
if emb is not None: if emb is not None:
emb.to(device=device, dtype=dtype, non_blocking=non_blocking) emb.to(device=device, dtype=dtype)
def calc_size(self) -> int: def calc_size(self) -> int:
"""Get the size of this model in bytes.""" """Get the size of this model in bytes."""

12
invokeai/backend/util/devices.py
View File

@ -112,15 +112,3 @@ class TorchDevice:
@classmethod @classmethod
def _to_dtype(cls, precision_name: TorchPrecisionNames) -> torch.dtype: def _to_dtype(cls, precision_name: TorchPrecisionNames) -> torch.dtype:
return NAME_TO_PRECISION[precision_name] return NAME_TO_PRECISION[precision_name]
@staticmethod
def get_non_blocking(to_device: torch.device) -> bool:
"""Return the non_blocking flag to be used when moving a tensor to a given device.
MPS may have unexpected errors with non-blocking operations - we should not use non-blocking when moving _to_ MPS.
When moving _from_ MPS, we can use non-blocking operations.
See:
- https://github.com/pytorch/pytorch/issues/107455
- https://discuss.pytorch.org/t/should-we-set-non-blocking-to-true/38234/28
"""
return False if to_device.type == "mps" else True

133
invokeai/frontend/web/public/locales/de.json
View File

@ -4,7 +4,7 @@
"reportBugLabel": "Fehler melden", "reportBugLabel": "Fehler melden",
"settingsLabel": "Einstellungen", "settingsLabel": "Einstellungen",
"img2img": "Bild zu Bild", "img2img": "Bild zu Bild",
"nodes": "Arbeitsabläufe", "nodes": "Workflows",
"upload": "Hochladen", "upload": "Hochladen",
"load": "Laden", "load": "Laden",
"statusDisconnected": "Getrennt", "statusDisconnected": "Getrennt",
@ -18,16 +18,16 @@
"postprocessing": "Nachbearbeitung", "postprocessing": "Nachbearbeitung",
"t2iAdapter": "T2I Adapter", "t2iAdapter": "T2I Adapter",
"communityLabel": "Gemeinschaft", "communityLabel": "Gemeinschaft",
"dontAskMeAgain": "Frag mich nicht nochmal", "dontAskMeAgain": "Nicht nochmal fragen",
"areYouSure": "Bist du dir sicher?", "areYouSure": "Bist du sicher?",
"on": "An", "on": "An",
"nodeEditor": "Knoten Editor", "nodeEditor": "Node-Editor",
"ipAdapter": "IP Adapter", "ipAdapter": "IP Adapter",
"auto": "Automatisch", "auto": "Auto",
"controlNet": "ControlNet", "controlNet": "ControlNet",
"imageFailedToLoad": "Kann Bild nicht laden", "imageFailedToLoad": "Kann Bild nicht laden",
"modelManager": "Model Manager", "modelManager": "Model Manager",
"learnMore": "Mehr lernen", "learnMore": "Mehr erfahren",
"loading": "Lade", "loading": "Lade",
"random": "Zufall", "random": "Zufall",
"batch": "Stapel-Manager", "batch": "Stapel-Manager",
@ -42,7 +42,7 @@
"outputs": "Ausgabe", "outputs": "Ausgabe",
"data": "Daten", "data": "Daten",
"safetensors": "Safe-Tensors", "safetensors": "Safe-Tensors",
"outpaint": "Outpaint (Außen ausmalen)", "outpaint": "Outpaint",
"details": "Details", "details": "Details",
"format": "Format", "format": "Format",
"unknown": "Unbekannt", "unknown": "Unbekannt",
@ -78,7 +78,20 @@
"add": "Hinzufügen", "add": "Hinzufügen",
"loglevel": "Protokoll Stufe", "loglevel": "Protokoll Stufe",
"selected": "Ausgewählt", "selected": "Ausgewählt",
"beta": "Beta" "beta": "Beta",
"comparing": "Vergleichen",
"comparingDesc": "Bilder vergleichen",
"editor": "Editor",
"goTo": "Gehe zu",
"positivePrompt": "Positiv-Prompt",
"negativePrompt": "Negativ-Prompt",
"editing": "Bearbeiten",
"editingDesc": "Bearbeiten auf der Kontrollebenen-Leinwand",
"viewing": "Ansehen",
"viewingDesc": "Bilder in großer Galerie ansehen",
"tab": "Tabulator",
"enabled": "Aktiviert",
"disabled": "Ausgeschaltet"
}, },
"gallery": { "gallery": {
"galleryImageSize": "Bildgröße", "galleryImageSize": "Bildgröße",
@ -585,17 +598,18 @@
"mode": "Modus", "mode": "Modus",
"resetUI": "$t(accessibility.reset) von UI", "resetUI": "$t(accessibility.reset) von UI",
"createIssue": "Ticket erstellen", "createIssue": "Ticket erstellen",
"about": "Über" "about": "Über",
"submitSupportTicket": "Support-Ticket senden"
}, },
"boards": { "boards": {
"autoAddBoard": "Automatisches Hinzufügen zum Board", "autoAddBoard": "Board automatisch erstellen",
"topMessage": "Dieser Ordner enthält Bilder die in den folgenden Funktionen verwendet werden:", "topMessage": "Dieser Ordner enthält Bilder, die in den folgenden Funktionen verwendet werden:",
"move": "Bewegen", "move": "Bewegen",
"menuItemAutoAdd": "Auto-Hinzufügen zu diesem Ordner", "menuItemAutoAdd": "Auto-Hinzufügen zu diesem Ordner",
"myBoard": "Meine Ordner", "myBoard": "Meine Ordner",
"searchBoard": "Ordner durchsuchen...", "searchBoard": "Ordner durchsuchen...",
"noMatching": "Keine passenden Ordner", "noMatching": "Keine passenden Ordner",
"selectBoard": "Ordner aussuchen", "selectBoard": "Ordner wählen",
"cancel": "Abbrechen", "cancel": "Abbrechen",
"addBoard": "Board hinzufügen", "addBoard": "Board hinzufügen",
"uncategorized": "Ohne Kategorie", "uncategorized": "Ohne Kategorie",
@ -605,30 +619,41 @@
"clearSearch": "Suche leeren", "clearSearch": "Suche leeren",
"bottomMessage": "Löschen des Boards und seiner Bilder setzt alle Funktionen zurück, die sie gerade verwenden.", "bottomMessage": "Löschen des Boards und seiner Bilder setzt alle Funktionen zurück, die sie gerade verwenden.",
"deleteBoardOnly": "Nur Ordner löschen", "deleteBoardOnly": "Nur Ordner löschen",
"deleteBoard": "Löschen Ordner", "deleteBoard": "Lösche Ordner",
"deleteBoardAndImages": "Löschen Ordner und Bilder", "deleteBoardAndImages": "Lösche Ordner und Bilder",
"deletedBoardsCannotbeRestored": "Gelöschte Ordner könnte nicht wiederhergestellt werden", "deletedBoardsCannotbeRestored": "Gelöschte Ordner können nicht wiederhergestellt werden",
"movingImagesToBoard_one": "Verschiebe {{count}} Bild zu Ordner:", "movingImagesToBoard_one": "Verschiebe {{count}} Bild in Ordner:",
"movingImagesToBoard_other": "Verschiebe {{count}} Bilder in Ordner:" "movingImagesToBoard_other": "Verschiebe {{count}} Bilder in Ordner:",
"selectedForAutoAdd": "Ausgewählt für Automatisches hinzufügen",
"imagesWithCount_one": "{{count}} Bild",
"imagesWithCount_other": "{{count}} Bilder",
"addPrivateBoard": "Privaten Ordner hinzufügen",
"addSharedBoard": "Geteilten Ordner hinzufügen",
"boards": "Ordner",
"unarchiveBoard": "Unarchive Ordner",
"private": "Private Ordner",
"shared": "Geteilte Ordner",
"archiveBoard": "Ordner archivieren",
"archived": "Archiviert"
}, },
"controlnet": { "controlnet": {
"showAdvanced": "Zeige Erweitert", "showAdvanced": "Zeige Erweitert",
"contentShuffleDescription": "Mischt den Inhalt von einem Bild", "contentShuffleDescription": "Mischt den Inhalt des Bilds",
"addT2IAdapter": "$t(common.t2iAdapter) hinzufügen", "addT2IAdapter": "$t(common.t2iAdapter) hinzufügen",
"importImageFromCanvas": "Bild von Zeichenfläche importieren", "importImageFromCanvas": "Bild von Zeichenfläche importieren",
"lineartDescription": "Konvertiere Bild in Strichzeichnung", "lineartDescription": "Konvertiert Bild in Linienzeichnung",
"importMaskFromCanvas": "Importiere Maske von Zeichenfläche", "importMaskFromCanvas": "Importiere Maske von Zeichenfläche",
"hed": "HED", "hed": "HED",
"hideAdvanced": "Verstecke Erweitert", "hideAdvanced": "Verstecke Erweitert",
"contentShuffle": "Inhalt mischen", "contentShuffle": "Inhalt mischen",
"beginEndStepPercent": "Start / Ende Step Prozent", "beginEndStepPercent": "Start/Ende Step Prozent",
"duplicate": "Kopieren", "duplicate": "Duplizieren",
"f": "F", "f": "F",
"h": "H", "h": "H",
"depthMidasDescription": "Tiefenmap erstellen mit Midas", "depthMidasDescription": "Z-Map erstellen mit Midas",
"controlnet": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.controlNet))", "controlnet": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.controlNet))",
"weight": "Einfluss", "weight": "Gewichtung",
"selectModel": "Wähle ein Modell", "selectModel": "Modell wählen",
"depthMidas": "Tiefe (Midas)", "depthMidas": "Tiefe (Midas)",
"w": "W", "w": "W",
"addControlNet": "$t(common.controlNet) hinzufügen", "addControlNet": "$t(common.controlNet) hinzufügen",
@ -637,7 +662,7 @@
"ip_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.ipAdapter))", "ip_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.ipAdapter))",
"fill": "Füllen", "fill": "Füllen",
"addIPAdapter": "$t(common.ipAdapter) hinzufügen", "addIPAdapter": "$t(common.ipAdapter) hinzufügen",
"colorMapDescription": "Erstelle eine Farbkarte von diesem Bild", "colorMapDescription": "Erstellt eine color-map von diesem Bild",
"t2i_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.t2iAdapter))", "t2i_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.t2iAdapter))",
"imageResolution": "Bild Auflösung", "imageResolution": "Bild Auflösung",
"depthZoe": "Tiefe (Zoe)", "depthZoe": "Tiefe (Zoe)",
@ -646,41 +671,41 @@
"highThreshold": "Hohe Schwelle", "highThreshold": "Hohe Schwelle",
"toggleControlNet": "Dieses ControlNet ein- oder ausschalten", "toggleControlNet": "Dieses ControlNet ein- oder ausschalten",
"delete": "Löschen", "delete": "Löschen",
"controlAdapter_one": "Control Adapter", "controlAdapter_one": "Control-Adapter",
"controlAdapter_other": "Control Adapter", "controlAdapter_other": "Control-Adapter",
"colorMapTileSize": "Kachelgröße", "colorMapTileSize": "Kachelgröße",
"depthZoeDescription": "Tiefenmap erstellen mit Zoe", "depthZoeDescription": "Z-Map erstellen mit Zoe",
"setControlImageDimensions": "Setze Control-Bild Auflösung auf Breite/Höhe", "setControlImageDimensions": "Bildauflösung auf optimalen Wert setzen",
"resize": "Größe ändern", "resize": "Größe ändern",
"resetControlImage": "Zurücksetzen vom Referenz Bild", "resetControlImage": "Zurücksetzen vom Kontrollbild",
"balanced": "Ausgewogen", "balanced": "Ausgewogen",
"prompt": "Prompt", "prompt": "Prompt",
"resizeMode": "Größe", "resizeMode": "Skalierungs-Modus",
"processor": "Prozessor", "processor": "Prozessor",
"saveControlImage": "Speichere Referenz Bild", "saveControlImage": "Speichere Kontrollbild",
"safe": "Speichern", "safe": "Speichern",
"pidi": "PIDI", "pidi": "PIDI",
"normalBae": "Normales BAE", "normalBae": "Normale BAE",
"mlsdDescription": "Minimalistischer Liniensegmentdetektor", "mlsdDescription": "Minimalistischer Liniensegmentdetektor",
"control": "Kontrolle", "control": "Kontrolle",
"coarse": "Grob", "coarse": "Grob",
"crop": "Zuschneiden", "crop": "Zuschneiden",
"pidiDescription": "PIDI-Bildverarbeitung", "pidiDescription": "PIDI-Bildverarbeitung",
"mediapipeFace": "Mediapipe Gesichter", "mediapipeFace": "Mediapipe Gesicht",
"mlsd": "M-LSD", "mlsd": "M-LSD",
"controlMode": "Steuermodus", "controlMode": "Kontrollmodus",
"cannyDescription": "Canny Umrisserkennung", "cannyDescription": "Canny Umrisserkennung",
"lineart": "Linienzeichnung", "lineart": "Linienzeichnung",
"lineartAnimeDescription": "Lineart-Verarbeitung im Anime-Stil", "lineartAnimeDescription": "Lineart-Verarbeitung im Anime-Stil",
"minConfidence": "Minimales Vertrauen", "minConfidence": "Minimales Vertrauen",
"megaControl": "Mega-Kontrolle", "megaControl": "Mega-Kontrolle",
"autoConfigure": "Prozessor Auto-konfig", "autoConfigure": "Prozessor Auto-Konfig",
"normalBaeDescription": "Normale BAE-Verarbeitung", "normalBaeDescription": "Normale BAE-Verarbeitung",
"noneDescription": "Es wurde keine Verarbeitung angewendet", "noneDescription": "Es wurde nichts angewendet",
"lineartAnime": "Lineart Anime / \"Strichzeichnung Anime\"", "lineartAnime": "Strichzeichnung Anime",
"mediapipeFaceDescription": "Gesichtserkennung mit Mediapipe", "mediapipeFaceDescription": "Gesichtserkennung mit Mediapipe",
"canny": "\"Canny\"", "canny": "Canny",
"hedDescription": "Ganzheitlich verschachtelte Kantenerkennung", "hedDescription": "Ganzheitlich-verschachtelte Kantenerkennung",
"scribble": "Scribble", "scribble": "Scribble",
"maxFaces": "Maximale Anzahl Gesichter", "maxFaces": "Maximale Anzahl Gesichter",
"resizeSimple": "Größe ändern (einfach)", "resizeSimple": "Größe ändern (einfach)",
@ -689,21 +714,23 @@
"small": "Klein", "small": "Klein",
"base": "Basis", "base": "Basis",
"depthAnything": "Depth Anything", "depthAnything": "Depth Anything",
"depthAnythingDescription": "Erstellung einer Tiefenkarte mit der Depth-Anything-Technik", "depthAnythingDescription": "Erstellung einer Z-Map mit Depth-Anything-Technik",
"face": "Gesicht", "face": "Gesicht",
"body": "Körper", "body": "Körper",
"hands": "Hände", "hands": "Hände",
"dwOpenpose": "DW Openpose", "dwOpenpose": "DW Openpose",
"dwOpenposeDescription": "Posenschätzung mit DW Openpose", "dwOpenposeDescription": "Posenschätzung mit DW Openpose",
"selectCLIPVisionModel": "Wähle ein CLIP Vision Model aus", "selectCLIPVisionModel": "Wähle ein CLIP-Vision Modell aus",
"ipAdapterMethod": "Methode", "ipAdapterMethod": "Methode",
"composition": "Nur Komposition", "composition": "Nur Komposition",
"full": "Voll", "full": "Voll",
"style": "Nur Style" "style": "Nur Stil",
"setControlImageDimensionsForce": "Bildauflösung setzen (ev. nicht optimal)",
"beginEndStepPercentShort": "Start/Ende %"
}, },
"queue": { "queue": {
"status": "Status", "status": "Status",
"cancelTooltip": "Aktuellen Aufgabe abbrechen", "cancelTooltip": "Aufgabe abbrechen",
"queueEmpty": "Warteschlange leer", "queueEmpty": "Warteschlange leer",
"in_progress": "In Arbeit", "in_progress": "In Arbeit",
"queueFront": "Am Anfang der Warteschlange einreihen", "queueFront": "Am Anfang der Warteschlange einreihen",
@ -739,7 +766,7 @@
"clearQueueAlertDialog2": "Warteschlange wirklich leeren?", "clearQueueAlertDialog2": "Warteschlange wirklich leeren?",
"pruneSucceeded": "{{item_count}} abgeschlossene Elemente aus der Warteschlange entfernt", "pruneSucceeded": "{{item_count}} abgeschlossene Elemente aus der Warteschlange entfernt",
"pauseSucceeded": "Prozess angehalten", "pauseSucceeded": "Prozess angehalten",
"cancelFailed": "Problem beim Stornieren des Auftrags", "cancelFailed": "Problem beim Abbrechen",
"pauseFailed": "Problem beim Anhalten des Prozesses", "pauseFailed": "Problem beim Anhalten des Prozesses",
"front": "Vorne", "front": "Vorne",
"pruneTooltip": "Bereinigen Sie {{item_count}} abgeschlossene Aufträge", "pruneTooltip": "Bereinigen Sie {{item_count}} abgeschlossene Aufträge",
@ -1026,13 +1053,13 @@
}, },
"hrf": { "hrf": {
"enableHrf": "Korrektur für hohe Auflösungen", "enableHrf": "Korrektur für hohe Auflösungen",
"upscaleMethod": "Vergrößerungsmethoden", "upscaleMethod": "Vergrößerungsmethode",
"metadata": { "metadata": {
"strength": "Hochauflösender Fix Stärke", "strength": "Auflösungs-Fix Stärke",
"enabled": "Hochauflösender Fix aktiviert", "enabled": "Auflösungs-Fix aktiviert",
"method": "Hochauflösender Fix Methode" "method": "Auflösungs-Fix Methode"
}, },
"hrf": "Hochauflösender Fix" "hrf": "Hohe-Auflösung-Fix"
}, },
"models": { "models": {
"noMatchingModels": "Keine passenden Modelle", "noMatchingModels": "Keine passenden Modelle",
@ -1063,7 +1090,7 @@
}, },
"compositing": { "compositing": {
"coherenceTab": "Kohärenzpass", "coherenceTab": "Kohärenzpass",
"infillTab": "Füllung / Infill", "infillTab": "Infill",
"title": "Compositing" "title": "Compositing"
} }
}, },
@ -1104,8 +1131,8 @@
"showDynamicPrompts": "Dynamische Prompts anzeigen" "showDynamicPrompts": "Dynamische Prompts anzeigen"
}, },
"prompt": { "prompt": {
"noMatchingTriggers": "Keine passenden Auslöser", "noMatchingTriggers": "Keine passenden Trigger",
"addPromptTrigger": "Auslöse Text hinzufügen", "addPromptTrigger": "Prompt-Trigger hinzufügen",
"compatibleEmbeddings": "Kompatible Einbettungen" "compatibleEmbeddings": "Kompatible Einbettungen"
} }
} }

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

@ -39,10 +39,10 @@
"movingImagesToBoard_other": "Moving {{count}} images to board:", "movingImagesToBoard_other": "Moving {{count}} images to board:",
"myBoard": "My Board", "myBoard": "My Board",
"noMatching": "No matching Boards", "noMatching": "No matching Boards",
"private": "Private", "private": "Private Boards",
"searchBoard": "Search Boards...", "searchBoard": "Search Boards...",
"selectBoard": "Select a Board", "selectBoard": "Select a Board",
"shared": "Shared", "shared": "Shared Boards",
"topMessage": "This board contains images used in the following features:", "topMessage": "This board contains images used in the following features:",
"unarchiveBoard": "Unarchive Board", "unarchiveBoard": "Unarchive Board",
"uncategorized": "Uncategorized", "uncategorized": "Uncategorized",
@ -370,6 +370,8 @@
"deleteImage_other": "Delete {{count}} Images", "deleteImage_other": "Delete {{count}} Images",
"deleteImageBin": "Deleted images will be sent to your operating system's Bin.", "deleteImageBin": "Deleted images will be sent to your operating system's Bin.",
"deleteImagePermanent": "Deleted images cannot be restored.", "deleteImagePermanent": "Deleted images cannot be restored.",
"displayBoardSearch": "Display Board Search",
"displaySearch": "Display Search",
"download": "Download", "download": "Download",
"featuresWillReset": "If you delete this image, those features will immediately be reset.", "featuresWillReset": "If you delete this image, those features will immediately be reset.",
"galleryImageSize": "Image Size", "galleryImageSize": "Image Size",

109
invokeai/frontend/web/public/locales/fr.json
View File

@ -1,7 +1,7 @@
{ {
"common": { "common": {
"hotkeysLabel": "Raccourcis clavier", "hotkeysLabel": "Raccourcis clavier",
"languagePickerLabel": "Sélecteur de langue", "languagePickerLabel": "Langue",
"reportBugLabel": "Signaler un bug", "reportBugLabel": "Signaler un bug",
"settingsLabel": "Paramètres", "settingsLabel": "Paramètres",
"img2img": "Image en image", "img2img": "Image en image",
@ -17,7 +17,53 @@
"cancel": "Annuler", "cancel": "Annuler",
"loading": "Chargement", "loading": "Chargement",
"txt2img": "Texte vers image", "txt2img": "Texte vers image",
"postprocessing": "Post-Traitement" "postprocessing": "Post-Traitement",
"file": "Fichier",
"orderBy": "Trier par",
"comparing": "Comparaison",
"add": "Ajouter",
"dontAskMeAgain": "Ne plus me demander",
"nodeEditor": "Éditeur de nœud",
"outputs": "Sorties",
"unknown": "Inconnu",
"editor": "Éditeur",
"error": "Erreur",
"installed": "Installé",
"format": "format",
"goTo": "Aller à",
"input": "Saisie",
"linear": "Linéaire",
"localSystem": "Système local",
"learnMore": "En savoir plus",
"modelManager": "Gestionnaire de modèle",
"notInstalled": "Non $t(common.installed)",
"openInNewTab": "Ouvrir dans un nouvel onglet",
"somethingWentWrong": "Une erreur s'est produite",
"created": "Créé",
"tab": "Onglet",
"folder": "Dossier",
"imageFailedToLoad": "Impossible de charger l'image",
"prevPage": "Page précédente",
"nextPage": "Page suivante",
"selected": "Sélectionné",
"save": "Enregistrer",
"updated": "Mis à jour",
"random": "Aléatoire",
"unknownError": "Erreur inconnue",
"red": "Rouge",
"green": "Vert",
"delete": "Supprimer",
"simple": "Simple",
"template": "Modèle",
"advanced": "Avancé",
"copy": "Copier",
"saveAs": "Enregistrer sous",
"blue": "Bleu",
"alpha": "Alpha",
"editing": "Édition",
"enabled": "Activé",
"disabled": "Désactivé",
"direction": "Direction"
}, },
"gallery": { "gallery": {
"galleryImageSize": "Taille de l'image", "galleryImageSize": "Taille de l'image",
@ -368,6 +414,63 @@
"previousImage": "Image précédente", "previousImage": "Image précédente",
"showOptionsPanel": "Montrer la page d'options", "showOptionsPanel": "Montrer la page d'options",
"invokeProgressBar": "Barre de Progression Invoke", "invokeProgressBar": "Barre de Progression Invoke",
"menu": "Menu" "menu": "Menu",
"loadMore": "Charger plus",
"about": "À propos",
"mode": "Mode"
},
"boards": {
"move": "Déplacer",
"cancel": "Annuler",
"loading": "Chargement…",
"archived": "Archivé",
"clearSearch": "Effacer la recherche",
"imagesWithCount_one": "{{count}} image",
"imagesWithCount_many": "{{count}} images",
"imagesWithCount_other": "{{count}} images"
},
"accordions": {
"advanced": {
"title": "Avancé"
},
"image": {
"title": "Image"
}
},
"controlnet": {
"none": "Aucun",
"detectResolution": "Détecter la résolution",
"balanced": "Équilibré",
"colorMap": "Couleur",
"control": "Contrôle",
"controlMode": "Mode de contrôle",
"processor": "Processeur",
"ipAdapterMethod": "Méthode",
"delete": "Supprimer",
"duplicate": "Dupliquer",
"crop": "Rogner",
"imageResolution": "Résolution d'image",
"resize": "Redimensionner"
},
"queue": {
"clear": "Effacer",
"failed": "Échec",
"session": "Session",
"queueEmpty": "File d'attente vide",
"next": "Suivant",
"queue": "File d'attente",
"clearSucceeded": "File d'attente effacée",
"total": "Total",
"pending": "En attente",
"in_progress": "En cours",
"time": "Heure",
"status": "État",
"openQueue": "Ouvrir la file d'attente",
"queueFront": "Ajouter en premier",
"cancel": "Annuler",
"canceled": "Annulé",
"clearQueueAlertDialog2": "Voulez-vous vraiment effacer la file d'attente ?",
"queueBack": "Ajouter à la file d'attente",
"completed": "Terminé"
} }
} }

35
invokeai/frontend/web/public/locales/it.json
View File

@ -116,9 +116,9 @@
"deleteSelection": "Elimina la selezione", "deleteSelection": "Elimina la selezione",
"image": "immagine", "image": "immagine",
"drop": "Rilascia", "drop": "Rilascia",
"unstarImage": "Rimuovi preferenza immagine", "unstarImage": "Rimuovi contrassegno immagine",
"dropOrUpload": "$t(gallery.drop) o carica", "dropOrUpload": "$t(gallery.drop) o carica",
"starImage": "Immagine preferita", "starImage": "Contrassegna l'immagine",
"dropToUpload": "$t(gallery.drop) per aggiornare", "dropToUpload": "$t(gallery.drop) per aggiornare",
"problemDeletingImagesDesc": "Impossibile eliminare una o più immagini", "problemDeletingImagesDesc": "Impossibile eliminare una o più immagini",
"problemDeletingImages": "Problema durante l'eliminazione delle immagini", "problemDeletingImages": "Problema durante l'eliminazione delle immagini",
@ -142,7 +142,15 @@
"compareHelp1": "Tieni premuto <Kbd>Alt</Kbd> mentre fai clic su un'immagine della galleria o usi i tasti freccia per cambiare l'immagine di confronto.", "compareHelp1": "Tieni premuto <Kbd>Alt</Kbd> mentre fai clic su un'immagine della galleria o usi i tasti freccia per cambiare l'immagine di confronto.",
"compareHelp2": "Premi <Kbd>M</Kbd> per scorrere le modalità di confronto.", "compareHelp2": "Premi <Kbd>M</Kbd> per scorrere le modalità di confronto.",
"compareHelp3": "Premi <Kbd>C</Kbd> per scambiare le immagini confrontate.", "compareHelp3": "Premi <Kbd>C</Kbd> per scambiare le immagini confrontate.",
"compareHelp4": "Premi <Kbd>Z</Kbd> o <Kbd>Esc</Kbd> per uscire." "compareHelp4": "Premi <Kbd>Z</Kbd> o <Kbd>Esc</Kbd> per uscire.",
"newestFirst": "Prima i più nuovi",
"oldestFirst": "Prima i più vecchi",
"sortDirection": "Direzione dell'ordinamento",
"showStarredImagesFirst": "Mostra prima le immagini contrassegnate",
"showArchivedBoards": "Mostra le bacheche archiviate",
"searchImages": "Ricerca per metadati",
"displayBoardSearch": "Mostra la ricerca nelle Bacheche",
"displaySearch": "Mostra la ricerca"
}, },
"hotkeys": { "hotkeys": {
"keyboardShortcuts": "Tasti di scelta rapida", "keyboardShortcuts": "Tasti di scelta rapida",
@ -941,7 +949,22 @@
"deletedBoardsCannotbeRestored": "Le bacheche eliminate non possono essere ripristinate", "deletedBoardsCannotbeRestored": "Le bacheche eliminate non possono essere ripristinate",
"movingImagesToBoard_one": "Spostare {{count}} immagine nella bacheca:", "movingImagesToBoard_one": "Spostare {{count}} immagine nella bacheca:",
"movingImagesToBoard_many": "Spostare {{count}} immagini nella bacheca:", "movingImagesToBoard_many": "Spostare {{count}} immagini nella bacheca:",
"movingImagesToBoard_other": "Spostare {{count}} immagini nella bacheca:" "movingImagesToBoard_other": "Spostare {{count}} immagini nella bacheca:",
"imagesWithCount_one": "{{count}} immagine",
"imagesWithCount_many": "{{count}} immagini",
"imagesWithCount_other": "{{count}} immagini",
"assetsWithCount_one": "{{count}} risorsa",
"assetsWithCount_many": "{{count}} risorse",
"assetsWithCount_other": "{{count}} risorse",
"archiveBoard": "Archivia la bacheca",
"archived": "Archiviato",
"unarchiveBoard": "Annulla l'archiviazione della bacheca",
"selectedForAutoAdd": "Selezionato per l'aggiunta automatica",
"addSharedBoard": "Aggiungi una Bacheca Condivisa",
"boards": "Bacheche",
"private": "Bacheche private",
"shared": "Bacheche condivise",
"addPrivateBoard": "Aggiungi una Bacheca Privata"
}, },
"controlnet": { "controlnet": {
"contentShuffleDescription": "Rimescola il contenuto di un'immagine", "contentShuffleDescription": "Rimescola il contenuto di un'immagine",
@ -1005,7 +1028,7 @@
"minConfidence": "Confidenza minima", "minConfidence": "Confidenza minima",
"scribble": "Scarabocchio", "scribble": "Scarabocchio",
"amult": "Angolo di illuminazione", "amult": "Angolo di illuminazione",
"coarse": "Approssimativo", "coarse": "Grossolano",
"resizeSimple": "Ridimensiona (semplice)", "resizeSimple": "Ridimensiona (semplice)",
"large": "Grande", "large": "Grande",
"small": "Piccolo", "small": "Piccolo",
@ -1330,7 +1353,7 @@
"lora": { "lora": {
"heading": "LoRA", "heading": "LoRA",
"paragraphs": [ "paragraphs": [
"Modelli leggeri utilizzati insieme ai modelli base." "Modelli concettuali utilizzati insieme ai modelli di base."
] ]
}, },
"controlNet": { "controlNet": {

93
invokeai/frontend/web/public/locales/ja.json
View File

@ -70,7 +70,25 @@
"outputs": "アウトプット", "outputs": "アウトプット",
"prevPage": "前のページ", "prevPage": "前のページ",
"unknownError": "未知のエラー", "unknownError": "未知のエラー",
"orderBy": "並び順:" "orderBy": "並び順:",
"comparing": "比較中",
"comparingDesc": "2 つの画像の比較する",
"enabled": "有効",
"notInstalled": "未インストール",
"positivePrompt": "プロンプト",
"negativePrompt": "除外する要素",
"selected": "選択済み",
"aboutDesc": "Invokeを業務で利用する場合はマークしてください:",
"beta": "ベータ",
"disabled": "無効",
"loglevel": "ログラベル",
"editor": "エディタ",
"safetensors": "Safetensors",
"tab": "タブ",
"viewingDesc": "画像を大きなギャラリービューで開く",
"editing": "編集",
"editingDesc": "コントロールレイヤキャンバスで編集",
"toResolve": "解決方法"
}, },
"gallery": { "gallery": {
"galleryImageSize": "画像のサイズ", "galleryImageSize": "画像のサイズ",
@ -105,7 +123,23 @@
"noImageSelected": "画像が選択されていません", "noImageSelected": "画像が選択されていません",
"deleteSelection": "選択中のものを削除", "deleteSelection": "選択中のものを削除",
"downloadSelection": "選択中のものをダウンロード", "downloadSelection": "選択中のものをダウンロード",
"starImage": "スターをつける" "starImage": "スターをつける",
"viewerImage": "閲覧画像",
"compareImage": "比較画像",
"openInViewer": "ビューアで開く",
"selectForCompare": "比較対象として選択",
"selectAnImageToCompare": "比較する画像を選択",
"slider": "スライダー",
"sideBySide": "横並び",
"hover": "ホバー",
"swapImages": "画像を入れ替える",
"compareOptions": "比較オプション",
"stretchToFit": "画面に合わせる",
"exitCompare": "比較を終了する",
"compareHelp1": "<Kbd>Alt</Kbd> キーを押しながらギャラリー画像をクリックするか、矢印キーを使用して比較画像を変更します。",
"compareHelp3": "<Kbd>C</Kbd>を押して、比較した画像を入れ替えます。",
"compareHelp4": "<Kbd>[Z</Kbd>]または<Kbd>[Esc</Kbd>]を押して終了します。",
"compareHelp2": "<Kbd>M</Kbd> キーを押して比較モードを切り替えます。"
}, },
"hotkeys": { "hotkeys": {
"keyboardShortcuts": "ホットキー", "keyboardShortcuts": "ホットキー",
@ -282,7 +316,8 @@
"title": "手のひらツール" "title": "手のひらツール"
}, },
"nextStagingImage": { "nextStagingImage": {
"desc": "次のプレビュー画像" "desc": "次のプレビュー画像",
"title": "次のステージング画像"
}, },
"cancelAndClear": { "cancelAndClear": {
"desc": "生成をキャンセルしキューもクリアします", "desc": "生成をキャンセルしキューもクリアします",
@ -302,6 +337,35 @@
"redoStroke": { "redoStroke": {
"title": "ストロークをやり直す", "title": "ストロークをやり直す",
"desc": "ブラシストロークのやり直し" "desc": "ブラシストロークのやり直し"
},
"resetOptionsAndGallery": {
"title": "オプションとギャラリーをリセット",
"desc": "オプションとギャラリーパネルをリセット"
},
"quickToggleMove": {
"title": "高速トグル切り替え",
"desc": "一時的に移動モードを切り替える"
},
"toggleSnap": {
"title": "スナップの切り替え",
"desc": "グリッドへのスナップの切り替え"
},
"previousStagingImage": {
"desc": "ステージング領域の前の画像",
"title": "前のステージング画像"
},
"nodesHotkeys": "ノード",
"toggleOptionsAndGallery": {
"desc": "オプションとギャラリーパネルのオンオフを切り替える",
"title": "オプションとギャラリーを切り替える"
},
"undoStroke": {
"desc": "ブラシストロークの取り消し",
"title": "ストロークの取り消し"
},
"toggleViewer": {
"desc": "イメージ ビューアーと現在のタブのワークスペースを切り替えます。",
"title": "画像ビューアの切り替え"
} }
}, },
"modelManager": { "modelManager": {
@ -464,10 +528,11 @@
"showGalleryPanel": "ギャラリーパネルを表示", "showGalleryPanel": "ギャラリーパネルを表示",
"menu": "メニュー", "menu": "メニュー",
"loadMore": "さらに読み込む", "loadMore": "さらに読み込む",
"createIssue": "課題の作成", "createIssue": "問題を報告",
"resetUI": "$t(accessibility.reset) UI", "resetUI": "$t(accessibility.reset) UI",
"mode": "モード:", "mode": "モード:",
"about": "Invoke について" "about": "Invoke について",
"submitSupportTicket": "サポート依頼を送信する"
}, },
"controlnet": { "controlnet": {
"resize": "リサイズ", "resize": "リサイズ",
@ -551,7 +616,13 @@
"lineartAnime": "アニメ線画", "lineartAnime": "アニメ線画",
"mlsdDescription": "最小線分検知", "mlsdDescription": "最小線分検知",
"dwOpenpose": "DW オープンポーズ", "dwOpenpose": "DW オープンポーズ",
"dwOpenposeDescription": "DW オープンポーズによる人体ポーズの推定" "dwOpenposeDescription": "DW オープンポーズによる人体ポーズの推定",
"ipAdapterMethod": "方式",
"setControlImageDimensionsForce": "モデルを無視してサイズを W/H にコピー",
"style": "スタイルのみ",
"selectCLIPVisionModel": "CLIP Visionのモデルを選択",
"composition": "構図のみ",
"beginEndStepPercentShort": "開始 / 終了 %"
}, },
"metadata": { "metadata": {
"seamless": "シームレス", "seamless": "シームレス",
@ -620,7 +691,10 @@
"time": "時間", "time": "時間",
"completedIn": "完了まで", "completedIn": "完了まで",
"back": "戻る", "back": "戻る",
"prune": "刈り込み" "prune": "刈り込み",
"prompts_other": "プロンプト",
"iterations_other": "繰り返し",
"generations_other": "生成"
}, },
"models": { "models": {
"noMatchingModels": "一致するモデルがありません", "noMatchingModels": "一致するモデルがありません",
@ -745,5 +819,10 @@
"addPromptTrigger": "プロンプトトリガーを追加", "addPromptTrigger": "プロンプトトリガーを追加",
"compatibleEmbeddings": "互換性のある埋め込み", "compatibleEmbeddings": "互換性のある埋め込み",
"noMatchingTriggers": "一致するトリガーがありません" "noMatchingTriggers": "一致するトリガーがありません"
},
"ui": {
"tabs": {
"queue": "キュー"
}
} }
} }

29
invokeai/frontend/web/public/locales/ru.json
View File

@ -144,7 +144,17 @@
"compareOptions": "Варианты сравнения", "compareOptions": "Варианты сравнения",
"compareHelp1": "Удерживайте <Kbd>Alt</Kbd> при нажатии на изображение в галерее или при помощи клавиш со стрелками, чтобы изменить сравниваемое изображение.", "compareHelp1": "Удерживайте <Kbd>Alt</Kbd> при нажатии на изображение в галерее или при помощи клавиш со стрелками, чтобы изменить сравниваемое изображение.",
"compareHelp2": "Нажмите <Kbd>M</Kbd>, чтобы переключиться между режимами сравнения.", "compareHelp2": "Нажмите <Kbd>M</Kbd>, чтобы переключиться между режимами сравнения.",
"compareHelp3": "Нажмите <Kbd>C</Kbd>, чтобы поменять местами сравниваемые изображения." "compareHelp3": "Нажмите <Kbd>C</Kbd>, чтобы поменять местами сравниваемые изображения.",
"newestFirst": "Сначала новые",
"sortDirection": "Направление сортировки",
"oldestFirst": "Сначала старые",
"showStarredImagesFirst": "Сначала избранные изображения",
"selectAllOnPage": "Выбрать все на странице",
"selectAllOnBoard": "Выбрать все на доске",
"showArchivedBoards": "Показать архивированные доски",
"searchImages": "Поиск по метаданным",
"displayBoardSearch": "Отобразить поиск досок",
"displaySearch": "Отобразить поиск"
}, },
"hotkeys": { "hotkeys": {
"keyboardShortcuts": "Горячие клавиши", "keyboardShortcuts": "Горячие клавиши",
@ -1043,7 +1053,22 @@
"downloadBoard": "Скачать доску", "downloadBoard": "Скачать доску",
"deleteBoard": "Удалить доску", "deleteBoard": "Удалить доску",
"deleteBoardAndImages": "Удалить доску и изображения", "deleteBoardAndImages": "Удалить доску и изображения",
"deletedBoardsCannotbeRestored": "Удаленные доски не подлежат восстановлению" "deletedBoardsCannotbeRestored": "Удаленные доски не подлежат восстановлению",
"assetsWithCount_one": "{{count}} ассет",
"assetsWithCount_few": "{{count}} ассета",
"assetsWithCount_many": "{{count}} ассетов",
"imagesWithCount_one": "{{count}} изображение",
"imagesWithCount_few": "{{count}} изображения",
"imagesWithCount_many": "{{count}} изображений",
"archiveBoard": "Архивировать доску",
"archived": "Заархивировано",
"unarchiveBoard": "Разархивировать доску",
"selectedForAutoAdd": "Выбрано для автодобавления",
"addSharedBoard": "Добавить общую доску",
"boards": "Доски",
"addPrivateBoard": "Добавить личную доску",
"private": "Личные доски",
"shared": "Общие доски"
}, },
"dynamicPrompts": { "dynamicPrompts": {
"seedBehaviour": { "seedBehaviour": {

65
invokeai/frontend/web/public/locales/zh_CN.json
View File

@ -70,7 +70,23 @@
"add": "添加", "add": "添加",
"loglevel": "日志级别", "loglevel": "日志级别",
"copy": "复制", "copy": "复制",
"localSystem": "本地系统" "localSystem": "本地系统",
"aboutHeading": "掌握你的创造力",
"comparing": "对比中",
"comparingDesc": "正在对比两张图片",
"enabled": "已启用",
"disabled": "已禁用",
"red": "红",
"editor": "编辑器",
"positivePrompt": "正向提示词",
"negativePrompt": "反向提示词",
"selected": "选中的",
"viewing": "查看",
"viewingDesc": "在大型画廊视图中查看图片",
"editing": "编辑中",
"green": "绿",
"blue": "蓝",
"editingDesc": "在控制图层画布上编辑"
}, },
"gallery": { "gallery": {
"galleryImageSize": "预览大小", "galleryImageSize": "预览大小",
@ -100,7 +116,24 @@
"problemDeletingImagesDesc": "有一张或多张图像无法被删除", "problemDeletingImagesDesc": "有一张或多张图像无法被删除",
"problemDeletingImages": "删除图像时出现问题", "problemDeletingImages": "删除图像时出现问题",
"unstarImage": "取消收藏图像", "unstarImage": "取消收藏图像",
"starImage": "收藏图像" "starImage": "收藏图像",
"alwaysShowImageSizeBadge": "始终显示图像尺寸",
"selectForCompare": "选择以比较",
"selectAnImageToCompare": "选择一个图像进行比较",
"slider": "滑块",
"sideBySide": "并排",
"bulkDownloadFailed": "下载失败",
"bulkDownloadRequested": "准备下载",
"bulkDownloadRequestedDesc": "您的下载请求正在准备中，这可能需要一些时间。",
"bulkDownloadRequestFailed": "下载准备过程中出现问题",
"viewerImage": "查看器图像",
"compareImage": "对比图像",
"openInViewer": "在查看器中打开",
"selectAllOnBoard": "选择板块全部",
"hover": "悬停",
"selectAllOnPage": "选择本页全部",
"swapImages": "交换图像",
"compareOptions": "比较选项"
}, },
"hotkeys": { "hotkeys": {
"keyboardShortcuts": "快捷键", "keyboardShortcuts": "快捷键",
@ -604,7 +637,8 @@
"mode": "模式", "mode": "模式",
"resetUI": "$t(accessibility.reset) UI", "resetUI": "$t(accessibility.reset) UI",
"createIssue": "创建问题", "createIssue": "创建问题",
"about": "关于" "about": "关于",
"submitSupportTicket": "提交支持工单"
}, },
"tooltip": { "tooltip": {
"feature": { "feature": {
@ -806,7 +840,21 @@
"controlAdapter_other": "Control Adapters", "controlAdapter_other": "Control Adapters",
"lineartAnime": "Lineart Anime", "lineartAnime": "Lineart Anime",
"canny": "Canny", "canny": "Canny",
"resizeSimple": "缩放（简单）" "resizeSimple": "缩放（简单）",
"body": "身体",
"ipAdapterMethod": "方法",
"setControlImageDimensionsForce": "将尺寸复制到宽/高（忽略模型）",
"depthAnythingDescription": "使用Depth Anything技术生成深度图",
"selectCLIPVisionModel": "选择一个CLIP视觉模型",
"small": "小",
"full": "全部",
"large": "大",
"face": "脸",
"style": "仅风格",
"hands": "手",
"composition": "仅构图",
"modelSize": "模型尺寸",
"dwOpenposeDescription": "使用DW Openpose进行人体姿态预估"
}, },
"queue": { "queue": {
"status": "状态", "status": "状态",
@ -863,7 +911,10 @@
"graphFailedToQueue": "节点图加入队列失败", "graphFailedToQueue": "节点图加入队列失败",
"batchFieldValues": "批处理值", "batchFieldValues": "批处理值",
"time": "时间", "time": "时间",
"openQueue": "打开队列" "openQueue": "打开队列",
"prompts_other": "提示词",
"iterations_other": "迭代",
"generations_other": "生成"
}, },
"sdxl": { "sdxl": {
"refinerStart": "Refiner 开始作用时机", "refinerStart": "Refiner 开始作用时机",
@ -1238,5 +1289,9 @@
"image": { "image": {
"title": "图像" "title": "图像"
} }
},
"prompt": {
"addPromptTrigger": "添加提示词触发器",
"noMatchingTriggers": "没有匹配的触发器"
} }
} }

27
invokeai/frontend/web/src/app/components/InvokeAIUI.tsx
View File

@ -7,11 +7,10 @@ import { $baseUrl } from 'app/store/nanostores/baseUrl';
import { $customNavComponent } from 'app/store/nanostores/customNavComponent'; import { $customNavComponent } from 'app/store/nanostores/customNavComponent';
import type { CustomStarUi } from 'app/store/nanostores/customStarUI'; import type { CustomStarUi } from 'app/store/nanostores/customStarUI';
import { $customStarUI } from 'app/store/nanostores/customStarUI'; import { $customStarUI } from 'app/store/nanostores/customStarUI';
import { $galleryHeader } from 'app/store/nanostores/galleryHeader';
import { $isDebugging } from 'app/store/nanostores/isDebugging'; import { $isDebugging } from 'app/store/nanostores/isDebugging';
import { $logo } from 'app/store/nanostores/logo'; import { $logo } from 'app/store/nanostores/logo';
import { $openAPISchemaUrl } from 'app/store/nanostores/openAPISchemaUrl'; import { $openAPISchemaUrl } from 'app/store/nanostores/openAPISchemaUrl';
import { $projectId } from 'app/store/nanostores/projectId'; import { $projectId, $projectName, $projectUrl } from 'app/store/nanostores/projectId';
import { $queueId, DEFAULT_QUEUE_ID } from 'app/store/nanostores/queueId'; import { $queueId, DEFAULT_QUEUE_ID } from 'app/store/nanostores/queueId';
import { $store } from 'app/store/nanostores/store'; import { $store } from 'app/store/nanostores/store';
import { $workflowCategories } from 'app/store/nanostores/workflowCategories'; import { $workflowCategories } from 'app/store/nanostores/workflowCategories';
@ -37,7 +36,8 @@ interface Props extends PropsWithChildren {
customNavComponent?: ReactNode; customNavComponent?: ReactNode;
middleware?: Middleware[]; middleware?: Middleware[];
projectId?: string; projectId?: string;
galleryHeader?: ReactNode; projectName?: string;
projectUrl?: string;
queueId?: string; queueId?: string;
selectedImage?: { selectedImage?: {
imageName: string; imageName: string;
@ -58,7 +58,8 @@ const InvokeAIUI = ({
customNavComponent, customNavComponent,
middleware, middleware,
projectId, projectId,
galleryHeader, projectName,
projectUrl,
queueId, queueId,
selectedImage, selectedImage,
customStarUi, customStarUi,
@ -108,7 +109,7 @@ const InvokeAIUI = ({
$projectId.set(undefined); $projectId.set(undefined);
$queueId.set(DEFAULT_QUEUE_ID); $queueId.set(DEFAULT_QUEUE_ID);
}; };
}, [apiUrl, token, middleware, projectId, queueId]); }, [apiUrl, token, middleware, projectId, queueId, projectName, projectUrl]);
useEffect(() => { useEffect(() => {
if (customStarUi) { if (customStarUi) {
@ -141,14 +142,20 @@ const InvokeAIUI = ({
}, [openAPISchemaUrl]); }, [openAPISchemaUrl]);
useEffect(() => { useEffect(() => {
if (galleryHeader) { $projectName.set(projectName);
$galleryHeader.set(galleryHeader);
}
return () => { return () => {
$galleryHeader.set(undefined); $projectName.set(undefined);
}; };
}, [galleryHeader]); }, [projectName]);
useEffect(() => {
$projectUrl.set(projectUrl);
return () => {
$projectUrl.set(undefined);
};
}, [projectUrl]);
useEffect(() => { useEffect(() => {
if (logo) { if (logo) {

100
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addArchivedOrDeletedBoardListener.ts
View File

@ -11,36 +11,114 @@ import { boardsApi } from 'services/api/endpoints/boards';
import { imagesApi } from 'services/api/endpoints/images'; import { imagesApi } from 'services/api/endpoints/images';
export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartListening) => { export const addArchivedOrDeletedBoardListener = (startAppListening: AppStartListening) => {
/**
* The auto-add board shouldn't be set to an archived board or deleted board. When we archive a board, delete
* a board, or change a the archived board visibility flag, we may need to reset the auto-add board.
*/
startAppListening({ startAppListening({
matcher: isAnyOf( matcher: isAnyOf(
// Updating a board may change its archived status
boardsApi.endpoints.updateBoard.matchFulfilled,
// If a board is deleted, we'll need to reset the auto-add board // If a board is deleted, we'll need to reset the auto-add board
imagesApi.endpoints.deleteBoard.matchFulfilled, imagesApi.endpoints.deleteBoard.matchFulfilled,
imagesApi.endpoints.deleteBoardAndImages.matchFulfilled, imagesApi.endpoints.deleteBoardAndImages.matchFulfilled
// When we change the visibility of archived boards, we may need to reset the auto-add board
shouldShowArchivedBoardsChanged
), ),
effect: async (action, { dispatch, getState }) => { effect: async (action, { dispatch, getState }) => {
/**
* The auto-add board shouldn't be set to an archived board or deleted board. When we archive a board, delete
* a board, or change a the archived board visibility flag, we may need to reset the auto-add board.
*/
const state = getState(); const state = getState();
const queryArgs = selectListBoardsQueryArgs(state); const queryArgs = selectListBoardsQueryArgs(state);
const queryResult = boardsApi.endpoints.listAllBoards.select(queryArgs)(state); const queryResult = boardsApi.endpoints.listAllBoards.select(queryArgs)(state);
const autoAddBoardId = state.gallery.autoAddBoardId; const { autoAddBoardId, selectedBoardId } = state.gallery;
if (!queryResult.data) { if (!queryResult.data) {
return; return;
} }
if (!queryResult.data.find((board) => board.board_id === selectedBoardId)) {
dispatch(boardIdSelected({ boardId: 'none' }));
dispatch(galleryViewChanged('images'));
}
if (!queryResult.data.find((board) => board.board_id === autoAddBoardId)) { if (!queryResult.data.find((board) => board.board_id === autoAddBoardId)) {
dispatch(autoAddBoardIdChanged('none')); dispatch(autoAddBoardIdChanged('none'));
}
},
});
// If we archived a board, it may end up hidden. If it's selected or the auto-add board, we should reset those.
startAppListening({
matcher: boardsApi.endpoints.updateBoard.matchFulfilled,
effect: async (action, { dispatch, getState }) => {
const state = getState();
const queryArgs = selectListBoardsQueryArgs(state);
const queryResult = boardsApi.endpoints.listAllBoards.select(queryArgs)(state);
const { shouldShowArchivedBoards } = state.gallery;
if (!queryResult.data) {
return;
}
const wasArchived = action.meta.arg.originalArgs.changes.archived === true;
if (wasArchived && !shouldShowArchivedBoards) {
dispatch(autoAddBoardIdChanged('none'));
dispatch(boardIdSelected({ boardId: 'none' })); dispatch(boardIdSelected({ boardId: 'none' }));
dispatch(galleryViewChanged('images')); dispatch(galleryViewChanged('images'));
} }
}, },
}); });
// When we hide archived boards, if the selected or the auto-add board is archived, we should reset those.
startAppListening({
actionCreator: shouldShowArchivedBoardsChanged,
effect: async (action, { dispatch, getState }) => {
const shouldShowArchivedBoards = action.payload;
// We only need to take action if we have just hidden archived boards.
if (!shouldShowArchivedBoards) {
return;
}
const state = getState();
const queryArgs = selectListBoardsQueryArgs(state);
const queryResult = boardsApi.endpoints.listAllBoards.select(queryArgs)(state);
const { selectedBoardId, autoAddBoardId } = state.gallery;
if (!queryResult.data) {
return;
}
// Handle the case where selected board is archived
const selectedBoard = queryResult.data.find((b) => b.board_id === selectedBoardId);
if (selectedBoard && selectedBoard.archived) {
dispatch(boardIdSelected({ boardId: 'none' }));
dispatch(galleryViewChanged('images'));
}
// Handle the case where auto-add board is archived
const autoAddBoard = queryResult.data.find((b) => b.board_id === autoAddBoardId);
if (autoAddBoard && autoAddBoard.archived) {
dispatch(autoAddBoardIdChanged('none'));
}
},
});
/**
* When listing boards, if the selected or auto-add boards are no longer in the list, we should reset them.
*/
startAppListening({
matcher: boardsApi.endpoints.listAllBoards.matchFulfilled,
effect: async (action, { dispatch, getState }) => {
const boards = action.payload;
const state = getState();
const { selectedBoardId, autoAddBoardId } = state.gallery;
// Handle the case where selected board isn't in the list of boards
if (!boards.find((b) => b.board_id === selectedBoardId)) {
dispatch(boardIdSelected({ boardId: 'none' }));
dispatch(galleryViewChanged('images'));
}
// Handle the case where auto-add board isn't in the list of boards
if (!boards.find((b) => b.board_id === autoAddBoardId)) {
dispatch(autoAddBoardIdChanged('none'));
}
},
});
}; };

9
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeletionListeners.ts
View File

@ -136,7 +136,12 @@ export const addImageDeletionListeners = (startAppListening: AppStartListening)
if (data) { if (data) {
const deletedImageIndex = data.items.findIndex((i) => i.image_name === imageDTO.image_name); const deletedImageIndex = data.items.findIndex((i) => i.image_name === imageDTO.image_name);
const nextImage = data.items[deletedImageIndex + 1] ?? data.items[0] ?? null; const nextImage = data.items[deletedImageIndex + 1] ?? data.items[0] ?? null;
dispatch(imageSelected(nextImage)); if (nextImage?.image_name === imageDTO.image_name) {
// If the next image is the same as the deleted one, it means it was the last image, reset selection
dispatch(imageSelected(null));
} else {
dispatch(imageSelected(nextImage));
}
} }
} }
@ -176,6 +181,8 @@ export const addImageDeletionListeners = (startAppListening: AppStartListening)
const queryArgs = selectListImagesQueryArgs(state); const queryArgs = selectListImagesQueryArgs(state);
const { data } = imagesApi.endpoints.listImages.select(queryArgs)(state); const { data } = imagesApi.endpoints.listImages.select(queryArgs)(state);
if (data) { if (data) {
// When we delete multiple images, we clear the selection. Then, the the next time we load images, we will
// select the first one. This is handled below in the listener for `imagesApi.endpoints.listImages.matchFulfilled`.
dispatch(imageSelected(null)); dispatch(imageSelected(null));
} }
} }

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

@ -1,4 +0,0 @@
import { atom } from 'nanostores';
import type { ReactNode } from 'react';
export const $galleryHeader = atom<ReactNode | undefined>(undefined);

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

@ -4,3 +4,6 @@ import { atom } from 'nanostores';
* The optional project-id header. * The optional project-id header.
*/ */
export const $projectId = atom<string | undefined>(); export const $projectId = atom<string | undefined>();
export const $projectName = atom<string | undefined>();
export const $projectUrl = atom<string | undefined>();

8
invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/AddBoardButton.tsx
View File

@ -1,6 +1,6 @@
import { IconButton } from '@invoke-ai/ui-library'; import { IconButton } from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { boardIdSelected } from 'features/gallery/store/gallerySlice'; import { boardIdSelected, boardSearchTextChanged } from 'features/gallery/store/gallerySlice';
import { memo, useCallback, useMemo } from 'react'; import { memo, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { PiPlusBold } from 'react-icons/pi'; import { PiPlusBold } from 'react-icons/pi';
@ -24,10 +24,12 @@ const AddBoardButton = ({ isPrivateBoard }: Props) => {
} }
return t('boards.addSharedBoard'); return t('boards.addSharedBoard');
}, [allowPrivateBoards, isPrivateBoard, t]); }, [allowPrivateBoards, isPrivateBoard, t]);
const handleCreateBoard = useCallback(async () => { const handleCreateBoard = useCallback(async () => {
try { try {
const board = await createBoard({ board_name: t('boards.myBoard'), is_private: isPrivateBoard }).unwrap(); const board = await createBoard({ board_name: t('boards.myBoard'), is_private: isPrivateBoard }).unwrap();
dispatch(boardIdSelected({ boardId: board.board_id })); dispatch(boardIdSelected({ boardId: board.board_id }));
dispatch(boardSearchTextChanged(''));
} catch { } catch {
//no-op //no-op
} }
@ -42,7 +44,9 @@ const AddBoardButton = ({ isPrivateBoard }: Props) => {
onClick={handleCreateBoard} onClick={handleCreateBoard}
size="md" size="md"
data-testid="add-board-button" data-testid="add-board-button"
variant="ghost" variant="link"
w={8}
h={8}
/> />
); );
}; };

135
invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardsList.tsx
View File

@ -1,20 +1,17 @@
import { Collapse, Flex, Icon, Text, useDisclosure } from '@invoke-ai/ui-library'; import { Box, Flex, Text } from '@invoke-ai/ui-library';
import { EMPTY_ARRAY } from 'app/store/constants'; import { EMPTY_ARRAY } from 'app/store/constants';
import { useAppSelector } from 'app/store/storeHooks'; import { useAppSelector } from 'app/store/storeHooks';
import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants'; import { overlayScrollbarsParams } from 'common/components/OverlayScrollbars/constants';
import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal'; import DeleteBoardModal from 'features/gallery/components/Boards/DeleteBoardModal';
import GallerySettingsPopover from 'features/gallery/components/GallerySettingsPopover/GallerySettingsPopover';
import { selectListBoardsQueryArgs } from 'features/gallery/store/gallerySelectors'; import { selectListBoardsQueryArgs } from 'features/gallery/store/gallerySelectors';
import { OverlayScrollbarsComponent } from 'overlayscrollbars-react'; import { OverlayScrollbarsComponent } from 'overlayscrollbars-react';
import type { CSSProperties } from 'react'; import type { CSSProperties } from 'react';
import { memo, useMemo, useState } from 'react'; import { memo, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { PiCaretUpBold } from 'react-icons/pi';
import { useListAllBoardsQuery } from 'services/api/endpoints/boards'; import { useListAllBoardsQuery } from 'services/api/endpoints/boards';
import type { BoardDTO } from 'services/api/types'; import type { BoardDTO } from 'services/api/types';
import AddBoardButton from './AddBoardButton'; import AddBoardButton from './AddBoardButton';
import BoardsSearch from './BoardsSearch';
import GalleryBoard from './GalleryBoard'; import GalleryBoard from './GalleryBoard';
import NoBoardBoard from './NoBoardBoard'; import NoBoardBoard from './NoBoardBoard';
@ -30,8 +27,6 @@ const BoardsList = () => {
const queryArgs = useAppSelector(selectListBoardsQueryArgs); const queryArgs = useAppSelector(selectListBoardsQueryArgs);
const { data: boards } = useListAllBoardsQuery(queryArgs); const { data: boards } = useListAllBoardsQuery(queryArgs);
const [boardToDelete, setBoardToDelete] = useState<BoardDTO>(); const [boardToDelete, setBoardToDelete] = useState<BoardDTO>();
const privateBoardsDisclosure = useDisclosure({ defaultIsOpen: false });
const sharedBoardsDisclosure = useDisclosure({ defaultIsOpen: false });
const { t } = useTranslation(); const { t } = useTranslation();
const { filteredPrivateBoards, filteredSharedBoards } = useMemo(() => { const { filteredPrivateBoards, filteredSharedBoards } = useMemo(() => {
@ -45,43 +40,30 @@ const BoardsList = () => {
return ( return (
<> <>
<Flex layerStyle="first" flexDir="column" borderRadius="base"> <Box position="relative" w="full" h="full">
<Flex gap={2} alignItems="center" pb={2}> <Box position="absolute" top={0} right={0} bottom={0} left={0}>
<BoardsSearch /> <OverlayScrollbarsComponent defer style={overlayScrollbarsStyles} options={overlayScrollbarsParams.options}>
<GallerySettingsPopover /> {allowPrivateBoards && (
</Flex> <Flex direction="column" gap={1}>
{allowPrivateBoards && ( <Flex
<> position="sticky"
<Flex w="full" gap={2}> w="full"
<Flex justifyContent="space-between"
flexGrow={1} alignItems="center"
onClick={privateBoardsDisclosure.onToggle} ps={2}
gap={2} pb={1}
alignItems="center" pt={2}
cursor="pointer" zIndex={1}
> top={0}
<Icon bg="base.900"
as={PiCaretUpBold} >
boxSize={4} <Text fontSize="md" fontWeight="semibold" userSelect="none">
transform={privateBoardsDisclosure.isOpen ? 'rotate(0deg)' : 'rotate(180deg)'} {t('boards.private')}
transitionProperty="common" </Text>
transitionDuration="normal" <AddBoardButton isPrivateBoard={true} />
color="base.400" </Flex>
/> <Flex direction="column" gap={1}>
<Text fontSize="md" fontWeight="medium" userSelect="none"> <NoBoardBoard isSelected={selectedBoardId === 'none'} />
{t('boards.private')}
</Text>
</Flex>
<AddBoardButton isPrivateBoard={true} />
</Flex>
<Collapse in={privateBoardsDisclosure.isOpen} animateOpacity>
<OverlayScrollbarsComponent
defer
style={overlayScrollbarsStyles}
options={overlayScrollbarsParams.options}
>
<Flex direction="column" maxH={346} gap={1}>
{allowPrivateBoards && <NoBoardBoard isSelected={selectedBoardId === 'none'} />}
{filteredPrivateBoards.map((board) => ( {filteredPrivateBoards.map((board) => (
<GalleryBoard <GalleryBoard
board={board} board={board}
@ -91,42 +73,41 @@ const BoardsList = () => {
/> />
))} ))}
</Flex> </Flex>
</OverlayScrollbarsComponent> </Flex>
</Collapse> )}
</> <Flex direction="column" gap={1}>
)} <Flex
<Flex w="full" gap={2}> position="sticky"
<Flex onClick={sharedBoardsDisclosure.onToggle} gap={2} alignItems="center" cursor="pointer" flexGrow={1}> w="full"
<Icon justifyContent="space-between"
as={PiCaretUpBold} alignItems="center"
boxSize={4} ps={2}
transform={sharedBoardsDisclosure.isOpen ? 'rotate(0deg)' : 'rotate(180deg)'} pb={1}
transitionProperty="common" pt={2}
transitionDuration="normal" zIndex={1}
color="base.400" top={0}
/> bg="base.900"
<Text fontSize="md" fontWeight="medium" userSelect="none"> >
{allowPrivateBoards ? t('boards.shared') : t('boards.boards')} <Text fontSize="md" fontWeight="semibold" userSelect="none">
</Text> {allowPrivateBoards ? t('boards.shared') : t('boards.boards')}
</Flex> </Text>
<AddBoardButton isPrivateBoard={false} /> <AddBoardButton isPrivateBoard={false} />
</Flex> </Flex>
<Collapse in={sharedBoardsDisclosure.isOpen} animateOpacity> <Flex direction="column" gap={1}>
<OverlayScrollbarsComponent defer style={overlayScrollbarsStyles} options={overlayScrollbarsParams.options}> {!allowPrivateBoards && <NoBoardBoard isSelected={selectedBoardId === 'none'} />}
<Flex direction="column" maxH={346} gap={1}> {filteredSharedBoards.map((board) => (
{!allowPrivateBoards && <NoBoardBoard isSelected={selectedBoardId === 'none'} />} <GalleryBoard
{filteredSharedBoards.map((board) => ( board={board}
<GalleryBoard isSelected={selectedBoardId === board.board_id}
board={board} setBoardToDelete={setBoardToDelete}
isSelected={selectedBoardId === board.board_id} key={board.board_id}
setBoardToDelete={setBoardToDelete} />
key={board.board_id} ))}
/> </Flex>
))}
</Flex> </Flex>
</OverlayScrollbarsComponent> </OverlayScrollbarsComponent>
</Collapse> </Box>
</Flex> </Box>
<DeleteBoardModal boardToDelete={boardToDelete} setBoardToDelete={setBoardToDelete} /> <DeleteBoardModal boardToDelete={boardToDelete} setBoardToDelete={setBoardToDelete} />
</> </>
); );

2
invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/BoardsSearch.tsx
View File

@ -40,7 +40,7 @@ const BoardsSearch = () => {
); );
return ( return (
<InputGroup> <InputGroup pt={2}>
<Input <Input
placeholder={t('boards.searchBoard')} placeholder={t('boards.searchBoard')}
value={boardSearchText} value={boardSearchText}

60
invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/GalleryBoard.tsx
View File

@ -9,6 +9,7 @@ import {
Text, Text,
Tooltip, Tooltip,
useDisclosure, useDisclosure,
useEditableControls,
} from '@invoke-ai/ui-library'; } from '@invoke-ai/ui-library';
import { skipToken } from '@reduxjs/toolkit/query'; import { skipToken } from '@reduxjs/toolkit/query';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
@ -18,7 +19,8 @@ import { AutoAddBadge } from 'features/gallery/components/Boards/AutoAddBadge';
import BoardContextMenu from 'features/gallery/components/Boards/BoardContextMenu'; import BoardContextMenu from 'features/gallery/components/Boards/BoardContextMenu';
import { BoardTotalsTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTotalsTooltip'; import { BoardTotalsTooltip } from 'features/gallery/components/Boards/BoardsList/BoardTotalsTooltip';
import { autoAddBoardIdChanged, boardIdSelected } from 'features/gallery/store/gallerySlice'; import { autoAddBoardIdChanged, boardIdSelected } from 'features/gallery/store/gallerySlice';
import { memo, useCallback, useMemo, useState } from 'react'; import type { MouseEvent, MouseEventHandler, MutableRefObject } from 'react';
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { PiArchiveBold, PiImageSquare } from 'react-icons/pi'; import { PiArchiveBold, PiImageSquare } from 'react-icons/pi';
import { useUpdateBoardMutation } from 'services/api/endpoints/boards'; import { useUpdateBoardMutation } from 'services/api/endpoints/boards';
@ -35,7 +37,7 @@ const editableInputStyles: SystemStyleObject = {
}; };
const _hover: SystemStyleObject = { const _hover: SystemStyleObject = {
bg: 'base.800', bg: 'base.850',
}; };
interface GalleryBoardProps { interface GalleryBoardProps {
@ -49,15 +51,19 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
const { t } = useTranslation(); const { t } = useTranslation();
const autoAddBoardId = useAppSelector((s) => s.gallery.autoAddBoardId); const autoAddBoardId = useAppSelector((s) => s.gallery.autoAddBoardId);
const autoAssignBoardOnClick = useAppSelector((s) => s.gallery.autoAssignBoardOnClick); const autoAssignBoardOnClick = useAppSelector((s) => s.gallery.autoAssignBoardOnClick);
const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId);
const editingDisclosure = useDisclosure(); const editingDisclosure = useDisclosure();
const [localBoardName, setLocalBoardName] = useState(board.board_name); const [localBoardName, setLocalBoardName] = useState(board.board_name);
const onStartEditingRef = useRef<MouseEventHandler | undefined>(undefined);
const handleSelectBoard = useCallback(() => { const onClick = useCallback(() => {
dispatch(boardIdSelected({ boardId: board.board_id })); if (selectedBoardId !== board.board_id) {
if (autoAssignBoardOnClick) { dispatch(boardIdSelected({ boardId: board.board_id }));
}
if (autoAssignBoardOnClick && autoAddBoardId !== board.board_id) {
dispatch(autoAddBoardIdChanged(board.board_id)); dispatch(autoAddBoardIdChanged(board.board_id));
} }
}, [dispatch, board.board_id, autoAssignBoardOnClick]); }, [selectedBoardId, board.board_id, autoAssignBoardOnClick, autoAddBoardId, dispatch]);
const [updateBoard, { isLoading: isUpdateBoardLoading }] = useUpdateBoardMutation(); const [updateBoard, { isLoading: isUpdateBoardLoading }] = useUpdateBoardMutation();
@ -70,7 +76,7 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
[board.board_id] [board.board_id]
); );
const handleSubmit = useCallback( const onSubmit = useCallback(
async (newBoardName: string) => { async (newBoardName: string) => {
if (!newBoardName.trim()) { if (!newBoardName.trim()) {
// empty strings are not allowed // empty strings are not allowed
@ -96,21 +102,30 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
[board.board_id, board.board_name, editingDisclosure, updateBoard] [board.board_id, board.board_name, editingDisclosure, updateBoard]
); );
const handleChange = useCallback((newBoardName: string) => { const onChange = useCallback((newBoardName: string) => {
setLocalBoardName(newBoardName); setLocalBoardName(newBoardName);
}, []); }, []);
const onDoubleClick = useCallback((e: MouseEvent<HTMLDivElement>) => {
if (onStartEditingRef.current) {
onStartEditingRef.current(e);
}
}, []);
return ( return (
<BoardContextMenu board={board} setBoardToDelete={setBoardToDelete}> <BoardContextMenu board={board} setBoardToDelete={setBoardToDelete}>
{(ref) => ( {(ref) => (
<Tooltip <Tooltip
label={<BoardTotalsTooltip board_id={board.board_id} isArchived={Boolean(board.archived)} />} label={<BoardTotalsTooltip board_id={board.board_id} isArchived={Boolean(board.archived)} />}
openDelay={1000} openDelay={1000}
placement="left"
closeOnScroll
> >
<Flex <Flex
position="relative" position="relative"
ref={ref} ref={ref}
onClick={handleSelectBoard} onClick={onClick}
onDoubleClick={onDoubleClick}
w="full" w="full"
alignItems="center" alignItems="center"
borderRadius="base" borderRadius="base"
@ -118,7 +133,7 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
py={1} py={1}
px={2} px={2}
gap={2} gap={2}
bg={isSelected ? 'base.800' : undefined} bg={isSelected ? 'base.850' : undefined}
_hover={_hover} _hover={_hover}
> >
<CoverImage board={board} /> <CoverImage board={board} />
@ -131,10 +146,12 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
value={localBoardName} value={localBoardName}
isDisabled={isUpdateBoardLoading} isDisabled={isUpdateBoardLoading}
submitOnBlur={true} submitOnBlur={true}
onChange={handleChange} onChange={onChange}
onSubmit={handleSubmit} onSubmit={onSubmit}
isPreviewFocusable={false}
> >
<EditablePreview <EditablePreview
cursor="pointer"
p={0} p={0}
fontSize="md" fontSize="md"
textOverflow="ellipsis" textOverflow="ellipsis"
@ -145,15 +162,10 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
fontWeight={isSelected ? 'semibold' : 'normal'} fontWeight={isSelected ? 'semibold' : 'normal'}
/> />
<EditableInput sx={editableInputStyles} /> <EditableInput sx={editableInputStyles} />
<JankEditableHijack onStartEditingRef={onStartEditingRef} />
</Editable> </Editable>
{autoAddBoardId === board.board_id && !editingDisclosure.isOpen && <AutoAddBadge />} {autoAddBoardId === board.board_id && !editingDisclosure.isOpen && <AutoAddBadge />}
{board.archived && !editingDisclosure.isOpen && ( {board.archived && !editingDisclosure.isOpen && <Icon as={PiArchiveBold} fill="base.300" />}
<Icon
as={PiArchiveBold}
fill="base.300"
filter="drop-shadow(0px 0px 0.1rem var(--invoke-colors-base-800))"
/>
)}
{!editingDisclosure.isOpen && <Text variant="subtext">{board.image_count}</Text>} {!editingDisclosure.isOpen && <Text variant="subtext">{board.image_count}</Text>}
<IAIDroppable data={droppableData} dropLabel={<Text fontSize="md">{t('unifiedCanvas.move')}</Text>} /> <IAIDroppable data={droppableData} dropLabel={<Text fontSize="md">{t('unifiedCanvas.move')}</Text>} />
@ -164,6 +176,16 @@ const GalleryBoard = ({ board, isSelected, setBoardToDelete }: GalleryBoardProps
); );
}; };
const JankEditableHijack = memo((props: { onStartEditingRef: MutableRefObject<MouseEventHandler | undefined> }) => {
const editableControls = useEditableControls();
useEffect(() => {
props.onStartEditingRef.current = editableControls.getEditButtonProps().onClick;
}, [props, editableControls]);
return null;
});
JankEditableHijack.displayName = 'JankEditableHijack';
export default memo(GalleryBoard); export default memo(GalleryBoard);
const CoverImage = ({ board }: { board: BoardDTO }) => { const CoverImage = ({ board }: { board: BoardDTO }) => {

22
invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx
View File

@ -17,7 +17,7 @@ interface Props {
} }
const _hover: SystemStyleObject = { const _hover: SystemStyleObject = {
bg: 'base.800', bg: 'base.850',
}; };
const NoBoardBoard = memo(({ isSelected }: Props) => { const NoBoardBoard = memo(({ isSelected }: Props) => {
@ -29,6 +29,7 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
}); });
const autoAddBoardId = useAppSelector((s) => s.gallery.autoAddBoardId); const autoAddBoardId = useAppSelector((s) => s.gallery.autoAddBoardId);
const autoAssignBoardOnClick = useAppSelector((s) => s.gallery.autoAssignBoardOnClick); const autoAssignBoardOnClick = useAppSelector((s) => s.gallery.autoAssignBoardOnClick);
const boardSearchText = useAppSelector((s) => s.gallery.boardSearchText);
const boardName = useBoardName('none'); const boardName = useBoardName('none');
const handleSelectBoard = useCallback(() => { const handleSelectBoard = useCallback(() => {
dispatch(boardIdSelected({ boardId: 'none' })); dispatch(boardIdSelected({ boardId: 'none' }));
@ -44,11 +45,26 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
}), }),
[] []
); );
const filteredOut = useMemo(() => {
return boardSearchText ? !boardName.toLowerCase().includes(boardSearchText.toLowerCase()) : false;
}, [boardName, boardSearchText]);
const { t } = useTranslation(); const { t } = useTranslation();
if (filteredOut) {
return null;
}
return ( return (
<NoBoardBoardContextMenu> <NoBoardBoardContextMenu>
{(ref) => ( {(ref) => (
<Tooltip label={<BoardTotalsTooltip board_id="none" isArchived={false} />} openDelay={1000}> <Tooltip
label={<BoardTotalsTooltip board_id="none" isArchived={false} />}
openDelay={1000}
placement="left"
closeOnScroll
>
<Flex <Flex
position="relative" position="relative"
ref={ref} ref={ref}
@ -60,7 +76,7 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
px={2} px={2}
py={1} py={1}
gap={2} gap={2}
bg={isSelected ? 'base.800' : undefined} bg={isSelected ? 'base.850' : undefined}
_hover={_hover} _hover={_hover}
> >
<Flex w={8} h={8} justifyContent="center" alignItems="center"> <Flex w={8} h={8} justifyContent="center" alignItems="center">

18
invokeai/frontend/web/src/features/gallery/components/GalleryBoardName.tsx
View File

@ -3,12 +3,26 @@ import { useAppSelector } from 'app/store/storeHooks';
import { memo } from 'react'; import { memo } from 'react';
import { useBoardName } from 'services/api/hooks/useBoardName'; import { useBoardName } from 'services/api/hooks/useBoardName';
const GalleryBoardName = () => { type Props = {
onClick: () => void;
};
const GalleryBoardName = (props: Props) => {
const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId); const selectedBoardId = useAppSelector((s) => s.gallery.selectedBoardId);
const boardName = useBoardName(selectedBoardId); const boardName = useBoardName(selectedBoardId);
return ( return (
<Flex w="full" borderWidth={1} borderRadius="base" alignItems="center" justifyContent="center" px={2}> <Flex
onClick={props.onClick}
as="button"
h="full"
w="full"
borderWidth={1}
borderRadius="base"
alignItems="center"
justifyContent="center"
px={2}
>
<Text fontWeight="semibold" fontSize="md" noOfLines={1} wordBreak="break-all" color="base.200"> <Text fontWeight="semibold" fontSize="md" noOfLines={1} wordBreak="break-all" color="base.200">
{boardName} {boardName}
</Text> </Text>

34
invokeai/frontend/web/src/features/gallery/components/GalleryHeader.tsx Normal file
View File

@ -0,0 +1,34 @@
import { Flex, Link, Text } from '@invoke-ai/ui-library';
import { useStore } from '@nanostores/react';
import { $projectName, $projectUrl } from 'app/store/nanostores/projectId';
import { memo } from 'react';
import GalleryBoardName from './GalleryBoardName';
type Props = {
onClickBoardName: () => void;
};
export const GalleryHeader = memo((props: Props) => {
const projectName = useStore($projectName);
const projectUrl = useStore($projectUrl);
if (projectName && projectUrl) {
return (
<Flex gap={2} w="full" alignItems="center" justifyContent="space-evenly" pe={2}>
<Text fontSize="md" fontWeight="semibold" noOfLines={1} w="full" textAlign="center">
<Link href={projectUrl}>{projectName}</Link>
</Text>
<GalleryBoardName onClick={props.onClickBoardName} />
</Flex>
);
}
return (
<Flex w="full" pe={2}>
<GalleryBoardName onClick={props.onClickBoardName} />
</Flex>
);
});
GalleryHeader.displayName = 'GalleryHeader';

2
invokeai/frontend/web/src/features/gallery/components/GallerySettingsPopover/GallerySettingsPopover.tsx
View File

@ -17,7 +17,7 @@ const GallerySettingsPopover = () => {
return ( return (
<Popover isLazy> <Popover isLazy>
<PopoverTrigger> <PopoverTrigger>
<IconButton aria-label={t('gallery.gallerySettings')} size="sm" icon={<RiSettings4Fill />} /> <IconButton aria-label={t('gallery.gallerySettings')} icon={<RiSettings4Fill />} variant="link" h="full" />
</PopoverTrigger> </PopoverTrigger>
<PopoverContent> <PopoverContent>
<PopoverBody> <PopoverBody>

205
invokeai/frontend/web/src/features/gallery/components/ImageGalleryContent.tsx
View File

@ -1,24 +1,71 @@
import { Button, ButtonGroup, Flex, Tab, TabList, Tabs } from '@invoke-ai/ui-library'; import type { ChakraProps } from '@invoke-ai/ui-library';
import { useStore } from '@nanostores/react'; import {
import { $galleryHeader } from 'app/store/nanostores/galleryHeader'; Box,
Collapse,
Divider,
Flex,
IconButton,
Spacer,
Tab,
TabList,
Tabs,
useDisclosure,
} from '@invoke-ai/ui-library';
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
import { GalleryHeader } from 'features/gallery/components/GalleryHeader';
import { galleryViewChanged } from 'features/gallery/store/gallerySlice'; import { galleryViewChanged } from 'features/gallery/store/gallerySlice';
import { memo, useCallback } from 'react'; import ResizeHandle from 'features/ui/components/tabs/ResizeHandle';
import { usePanel, type UsePanelOptions } from 'features/ui/hooks/usePanel';
import type { CSSProperties } from 'react';
import { memo, useCallback, useMemo, useRef } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { PiImagesBold } from 'react-icons/pi'; import { PiMagnifyingGlassBold } from 'react-icons/pi';
import { RiServerLine } from 'react-icons/ri'; import type { ImperativePanelGroupHandle } from 'react-resizable-panels';
import { Panel, PanelGroup } from 'react-resizable-panels';
import BoardsList from './Boards/BoardsList/BoardsList'; import BoardsList from './Boards/BoardsList/BoardsList';
import GalleryBoardName from './GalleryBoardName'; import BoardsSearch from './Boards/BoardsList/BoardsSearch';
import GallerySettingsPopover from './GallerySettingsPopover/GallerySettingsPopover';
import GalleryImageGrid from './ImageGrid/GalleryImageGrid'; import GalleryImageGrid from './ImageGrid/GalleryImageGrid';
import { GalleryPagination } from './ImageGrid/GalleryPagination'; import { GalleryPagination } from './ImageGrid/GalleryPagination';
import { GallerySearch } from './ImageGrid/GallerySearch'; import { GallerySearch } from './ImageGrid/GallerySearch';
const COLLAPSE_STYLES: CSSProperties = { flexShrink: 0, minHeight: 0 };
const BASE_STYLES: ChakraProps['sx'] = {
fontWeight: 'semibold',
fontSize: 'sm',
color: 'base.300',
};
const SELECTED_STYLES: ChakraProps['sx'] = {
borderColor: 'base.800',
borderBottomColor: 'base.900',
color: 'invokeBlue.300',
};
const ImageGalleryContent = () => { const ImageGalleryContent = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const galleryView = useAppSelector((s) => s.gallery.galleryView); const galleryView = useAppSelector((s) => s.gallery.galleryView);
const searchTerm = useAppSelector((s) => s.gallery.searchTerm);
const boardSearchText = useAppSelector((s) => s.gallery.boardSearchText);
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const galleryHeader = useStore($galleryHeader); const searchDisclosure = useDisclosure({ defaultIsOpen: false });
const boardSearchDisclosure = useDisclosure({ defaultIsOpen: false });
const panelGroupRef = useRef<ImperativePanelGroupHandle>(null);
const boardsListPanelOptions = useMemo<UsePanelOptions>(
() => ({
unit: 'pixels',
minSize: 128,
defaultSize: 256,
fallbackMinSizePct: 20,
panelGroupRef,
panelGroupDirection: 'vertical',
}),
[]
);
const boardsListPanel = usePanel(boardsListPanelOptions);
const handleClickImages = useCallback(() => { const handleClickImages = useCallback(() => {
dispatch(galleryViewChanged('images')); dispatch(galleryViewChanged('images'));
@ -29,53 +76,103 @@ const ImageGalleryContent = () => {
}, [dispatch]); }, [dispatch]);
return ( return (
<Flex <Flex position="relative" flexDirection="column" h="full" w="full" pt={2}>
layerStyle="first" <Flex alignItems="center" gap={2}>
position="relative" <GalleryHeader onClickBoardName={boardsListPanel.toggle} />
flexDirection="column" <GallerySettingsPopover />
h="full" <Box position="relative" h="full">
w="full" <IconButton
borderRadius="base" w="full"
p={2} h="full"
gap={2} onClick={boardSearchDisclosure.onToggle}
> tooltip={`${t('gallery.displayBoardSearch')}`}
{galleryHeader} aria-label={t('gallery.displayBoardSearch')}
<BoardsList /> icon={<PiMagnifyingGlassBold />}
<GalleryBoardName /> variant="link"
<Flex alignItems="center" justifyContent="space-between" gap={2}> />
<Tabs index={galleryView === 'images' ? 0 : 1} variant="unstyled" size="sm" w="full"> {boardSearchText && (
<TabList> <Box
<ButtonGroup w="full"> position="absolute"
<Tab w={2}
as={Button} h={2}
size="sm" bg="invokeBlue.300"
isChecked={galleryView === 'images'} borderRadius="full"
onClick={handleClickImages} insetBlockStart={2}
w="full" insetInlineEnd={2}
leftIcon={<PiImagesBold size="16px" />} />
data-testid="images-tab" )}
> </Box>
{t('parameters.images')}
</Tab>
<Tab
as={Button}
size="sm"
isChecked={galleryView === 'assets'}
onClick={handleClickAssets}
w="full"
leftIcon={<RiServerLine size="16px" />}
data-testid="assets-tab"
>
{t('gallery.assets')}
</Tab>
</ButtonGroup>
</TabList>
</Tabs>
</Flex> </Flex>
<PanelGroup ref={panelGroupRef} direction="vertical">
<GallerySearch /> <Panel
<GalleryImageGrid /> id="boards-list-panel"
<GalleryPagination /> ref={boardsListPanel.ref}
defaultSize={boardsListPanel.defaultSize}
minSize={boardsListPanel.minSize}
onCollapse={boardsListPanel.onCollapse}
onExpand={boardsListPanel.onExpand}
collapsible
>
<Flex flexDir="column" w="full" h="full">
<Collapse in={boardSearchDisclosure.isOpen} style={COLLAPSE_STYLES}>
<BoardsSearch />
</Collapse>
<Divider pt={2} />
<BoardsList />
</Flex>
</Panel>
<ResizeHandle
id="gallery-panel-handle"
orientation="horizontal"
onDoubleClick={boardsListPanel.onDoubleClickHandle}
/>
<Panel id="gallery-wrapper-panel" minSize={20}>
<Flex flexDirection="column" alignItems="center" justifyContent="space-between" h="full" w="full">
<Tabs index={galleryView === 'images' ? 0 : 1} variant="enclosed" display="flex" flexDir="column" w="full">
<TabList gap={2} fontSize="sm" borderColor="base.800">
<Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickImages} data-testid="images-tab">
{t('parameters.images')}
</Tab>
<Tab sx={BASE_STYLES} _selected={SELECTED_STYLES} onClick={handleClickAssets} data-testid="assets-tab">
{t('gallery.assets')}
</Tab>
<Spacer />
<Box position="relative">
<IconButton
w="full"
h="full"
onClick={searchDisclosure.onToggle}
tooltip={`${t('gallery.displaySearch')}`}
aria-label={t('gallery.displaySearch')}
icon={<PiMagnifyingGlassBold />}
variant="link"
/>
{searchTerm && (
<Box
position="absolute"
w={2}
h={2}
bg="invokeBlue.300"
borderRadius="full"
insetBlockStart={2}
insetInlineEnd={2}
/>
)}
</Box>
</TabList>
</Tabs>
<Box w="full">
<Collapse in={searchDisclosure.isOpen} style={COLLAPSE_STYLES}>
<Box w="full" pt={2}>
<GallerySearch />
</Box>
</Collapse>
</Box>
<GalleryImageGrid />
<GalleryPagination />
</Flex>
</Panel>
</PanelGroup>
</Flex> </Flex>
); );
}; };

2
invokeai/frontend/web/src/features/gallery/components/ImageGrid/GalleryImageGrid.tsx
View File

@ -124,7 +124,7 @@ const Content = () => {
}, [calculateNewLimit, container, dispatch]); }, [calculateNewLimit, container, dispatch]);
return ( return (
<Box position="relative" w="full" h="full"> <Box position="relative" w="full" h="full" mt={2}>
<Box <Box
ref={containerRef} ref={containerRef}
position="absolute" position="absolute"

4
invokeai/frontend/web/src/features/ui/components/tabs/ResizeHandle.tsx
View File

@ -48,12 +48,12 @@ const sx: SystemStyleObject = {
transitionDuration: 'normal', transitionDuration: 'normal',
'.resize-handle-inner': { '.resize-handle-inner': {
'&[data-orientation="horizontal"]': { '&[data-orientation="horizontal"]': {
w: 'calc(100% - 1rem)', w: '100%',
h: '2px', h: '2px',
}, },
'&[data-orientation="vertical"]': { '&[data-orientation="vertical"]': {
w: '2px', w: '2px',
h: 'calc(100% - 1rem)', h: '100%',
}, },
borderRadius: 'base', borderRadius: 'base',
transitionProperty: 'inherit', transitionProperty: 'inherit',

46
invokeai/frontend/web/src/features/ui/hooks/usePanel.ts
View File

@ -16,6 +16,10 @@ export type UsePanelOptions =
* The minimum size of the panel as a percentage. * The minimum size of the panel as a percentage.
*/ */
minSize: number; minSize: number;
/**
* The default size of the panel as a percentage.
*/
defaultSize?: number;
/** /**
* The unit of the minSize * The unit of the minSize
*/ */
@ -26,6 +30,10 @@ export type UsePanelOptions =
* The minimum size of the panel in pixels. * The minimum size of the panel in pixels.
*/ */
minSize: number; minSize: number;
/**
* The default size of the panel in pixels.
*/
defaultSize?: number;
/** /**
* The unit of the minSize. * The unit of the minSize.
*/ */
@ -50,6 +58,10 @@ export type UsePanelReturn = {
* The dynamically calculated minimum size of the panel. * The dynamically calculated minimum size of the panel.
*/ */
minSize: number; minSize: number;
/**
* The dynamically calculated default size of the panel.
*/
defaultSize: number;
/** /**
* Whether the panel is collapsed. * Whether the panel is collapsed.
*/ */
@ -94,6 +106,7 @@ export type UsePanelReturn = {
export const usePanel = (arg: UsePanelOptions): UsePanelReturn => { export const usePanel = (arg: UsePanelOptions): UsePanelReturn => {
const panelHandleRef = useRef<ImperativePanelHandle>(null); const panelHandleRef = useRef<ImperativePanelHandle>(null);
const [_minSize, _setMinSize] = useState<number>(arg.unit === 'percentages' ? arg.minSize : 0); const [_minSize, _setMinSize] = useState<number>(arg.unit === 'percentages' ? arg.minSize : 0);
const [_defaultSize, _setDefaultSize] = useState<number>(arg.defaultSize ?? arg.minSize);
// If the units are pixels, we need to calculate the min size as a percentage of the available space, // If the units are pixels, we need to calculate the min size as a percentage of the available space,
// then resize the panel if it is too small. // then resize the panel if it is too small.
@ -113,18 +126,16 @@ export const usePanel = (arg: UsePanelOptions): UsePanelReturn => {
} }
const minSizePct = getSizeAsPercentage(arg.minSize, arg.panelGroupRef, arg.panelGroupDirection); const minSizePct = getSizeAsPercentage(arg.minSize, arg.panelGroupRef, arg.panelGroupDirection);
_setMinSize(minSizePct); _setMinSize(minSizePct);
/** const defaultSizePct = getSizeAsPercentage(
* TODO(psyche): Ideally, we only resize the panel if there is not enough room for it in the arg.defaultSize ?? arg.minSize,
* panel group. This is a bit tricky, though. We'd need to track the last known panel size arg.panelGroupRef,
* and compare it to the new size before resizing. This introduces some complexity that I'd arg.panelGroupDirection
* rather not need to maintain. );
* _setDefaultSize(defaultSizePct);
* For now, we'll just resize the panel to the min size every time the panel group is resized.
*/ if (!panelHandleRef.current.isCollapsed() && panelHandleRef.current.getSize() < minSizePct && minSizePct > 0) {
if (!panelHandleRef.current.isCollapsed()) {
panelHandleRef.current.resize(minSizePct); panelHandleRef.current.resize(minSizePct);
} }
}); });
@ -133,8 +144,12 @@ export const usePanel = (arg: UsePanelOptions): UsePanelReturn => {
panelGroupHandleElements.forEach((el) => resizeObserver.observe(el)); panelGroupHandleElements.forEach((el) => resizeObserver.observe(el));
// Resize the panel to the min size once on startup // Resize the panel to the min size once on startup
const minSizePct = getSizeAsPercentage(arg.minSize, arg.panelGroupRef, arg.panelGroupDirection); const defaultSizePct = getSizeAsPercentage(
panelHandleRef.current?.resize(minSizePct); arg.defaultSize ?? arg.minSize,
arg.panelGroupRef,
arg.panelGroupDirection
);
panelHandleRef.current?.resize(defaultSizePct);
return () => { return () => {
resizeObserver.disconnect(); resizeObserver.disconnect();
@ -188,14 +203,14 @@ export const usePanel = (arg: UsePanelOptions): UsePanelReturn => {
const onDoubleClickHandle = useCallback(() => { const onDoubleClickHandle = useCallback(() => {
// If the panel is really super close to the min size, collapse it // If the panel is really super close to the min size, collapse it
if (Math.abs((panelHandleRef.current?.getSize() ?? 0) - _minSize) < 0.01) { if (Math.abs((panelHandleRef.current?.getSize() ?? 0) - _defaultSize) < 0.01) {
collapse(); collapse();
return; return;
} }
// Otherwise, resize to the min size // Otherwise, resize to the min size
panelHandleRef.current?.resize(_minSize); panelHandleRef.current?.resize(_defaultSize);
}, [_minSize, collapse]); }, [_defaultSize, collapse]);
return { return {
ref: panelHandleRef, ref: panelHandleRef,
@ -209,6 +224,7 @@ export const usePanel = (arg: UsePanelOptions): UsePanelReturn => {
collapse, collapse,
resize, resize,
onDoubleClickHandle, onDoubleClickHandle,
defaultSize: _defaultSize,
}; };
}; };

9
invokeai/frontend/web/src/services/api/endpoints/images.ts
View File

@ -93,7 +93,6 @@ export const imagesApi = api.injectEndpoints({
const boardId = imageDTO.board_id ?? 'none'; const boardId = imageDTO.board_id ?? 'none';
return [ return [
{ type: 'Image', id: imageDTO.image_name },
{ {
type: 'ImageList', type: 'ImageList',
id: getListImagesUrl({ id: getListImagesUrl({
@ -138,9 +137,6 @@ export const imagesApi = api.injectEndpoints({
id: boardId, id: boardId,
}, },
]; ];
for (const imageDTO of imageDTOs) {
tags.push({ type: 'Image', id: imageDTO.image_name });
}
return tags; return tags;
} }
@ -508,7 +504,6 @@ export const imagesApi = api.injectEndpoints({
export const { export const {
useGetIntermediatesCountQuery, useGetIntermediatesCountQuery,
useListImagesQuery, useListImagesQuery,
useGetImageDTOQuery,
useGetImageMetadataQuery, useGetImageMetadataQuery,
useGetImageWorkflowQuery, useGetImageWorkflowQuery,
useLazyGetImageWorkflowQuery, useLazyGetImageWorkflowQuery,
@ -526,6 +521,10 @@ export const {
useBulkDownloadImagesMutation, useBulkDownloadImagesMutation,
} = imagesApi; } = imagesApi;
export const useGetImageDTOQuery = (...args: Parameters<typeof imagesApi.useGetImageDTOQuery>) => {
return imagesApi.useGetImageDTOQuery(...args);
};
/** /**
* Imperative RTKQ helper to fetch an ImageDTO. * Imperative RTKQ helper to fetch an ImageDTO.
* @param image_name The name of the image to fetch * @param image_name The name of the image to fetch

2
invokeai/version/invokeai_version.py
View File

@ -1 +1 @@
__version__ = "4.2.5" __version__ = "4.2.6post1"

2
tests/app/services/model_records/test_model_records_sql.py
View File

@ -40,7 +40,7 @@ def store(
config._root = datadir config._root = datadir
logger = InvokeAILogger.get_logger(config=config) logger = InvokeAILogger.get_logger(config=config)
db = create_mock_sqlite_database(config, logger) db = create_mock_sqlite_database(config, logger)
return ModelRecordServiceSQL(db) return ModelRecordServiceSQL(db, logger)
def example_ti_config(key: Optional[str] = None) -> TextualInversionFileConfig: def example_ti_config(key: Optional[str] = None) -> TextualInversionFileConfig:

4
tests/backend/model_manager/model_manager_fixtures.py
View File

@ -110,7 +110,7 @@ def mm2_installer(
logger = InvokeAILogger.get_logger() logger = InvokeAILogger.get_logger()
db = create_mock_sqlite_database(mm2_app_config, logger) db = create_mock_sqlite_database(mm2_app_config, logger)
events = TestEventService() events = TestEventService()
store = ModelRecordServiceSQL(db) store = ModelRecordServiceSQL(db, logger)
installer = ModelInstallService( installer = ModelInstallService(
app_config=mm2_app_config, app_config=mm2_app_config,
@ -128,7 +128,7 @@ def mm2_installer(
def mm2_record_store(mm2_app_config: InvokeAIAppConfig) -> ModelRecordServiceBase: def mm2_record_store(mm2_app_config: InvokeAIAppConfig) -> ModelRecordServiceBase:
logger = InvokeAILogger.get_logger(config=mm2_app_config) logger = InvokeAILogger.get_logger(config=mm2_app_config)
db = create_mock_sqlite_database(mm2_app_config, logger) db = create_mock_sqlite_database(mm2_app_config, logger)
store = ModelRecordServiceSQL(db) store = ModelRecordServiceSQL(db, logger)
# add five simple config records to the database # add five simple config records to the database
config1 = VAEDiffusersConfig( config1 = VAEDiffusersConfig(
key="test_config_1", key="test_config_1",