-
-
-
-
-![](data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg"/>)
-
- -
-
- Postprocessing...1/3
-
-
-
- 
+
[Full mp4 of Example Output test.mp4](https://github.com/helix4u/load_video_frame/blob/main/test.mp4)
--------------------------------
diff --git a/installer/templates/invoke.bat.in b/installer/templates/invoke.bat.in
index 227091b33a..ee6d56fc56 100644
--- a/installer/templates/invoke.bat.in
+++ b/installer/templates/invoke.bat.in
@@ -9,41 +9,37 @@ set INVOKEAI_ROOT=.
:start
echo Desired action:
echo 1. Generate images with the browser-based interface
-echo 2. Explore InvokeAI nodes using a command-line interface
-echo 3. Run textual inversion training
-echo 4. Merge models (diffusers type only)
-echo 5. Download and install models
-echo 6. Change InvokeAI startup options
-echo 7. Re-run the configure script to fix a broken install or to complete a major upgrade
-echo 8. Open the developer console
-echo 9. Update InvokeAI
-echo 10. Run the InvokeAI image database maintenance script
-echo 11. Command-line help
+echo 2. Run textual inversion training
+echo 3. Merge models (diffusers type only)
+echo 4. Download and install models
+echo 5. Change InvokeAI startup options
+echo 6. Re-run the configure script to fix a broken install or to complete a major upgrade
+echo 7. Open the developer console
+echo 8. Update InvokeAI
+echo 9. Run the InvokeAI image database maintenance script
+echo 10. Command-line help
echo Q - Quit
-set /P choice="Please enter 1-11, Q: [1] "
+set /P choice="Please enter 1-10, Q: [1] "
if not defined choice set choice=1
IF /I "%choice%" == "1" (
echo Starting the InvokeAI browser-based UI..
python .venv\Scripts\invokeai-web.exe %*
) ELSE IF /I "%choice%" == "2" (
- echo Starting the InvokeAI command-line..
- python .venv\Scripts\invokeai.exe %*
-) ELSE IF /I "%choice%" == "3" (
echo Starting textual inversion training..
python .venv\Scripts\invokeai-ti.exe --gui
-) ELSE IF /I "%choice%" == "4" (
+) ELSE IF /I "%choice%" == "3" (
echo Starting model merging script..
python .venv\Scripts\invokeai-merge.exe --gui
-) ELSE IF /I "%choice%" == "5" (
+) ELSE IF /I "%choice%" == "4" (
echo Running invokeai-model-install...
python .venv\Scripts\invokeai-model-install.exe
-) ELSE IF /I "%choice%" == "6" (
+) ELSE IF /I "%choice%" == "5" (
echo Running invokeai-configure...
python .venv\Scripts\invokeai-configure.exe --skip-sd-weight --skip-support-models
-) ELSE IF /I "%choice%" == "7" (
+) ELSE IF /I "%choice%" == "6" (
echo Running invokeai-configure...
python .venv\Scripts\invokeai-configure.exe --yes --skip-sd-weight
-) ELSE IF /I "%choice%" == "8" (
+) ELSE IF /I "%choice%" == "7" (
echo Developer Console
echo Python command is:
where python
@@ -55,13 +51,13 @@ IF /I "%choice%" == "1" (
echo *************************
echo *** Type `exit` to quit this shell and deactivate the Python virtual environment ***
call cmd /k
-) ELSE IF /I "%choice%" == "9" (
+) ELSE IF /I "%choice%" == "8" (
echo Running invokeai-update...
python -m invokeai.frontend.install.invokeai_update
-) ELSE IF /I "%choice%" == "10" (
+) ELSE IF /I "%choice%" == "9" (
echo Running the db maintenance script...
python .venv\Scripts\invokeai-db-maintenance.exe
-) ELSE IF /I "%choice%" == "11" (
+) ELSE IF /I "%choice%" == "10" (
echo Displaying command line help...
python .venv\Scripts\invokeai-web.exe --help %*
pause
diff --git a/installer/templates/invoke.sh.in b/installer/templates/invoke.sh.in
index 6cf6967608..3230c9f442 100644
--- a/installer/templates/invoke.sh.in
+++ b/installer/templates/invoke.sh.in
@@ -58,52 +58,47 @@ do_choice() {
invokeai-web $PARAMS
;;
2)
- clear
- printf "Explore InvokeAI nodes using a command-line interface\n"
- invokeai $PARAMS
- ;;
- 3)
clear
printf "Textual inversion training\n"
invokeai-ti --gui $PARAMS
;;
- 4)
+ 3)
clear
printf "Merge models (diffusers type only)\n"
invokeai-merge --gui $PARAMS
;;
- 5)
+ 4)
clear
printf "Download and install models\n"
invokeai-model-install --root ${INVOKEAI_ROOT}
;;
- 6)
+ 5)
clear
printf "Change InvokeAI startup options\n"
invokeai-configure --root ${INVOKEAI_ROOT} --skip-sd-weights --skip-support-models
;;
- 7)
+ 6)
clear
printf "Re-run the configure script to fix a broken install or to complete a major upgrade\n"
invokeai-configure --root ${INVOKEAI_ROOT} --yes --default_only --skip-sd-weights
;;
- 8)
+ 7)
clear
printf "Open the developer console\n"
file_name=$(basename "${BASH_SOURCE[0]}")
bash --init-file "$file_name"
;;
- 9)
+ 8)
clear
printf "Update InvokeAI\n"
python -m invokeai.frontend.install.invokeai_update
;;
- 10)
+ 9)
clear
printf "Running the db maintenance script\n"
invokeai-db-maintenance --root ${INVOKEAI_ROOT}
;;
- 11)
+ 10)
clear
printf "Command-line help\n"
invokeai-web --help
@@ -121,16 +116,15 @@ do_choice() {
do_dialog() {
options=(
1 "Generate images with a browser-based interface"
- 2 "Explore InvokeAI nodes using a command-line interface"
- 3 "Textual inversion training"
- 4 "Merge models (diffusers type only)"
- 5 "Download and install models"
- 6 "Change InvokeAI startup options"
- 7 "Re-run the configure script to fix a broken install or to complete a major upgrade"
- 8 "Open the developer console"
- 9 "Update InvokeAI"
- 10 "Run the InvokeAI image database maintenance script"
- 11 "Command-line help"
+ 2 "Textual inversion training"
+ 3 "Merge models (diffusers type only)"
+ 4 "Download and install models"
+ 5 "Change InvokeAI startup options"
+ 6 "Re-run the configure script to fix a broken install or to complete a major upgrade"
+ 7 "Open the developer console"
+ 8 "Update InvokeAI"
+ 9 "Run the InvokeAI image database maintenance script"
+ 10 "Command-line help"
)
choice=$(dialog --clear \
@@ -155,18 +149,17 @@ do_line_input() {
printf " ** For a more attractive experience, please install the 'dialog' utility using your package manager. **\n\n"
printf "What would you like to do?\n"
printf "1: Generate images using the browser-based interface\n"
- printf "2: Explore InvokeAI nodes using the command-line interface\n"
- printf "3: Run textual inversion training\n"
- printf "4: Merge models (diffusers type only)\n"
- printf "5: Download and install models\n"
- printf "6: Change InvokeAI startup options\n"
- printf "7: Re-run the configure script to fix a broken install\n"
- printf "8: Open the developer console\n"
- printf "9: Update InvokeAI\n"
- printf "10: Run the InvokeAI image database maintenance script\n"
- printf "11: Command-line help\n"
+ printf "2: Run textual inversion training\n"
+ printf "3: Merge models (diffusers type only)\n"
+ printf "4: Download and install models\n"
+ printf "5: Change InvokeAI startup options\n"
+ printf "6: Re-run the configure script to fix a broken install\n"
+ printf "7: Open the developer console\n"
+ printf "8: Update InvokeAI\n"
+ printf "9: Run the InvokeAI image database maintenance script\n"
+ printf "10: Command-line help\n"
printf "Q: Quit\n\n"
- read -p "Please enter 1-11, Q: [1] " yn
+ read -p "Please enter 1-10, Q: [1] " yn
choice=${yn:='1'}
do_choice $choice
clear
diff --git a/invokeai/app/api/dependencies.py b/invokeai/app/api/dependencies.py
index c9a2f0a843..e7c8fa7fae 100644
--- a/invokeai/app/api/dependencies.py
+++ b/invokeai/app/api/dependencies.py
@@ -2,6 +2,7 @@
from logging import Logger
+from invokeai.app.services.workflow_image_records.workflow_image_records_sqlite import SqliteWorkflowImageRecordsStorage
from invokeai.backend.util.logging import InvokeAILogger
from invokeai.version.invokeai_version import __version__
@@ -30,6 +31,7 @@ from ..services.shared.default_graphs import create_system_graphs
from ..services.shared.graph import GraphExecutionState, LibraryGraph
from ..services.shared.sqlite import SqliteDatabase
from ..services.urls.urls_default import LocalUrlService
+from ..services.workflow_records.workflow_records_sqlite import SqliteWorkflowRecordsStorage
from .events import FastAPIEventService
@@ -90,6 +92,8 @@ class ApiDependencies:
session_processor = DefaultSessionProcessor()
session_queue = SqliteSessionQueue(db=db)
urls = LocalUrlService()
+ workflow_image_records = SqliteWorkflowImageRecordsStorage(db=db)
+ workflow_records = SqliteWorkflowRecordsStorage(db=db)
services = InvocationServices(
board_image_records=board_image_records,
@@ -114,6 +118,8 @@ class ApiDependencies:
session_processor=session_processor,
session_queue=session_queue,
urls=urls,
+ workflow_image_records=workflow_image_records,
+ workflow_records=workflow_records,
)
create_system_graphs(services.graph_library)
diff --git a/invokeai/app/api/routers/images.py b/invokeai/app/api/routers/images.py
index 43a72943ee..e8c8c693b3 100644
--- a/invokeai/app/api/routers/images.py
+++ b/invokeai/app/api/routers/images.py
@@ -1,13 +1,14 @@
import io
+import traceback
from typing import Optional
from fastapi import Body, HTTPException, Path, Query, Request, Response, UploadFile
from fastapi.responses import FileResponse
from fastapi.routing import APIRouter
from PIL import Image
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ValidationError
-from invokeai.app.invocations.metadata import ImageMetadata
+from invokeai.app.invocations.baseinvocation import MetadataField, MetadataFieldValidator, WorkflowFieldValidator
from invokeai.app.services.image_records.image_records_common import ImageCategory, ImageRecordChanges, ResourceOrigin
from invokeai.app.services.images.images_common import ImageDTO, ImageUrlsDTO
from invokeai.app.services.shared.pagination import OffsetPaginatedResults
@@ -45,17 +46,38 @@ async def upload_image(
if not file.content_type or not file.content_type.startswith("image"):
raise HTTPException(status_code=415, detail="Not an image")
- contents = await file.read()
+ metadata = None
+ workflow = None
+ contents = await file.read()
try:
pil_image = Image.open(io.BytesIO(contents))
if crop_visible:
bbox = pil_image.getbbox()
pil_image = pil_image.crop(bbox)
except Exception:
- # Error opening the image
+ ApiDependencies.invoker.services.logger.error(traceback.format_exc())
raise HTTPException(status_code=415, detail="Failed to read image")
+ # TODO: retain non-invokeai metadata on upload?
+ # attempt to parse metadata from image
+ metadata_raw = pil_image.info.get("invokeai_metadata", None)
+ if metadata_raw:
+ try:
+ metadata = MetadataFieldValidator.validate_json(metadata_raw)
+ except ValidationError:
+ ApiDependencies.invoker.services.logger.warn("Failed to parse metadata for uploaded image")
+ pass
+
+ # attempt to parse workflow from image
+ workflow_raw = pil_image.info.get("invokeai_workflow", None)
+ if workflow_raw is not None:
+ try:
+ workflow = WorkflowFieldValidator.validate_json(workflow_raw)
+ except ValidationError:
+ ApiDependencies.invoker.services.logger.warn("Failed to parse metadata for uploaded image")
+ pass
+
try:
image_dto = ApiDependencies.invoker.services.images.create(
image=pil_image,
@@ -63,6 +85,8 @@ async def upload_image(
image_category=image_category,
session_id=session_id,
board_id=board_id,
+ metadata=metadata,
+ workflow=workflow,
is_intermediate=is_intermediate,
)
@@ -71,6 +95,7 @@ async def upload_image(
return image_dto
except Exception:
+ ApiDependencies.invoker.services.logger.error(traceback.format_exc())
raise HTTPException(status_code=500, detail="Failed to create image")
@@ -87,7 +112,7 @@ async def delete_image(
pass
-@images_router.post("/clear-intermediates", operation_id="clear_intermediates")
+@images_router.delete("/intermediates", operation_id="clear_intermediates")
async def clear_intermediates() -> int:
"""Clears all intermediates"""
@@ -99,6 +124,17 @@ async def clear_intermediates() -> int:
pass
+@images_router.get("/intermediates", operation_id="get_intermediates_count")
+async def get_intermediates_count() -> int:
+ """Gets the count of intermediate images"""
+
+ try:
+ return ApiDependencies.invoker.services.images.get_intermediates_count()
+ except Exception:
+ raise HTTPException(status_code=500, detail="Failed to get intermediates")
+ pass
+
+
@images_router.patch(
"/i/{image_name}",
operation_id="update_image",
@@ -135,11 +171,11 @@ async def get_image_dto(
@images_router.get(
"/i/{image_name}/metadata",
operation_id="get_image_metadata",
- response_model=ImageMetadata,
+ response_model=Optional[MetadataField],
)
async def get_image_metadata(
image_name: str = Path(description="The name of image to get"),
-) -> ImageMetadata:
+) -> Optional[MetadataField]:
"""Gets an image's metadata"""
try:
diff --git a/invokeai/app/api/routers/models.py b/invokeai/app/api/routers/models.py
index 018f3af02b..afa7d8df82 100644
--- a/invokeai/app/api/routers/models.py
+++ b/invokeai/app/api/routers/models.py
@@ -23,13 +23,13 @@ from ..dependencies import ApiDependencies
models_router = APIRouter(prefix="/v1/models", tags=["models"])
UpdateModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
-update_models_response_adapter = TypeAdapter(UpdateModelResponse)
+UpdateModelResponseValidator = TypeAdapter(UpdateModelResponse)
ImportModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
-import_models_response_adapter = TypeAdapter(ImportModelResponse)
+ImportModelResponseValidator = TypeAdapter(ImportModelResponse)
ConvertModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
-convert_models_response_adapter = TypeAdapter(ConvertModelResponse)
+ConvertModelResponseValidator = TypeAdapter(ConvertModelResponse)
MergeModelResponse = Union[tuple(OPENAPI_MODEL_CONFIGS)]
ImportModelAttributes = Union[tuple(OPENAPI_MODEL_CONFIGS)]
@@ -41,7 +41,7 @@ class ModelsList(BaseModel):
model_config = ConfigDict(use_enum_values=True)
-models_list_adapter = TypeAdapter(ModelsList)
+ModelsListValidator = TypeAdapter(ModelsList)
@models_router.get(
@@ -60,7 +60,7 @@ async def list_models(
models_raw.extend(ApiDependencies.invoker.services.model_manager.list_models(base_model, model_type))
else:
models_raw = ApiDependencies.invoker.services.model_manager.list_models(None, model_type)
- models = models_list_adapter.validate_python({"models": models_raw})
+ models = ModelsListValidator.validate_python({"models": models_raw})
return models
@@ -131,7 +131,7 @@ async def update_model(
base_model=base_model,
model_type=model_type,
)
- model_response = update_models_response_adapter.validate_python(model_raw)
+ model_response = UpdateModelResponseValidator.validate_python(model_raw)
except ModelNotFoundException as e:
raise HTTPException(status_code=404, detail=str(e))
except ValueError as e:
@@ -186,7 +186,7 @@ async def import_model(
model_raw = ApiDependencies.invoker.services.model_manager.list_model(
model_name=info.name, base_model=info.base_model, model_type=info.model_type
)
- return import_models_response_adapter.validate_python(model_raw)
+ return ImportModelResponseValidator.validate_python(model_raw)
except ModelNotFoundException as e:
logger.error(str(e))
@@ -231,7 +231,7 @@ async def add_model(
base_model=info.base_model,
model_type=info.model_type,
)
- return import_models_response_adapter.validate_python(model_raw)
+ return ImportModelResponseValidator.validate_python(model_raw)
except ModelNotFoundException as e:
logger.error(str(e))
raise HTTPException(status_code=404, detail=str(e))
@@ -302,7 +302,7 @@ async def convert_model(
model_raw = ApiDependencies.invoker.services.model_manager.list_model(
model_name, base_model=base_model, model_type=model_type
)
- response = convert_models_response_adapter.validate_python(model_raw)
+ response = ConvertModelResponseValidator.validate_python(model_raw)
except ModelNotFoundException as e:
raise HTTPException(status_code=404, detail=f"Model '{model_name}' not found: {str(e)}")
except ValueError as e:
@@ -417,7 +417,7 @@ async def merge_models(
base_model=base_model,
model_type=ModelType.Main,
)
- response = convert_models_response_adapter.validate_python(model_raw)
+ response = ConvertModelResponseValidator.validate_python(model_raw)
except ModelNotFoundException:
raise HTTPException(
status_code=404,
diff --git a/invokeai/app/api/routers/session_queue.py b/invokeai/app/api/routers/session_queue.py
index 7ecb0504a3..40f1f2213b 100644
--- a/invokeai/app/api/routers/session_queue.py
+++ b/invokeai/app/api/routers/session_queue.py
@@ -12,13 +12,11 @@ from invokeai.app.services.session_queue.session_queue_common import (
CancelByBatchIDsResult,
ClearResult,
EnqueueBatchResult,
- EnqueueGraphResult,
PruneResult,
SessionQueueItem,
SessionQueueItemDTO,
SessionQueueStatus,
)
-from invokeai.app.services.shared.graph import Graph
from invokeai.app.services.shared.pagination import CursorPaginatedResults
from ..dependencies import ApiDependencies
@@ -33,23 +31,6 @@ class SessionQueueAndProcessorStatus(BaseModel):
processor: SessionProcessorStatus
-@session_queue_router.post(
- "/{queue_id}/enqueue_graph",
- operation_id="enqueue_graph",
- responses={
- 201: {"model": EnqueueGraphResult},
- },
-)
-async def enqueue_graph(
- queue_id: str = Path(description="The queue id to perform this operation on"),
- graph: Graph = Body(description="The graph to enqueue"),
- prepend: bool = Body(default=False, description="Whether or not to prepend this batch in the queue"),
-) -> EnqueueGraphResult:
- """Enqueues a graph for single execution."""
-
- return ApiDependencies.invoker.services.session_queue.enqueue_graph(queue_id=queue_id, graph=graph, prepend=prepend)
-
-
@session_queue_router.post(
"/{queue_id}/enqueue_batch",
operation_id="enqueue_batch",
diff --git a/invokeai/app/api/routers/workflows.py b/invokeai/app/api/routers/workflows.py
new file mode 100644
index 0000000000..36de31fb51
--- /dev/null
+++ b/invokeai/app/api/routers/workflows.py
@@ -0,0 +1,20 @@
+from fastapi import APIRouter, Path
+
+from invokeai.app.api.dependencies import ApiDependencies
+from invokeai.app.invocations.baseinvocation import WorkflowField
+
+workflows_router = APIRouter(prefix="/v1/workflows", tags=["workflows"])
+
+
+@workflows_router.get(
+ "/i/{workflow_id}",
+ operation_id="get_workflow",
+ responses={
+ 200: {"model": WorkflowField},
+ },
+)
+async def get_workflow(
+ workflow_id: str = Path(description="The workflow to get"),
+) -> WorkflowField:
+ """Gets a workflow"""
+ return ApiDependencies.invoker.services.workflow_records.get(workflow_id)
diff --git a/invokeai/app/api_app.py b/invokeai/app/api_app.py
index e07b037dd1..51aa14c75b 100644
--- a/invokeai/app/api_app.py
+++ b/invokeai/app/api_app.py
@@ -1,3 +1,7 @@
+from typing import Any
+
+from fastapi.responses import HTMLResponse
+
from .services.config import InvokeAIAppConfig
# parse_args() must be called before any other imports. if it is not called first, consumers of the config
@@ -13,17 +17,20 @@ if True: # hack to make flake8 happy with imports coming after setting up the c
from inspect import signature
from pathlib import Path
- import torch
import uvicorn
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
+ from fastapi.middleware.gzip import GZipMiddleware
from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
from fastapi.openapi.utils import get_openapi
+ from fastapi.responses import FileResponse
from fastapi.staticfiles import StaticFiles
from fastapi_events.handlers.local import local_handler
from fastapi_events.middleware import EventHandlerASGIMiddleware
from pydantic.json_schema import models_json_schema
+ from torch.backends.mps import is_available as is_mps_available
+ # for PyCharm:
# noinspection PyUnresolvedReferences
import invokeai.backend.util.hotfixes # noqa: F401 (monkeypatching on import)
import invokeai.frontend.web as web_dir
@@ -31,19 +38,27 @@ if True: # hack to make flake8 happy with imports coming after setting up the c
from ..backend.util.logging import InvokeAILogger
from .api.dependencies import ApiDependencies
- from .api.routers import app_info, board_images, boards, images, models, session_queue, sessions, utilities
+ from .api.routers import (
+ app_info,
+ board_images,
+ boards,
+ images,
+ models,
+ session_queue,
+ sessions,
+ utilities,
+ workflows,
+ )
from .api.sockets import SocketIO
from .invocations.baseinvocation import BaseInvocation, UIConfigBase, _InputField, _OutputField
- if torch.backends.mps.is_available():
- # noinspection PyUnresolvedReferences
+ if is_mps_available():
import invokeai.backend.util.mps_fixes # noqa: F401 (monkeypatching on import)
app_config = InvokeAIAppConfig.get_config()
app_config.parse_args()
logger = InvokeAILogger.get_logger(config=app_config)
-
# fix for windows mimetypes registry entries being borked
# see https://github.com/invoke-ai/InvokeAI/discussions/3684#discussioncomment-6391352
mimetypes.add_type("application/javascript", ".js")
@@ -71,16 +86,18 @@ app.add_middleware(
allow_headers=app_config.allow_headers,
)
+app.add_middleware(GZipMiddleware, minimum_size=1000)
+
# Add startup event to load dependencies
@app.on_event("startup")
-async def startup_event():
+async def startup_event() -> None:
ApiDependencies.initialize(config=app_config, event_handler_id=event_handler_id, logger=logger)
# Shut down threads
@app.on_event("shutdown")
-async def shutdown_event():
+async def shutdown_event() -> None:
ApiDependencies.shutdown()
@@ -88,23 +105,18 @@ async def shutdown_event():
app.include_router(sessions.session_router, prefix="/api")
app.include_router(utilities.utilities_router, prefix="/api")
-
app.include_router(models.models_router, prefix="/api")
-
app.include_router(images.images_router, prefix="/api")
-
app.include_router(boards.boards_router, prefix="/api")
-
app.include_router(board_images.board_images_router, prefix="/api")
-
app.include_router(app_info.app_router, prefix="/api")
-
app.include_router(session_queue.session_queue_router, prefix="/api")
+app.include_router(workflows.workflows_router, prefix="/api")
# Build a custom OpenAPI to include all outputs
# TODO: can outputs be included on metadata of invocation schemas somehow?
-def custom_openapi():
+def custom_openapi() -> dict[str, Any]:
if app.openapi_schema:
return app.openapi_schema
openapi_schema = get_openapi(
@@ -159,7 +171,6 @@ def custom_openapi():
# print(f"Config with name {name} already defined")
continue
- # "BaseModelType":{"title":"BaseModelType","description":"An enumeration.","enum":["sd-1","sd-2"],"type":"string"}
openapi_schema["components"]["schemas"][name] = dict(
title=name,
description="An enumeration.",
@@ -173,34 +184,43 @@ def custom_openapi():
app.openapi = custom_openapi # type: ignore [method-assign] # this is a valid assignment
-# Override API doc favicons
-app.mount("/static", StaticFiles(directory=Path(web_dir.__path__[0], "static/dream_web")), name="static")
-
@app.get("/docs", include_in_schema=False)
-def overridden_swagger():
+def overridden_swagger() -> HTMLResponse:
return get_swagger_ui_html(
- openapi_url=app.openapi_url,
+ openapi_url=app.openapi_url, # type: ignore [arg-type] # this is always a string
title=app.title,
- swagger_favicon_url="/static/favicon.ico",
+ swagger_favicon_url="/static/docs/favicon.ico",
)
@app.get("/redoc", include_in_schema=False)
-def overridden_redoc():
+def overridden_redoc() -> HTMLResponse:
return get_redoc_html(
- openapi_url=app.openapi_url,
+ openapi_url=app.openapi_url, # type: ignore [arg-type] # this is always a string
title=app.title,
- redoc_favicon_url="/static/favicon.ico",
+ redoc_favicon_url="/static/docs/favicon.ico",
)
-# Must mount *after* the other routes else it borks em
-app.mount("/", StaticFiles(directory=Path(web_dir.__path__[0], "dist"), html=True), name="ui")
+web_root_path = Path(list(web_dir.__path__)[0])
-def invoke_api():
- def find_port(port: int):
+# Cannot add headers to StaticFiles, so we must serve index.html with a custom route
+# Add cache-control: no-store header to prevent caching of index.html, which leads to broken UIs at release
+@app.get("/", include_in_schema=False, name="ui_root")
+def get_index() -> FileResponse:
+ return FileResponse(Path(web_root_path, "dist/index.html"), headers={"Cache-Control": "no-store"})
+
+
+# # Must mount *after* the other routes else it borks em
+app.mount("/static", StaticFiles(directory=Path(web_root_path, "static/")), name="static") # docs favicon is in here
+app.mount("/assets", StaticFiles(directory=Path(web_root_path, "dist/assets/")), name="assets")
+app.mount("/locales", StaticFiles(directory=Path(web_root_path, "dist/locales/")), name="locales")
+
+
+def invoke_api() -> None:
+ def find_port(port: int) -> int:
"""Find a port not in use starting at given port"""
# Taken from https://waylonwalker.com/python-find-available-port/, thanks Waylon!
# https://github.com/WaylonWalker
@@ -235,7 +255,7 @@ def invoke_api():
app=app,
host=app_config.host,
port=port,
- loop=loop,
+ loop="asyncio",
log_level=app_config.log_level,
)
server = uvicorn.Server(config)
diff --git a/invokeai/app/cli/commands.py b/invokeai/app/cli/commands.py
deleted file mode 100644
index c21c6315ed..0000000000
--- a/invokeai/app/cli/commands.py
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright (c) 2023 Kyle Schouviller (https://github.com/kyle0654)
-
-import argparse
-from abc import ABC, abstractmethod
-from typing import Any, Callable, Iterable, Literal, Union, get_args, get_origin, get_type_hints
-
-import matplotlib.pyplot as plt
-import networkx as nx
-from pydantic import BaseModel, Field
-
-import invokeai.backend.util.logging as logger
-
-from ..invocations.baseinvocation import BaseInvocation
-from ..invocations.image import ImageField
-from ..services.graph import Edge, GraphExecutionState, LibraryGraph
-from ..services.invoker import Invoker
-
-
-def add_field_argument(command_parser, name: str, field, default_override=None):
- default = (
- default_override
- if default_override is not None
- else field.default
- if field.default_factory is None
- else field.default_factory()
- )
- if get_origin(field.annotation) == Literal:
- allowed_values = get_args(field.annotation)
- allowed_types = set()
- for val in allowed_values:
- allowed_types.add(type(val))
- allowed_types_list = list(allowed_types)
- field_type = allowed_types_list[0] if len(allowed_types) == 1 else Union[allowed_types_list] # type: ignore
-
- command_parser.add_argument(
- f"--{name}",
- dest=name,
- type=field_type,
- default=default,
- choices=allowed_values,
- help=field.description,
- )
- else:
- command_parser.add_argument(
- f"--{name}",
- dest=name,
- type=field.annotation,
- default=default,
- help=field.description,
- )
-
-
-def add_parsers(
- subparsers,
- commands: list[type],
- command_field: str = "type",
- exclude_fields: list[str] = ["id", "type"],
- add_arguments: Union[Callable[[argparse.ArgumentParser], None], None] = None,
-):
- """Adds parsers for each command to the subparsers"""
-
- # Create subparsers for each command
- for command in commands:
- hints = get_type_hints(command)
- cmd_name = get_args(hints[command_field])[0]
- command_parser = subparsers.add_parser(cmd_name, help=command.__doc__)
-
- if add_arguments is not None:
- add_arguments(command_parser)
-
- # Convert all fields to arguments
- fields = command.__fields__ # type: ignore
- for name, field in fields.items():
- if name in exclude_fields:
- continue
-
- add_field_argument(command_parser, name, field)
-
-
-def add_graph_parsers(
- subparsers, graphs: list[LibraryGraph], add_arguments: Union[Callable[[argparse.ArgumentParser], None], None] = None
-):
- for graph in graphs:
- command_parser = subparsers.add_parser(graph.name, help=graph.description)
-
- if add_arguments is not None:
- add_arguments(command_parser)
-
- # Add arguments for inputs
- for exposed_input in graph.exposed_inputs:
- node = graph.graph.get_node(exposed_input.node_path)
- field = node.__fields__[exposed_input.field]
- default_override = getattr(node, exposed_input.field)
- add_field_argument(command_parser, exposed_input.alias, field, default_override)
-
-
-class CliContext:
- invoker: Invoker
- session: GraphExecutionState
- parser: argparse.ArgumentParser
- defaults: dict[str, Any]
- graph_nodes: dict[str, str]
- nodes_added: list[str]
-
- def __init__(self, invoker: Invoker, session: GraphExecutionState, parser: argparse.ArgumentParser):
- self.invoker = invoker
- self.session = session
- self.parser = parser
- self.defaults = dict()
- self.graph_nodes = dict()
- self.nodes_added = list()
-
- def get_session(self):
- self.session = self.invoker.services.graph_execution_manager.get(self.session.id)
- return self.session
-
- def reset(self):
- self.session = self.invoker.create_execution_state()
- self.graph_nodes = dict()
- self.nodes_added = list()
- # Leave defaults unchanged
-
- def add_node(self, node: BaseInvocation):
- self.get_session()
- self.session.graph.add_node(node)
- self.nodes_added.append(node.id)
- self.invoker.services.graph_execution_manager.set(self.session)
-
- def add_edge(self, edge: Edge):
- self.get_session()
- self.session.add_edge(edge)
- self.invoker.services.graph_execution_manager.set(self.session)
-
-
-class ExitCli(Exception):
- """Exception to exit the CLI"""
-
- pass
-
-
-class BaseCommand(ABC, BaseModel):
- """A CLI command"""
-
- # All commands must include a type name like this:
-
- @classmethod
- def get_all_subclasses(cls):
- subclasses = []
- toprocess = [cls]
- while len(toprocess) > 0:
- next = toprocess.pop(0)
- next_subclasses = next.__subclasses__()
- subclasses.extend(next_subclasses)
- toprocess.extend(next_subclasses)
- return subclasses
-
- @classmethod
- def get_commands(cls):
- return tuple(BaseCommand.get_all_subclasses())
-
- @classmethod
- def get_commands_map(cls):
- # Get the type strings out of the literals and into a dictionary
- return dict(map(lambda t: (get_args(get_type_hints(t)["type"])[0], t), BaseCommand.get_all_subclasses()))
-
- @abstractmethod
- def run(self, context: CliContext) -> None:
- """Run the command. Raise ExitCli to exit."""
- pass
-
-
-class ExitCommand(BaseCommand):
- """Exits the CLI"""
-
- type: Literal["exit"] = "exit"
-
- def run(self, context: CliContext) -> None:
- raise ExitCli()
-
-
-class HelpCommand(BaseCommand):
- """Shows help"""
-
- type: Literal["help"] = "help"
-
- def run(self, context: CliContext) -> None:
- context.parser.print_help()
-
-
-def get_graph_execution_history(
- graph_execution_state: GraphExecutionState,
-) -> Iterable[str]:
- """Gets the history of fully-executed invocations for a graph execution"""
- return (n for n in reversed(graph_execution_state.executed_history) if n in graph_execution_state.graph.nodes)
-
-
-def get_invocation_command(invocation) -> str:
- fields = invocation.__fields__.items()
- type_hints = get_type_hints(type(invocation))
- command = [invocation.type]
- for name, field in fields:
- if name in ["id", "type"]:
- continue
-
- # TODO: add links
-
- # Skip image fields when serializing command
- type_hint = type_hints.get(name) or None
- if type_hint is ImageField or ImageField in get_args(type_hint):
- continue
-
- field_value = getattr(invocation, name)
- field_default = field.default
- if field_value != field_default:
- if type_hint is str or str in get_args(type_hint):
- command.append(f'--{name} "{field_value}"')
- else:
- command.append(f"--{name} {field_value}")
-
- return " ".join(command)
-
-
-class HistoryCommand(BaseCommand):
- """Shows the invocation history"""
-
- type: Literal["history"] = "history"
-
- # Inputs
- # fmt: off
- count: int = Field(default=5, gt=0, description="The number of history entries to show")
- # fmt: on
-
- def run(self, context: CliContext) -> None:
- history = list(get_graph_execution_history(context.get_session()))
- for i in range(min(self.count, len(history))):
- entry_id = history[-1 - i]
- entry = context.get_session().graph.get_node(entry_id)
- logger.info(f"{entry_id}: {get_invocation_command(entry)}")
-
-
-class SetDefaultCommand(BaseCommand):
- """Sets a default value for a field"""
-
- type: Literal["default"] = "default"
-
- # Inputs
- # fmt: off
- field: str = Field(description="The field to set the default for")
- value: str = Field(description="The value to set the default to, or None to clear the default")
- # fmt: on
-
- def run(self, context: CliContext) -> None:
- if self.value is None:
- if self.field in context.defaults:
- del context.defaults[self.field]
- else:
- context.defaults[self.field] = self.value
-
-
-class DrawGraphCommand(BaseCommand):
- """Debugs a graph"""
-
- type: Literal["draw_graph"] = "draw_graph"
-
- def run(self, context: CliContext) -> None:
- session: GraphExecutionState = context.invoker.services.graph_execution_manager.get(context.session.id)
- nxgraph = session.graph.nx_graph_flat()
-
- # Draw the networkx graph
- plt.figure(figsize=(20, 20))
- pos = nx.spectral_layout(nxgraph)
- nx.draw_networkx_nodes(nxgraph, pos, node_size=1000)
- nx.draw_networkx_edges(nxgraph, pos, width=2)
- nx.draw_networkx_labels(nxgraph, pos, font_size=20, font_family="sans-serif")
- plt.axis("off")
- plt.show()
-
-
-class DrawExecutionGraphCommand(BaseCommand):
- """Debugs an execution graph"""
-
- type: Literal["draw_xgraph"] = "draw_xgraph"
-
- def run(self, context: CliContext) -> None:
- session: GraphExecutionState = context.invoker.services.graph_execution_manager.get(context.session.id)
- nxgraph = session.execution_graph.nx_graph_flat()
-
- # Draw the networkx graph
- plt.figure(figsize=(20, 20))
- pos = nx.spectral_layout(nxgraph)
- nx.draw_networkx_nodes(nxgraph, pos, node_size=1000)
- nx.draw_networkx_edges(nxgraph, pos, width=2)
- nx.draw_networkx_labels(nxgraph, pos, font_size=20, font_family="sans-serif")
- plt.axis("off")
- plt.show()
-
-
-class SortedHelpFormatter(argparse.HelpFormatter):
- def _iter_indented_subactions(self, action):
- try:
- get_subactions = action._get_subactions
- except AttributeError:
- pass
- else:
- self._indent()
- if isinstance(action, argparse._SubParsersAction):
- for subaction in sorted(get_subactions(), key=lambda x: x.dest):
- yield subaction
- else:
- for subaction in get_subactions():
- yield subaction
- self._dedent()
diff --git a/invokeai/app/cli/completer.py b/invokeai/app/cli/completer.py
deleted file mode 100644
index 5aece8a058..0000000000
--- a/invokeai/app/cli/completer.py
+++ /dev/null
@@ -1,171 +0,0 @@
-"""
-Readline helper functions for cli_app.py
-You may import the global singleton `completer` to get access to the
-completer object.
-"""
-import atexit
-import readline
-import shlex
-from pathlib import Path
-from typing import Dict, List, Literal, get_args, get_origin, get_type_hints
-
-import invokeai.backend.util.logging as logger
-
-from ...backend import ModelManager
-from ..invocations.baseinvocation import BaseInvocation
-from ..services.invocation_services import InvocationServices
-from .commands import BaseCommand
-
-# singleton object, class variable
-completer = None
-
-
-class Completer(object):
- def __init__(self, model_manager: ModelManager):
- self.commands = self.get_commands()
- self.matches = None
- self.linebuffer = None
- self.manager = model_manager
- return
-
- def complete(self, text, state):
- """
- Complete commands and switches fromm the node CLI command line.
- Switches are determined in a context-specific manner.
- """
-
- buffer = readline.get_line_buffer()
- if state == 0:
- options = None
- try:
- current_command, current_switch = self.get_current_command(buffer)
- options = self.get_command_options(current_command, current_switch)
- except IndexError:
- pass
- options = options or list(self.parse_commands().keys())
-
- if not text: # first time
- self.matches = options
- else:
- self.matches = [s for s in options if s and s.startswith(text)]
-
- try:
- match = self.matches[state]
- except IndexError:
- match = None
- return match
-
- @classmethod
- def get_commands(self) -> List[object]:
- """
- Return a list of all the client commands and invocations.
- """
- return BaseCommand.get_commands() + BaseInvocation.get_invocations()
-
- def get_current_command(self, buffer: str) -> tuple[str, str]:
- """
- Parse the readline buffer to find the most recent command and its switch.
- """
- if len(buffer) == 0:
- return None, None
- tokens = shlex.split(buffer)
- command = None
- switch = None
- for t in tokens:
- if t[0].isalpha():
- if switch is None:
- command = t
- else:
- switch = t
- # don't try to autocomplete switches that are already complete
- if switch and buffer.endswith(" "):
- switch = None
- return command or "", switch or ""
-
- def parse_commands(self) -> Dict[str, List[str]]:
- """
- Return a dict in which the keys are the command name
- and the values are the parameters the command takes.
- """
- result = dict()
- for command in self.commands:
- hints = get_type_hints(command)
- name = get_args(hints["type"])[0]
- result.update({name: hints})
- return result
-
- def get_command_options(self, command: str, switch: str) -> List[str]:
- """
- Return all the parameters that can be passed to the command as
- command-line switches. Returns None if the command is unrecognized.
- """
- parsed_commands = self.parse_commands()
- if command not in parsed_commands:
- return None
-
- # handle switches in the format "-foo=bar"
- argument = None
- if switch and "=" in switch:
- switch, argument = switch.split("=")
-
- parameter = switch.strip("-")
- if parameter in parsed_commands[command]:
- if argument is None:
- return self.get_parameter_options(parameter, parsed_commands[command][parameter])
- else:
- return [
- f"--{parameter}={x}"
- for x in self.get_parameter_options(parameter, parsed_commands[command][parameter])
- ]
- else:
- return [f"--{x}" for x in parsed_commands[command].keys()]
-
- def get_parameter_options(self, parameter: str, typehint) -> List[str]:
- """
- Given a parameter type (such as Literal), offers autocompletions.
- """
- if get_origin(typehint) == Literal:
- return get_args(typehint)
- if parameter == "model":
- return self.manager.model_names()
-
- def _pre_input_hook(self):
- if self.linebuffer:
- readline.insert_text(self.linebuffer)
- readline.redisplay()
- self.linebuffer = None
-
-
-def set_autocompleter(services: InvocationServices) -> Completer:
- global completer
-
- if completer:
- return completer
-
- completer = Completer(services.model_manager)
-
- readline.set_completer(completer.complete)
- try:
- readline.set_auto_history(True)
- except AttributeError:
- # pyreadline3 does not have a set_auto_history() method
- pass
- readline.set_pre_input_hook(completer._pre_input_hook)
- readline.set_completer_delims(" ")
- readline.parse_and_bind("tab: complete")
- readline.parse_and_bind("set print-completions-horizontally off")
- readline.parse_and_bind("set page-completions on")
- readline.parse_and_bind("set skip-completed-text on")
- readline.parse_and_bind("set show-all-if-ambiguous on")
-
- histfile = Path(services.configuration.root_dir / ".invoke_history")
- try:
- readline.read_history_file(histfile)
- readline.set_history_length(1000)
- except FileNotFoundError:
- pass
- except OSError: # file likely corrupted
- newname = f"{histfile}.old"
- logger.error(f"Your history file {histfile} couldn't be loaded and may be corrupted. Renaming it to {newname}")
- histfile.replace(Path(newname))
- atexit.register(readline.write_history_file, histfile)
diff --git a/invokeai/app/cli_app.py b/invokeai/app/cli_app.py
deleted file mode 100644
index 2f8a4d2cbd..0000000000
--- a/invokeai/app/cli_app.py
+++ /dev/null
@@ -1,484 +0,0 @@
-# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654) and the InvokeAI Team
-
-from invokeai.app.services.invocation_cache.invocation_cache_memory import MemoryInvocationCache
-
-from .services.config import InvokeAIAppConfig
-
-# parse_args() must be called before any other imports. if it is not called first, consumers of the config
-# which are imported/used before parse_args() is called will get the default config values instead of the
-# values from the command line or config file.
-
-if True: # hack to make flake8 happy with imports coming after setting up the config
- import argparse
- import re
- import shlex
- import sqlite3
- import sys
- import time
- from typing import Optional, Union, get_type_hints
-
- import torch
- from pydantic import BaseModel, ValidationError
- from pydantic.fields import Field
-
- import invokeai.backend.util.hotfixes # noqa: F401 (monkeypatching on import)
- from invokeai.app.services.board_image_record_storage import SqliteBoardImageRecordStorage
- from invokeai.app.services.board_images import BoardImagesService, BoardImagesServiceDependencies
- from invokeai.app.services.board_record_storage import SqliteBoardRecordStorage
- from invokeai.app.services.boards import BoardService, BoardServiceDependencies
- from invokeai.app.services.image_record_storage import SqliteImageRecordStorage
- from invokeai.app.services.images import ImageService, ImageServiceDependencies
- from invokeai.app.services.invocation_stats import InvocationStatsService
- from invokeai.app.services.resource_name import SimpleNameService
- from invokeai.app.services.urls import LocalUrlService
- from invokeai.backend.util.logging import InvokeAILogger
- from invokeai.version.invokeai_version import __version__
-
- from .cli.commands import BaseCommand, CliContext, ExitCli, SortedHelpFormatter, add_graph_parsers, add_parsers
- from .cli.completer import set_autocompleter
- from .invocations.baseinvocation import BaseInvocation
- from .services.default_graphs import create_system_graphs, default_text_to_image_graph_id
- from .services.events import EventServiceBase
- from .services.graph import (
- Edge,
- EdgeConnection,
- GraphExecutionState,
- GraphInvocation,
- LibraryGraph,
- are_connection_types_compatible,
- )
- from .services.image_file_storage import DiskImageFileStorage
- from .services.invocation_queue import MemoryInvocationQueue
- from .services.invocation_services import InvocationServices
- from .services.invoker import Invoker
- from .services.latent_storage import DiskLatentsStorage, ForwardCacheLatentsStorage
- from .services.model_manager_service import ModelManagerService
- from .services.processor import DefaultInvocationProcessor
- from .services.sqlite import SqliteItemStorage
-
- if torch.backends.mps.is_available():
- import invokeai.backend.util.mps_fixes # noqa: F401 (monkeypatching on import)
-
-config = InvokeAIAppConfig.get_config()
-config.parse_args()
-logger = InvokeAILogger().get_logger(config=config)
-
-
-class CliCommand(BaseModel):
- command: Union[BaseCommand.get_commands() + BaseInvocation.get_invocations()] = Field(discriminator="type") # type: ignore
-
-
-class InvalidArgs(Exception):
- pass
-
-
-def add_invocation_args(command_parser):
- # Add linking capability
- command_parser.add_argument(
- "--link",
- "-l",
- action="append",
- nargs=3,
- help="A link in the format 'source_node source_field dest_field'. source_node can be relative to history (e.g. -1)",
- )
-
- command_parser.add_argument(
- "--link_node",
- "-ln",
- action="append",
- help="A link from all fields in the specified node. Node can be relative to history (e.g. -1)",
- )
-
-
-def get_command_parser(services: InvocationServices) -> argparse.ArgumentParser:
- # Create invocation parser
- parser = argparse.ArgumentParser(formatter_class=SortedHelpFormatter)
-
- def exit(*args, **kwargs):
- raise InvalidArgs
-
- parser.exit = exit
- subparsers = parser.add_subparsers(dest="type")
-
- # Create subparsers for each invocation
- invocations = BaseInvocation.get_all_subclasses()
- add_parsers(subparsers, invocations, add_arguments=add_invocation_args)
-
- # Create subparsers for each command
- commands = BaseCommand.get_all_subclasses()
- add_parsers(subparsers, commands, exclude_fields=["type"])
-
- # Create subparsers for exposed CLI graphs
- # TODO: add a way to identify these graphs
- text_to_image = services.graph_library.get(default_text_to_image_graph_id)
- add_graph_parsers(subparsers, [text_to_image], add_arguments=add_invocation_args)
-
- return parser
-
-
-class NodeField:
- alias: str
- node_path: str
- field: str
- field_type: type
-
- def __init__(self, alias: str, node_path: str, field: str, field_type: type):
- self.alias = alias
- self.node_path = node_path
- self.field = field
- self.field_type = field_type
-
-
-def fields_from_type_hints(hints: dict[str, type], node_path: str) -> dict[str, NodeField]:
- return {k: NodeField(alias=k, node_path=node_path, field=k, field_type=v) for k, v in hints.items()}
-
-
-def get_node_input_field(graph: LibraryGraph, field_alias: str, node_id: str) -> NodeField:
- """Gets the node field for the specified field alias"""
- exposed_input = next(e for e in graph.exposed_inputs if e.alias == field_alias)
- node_type = type(graph.graph.get_node(exposed_input.node_path))
- return NodeField(
- alias=exposed_input.alias,
- node_path=f"{node_id}.{exposed_input.node_path}",
- field=exposed_input.field,
- field_type=get_type_hints(node_type)[exposed_input.field],
- )
-
-
-def get_node_output_field(graph: LibraryGraph, field_alias: str, node_id: str) -> NodeField:
- """Gets the node field for the specified field alias"""
- exposed_output = next(e for e in graph.exposed_outputs if e.alias == field_alias)
- node_type = type(graph.graph.get_node(exposed_output.node_path))
- node_output_type = node_type.get_output_type()
- return NodeField(
- alias=exposed_output.alias,
- node_path=f"{node_id}.{exposed_output.node_path}",
- field=exposed_output.field,
- field_type=get_type_hints(node_output_type)[exposed_output.field],
- )
-
-
-def get_node_inputs(invocation: BaseInvocation, context: CliContext) -> dict[str, NodeField]:
- """Gets the inputs for the specified invocation from the context"""
- node_type = type(invocation)
- if node_type is not GraphInvocation:
- return fields_from_type_hints(get_type_hints(node_type), invocation.id)
- else:
- graph: LibraryGraph = context.invoker.services.graph_library.get(context.graph_nodes[invocation.id])
- return {e.alias: get_node_input_field(graph, e.alias, invocation.id) for e in graph.exposed_inputs}
-
-
-def get_node_outputs(invocation: BaseInvocation, context: CliContext) -> dict[str, NodeField]:
- """Gets the outputs for the specified invocation from the context"""
- node_type = type(invocation)
- if node_type is not GraphInvocation:
- return fields_from_type_hints(get_type_hints(node_type.get_output_type()), invocation.id)
- else:
- graph: LibraryGraph = context.invoker.services.graph_library.get(context.graph_nodes[invocation.id])
- return {e.alias: get_node_output_field(graph, e.alias, invocation.id) for e in graph.exposed_outputs}
-
-
-def generate_matching_edges(a: BaseInvocation, b: BaseInvocation, context: CliContext) -> list[Edge]:
- """Generates all possible edges between two invocations"""
- afields = get_node_outputs(a, context)
- bfields = get_node_inputs(b, context)
-
- matching_fields = set(afields.keys()).intersection(bfields.keys())
-
- # Remove invalid fields
- invalid_fields = set(["type", "id"])
- matching_fields = matching_fields.difference(invalid_fields)
-
- # Validate types
- matching_fields = [
- f for f in matching_fields if are_connection_types_compatible(afields[f].field_type, bfields[f].field_type)
- ]
-
- edges = [
- Edge(
- source=EdgeConnection(node_id=afields[alias].node_path, field=afields[alias].field),
- destination=EdgeConnection(node_id=bfields[alias].node_path, field=bfields[alias].field),
- )
- for alias in matching_fields
- ]
- return edges
-
-
-class SessionError(Exception):
- """Raised when a session error has occurred"""
-
- pass
-
-
-def invoke_all(context: CliContext):
- """Runs all invocations in the specified session"""
- context.invoker.invoke(context.session, invoke_all=True)
- while not context.get_session().is_complete():
- # Wait some time
- time.sleep(0.1)
-
- # Print any errors
- if context.session.has_error():
- for n in context.session.errors:
- context.invoker.services.logger.error(
- f"Error in node {n} (source node {context.session.prepared_source_mapping[n]}): {context.session.errors[n]}"
- )
-
- raise SessionError()
-
-
-def invoke_cli():
- logger.info(f"InvokeAI version {__version__}")
- # get the optional list of invocations to execute on the command line
- parser = config.get_parser()
- parser.add_argument("commands", nargs="*")
- invocation_commands = parser.parse_args().commands
-
- # get the optional file to read commands from.
- # Simplest is to use it for STDIN
- if infile := config.from_file:
- sys.stdin = open(infile, "r")
-
- model_manager = ModelManagerService(config, logger)
-
- events = EventServiceBase()
- output_folder = config.output_path
-
- # TODO: build a file/path manager?
- if config.use_memory_db:
- db_location = ":memory:"
- else:
- db_location = config.db_path
- db_location.parent.mkdir(parents=True, exist_ok=True)
-
- db_conn = sqlite3.connect(db_location, check_same_thread=False) # TODO: figure out a better threading solution
- logger.info(f'InvokeAI database location is "{db_location}"')
-
- graph_execution_manager = SqliteItemStorage[GraphExecutionState](conn=db_conn, table_name="graph_executions")
-
- urls = LocalUrlService()
- image_record_storage = SqliteImageRecordStorage(conn=db_conn)
- image_file_storage = DiskImageFileStorage(f"{output_folder}/images")
- names = SimpleNameService()
-
- board_record_storage = SqliteBoardRecordStorage(conn=db_conn)
- board_image_record_storage = SqliteBoardImageRecordStorage(conn=db_conn)
-
- boards = BoardService(
- services=BoardServiceDependencies(
- board_image_record_storage=board_image_record_storage,
- board_record_storage=board_record_storage,
- image_record_storage=image_record_storage,
- url=urls,
- logger=logger,
- )
- )
-
- board_images = BoardImagesService(
- services=BoardImagesServiceDependencies(
- board_image_record_storage=board_image_record_storage,
- board_record_storage=board_record_storage,
- image_record_storage=image_record_storage,
- url=urls,
- logger=logger,
- )
- )
-
- images = ImageService(
- services=ImageServiceDependencies(
- board_image_record_storage=board_image_record_storage,
- image_record_storage=image_record_storage,
- image_file_storage=image_file_storage,
- url=urls,
- logger=logger,
- names=names,
- graph_execution_manager=graph_execution_manager,
- )
- )
-
- services = InvocationServices(
- model_manager=model_manager,
- events=events,
- latents=ForwardCacheLatentsStorage(DiskLatentsStorage(f"{output_folder}/latents")),
- images=images,
- boards=boards,
- board_images=board_images,
- queue=MemoryInvocationQueue(),
- graph_library=SqliteItemStorage[LibraryGraph](conn=db_conn, table_name="graphs"),
- graph_execution_manager=graph_execution_manager,
- processor=DefaultInvocationProcessor(),
- performance_statistics=InvocationStatsService(graph_execution_manager),
- logger=logger,
- configuration=config,
- invocation_cache=MemoryInvocationCache(max_cache_size=config.node_cache_size),
- )
-
- system_graphs = create_system_graphs(services.graph_library)
- system_graph_names = set([g.name for g in system_graphs])
- set_autocompleter(services)
-
- invoker = Invoker(services)
- session: GraphExecutionState = invoker.create_execution_state()
- parser = get_command_parser(services)
-
- re_negid = re.compile("^-[0-9]+$")
-
- # Uncomment to print out previous sessions at startup
- # print(services.session_manager.list())
-
- context = CliContext(invoker, session, parser)
- set_autocompleter(services)
-
- command_line_args_exist = len(invocation_commands) > 0
- done = False
-
- while not done:
- try:
- if command_line_args_exist:
- cmd_input = invocation_commands.pop(0)
- done = len(invocation_commands) == 0
- else:
- cmd_input = input("invoke> ")
- except (KeyboardInterrupt, EOFError):
- # Ctrl-c exits
- break
-
- try:
- # Refresh the state of the session
- # history = list(get_graph_execution_history(context.session))
- history = list(reversed(context.nodes_added))
-
- # Split the command for piping
- cmds = cmd_input.split("|")
- start_id = len(context.nodes_added)
- current_id = start_id
- new_invocations = list()
- for cmd in cmds:
- if cmd is None or cmd.strip() == "":
- raise InvalidArgs("Empty command")
-
- # Parse args to create invocation
- args = vars(context.parser.parse_args(shlex.split(cmd.strip())))
-
- # Override defaults
- for field_name, field_default in context.defaults.items():
- if field_name in args:
- args[field_name] = field_default
-
- # Parse invocation
- command: CliCommand = None # type:ignore
- system_graph: Optional[LibraryGraph] = None
- if args["type"] in system_graph_names:
- system_graph = next(filter(lambda g: g.name == args["type"], system_graphs))
- invocation = GraphInvocation(graph=system_graph.graph, id=str(current_id))
- for exposed_input in system_graph.exposed_inputs:
- if exposed_input.alias in args:
- node = invocation.graph.get_node(exposed_input.node_path)
- field = exposed_input.field
- setattr(node, field, args[exposed_input.alias])
- command = CliCommand(command=invocation)
- context.graph_nodes[invocation.id] = system_graph.id
- else:
- args["id"] = current_id
- command = CliCommand(command=args)
-
- if command is None:
- continue
-
- # Run any CLI commands immediately
- if isinstance(command.command, BaseCommand):
- # Invoke all current nodes to preserve operation order
- invoke_all(context)
-
- # Run the command
- command.command.run(context)
- continue
-
- # TODO: handle linking with library graphs
- # Pipe previous command output (if there was a previous command)
- edges: list[Edge] = list()
- if len(history) > 0 or current_id != start_id:
- from_id = history[0] if current_id == start_id else str(current_id - 1)
- from_node = (
- next(filter(lambda n: n[0].id == from_id, new_invocations))[0]
- if current_id != start_id
- else context.session.graph.get_node(from_id)
- )
- matching_edges = generate_matching_edges(from_node, command.command, context)
- edges.extend(matching_edges)
-
- # Parse provided links
- if "link_node" in args and args["link_node"]:
- for link in args["link_node"]:
- node_id = link
- if re_negid.match(node_id):
- node_id = str(current_id + int(node_id))
-
- link_node = context.session.graph.get_node(node_id)
- matching_edges = generate_matching_edges(link_node, command.command, context)
- matching_destinations = [e.destination for e in matching_edges]
- edges = [e for e in edges if e.destination not in matching_destinations]
- edges.extend(matching_edges)
-
- if "link" in args and args["link"]:
- for link in args["link"]:
- edges = [
- e
- for e in edges
- if e.destination.node_id != command.command.id or e.destination.field != link[2]
- ]
-
- node_id = link[0]
- if re_negid.match(node_id):
- node_id = str(current_id + int(node_id))
-
- # TODO: handle missing input/output
- node_output = get_node_outputs(context.session.graph.get_node(node_id), context)[link[1]]
- node_input = get_node_inputs(command.command, context)[link[2]]
-
- edges.append(
- Edge(
- source=EdgeConnection(node_id=node_output.node_path, field=node_output.field),
- destination=EdgeConnection(node_id=node_input.node_path, field=node_input.field),
- )
- )
-
- new_invocations.append((command.command, edges))
-
- current_id = current_id + 1
-
- # Add the node to the session
- context.add_node(command.command)
- for edge in edges:
- print(edge)
- context.add_edge(edge)
-
- # Execute all remaining nodes
- invoke_all(context)
-
- except InvalidArgs:
- invoker.services.logger.warning('Invalid command, use "help" to list commands')
- continue
-
- except ValidationError:
- invoker.services.logger.warning('Invalid command arguments, run "Stable Diffusion Dream Server
-
- For news and support for this web service, visit our GitHub
- site
-
- -
-
-
-
-
-
-
diff --git a/invokeai/frontend/web/static/legacy_web/favicon.ico b/invokeai/frontend/web/static/legacy_web/favicon.ico
deleted file mode 100644
index 51eb844a6a..0000000000
Binary files a/invokeai/frontend/web/static/legacy_web/favicon.ico and /dev/null differ
diff --git a/invokeai/frontend/web/static/legacy_web/index.css b/invokeai/frontend/web/static/legacy_web/index.css
deleted file mode 100644
index 51f0f267c3..0000000000
--- a/invokeai/frontend/web/static/legacy_web/index.css
+++ /dev/null
@@ -1,152 +0,0 @@
-* {
- font-family: 'Arial';
- font-size: 100%;
-}
-body {
- font-size: 1em;
-}
-textarea {
- font-size: 0.95em;
-}
-header, form, #progress-section {
- margin-left: auto;
- margin-right: auto;
- max-width: 1024px;
- text-align: center;
-}
-fieldset {
- border: none;
- line-height: 2.2em;
-}
-select, input {
- margin-right: 10px;
- padding: 2px;
-}
-input[type=submit] {
- background-color: #666;
- color: white;
-}
-input[type=checkbox] {
- margin-right: 0px;
- width: 20px;
- height: 20px;
- vertical-align: middle;
-}
-input#seed {
- margin-right: 0px;
-}
-div {
- padding: 10px 10px 10px 10px;
-}
-header {
- margin-bottom: 16px;
-}
-header h1 {
- margin-bottom: 0;
- font-size: 2em;
-}
-#search-box {
- display: flex;
-}
-#scaling-inprocess-message {
- font-weight: bold;
- font-style: italic;
- display: none;
-}
-#prompt {
- flex-grow: 1;
- padding: 5px 10px 5px 10px;
- border: 1px solid #999;
- outline: none;
-}
-#submit {
- padding: 5px 10px 5px 10px;
- border: 1px solid #999;
-}
-#reset-all, #remove-image {
- margin-top: 12px;
- font-size: 0.8em;
- background-color: pink;
- border: 1px solid #999;
- border-radius: 4px;
-}
-#results {
- text-align: center;
- margin: auto;
- padding-top: 10px;
-}
-#results figure {
- display: inline-block;
- margin: 10px;
-}
-#results figcaption {
- font-size: 0.8em;
- padding: 3px;
- color: #888;
- cursor: pointer;
-}
-#results img {
- border-radius: 5px;
- object-fit: cover;
-}
-#fieldset-config {
- line-height:2em;
- background-color: #F0F0F0;
-}
-input[type="number"] {
- width: 60px;
-}
-#seed {
- width: 150px;
-}
-button#reset-seed {
- font-size: 1.7em;
- background: #efefef;
- border: 1px solid #999;
- border-radius: 4px;
- line-height: 0.8;
- margin: 0 10px 0 0;
- padding: 0 5px 3px;
- vertical-align: middle;
-}
-label {
- white-space: nowrap;
-}
-#progress-section {
- display: none;
-}
-#progress-image {
- width: 30vh;
- height: 30vh;
-}
-#cancel-button {
- cursor: pointer;
- color: red;
-}
-#basic-parameters {
- background-color: #EEEEEE;
-}
-#txt2img {
- background-color: #DCDCDC;
-}
-#variations {
- background-color: #EEEEEE;
-}
-#img2img {
- background-color: #DCDCDC;
-}
-#gfpgan {
- background-color: #EEEEEE;
-}
-#progress-section {
- background-color: #F5F5F5;
-}
-.section-header {
- text-align: left;
- font-weight: bold;
- padding: 0 0 0 0;
-}
-#no-results-message:not(:only-child) {
- display: none;
-}
-
diff --git a/invokeai/frontend/web/static/legacy_web/index.html b/invokeai/frontend/web/static/legacy_web/index.html
deleted file mode 100644
index c96eed54c3..0000000000
--- a/invokeai/frontend/web/static/legacy_web/index.html
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
- Stable Diffusion Dream Server
-
- For news and support for this web service, visit our GitHub site
-
- -
-
-
-
-
- 
-
- ${seed}
- `;
-
- outputNode.innerHTML = figureContents;
- let figcaption = outputNode.querySelector('figcaption');
-
- // Reload image config
- figcaption.addEventListener('click', () => {
- let form = document.querySelector('#generate-form');
- for (const [k, v] of new FormData(form)) {
- if (k == 'initimg') {
- continue;
- }
- form.querySelector(`*[name=${k}]`).value = config[k];
- }
-
- document.querySelector('#seed').value = baseseed;
- document.querySelector('#with_variations').value = variations || '';
- if (document.querySelector('#variation_amount').value <= 0) {
- document.querySelector('#variation_amount').value = 0.2;
- }
-
- saveFields(document.querySelector('#generate-form'));
- });
-
- document.querySelector('#results').prepend(outputNode);
-}
-
-function saveFields(form) {
- for (const [k, v] of new FormData(form)) {
- if (typeof v !== 'object') {
- // Don't save 'file' type
- localStorage.setItem(k, v);
- }
- }
-}
-
-function loadFields(form) {
- for (const [k, v] of new FormData(form)) {
- const item = localStorage.getItem(k);
- if (item != null) {
- form.querySelector(`*[name=${k}]`).value = item;
- }
- }
-}
-
-function clearFields(form) {
- localStorage.clear();
- let prompt = form.prompt.value;
- form.reset();
- form.prompt.value = prompt;
-}
-
-const BLANK_IMAGE_URL =
- 'data:image/svg+xml,';
-async function generateSubmit(form) {
- const prompt = document.querySelector('#prompt').value;
-
- // Convert file data to base64
- let formData = Object.fromEntries(new FormData(form));
- formData.initimg_name = formData.initimg.name;
- formData.initimg =
- formData.initimg.name !== '' ? await toBase64(formData.initimg) : null;
-
- let strength = formData.strength;
- let totalSteps = formData.initimg
- ? Math.floor(strength * formData.steps)
- : formData.steps;
-
- let progressSectionEle = document.querySelector('#progress-section');
- progressSectionEle.style.display = 'initial';
- let progressEle = document.querySelector('#progress-bar');
- progressEle.setAttribute('max', totalSteps);
- let progressImageEle = document.querySelector('#progress-image');
- progressImageEle.src = BLANK_IMAGE_URL;
-
- progressImageEle.style.display = {}.hasOwnProperty.call(
- formData,
- 'progress_images'
- )
- ? 'initial'
- : 'none';
-
- // Post as JSON, using Fetch streaming to get results
- fetch(form.action, {
- method: form.method,
- body: JSON.stringify(formData),
- }).then(async (response) => {
- const reader = response.body.getReader();
-
- let noOutputs = true;
- while (true) {
- let { value, done } = await reader.read();
- value = new TextDecoder().decode(value);
- if (done) {
- progressSectionEle.style.display = 'none';
- break;
- }
-
- for (let event of value.split('\n').filter((e) => e !== '')) {
- const data = JSON.parse(event);
-
- if (data.event === 'result') {
- noOutputs = false;
- appendOutput(data.url, data.seed, data.config);
- progressEle.setAttribute('value', 0);
- progressEle.setAttribute('max', totalSteps);
- } else if (data.event === 'upscaling-started') {
- document.getElementById('processing_cnt').textContent =
- data.processed_file_cnt;
- document.getElementById('scaling-inprocess-message').style.display =
- 'block';
- } else if (data.event === 'upscaling-done') {
- document.getElementById('scaling-inprocess-message').style.display =
- 'none';
- } else if (data.event === 'step') {
- progressEle.setAttribute('value', data.step);
- if (data.url) {
- progressImageEle.src = data.url;
- }
- } else if (data.event === 'canceled') {
- // avoid alerting as if this were an error case
- noOutputs = false;
- }
- }
- }
-
- // Re-enable form, remove no-results-message
- form.querySelector('fieldset').removeAttribute('disabled');
- document.querySelector('#prompt').value = prompt;
- document.querySelector('progress').setAttribute('value', '0');
-
- if (noOutputs) {
- alert('Error occurred while generating.');
- }
- });
-
- // Disable form while generating
- form.querySelector('fieldset').setAttribute('disabled', '');
- document.querySelector('#prompt').value = `Generating: "${prompt}"`;
-}
-
-async function fetchRunLog() {
- try {
- let response = await fetch('/run_log.json');
- const data = await response.json();
- for (let item of data.run_log) {
- appendOutput(item.url, item.seed, item);
- }
- } catch (e) {
- console.error(e);
- }
-}
-
-window.onload = async () => {
- document.querySelector('#prompt').addEventListener('keydown', (e) => {
- if (e.key === 'Enter' && !e.shiftKey) {
- const form = e.target.form;
- generateSubmit(form);
- }
- });
- document.querySelector('#generate-form').addEventListener('submit', (e) => {
- e.preventDefault();
- const form = e.target;
-
- generateSubmit(form);
- });
- document.querySelector('#generate-form').addEventListener('change', (e) => {
- saveFields(e.target.form);
- });
- document.querySelector('#reset-seed').addEventListener('click', (e) => {
- document.querySelector('#seed').value = -1;
- saveFields(e.target.form);
- });
- document.querySelector('#reset-all').addEventListener('click', (e) => {
- clearFields(e.target.form);
- });
- document.querySelector('#remove-image').addEventListener('click', (e) => {
- initimg.value = null;
- });
- loadFields(document.querySelector('#generate-form'));
-
- document.querySelector('#cancel-button').addEventListener('click', () => {
- fetch('/cancel').catch((e) => {
- console.error(e);
- });
- });
- document.documentElement.addEventListener('keydown', (e) => {
- if (e.key === 'Escape')
- fetch('/cancel').catch((err) => {
- console.error(err);
- });
- });
-
- if (!config.gfpgan_model_exists) {
- document.querySelector('#gfpgan').style.display = 'none';
- }
- await fetchRunLog();
-};
diff --git a/mkdocs.yml b/mkdocs.yml
index f95d83ac8f..97b2a16f19 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -134,6 +134,7 @@ nav:
- List of Default Nodes: 'nodes/defaultNodes.md'
- Workflow Editor Usage: 'nodes/NODES.md'
- ComfyUI to InvokeAI: 'nodes/comfyToInvoke.md'
+ - Facetool Node: 'nodes/detailedNodes/faceTools.md'
- Contributing Nodes: 'nodes/contributingNodes.md'
- Features:
- Overview: 'features/index.md'
@@ -144,7 +145,7 @@ nav:
- Image-to-Image: 'features/IMG2IMG.md'
- Controlling Logging: 'features/LOGGING.md'
- Model Merging: 'features/MODEL_MERGING.md'
- - Using Nodes : './nodes/overview'
+ - Using Nodes : 'nodes/overview.md'
- NSFW Checker: 'features/WATERMARK+NSFW.md'
- Postprocessing: 'features/POSTPROCESS.md'
- Prompting Features: 'features/PROMPTS.md'
@@ -152,15 +153,18 @@ nav:
- Unified Canvas: 'features/UNIFIED_CANVAS.md'
- InvokeAI Web Server: 'features/WEB.md'
- WebUI Hotkeys: "features/WEBUIHOTKEYS.md"
+ - Maintenance Utilities: "features/UTILITIES.md"
- Other: 'features/OTHER.md'
- Contributing:
- How to Contribute: 'contributing/CONTRIBUTING.md'
+ - InvokeAI Code of Conduct: 'CODE_OF_CONDUCT.md'
- Development:
- Overview: 'contributing/contribution_guides/development.md'
- New Contributors: 'contributing/contribution_guides/newContributorChecklist.md'
- InvokeAI Architecture: 'contributing/ARCHITECTURE.md'
- Frontend Documentation: 'contributing/contribution_guides/contributingToFrontend.md'
- Local Development: 'contributing/LOCAL_DEVELOPMENT.md'
+ - Adding Tests: 'contributing/TESTS.md'
- Documentation: 'contributing/contribution_guides/documentation.md'
- Nodes: 'contributing/INVOCATIONS.md'
- Translation: 'contributing/contribution_guides/translation.md'
@@ -168,9 +172,12 @@ nav:
- Changelog: 'CHANGELOG.md'
- Deprecated:
- Command Line Interface: 'deprecated/CLI.md'
+ - Variations: 'deprecated/VARIATIONS.md'
+ - Translations: 'deprecated/TRANSLATION.md'
- Embiggen: 'deprecated/EMBIGGEN.md'
- Inpainting: 'deprecated/INPAINTING.md'
- Outpainting: 'deprecated/OUTPAINTING.md'
+ - Troubleshooting: 'help/deprecated/TROUBLESHOOT.md'
- Help:
- Getting Started: 'help/gettingStartedWithAI.md'
- Diffusion Overview: 'help/diffusion.md'
diff --git a/pyproject.toml b/pyproject.toml
index 67486e1120..d67b096ddc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -122,10 +122,9 @@ dependencies = [
"configure_invokeai.py" = "invokeai.frontend.install.invokeai_configure:invokeai_configure"
"textual_inversion.py" = "invokeai.frontend.training:invokeai_textual_inversion"
-# shortcut commands to start cli and web
+# shortcut commands to start web ui
# "invokeai --web" will launch the web interface
-# "invokeai" will launch the CLI
-"invokeai" = "invokeai.frontend.legacy_launch_invokeai:main"
+# "invokeai" = "invokeai.frontend.legacy_launch_invokeai:main"
# new shortcut to launch web interface
"invokeai-web" = "invokeai.app.api_app:invoke_api"
@@ -138,7 +137,6 @@ dependencies = [
"invokeai-migrate3" = "invokeai.backend.install.migrate_to_3:main"
"invokeai-update" = "invokeai.frontend.install.invokeai_update:main"
"invokeai-metadata" = "invokeai.backend.image_util.invoke_metadata:main"
-"invokeai-node-cli" = "invokeai.app.cli_app:invoke_cli"
"invokeai-node-web" = "invokeai.app.api_app:invoke_api"
"invokeai-import-images" = "invokeai.frontend.install.import_images:main"
"invokeai-db-maintenance" = "invokeai.backend.util.db_maintenance:main"
@@ -168,11 +166,13 @@ version = { attr = "invokeai.version.__version__" }
]
[tool.setuptools.package-data]
+"invokeai.app.assets" = ["**/*.png"]
"invokeai.assets.fonts" = ["**/*.ttf"]
"invokeai.backend" = ["**.png"]
"invokeai.configs" = ["*.example", "**/*.yaml", "*.txt"]
"invokeai.frontend.web.dist" = ["**"]
"invokeai.frontend.web.static" = ["**"]
+"invokeai.app.invocations" = ["**"]
#=== Begin: PyTest and Coverage
[tool.pytest.ini_options]
diff --git a/tests/backend/ip_adapter/test_ip_adapter.py b/tests/backend/ip_adapter/test_ip_adapter.py
index 7f634ee1fe..6712196778 100644
--- a/tests/backend/ip_adapter/test_ip_adapter.py
+++ b/tests/backend/ip_adapter/test_ip_adapter.py
@@ -65,7 +65,10 @@ def test_ip_adapter_unet_patch(model_params, model_installer, torch_device):
ip_adapter.to(torch_device, dtype=torch.float32)
unet.to(torch_device, dtype=torch.float32)
- cross_attention_kwargs = {"ip_adapter_image_prompt_embeds": [torch.randn((1, 4, 768)).to(torch_device)]}
+ # ip_embeds shape: (batch_size, num_ip_images, seq_len, ip_image_embedding_len)
+ ip_embeds = torch.randn((1, 3, 4, 768)).to(torch_device)
+
+ cross_attention_kwargs = {"ip_adapter_image_prompt_embeds": [ip_embeds]}
ip_adapter_unet_patcher = UNetPatcher([ip_adapter])
with ip_adapter_unet_patcher.apply_ip_adapter_attention(unet):
output = unet(**dummy_unet_input, cross_attention_kwargs=cross_attention_kwargs).sample
diff --git a/tests/nodes/test_graph_execution_state.py b/tests/nodes/test_graph_execution_state.py
index 27b8a58bea..171cdfdb6f 100644
--- a/tests/nodes/test_graph_execution_state.py
+++ b/tests/nodes/test_graph_execution_state.py
@@ -75,6 +75,8 @@ def mock_services() -> InvocationServices:
session_processor=None, # type: ignore
session_queue=None, # type: ignore
urls=None, # type: ignore
+ workflow_records=None, # type: ignore
+ workflow_image_records=None, # type: ignore
)
diff --git a/tests/nodes/test_invoker.py b/tests/nodes/test_invoker.py
index 105f7417cd..25b02955b0 100644
--- a/tests/nodes/test_invoker.py
+++ b/tests/nodes/test_invoker.py
@@ -80,6 +80,8 @@ def mock_services() -> InvocationServices:
session_processor=None, # type: ignore
session_queue=None, # type: ignore
urls=None, # type: ignore
+ workflow_records=None, # type: ignore
+ workflow_image_records=None, # type: ignore
)
diff --git a/tests/nodes/test_node_graph.py b/tests/nodes/test_node_graph.py
index 3c965895f9..e2a50e61e5 100644
--- a/tests/nodes/test_node_graph.py
+++ b/tests/nodes/test_node_graph.py
@@ -10,7 +10,12 @@ from invokeai.app.invocations.baseinvocation import (
)
from invokeai.app.invocations.image import ShowImageInvocation
from invokeai.app.invocations.math import AddInvocation, SubtractInvocation
-from invokeai.app.invocations.primitives import FloatInvocation, IntegerInvocation
+from invokeai.app.invocations.primitives import (
+ FloatCollectionInvocation,
+ FloatInvocation,
+ IntegerInvocation,
+ StringInvocation,
+)
from invokeai.app.invocations.upscale import ESRGANInvocation
from invokeai.app.services.shared.default_graphs import create_text_to_image
from invokeai.app.services.shared.graph import (
@@ -27,8 +32,11 @@ from invokeai.app.services.shared.graph import (
)
from .test_nodes import (
+ AnyTypeTestInvocation,
ImageToImageTestInvocation,
ListPassThroughInvocation,
+ PolymorphicStringTestInvocation,
+ PromptCollectionTestInvocation,
PromptTestInvocation,
TextToImageTestInvocation,
)
@@ -607,8 +615,8 @@ def test_graph_can_deserialize():
g.add_edge(e)
json = g.model_dump_json()
- adapter_graph = TypeAdapter(Graph)
- g2 = adapter_graph.validate_json(json)
+ GraphValidator = TypeAdapter(Graph)
+ g2 = GraphValidator.validate_json(json)
assert g2 is not None
assert g2.nodes["1"] is not None
@@ -692,6 +700,144 @@ def test_ints_do_not_accept_floats():
g.add_edge(e)
+def test_polymorphic_accepts_single():
+ g = Graph()
+ n1 = StringInvocation(id="1", value="banana")
+ n2 = PolymorphicStringTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e1 = create_edge(n1.id, "value", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e1)
+
+
+def test_polymorphic_accepts_collection_of_same_base_type():
+ g = Graph()
+ n1 = PromptCollectionTestInvocation(id="1", collection=["banana", "sundae"])
+ n2 = PolymorphicStringTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e1 = create_edge(n1.id, "collection", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e1)
+
+
+def test_polymorphic_does_not_accept_collection_of_different_base_type():
+ g = Graph()
+ n1 = FloatCollectionInvocation(id="1", collection=[1.0, 2.0, 3.0])
+ n2 = PolymorphicStringTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e1 = create_edge(n1.id, "collection", n2.id, "value")
+ with pytest.raises(InvalidEdgeError):
+ g.add_edge(e1)
+
+
+def test_polymorphic_does_not_accept_generic_collection():
+ g = Graph()
+ n1 = IntegerInvocation(id="1", value=1)
+ n2 = IntegerInvocation(id="2", value=2)
+ n3 = CollectInvocation(id="3")
+ n4 = PolymorphicStringTestInvocation(id="4")
+ g.add_node(n1)
+ g.add_node(n2)
+ g.add_node(n3)
+ g.add_node(n4)
+ e1 = create_edge(n1.id, "value", n3.id, "item")
+ e2 = create_edge(n2.id, "value", n3.id, "item")
+ e3 = create_edge(n3.id, "collection", n4.id, "value")
+ g.add_edge(e1)
+ g.add_edge(e2)
+ with pytest.raises(InvalidEdgeError):
+ g.add_edge(e3)
+
+
+def test_any_accepts_integer():
+ g = Graph()
+ n1 = IntegerInvocation(id="1", value=1)
+ n2 = AnyTypeTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "value", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e)
+
+
+def test_any_accepts_string():
+ g = Graph()
+ n1 = StringInvocation(id="1", value="banana sundae")
+ n2 = AnyTypeTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "value", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e)
+
+
+def test_any_accepts_generic_collection():
+ g = Graph()
+ n1 = IntegerInvocation(id="1", value=1)
+ n2 = IntegerInvocation(id="2", value=2)
+ n3 = CollectInvocation(id="3")
+ n4 = AnyTypeTestInvocation(id="4")
+ g.add_node(n1)
+ g.add_node(n2)
+ g.add_node(n3)
+ g.add_node(n4)
+ e1 = create_edge(n1.id, "value", n3.id, "item")
+ e2 = create_edge(n2.id, "value", n3.id, "item")
+ e3 = create_edge(n3.id, "collection", n4.id, "value")
+ g.add_edge(e1)
+ g.add_edge(e2)
+ # Not throwing on this line is sufficient
+ g.add_edge(e3)
+
+
+def test_any_accepts_prompt_collection():
+ g = Graph()
+ n1 = PromptCollectionTestInvocation(id="1", collection=["banana", "sundae"])
+ n2 = AnyTypeTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "collection", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e)
+
+
+def test_any_accepts_any():
+ g = Graph()
+ n1 = AnyTypeTestInvocation(id="1")
+ n2 = AnyTypeTestInvocation(id="2")
+ g.add_node(n1)
+ g.add_node(n2)
+ e = create_edge(n1.id, "value", n2.id, "value")
+ # Not throwing on this line is sufficient
+ g.add_edge(e)
+
+
+def test_iterate_accepts_collection():
+ """We need to update the validation for Collect -> Iterate to traverse to the Iterate
+ node's output and compare that against the item type of the Collect node's collection. Until
+ then, Collect nodes may not output into Iterate nodes."""
+ g = Graph()
+ n1 = IntegerInvocation(id="1", value=1)
+ n2 = IntegerInvocation(id="2", value=2)
+ n3 = CollectInvocation(id="3")
+ n4 = IterateInvocation(id="4")
+ g.add_node(n1)
+ g.add_node(n2)
+ g.add_node(n3)
+ g.add_node(n4)
+ e1 = create_edge(n1.id, "value", n3.id, "item")
+ e2 = create_edge(n2.id, "value", n3.id, "item")
+ e3 = create_edge(n3.id, "collection", n4.id, "collection")
+ g.add_edge(e1)
+ g.add_edge(e2)
+ # Once we fix the validation logic as described, this should should not raise an error
+ with pytest.raises(InvalidEdgeError, match="Cannot connect collector to iterator"):
+ g.add_edge(e3)
+
+
def test_graph_can_generate_schema():
# Not throwing on this line is sufficient
# NOTE: if this test fails, it's PROBABLY because a new invocation type is breaking schema generation
diff --git a/tests/nodes/test_nodes.py b/tests/nodes/test_nodes.py
index 471c72a005..51b33dd4c7 100644
--- a/tests/nodes/test_nodes.py
+++ b/tests/nodes/test_nodes.py
@@ -1,11 +1,11 @@
from typing import Any, Callable, Union
-from pydantic import Field
-
from invokeai.app.invocations.baseinvocation import (
BaseInvocation,
BaseInvocationOutput,
+ InputField,
InvocationContext,
+ OutputField,
invocation,
invocation_output,
)
@@ -15,12 +15,12 @@ from invokeai.app.invocations.image import ImageField
# Define test invocations before importing anything that uses invocations
@invocation_output("test_list_output")
class ListPassThroughInvocationOutput(BaseInvocationOutput):
- collection: list[ImageField] = Field(default_factory=list)
+ collection: list[ImageField] = OutputField(default_factory=list)
@invocation("test_list")
class ListPassThroughInvocation(BaseInvocation):
- collection: list[ImageField] = Field(default_factory=list)
+ collection: list[ImageField] = InputField(default_factory=list)
def invoke(self, context: InvocationContext) -> ListPassThroughInvocationOutput:
return ListPassThroughInvocationOutput(collection=self.collection)
@@ -28,12 +28,12 @@ class ListPassThroughInvocation(BaseInvocation):
@invocation_output("test_prompt_output")
class PromptTestInvocationOutput(BaseInvocationOutput):
- prompt: str = Field(default="")
+ prompt: str = OutputField(default="")
@invocation("test_prompt")
class PromptTestInvocation(BaseInvocation):
- prompt: str = Field(default="")
+ prompt: str = InputField(default="")
def invoke(self, context: InvocationContext) -> PromptTestInvocationOutput:
return PromptTestInvocationOutput(prompt=self.prompt)
@@ -47,13 +47,13 @@ class ErrorInvocation(BaseInvocation):
@invocation_output("test_image_output")
class ImageTestInvocationOutput(BaseInvocationOutput):
- image: ImageField = Field()
+ image: ImageField = OutputField()
@invocation("test_text_to_image")
class TextToImageTestInvocation(BaseInvocation):
- prompt: str = Field(default="")
- prompt2: str = Field(default="")
+ prompt: str = InputField(default="")
+ prompt2: str = InputField(default="")
def invoke(self, context: InvocationContext) -> ImageTestInvocationOutput:
return ImageTestInvocationOutput(image=ImageField(image_name=self.id))
@@ -61,8 +61,8 @@ class TextToImageTestInvocation(BaseInvocation):
@invocation("test_image_to_image")
class ImageToImageTestInvocation(BaseInvocation):
- prompt: str = Field(default="")
- image: Union[ImageField, None] = Field(default=None)
+ prompt: str = InputField(default="")
+ image: Union[ImageField, None] = InputField(default=None)
def invoke(self, context: InvocationContext) -> ImageTestInvocationOutput:
return ImageTestInvocationOutput(image=ImageField(image_name=self.id))
@@ -70,17 +70,40 @@ class ImageToImageTestInvocation(BaseInvocation):
@invocation_output("test_prompt_collection_output")
class PromptCollectionTestInvocationOutput(BaseInvocationOutput):
- collection: list[str] = Field(default_factory=list)
+ collection: list[str] = OutputField(default_factory=list)
@invocation("test_prompt_collection")
class PromptCollectionTestInvocation(BaseInvocation):
- collection: list[str] = Field()
+ collection: list[str] = InputField()
def invoke(self, context: InvocationContext) -> PromptCollectionTestInvocationOutput:
return PromptCollectionTestInvocationOutput(collection=self.collection.copy())
+@invocation_output("test_any_output")
+class AnyTypeTestInvocationOutput(BaseInvocationOutput):
+ value: Any = OutputField()
+
+
+@invocation("test_any")
+class AnyTypeTestInvocation(BaseInvocation):
+ value: Any = InputField(default=None)
+
+ def invoke(self, context: InvocationContext) -> AnyTypeTestInvocationOutput:
+ return AnyTypeTestInvocationOutput(value=self.value)
+
+
+@invocation("test_polymorphic")
+class PolymorphicStringTestInvocation(BaseInvocation):
+ value: Union[str, list[str]] = InputField(default="")
+
+ def invoke(self, context: InvocationContext) -> PromptCollectionTestInvocationOutput:
+ if isinstance(self.value, str):
+ return PromptCollectionTestInvocationOutput(collection=[self.value])
+ return PromptCollectionTestInvocationOutput(collection=self.value)
+
+
# Importing these must happen after test invocations are defined or they won't register
from invokeai.app.services.events.events_base import EventServiceBase # noqa: E402
from invokeai.app.services.shared.graph import Edge, EdgeConnection # noqa: E402
diff --git a/tests/nodes/test_session_queue.py b/tests/nodes/test_session_queue.py
index 731316068c..cdab5729f8 100644
--- a/tests/nodes/test_session_queue.py
+++ b/tests/nodes/test_session_queue.py
@@ -150,9 +150,9 @@ def test_prepare_values_to_insert(batch_data_collection, batch_graph):
values = prepare_values_to_insert(queue_id="default", batch=b, priority=0, max_new_queue_items=1000)
assert len(values) == 8
- session_adapter = TypeAdapter(GraphExecutionState)
+ GraphExecutionStateValidator = TypeAdapter(GraphExecutionState)
# graph should be serialized
- ges = session_adapter.validate_json(values[0].session)
+ ges = GraphExecutionStateValidator.validate_json(values[0].session)
# graph values should be populated
assert ges.graph.get_node("1").prompt == "Banana sushi"
@@ -161,16 +161,16 @@ def test_prepare_values_to_insert(batch_data_collection, batch_graph):
assert ges.graph.get_node("4").prompt == "Nissan"
# session ids should match deserialized graph
- assert [v.session_id for v in values] == [session_adapter.validate_json(v.session).id for v in values]
+ assert [v.session_id for v in values] == [GraphExecutionStateValidator.validate_json(v.session).id for v in values]
# should unique session ids
sids = [v.session_id for v in values]
assert len(sids) == len(set(sids))
- nfv_list_adapter = TypeAdapter(list[NodeFieldValue])
+ NodeFieldValueValidator = TypeAdapter(list[NodeFieldValue])
# should have 3 node field values
assert type(values[0].field_values) is str
- assert len(nfv_list_adapter.validate_json(values[0].field_values)) == 3
+ assert len(NodeFieldValueValidator.validate_json(values[0].field_values)) == 3
# should have batch id and priority
assert all(v.batch_id == b.batch_id for v in values)
-
-
- Postprocessing...1/3
-
-
-
-
-
-
-
-
-
diff --git a/invokeai/frontend/web/static/legacy_web/index.js b/invokeai/frontend/web/static/legacy_web/index.js
deleted file mode 100644
index a150f3f2e9..0000000000
--- a/invokeai/frontend/web/static/legacy_web/index.js
+++ /dev/null
@@ -1,234 +0,0 @@
-function toBase64(file) {
- return new Promise((resolve, reject) => {
- const r = new FileReader();
- r.readAsDataURL(file);
- r.onload = () => resolve(r.result);
- r.onerror = (error) => reject(error);
- });
-}
-
-function appendOutput(src, seed, config) {
- let outputNode = document.createElement('figure');
-
- let variations = config.with_variations;
- if (config.variation_amount > 0) {
- variations =
- (variations ? variations + ',' : '') +
- seed +
- ':' +
- config.variation_amount;
- }
- let baseseed =
- config.with_variations || config.variation_amount > 0 ? config.seed : seed;
- let altText =
- baseseed + ' | ' + (variations ? variations + ' | ' : '') + config.prompt;
-
- // img needs width and height for lazy loading to work
- const figureContents = `
-
-
-
- No results...
-