InvokeAI 4.2.7rc1__tar.gz → 4.2.8__tar.gz

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/InvokeAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 4.2.7rc1
+Version: 4.2.8
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/InvokeAI.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ invokeai/app/api/routers/download_queue.py
 invokeai/app/api/routers/images.py
 invokeai/app/api/routers/model_manager.py
 invokeai/app/api/routers/session_queue.py
+invokeai/app/api/routers/style_presets.py
 invokeai/app/api/routers/utilities.py
 invokeai/app/api/routers/workflows.py
 invokeai/app/assets/images/caution.png
@@ -39,6 +40,7 @@ invokeai/app/invocations/cv.py
 invokeai/app/invocations/denoise_latents.py
 invokeai/app/invocations/facetools.py
 invokeai/app/invocations/fields.py
+invokeai/app/invocations/grounding_dino.py
 invokeai/app/invocations/ideal_size.py
 invokeai/app/invocations/image.py
 invokeai/app/invocations/image_to_latents.py
@@ -56,6 +58,7 @@ invokeai/app/invocations/prompt.py
 invokeai/app/invocations/resize_latents.py
 invokeai/app/invocations/scheduler.py
 invokeai/app/invocations/sdxl.py
+invokeai/app/invocations/segment_anything.py
 invokeai/app/invocations/spandrel_image_to_image.py
 invokeai/app/invocations/strings.py
 invokeai/app/invocations/t2i_adapter.py
@@ -170,6 +173,7 @@ invokeai/app/services/shared/sqlite_migrator/migrations/migration_10.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_11.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_12.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_13.py
+invokeai/app/services/shared/sqlite_migrator/migrations/migration_14.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_2.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_3.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_4.py
@@ -178,6 +182,33 @@ invokeai/app/services/shared/sqlite_migrator/migrations/migration_6.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_8.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_9.py
+invokeai/app/services/style_preset_images/style_preset_images_base.py
+invokeai/app/services/style_preset_images/style_preset_images_common.py
+invokeai/app/services/style_preset_images/style_preset_images_disk.py
+invokeai/app/services/style_preset_images/default_style_preset_images/Anime.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Architectural Visualization.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Concept Art (Character).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Concept Art (Fantasy).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Concept Art (Painterly).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Concept Art (Sci-Fi).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Environment Art.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Illustration.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Interior Design (Visualization).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Line Art.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Photography (Black and White).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Photography (General).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Photography (Landscape).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Photography (Portrait).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Photography (Studio Lighting).png
+invokeai/app/services/style_preset_images/default_style_preset_images/Product Rendering.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Sketch.png
+invokeai/app/services/style_preset_images/default_style_preset_images/Vehicles.png
+invokeai/app/services/style_preset_images/default_style_preset_images/__init__.py
+invokeai/app/services/style_preset_records/__init__.py
+invokeai/app/services/style_preset_records/default_style_presets.json
+invokeai/app/services/style_preset_records/style_preset_records_base.py
+invokeai/app/services/style_preset_records/style_preset_records_common.py
+invokeai/app/services/style_preset_records/style_preset_records_sqlite.py
 invokeai/app/services/urls/__init__.py
 invokeai/app/services/urls/urls_base.py
 invokeai/app/services/urls/urls_default.py
@@ -188,7 +219,8 @@ invokeai/app/services/workflow_records/workflow_records_sqlite.py
 invokeai/app/services/workflow_records/default_workflows/ESRGAN Upscaling with Canny ControlNet.json
 invokeai/app/services/workflow_records/default_workflows/Face Detailer with IP-Adapter & Canny (See Note in Details).json
 invokeai/app/services/workflow_records/default_workflows/Multi ControlNet (Canny & Depth).json
-invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SDXL (Beta).json
+invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SD1.5.json
+invokeai/app/services/workflow_records/default_workflows/MultiDiffusion SDXL.json
 invokeai/app/services/workflow_records/default_workflows/Prompt from File.json
 invokeai/app/services/workflow_records/default_workflows/Text to Image - SD1.5.json
 invokeai/app/services/workflow_records/default_workflows/Text to Image - SDXL.json
