Merge branch 'main' into feat_compel_and

invokeai/app/api_app.py

@@ -1,11 +1,11 @@
 # Copyright (c) 2022-2023 Kyle Schouviller (https://github.com/kyle0654) and the InvokeAI Team
 import asyncio
-from inspect import signature
-
 import logging
-import uvicorn
 import socket
+from inspect import signature
+from pathlib import Path
 
+import uvicorn
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.docs import get_redoc_html, get_swagger_ui_html
@@ -13,7 +13,6 @@ from fastapi.openapi.utils import get_openapi
 from fastapi.staticfiles import StaticFiles
 from fastapi_events.handlers.local import local_handler
 from fastapi_events.middleware import EventHandlerASGIMiddleware
-from pathlib import Path
 from pydantic.schema import schema
 
 from .services.config import InvokeAIAppConfig
@@ -30,9 +29,12 @@ from .api.sockets import SocketIO
 from .invocations.baseinvocation import BaseInvocation, _InputField, _OutputField, UIConfigBase
 
 import torch
+
+# noinspection PyUnresolvedReferences
 import invokeai.backend.util.hotfixes  # noqa: F401 (monkeypatching on import)
 
 if torch.backends.mps.is_available():
+    # noinspection PyUnresolvedReferences
     import invokeai.backend.util.mps_fixes  # noqa: F401 (monkeypatching on import)
 
 
@@ -40,7 +42,6 @@ app_config = InvokeAIAppConfig.get_config()
 app_config.parse_args()
 logger = InvokeAILogger.getLogger(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")
@@ -208,6 +209,17 @@ def invoke_api():
 
     check_invokeai_root(app_config)  # note, may exit with an exception if root not set up
 
+    if app_config.dev_reload:
+        try:
+            import jurigged
+        except ImportError as e:
+            logger.error(
+                'Can\'t start `--dev_reload` because jurigged is not found; `pip install -e ".[dev]"` to include development dependencies.',
+                exc_info=e,
+            )
+        else:
+            jurigged.watch(logger=InvokeAILogger.getLogger(name="jurigged").info)
+
     port = find_port(app_config.port)
     if port != app_config.port:
         logger.warn(f"Port {app_config.port} in use, using port {port}")

invokeai/app/invocations/metadata.py

@@ -32,6 +32,7 @@ class CoreMetadata(BaseModelExcludeNull):
     generation_mode: str = Field(
         description="The generation mode that output this image",
     )
+    created_by: Optional[str] = Field(description="The name of the creator of the image")
     positive_prompt: str = Field(description="The positive prompt parameter")
     negative_prompt: str = Field(description="The negative prompt parameter")
     width: int = Field(description="The width parameter")

invokeai/app/services/config/invokeai_config.py

@@ -169,11 +169,13 @@ two configs are kept in separate sections of the config file:
 
 """
 from __future__ import annotations
+
 import os
-from omegaconf import OmegaConf, DictConfig
 from pathlib import Path
+from typing import ClassVar, Dict, List, Literal, Union, get_type_hints, Optional
+
+from omegaconf import OmegaConf, DictConfig
 from pydantic import Field, parse_obj_as
-from typing import ClassVar, Dict, List, Literal, Union, Optional, get_type_hints
 
 from .base import InvokeAISettings
 
@@ -233,6 +235,8 @@ class InvokeAIAppConfig(InvokeAISettings):
     log_format          : Literal['plain', 'color', 'syslog', 'legacy'] = Field(default="color", description='Log format. Use "plain" for text-only, "color" for colorized output, "legacy" for 2.3-style logging and "syslog" for syslog-style', category="Logging")
     log_level           : Literal["debug", "info", "warning", "error", "critical"] = Field(default="info", description="Emit logging messages at this level or  higher", category="Logging")
 
+    dev_reload          : bool = Field(default=False, description="Automatically reload when Python sources are changed.", category="Development")
+
     version             : bool = Field(default=False, description="Show InvokeAI version and exit", category="Other")
 
     # CACHE