@@ -226,15 +258,15 @@ invokeai/backend/image_util/util.py
 invokeai/backend/image_util/basicsr/__init__.py
 invokeai/backend/image_util/basicsr/arch_util.py
 invokeai/backend/image_util/basicsr/rrdbnet_arch.py
-invokeai/backend/image_util/depth_anything/__init__.py
-invokeai/backend/image_util/depth_anything/model/blocks.py
-invokeai/backend/image_util/depth_anything/model/dpt.py
-invokeai/backend/image_util/depth_anything/utilities/util.py
+invokeai/backend/image_util/depth_anything/depth_anything_pipeline.py
 invokeai/backend/image_util/dw_openpose/__init__.py
 invokeai/backend/image_util/dw_openpose/onnxdet.py
 invokeai/backend/image_util/dw_openpose/onnxpose.py
 invokeai/backend/image_util/dw_openpose/utils.py
 invokeai/backend/image_util/dw_openpose/wholebody.py
+invokeai/backend/image_util/grounding_dino/__init__.py
+invokeai/backend/image_util/grounding_dino/detection_result.py
+invokeai/backend/image_util/grounding_dino/grounding_dino_pipeline.py
 invokeai/backend/image_util/infill_methods/cv2_inpaint.py
 invokeai/backend/image_util/infill_methods/lama.py
 invokeai/backend/image_util/infill_methods/mosaic.py
@@ -242,6 +274,9 @@ invokeai/backend/image_util/infill_methods/patchmatch.py
 invokeai/backend/image_util/infill_methods/tile.py
 invokeai/backend/image_util/realesrgan/__init__.py
 invokeai/backend/image_util/realesrgan/realesrgan.py
+invokeai/backend/image_util/segment_anything/__init__.py
+invokeai/backend/image_util/segment_anything/mask_refinement.py
+invokeai/backend/image_util/segment_anything/segment_anything_pipeline.py
 invokeai/backend/ip_adapter/__init__.py
 invokeai/backend/ip_adapter/ip_adapter.py
 invokeai/backend/ip_adapter/ip_attention_weights.py
@@ -291,7 +326,6 @@ invokeai/backend/stable_diffusion/diffusion_backend.py
 invokeai/backend/stable_diffusion/extension_callback_type.py
 invokeai/backend/stable_diffusion/extensions_manager.py
 invokeai/backend/stable_diffusion/multi_diffusion_pipeline.py
-invokeai/backend/stable_diffusion/seamless.py
 invokeai/backend/stable_diffusion/vae_tiling.py
 invokeai/backend/stable_diffusion/diffusion/__init__.py
 invokeai/backend/stable_diffusion/diffusion/conditioning_data.py
@@ -303,8 +337,13 @@ invokeai/backend/stable_diffusion/diffusion/unet_attention_patcher.py
 invokeai/backend/stable_diffusion/extensions/base.py
 invokeai/backend/stable_diffusion/extensions/controlnet.py
 invokeai/backend/stable_diffusion/extensions/freeu.py
+invokeai/backend/stable_diffusion/extensions/inpaint.py
+invokeai/backend/stable_diffusion/extensions/inpaint_model.py
+invokeai/backend/stable_diffusion/extensions/lora.py
 invokeai/backend/stable_diffusion/extensions/preview.py
 invokeai/backend/stable_diffusion/extensions/rescale_cfg.py
+invokeai/backend/stable_diffusion/extensions/seamless.py
+invokeai/backend/stable_diffusion/extensions/t2i_adapter.py
 invokeai/backend/stable_diffusion/schedulers/__init__.py
 invokeai/backend/stable_diffusion/schedulers/schedulers.py
 invokeai/backend/tiles/__init__.py
@@ -319,6 +358,7 @@ invokeai/backend/util/hotfixes.py
 invokeai/backend/util/logging.py
 invokeai/backend/util/mask.py
 invokeai/backend/util/mps_fixes.py
+invokeai/backend/util/original_weights_storage.py
 invokeai/backend/util/silence_warnings.py
 invokeai/backend/util/test_utils.py
 invokeai/backend/util/util.py
@@ -345,18 +385,18 @@ invokeai/frontend/install/__init__.py
 invokeai/frontend/install/import_images.py
 invokeai/frontend/web/__init__.py
 invokeai/frontend/web/dist/index.html
+invokeai/frontend/web/dist/assets/App-CWIiEcee.js
 invokeai/frontend/web/dist/assets/App-DEu4J2pT.css
-invokeai/frontend/web/dist/assets/App-eRckIUzO.js
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-DzjsLZSc.css
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-KWOypeWr.js
-invokeai/frontend/web/dist/assets/index-Cg0nXI8H.js
-invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-DIEz8p5i.woff2
-invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-BmJJXa8e.woff2
-invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal-D5AYLNiq.woff2
-invokeai/frontend/web/dist/assets/inter-greek-wght-normal-DyIDNIyN.woff2
-invokeai/frontend/web/dist/assets/inter-latin-ext-wght-normal-CN1pIXkb.woff2
-invokeai/frontend/web/dist/assets/inter-latin-wght-normal-BgVq2Tq4.woff2
-invokeai/frontend/web/dist/assets/inter-vietnamese-wght-normal-_GQuwPVU.woff2
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-B2NxUfIp.css
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-BA4F4U51.js
+invokeai/frontend/web/dist/assets/index-CnfsQw4G.js
+invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-B2xhLi22.woff2
+invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-CMZtQduZ.woff2
+invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal-CGAr0uHJ.woff2
+invokeai/frontend/web/dist/assets/inter-greek-wght-normal-CaVNZxsx.woff2
+invokeai/frontend/web/dist/assets/inter-latin-ext-wght-normal-CFHvXkgd.woff2
+invokeai/frontend/web/dist/assets/inter-latin-wght-normal-C2S99t-D.woff2
+invokeai/frontend/web/dist/assets/inter-vietnamese-wght-normal-CBcvBZtf.woff2
 invokeai/frontend/web/dist/assets/images/invoke-alert-favicon.svg
 invokeai/frontend/web/dist/assets/images/invoke-avatar-circle.svg
 invokeai/frontend/web/dist/assets/images/invoke-avatar-square.svg

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/InvokeAI.egg-info/requires.txt

@@ -35,7 +35,7 @@ dynamicprompts
 easing-functions
 einops
 facexlib
-matplotlib
+matplotlib!=3.9.1
 npyscreen
 omegaconf
 picklescan
@@ -50,7 +50,6 @@ requests~=2.28.2
 rich~=13.3
 scikit-image~=0.21.0
 semver~=3.0.1
-send2trash
 test-tube~=0.7.5
 
 [:sys_platform == "win32"]

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 4.2.7rc1
+Version: 4.2.8
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/invokeai/app/api/dependencies.py

@@ -1,5 +1,6 @@
 # Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
 
+import asyncio
 from logging import Logger
 
 import torch
@@ -31,6 +32,8 @@ from invokeai.app.services.session_processor.session_processor_default import (
 )
 from invokeai.app.services.session_queue.session_queue_sqlite import SqliteSessionQueue
 from invokeai.app.services.shared.sqlite.sqlite_util import init_db
+from invokeai.app.services.style_preset_images.style_preset_images_disk import StylePresetImageFileStorageDisk
+from invokeai.app.services.style_preset_records.style_preset_records_sqlite import SqliteStylePresetRecordsStorage
 from invokeai.app.services.urls.urls_default import LocalUrlService
 from invokeai.app.services.workflow_records.workflow_records_sqlite import SqliteWorkflowRecordsStorage
 from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningFieldData
@@ -63,7 +66,12 @@ class ApiDependencies:
     invoker: Invoker
 
     @staticmethod
-    def initialize(config: InvokeAIAppConfig, event_handler_id: int, logger: Logger = logger) -> None:
+    def initialize(
+        config: InvokeAIAppConfig,
+        event_handler_id: int,
+        loop: asyncio.AbstractEventLoop,
+        logger: Logger = logger,
+    ) -> None:
         logger.info(f"InvokeAI version {__version__}")
         logger.info(f"Root directory = {str(config.root_path)}")
 
@@ -74,6 +82,7 @@ class ApiDependencies:
         image_files = DiskImageFileStorage(f"{output_folder}/images")
 
         model_images_folder = config.models_path
+        style_presets_folder = config.style_presets_path
 
         db = init_db(config=config, logger=logger, image_files=image_files)
 
@@ -84,7 +93,7 @@ class ApiDependencies:
         board_images = BoardImagesService()
         board_records = SqliteBoardRecordStorage(db=db)
         boards = BoardService()
-        events = FastAPIEventService(event_handler_id)
+        events = FastAPIEventService(event_handler_id, loop=loop)
         bulk_download = BulkDownloadService()
         image_records = SqliteImageRecordStorage(db=db)
         images = ImageService()
@@ -109,6 +118,8 @@ class ApiDependencies:
         session_queue = SqliteSessionQueue(db=db)
         urls = LocalUrlService()
         workflow_records = SqliteWorkflowRecordsStorage(db=db)
+        style_preset_records = SqliteStylePresetRecordsStorage(db=db)
+        style_preset_image_files = StylePresetImageFileStorageDisk(style_presets_folder / "images")
 
         services = InvocationServices(
             board_image_records=board_image_records,
@@ -134,6 +145,8 @@ class ApiDependencies:
             workflow_records=workflow_records,
             tensors=tensors,
             conditioning=conditioning,
+            style_preset_records=style_preset_records,
+            style_preset_image_files=style_preset_image_files,
         )
 
         ApiDependencies.invoker = Invoker(services)

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/invokeai/app/api/routers/images.py

@@ -218,9 +218,8 @@ async def get_image_workflow(
         raise HTTPException(status_code=404)
 
 
-@images_router.api_route(
+@images_router.get(
     "/i/{image_name}/full",
-    methods=["GET", "HEAD"],
     operation_id="get_image_full",
     response_class=Response,
     responses={
@@ -231,6 +230,18 @@ async def get_image_workflow(
         404: {"description": "Image not found"},
     },
 )
+@images_router.head(
+    "/i/{image_name}/full",
+    operation_id="get_image_full_head",
+    response_class=Response,
+    responses={
+        200: {
+            "description": "Return the full-resolution image",
+            "content": {"image/png": {}},
+        },
+        404: {"description": "Image not found"},
+    },
+)
 async def get_image_full(
     image_name: str = Path(description="The name of full-resolution image file to get"),
 ) -> Response:
@@ -242,6 +253,7 @@ async def get_image_full(
             content = f.read()
         response = Response(content, media_type="image/png")
         response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
+        response.headers["Content-Disposition"] = f'inline; filename="{image_name}"'
         return response
     except Exception:
         raise HTTPException(status_code=404)

InvokeAI-4.2.8/invokeai/app/api/routers/style_presets.py

@@ -0,0 +1,274 @@
+import csv
+import io
+import json
+import traceback
+from typing import Optional
+
+import pydantic
+from fastapi import APIRouter, File, Form, HTTPException, Path, Response, UploadFile
+from fastapi.responses import FileResponse
+from PIL import Image
+from pydantic import BaseModel, Field
+
+from invokeai.app.api.dependencies import ApiDependencies
+from invokeai.app.api.routers.model_manager import IMAGE_MAX_AGE
+from invokeai.app.services.style_preset_images.style_preset_images_common import StylePresetImageFileNotFoundException
+from invokeai.app.services.style_preset_records.style_preset_records_common import (
+    InvalidPresetImportDataError,
+    PresetData,
+    PresetType,
+    StylePresetChanges,
+    StylePresetNotFoundError,
+    StylePresetRecordWithImage,
+    StylePresetWithoutId,
+    UnsupportedFileTypeError,
+    parse_presets_from_file,
+)
+
+
+class StylePresetFormData(BaseModel):
+    name: str = Field(description="Preset name")
+    positive_prompt: str = Field(description="Positive prompt")
+    negative_prompt: str = Field(description="Negative prompt")
+    type: PresetType = Field(description="Preset type")
+
+
+style_presets_router = APIRouter(prefix="/v1/style_presets", tags=["style_presets"])
+
+
+@style_presets_router.get(
+    "/i/{style_preset_id}",
+    operation_id="get_style_preset",
+    responses={
+        200: {"model": StylePresetRecordWithImage},
+    },
+)
+async def get_style_preset(
+    style_preset_id: str = Path(description="The style preset to get"),
+) -> StylePresetRecordWithImage:
+    """Gets a style preset"""
+    try:
+        image = ApiDependencies.invoker.services.style_preset_image_files.get_url(style_preset_id)
+        style_preset = ApiDependencies.invoker.services.style_preset_records.get(style_preset_id)
+        return StylePresetRecordWithImage(image=image, **style_preset.model_dump())
+    except StylePresetNotFoundError:
+        raise HTTPException(status_code=404, detail="Style preset not found")
+
+
+@style_presets_router.patch(
+    "/i/{style_preset_id}",
+    operation_id="update_style_preset",
+    responses={
+        200: {"model": StylePresetRecordWithImage},
+    },
+)
+async def update_style_preset(
+    image: Optional[UploadFile] = File(description="The image file to upload", default=None),
+    style_preset_id: str = Path(description="The id of the style preset to update"),
+    data: str = Form(description="The data of the style preset to update"),
+) -> StylePresetRecordWithImage:
+    """Updates a style preset"""
+    if image is not None:
+        if not image.content_type or not image.content_type.startswith("image"):
+            raise HTTPException(status_code=415, detail="Not an image")
+
+        contents = await image.read()
+        try:
+            pil_image = Image.open(io.BytesIO(contents))
+
+        except Exception:
+            ApiDependencies.invoker.services.logger.error(traceback.format_exc())
+            raise HTTPException(status_code=415, detail="Failed to read image")
+
+        try:
+            ApiDependencies.invoker.services.style_preset_image_files.save(style_preset_id, pil_image)
+        except ValueError as e:
+            raise HTTPException(status_code=409, detail=str(e))
+    else:
+        try:
+            ApiDependencies.invoker.services.style_preset_image_files.delete(style_preset_id)
+        except StylePresetImageFileNotFoundException:
+            pass
+
+    try:
+        parsed_data = json.loads(data)
+        validated_data = StylePresetFormData(**parsed_data)
+
+        name = validated_data.name
+        type = validated_data.type
+        positive_prompt = validated_data.positive_prompt
+        negative_prompt = validated_data.negative_prompt
+
+    except pydantic.ValidationError:
+        raise HTTPException(status_code=400, detail="Invalid preset data")
+
+    preset_data = PresetData(positive_prompt=positive_prompt, negative_prompt=negative_prompt)
+    changes = StylePresetChanges(name=name, preset_data=preset_data, type=type)
+
+    style_preset_image = ApiDependencies.invoker.services.style_preset_image_files.get_url(style_preset_id)
+    style_preset = ApiDependencies.invoker.services.style_preset_records.update(
+        style_preset_id=style_preset_id, changes=changes
+    )
+    return StylePresetRecordWithImage(image=style_preset_image, **style_preset.model_dump())
+
+
+@style_presets_router.delete(
+    "/i/{style_preset_id}",
+    operation_id="delete_style_preset",
+)
+async def delete_style_preset(
+    style_preset_id: str = Path(description="The style preset to delete"),
+) -> None:
+    """Deletes a style preset"""
+    try:
+        ApiDependencies.invoker.services.style_preset_image_files.delete(style_preset_id)
+    except StylePresetImageFileNotFoundException:
+        pass
+
+    ApiDependencies.invoker.services.style_preset_records.delete(style_preset_id)
+
+
+@style_presets_router.post(
+    "/",
+    operation_id="create_style_preset",
+    responses={
+        200: {"model": StylePresetRecordWithImage},
+    },
+)
+async def create_style_preset(
+    image: Optional[UploadFile] = File(description="The image file to upload", default=None),
+    data: str = Form(description="The data of the style preset to create"),
+) -> StylePresetRecordWithImage:
+    """Creates a style preset"""
+
+    try:
+        parsed_data = json.loads(data)
+        validated_data = StylePresetFormData(**parsed_data)
+
+        name = validated_data.name
+        type = validated_data.type
+        positive_prompt = validated_data.positive_prompt
+        negative_prompt = validated_data.negative_prompt
+
+    except pydantic.ValidationError:
+        raise HTTPException(status_code=400, detail="Invalid preset data")
+
+    preset_data = PresetData(positive_prompt=positive_prompt, negative_prompt=negative_prompt)
+    style_preset = StylePresetWithoutId(name=name, preset_data=preset_data, type=type)
+    new_style_preset = ApiDependencies.invoker.services.style_preset_records.create(style_preset=style_preset)
+
+    if image is not None:
+        if not image.content_type or not image.content_type.startswith("image"):
+            raise HTTPException(status_code=415, detail="Not an image")
+
+        contents = await image.read()
+        try:
+            pil_image = Image.open(io.BytesIO(contents))
+
+        except Exception:
+            ApiDependencies.invoker.services.logger.error(traceback.format_exc())
+            raise HTTPException(status_code=415, detail="Failed to read image")
+
+        try:
+            ApiDependencies.invoker.services.style_preset_image_files.save(new_style_preset.id, pil_image)
+        except ValueError as e:
+            raise HTTPException(status_code=409, detail=str(e))
+
+    preset_image = ApiDependencies.invoker.services.style_preset_image_files.get_url(new_style_preset.id)
+    return StylePresetRecordWithImage(image=preset_image, **new_style_preset.model_dump())
+
+
+@style_presets_router.get(
+    "/",
+    operation_id="list_style_presets",
+    responses={
+        200: {"model": list[StylePresetRecordWithImage]},
+    },
+)
+async def list_style_presets() -> list[StylePresetRecordWithImage]:
+    """Gets a page of style presets"""
+    style_presets_with_image: list[StylePresetRecordWithImage] = []
+    style_presets = ApiDependencies.invoker.services.style_preset_records.get_many()
+    for preset in style_presets:
+        image = ApiDependencies.invoker.services.style_preset_image_files.get_url(preset.id)
+        style_preset_with_image = StylePresetRecordWithImage(image=image, **preset.model_dump())
+        style_presets_with_image.append(style_preset_with_image)
+
+    return style_presets_with_image
+
+
+@style_presets_router.get(
+    "/i/{style_preset_id}/image",
+    operation_id="get_style_preset_image",
+    responses={
+        200: {
+            "description": "The style preset image was fetched successfully",
+        },
+        400: {"description": "Bad request"},
+        404: {"description": "The style preset image could not be found"},
+    },
+    status_code=200,
+)
+async def get_style_preset_image(
+    style_preset_id: str = Path(description="The id of the style preset image to get"),
+) -> FileResponse:
+    """Gets an image file that previews the model"""
+
+    try:
+        path = ApiDependencies.invoker.services.style_preset_image_files.get_path(style_preset_id)
+
+        response = FileResponse(
+            path,
+            media_type="image/png",
+            filename=style_preset_id + ".png",
+            content_disposition_type="inline",
+        )
+        response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
+        return response
+    except Exception:
+        raise HTTPException(status_code=404)
+
+
+@style_presets_router.get(
+    "/export",
+    operation_id="export_style_presets",
+    responses={200: {"content": {"text/csv": {}}, "description": "A CSV file with the requested data."}},
+    status_code=200,
+)
+async def export_style_presets():
+    # Create an in-memory stream to store the CSV data
+    output = io.StringIO()
+    writer = csv.writer(output)
+
+    # Write the header
+    writer.writerow(["name", "prompt", "negative_prompt"])
+
+    style_presets = ApiDependencies.invoker.services.style_preset_records.get_many(type=PresetType.User)
+
+    for preset in style_presets:
+        writer.writerow([preset.name, preset.preset_data.positive_prompt, preset.preset_data.negative_prompt])
+
+    csv_data = output.getvalue()
+    output.close()
+
+    return Response(
+        content=csv_data,
+        media_type="text/csv",
+        headers={"Content-Disposition": "attachment; filename=prompt_templates.csv"},
+    )
+
+
+@style_presets_router.post(
+    "/import",
+    operation_id="import_style_presets",
+)
+async def import_style_presets(file: UploadFile = File(description="The file to import")):
+    try:
+        style_presets = await parse_presets_from_file(file)
+        ApiDependencies.invoker.services.style_preset_records.create_many(style_presets)
+    except InvalidPresetImportDataError as e:
+        ApiDependencies.invoker.services.logger.error(traceback.format_exc())
+        raise HTTPException(status_code=400, detail=str(e))
+    except UnsupportedFileTypeError as e:
+        ApiDependencies.invoker.services.logger.error(traceback.format_exc())
+        raise HTTPException(status_code=415, detail=str(e))

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/invokeai/app/api_app.py

@@ -30,6 +30,7 @@ from invokeai.app.api.routers import (
     images,
     model_manager,
     session_queue,
+    style_presets,
     utilities,
     workflows,
 )
@@ -55,11 +56,13 @@ mimetypes.add_type("text/css", ".css")
 torch_device_name = TorchDevice.get_torch_device_name()
 logger.info(f"Using torch device: {torch_device_name}")
 
+loop = asyncio.new_event_loop()
+
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     # Add startup event to load dependencies
-    ApiDependencies.initialize(config=app_config, event_handler_id=event_handler_id, logger=logger)
+    ApiDependencies.initialize(config=app_config, event_handler_id=event_handler_id, loop=loop, logger=logger)
     yield
     # Shut down threads
     ApiDependencies.shutdown()
@@ -106,6 +109,7 @@ 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")
+app.include_router(style_presets.style_presets_router, prefix="/api")
 
 app.openapi = get_openapi_func(app)
 
@@ -184,8 +188,6 @@ def invoke_api() -> None:
 
     check_cudnn(logger)
 
-    # Start our own event loop for eventing usage
-    loop = asyncio.new_event_loop()
     config = uvicorn.Config(
         app=app,
         host=app_config.host,

{InvokeAI-4.2.7rc1 → InvokeAI-4.2.8}/invokeai/app/invocations/compel.py

@@ -80,12 +80,12 @@ class CompelInvocation(BaseInvocation):
 
         with (
             # apply all patches while the model is on the target device
-            text_encoder_info.model_on_device() as (model_state_dict, text_encoder),
+            text_encoder_info.model_on_device() as (cached_weights, text_encoder),
             tokenizer_info as tokenizer,
             ModelPatcher.apply_lora_text_encoder(
                 text_encoder,
                 loras=_lora_loader(),
-                model_state_dict=model_state_dict,
+                cached_weights=cached_weights,
             ),
             # Apply CLIP Skip after LoRA to prevent LoRA application from failing on skipped layers.
             ModelPatcher.apply_clip_skip(text_encoder, self.clip.skipped_layers),
@@ -175,13 +175,13 @@ class SDXLPromptInvocationBase:
 
         with (
             # apply all patches while the model is on the target device
-            text_encoder_info.model_on_device() as (state_dict, text_encoder),
+            text_encoder_info.model_on_device() as (cached_weights, text_encoder),
             tokenizer_info as tokenizer,
             ModelPatcher.apply_lora(
                 text_encoder,
                 loras=_lora_loader(),
                 prefix=lora_prefix,
-                model_state_dict=state_dict,
+                cached_weights=cached_weights,
             ),
             # Apply CLIP Skip after LoRA to prevent LoRA application from failing on skipped layers.
             ModelPatcher.apply_clip_skip(text_encoder, clip_field.skipped_layers),