mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
5f498e10bd
* feat(ui): add axios client generator and simple example * fix(ui): update client & nodes test code w/ new Edge type * chore(ui): organize generated files * chore(ui): update .eslintignore, .prettierignore * chore(ui): update openapi.json * feat(backend): fixes for nodes/generator * feat(ui): generate object args for api client * feat(ui): more nodes api prototyping * feat(ui): nodes cancel * chore(ui): regenerate api client * fix(ui): disable OG web server socket connection * fix(ui): fix scrollbar styles typing and prop just noticed the typo, and made the types stronger. * feat(ui): add socketio types * feat(ui): wip nodes - extract api client method arg types instead of manually declaring them - update example to display images - general tidy up * start building out node translations from frontend state and add notes about missing features * use reference to sampler_name * use reference to sampler_name * add optional apiUrl prop * feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation * feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node * feat(ui): img2img implementation * feat(ui): get intermediate images working but types are stubbed out * chore(ui): add support for package mode * feat(ui): add nodes mode script * feat(ui): handle random seeds * fix(ui): fix middleware types * feat(ui): add rtk action type guard * feat(ui): disable NodeAPITest This was polluting the network/socket logs. * feat(ui): fix parameters panel border color This commit should be elsewhere but I don't want to break my flow * feat(ui): make thunk types more consistent * feat(ui): add type guards for outputs * feat(ui): load images on socket connect Rudimentary * chore(ui): bump redux-toolkit * docs(ui): update readme * chore(ui): regenerate api client * chore(ui): add typescript as dev dependency I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue. * feat(ui): begin migrating gallery to nodes Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way. * feat(ui): clean up & comment results slice * fix(ui): separate thunk for initial gallery load so it properly gets index 0 * feat(ui): POST upload working * fix(ui): restore removed type * feat(ui): patch api generation for headers access * chore(ui): regenerate api * feat(ui): wip gallery migration * feat(ui): wip gallery migration * chore(ui): regenerate api * feat(ui): wip refactor socket events * feat(ui): disable panels based on app props * feat(ui): invert logic to be disabled * disable panels when app mounts * feat(ui): add support to disableTabs * docs(ui): organise and update docs * lang(ui): add toast strings * feat(ui): wip events, comments, and general refactoring * feat(ui): add optional token for auth * feat(ui): export StatusIndicator and ModelSelect for header use * feat(ui) working on making socket URL dynamic * feat(ui): dynamic middleware loading * feat(ui): prep for socket jwt * feat(ui): migrate cancelation also updated action names to be event-like instead of declaration-like sorry, i was scattered and this commit has a lot of unrelated stuff in it. * fix(ui): fix img2img type * chore(ui): regenerate api client * feat(ui): improve InvocationCompleteEvent types * feat(ui): increase StatusIndicator font size * fix(ui): fix middleware order for multi-node graphs * feat(ui): add exampleGraphs object w/ iterations example * feat(ui): generate iterations graph * feat(ui): update ModelSelect for nodes API * feat(ui): add hi-res functionality for txt2img generations * feat(ui): "subscribe" to particular nodes feels like a dirty hack but oh well it works * feat(ui): first steps to node editor ui * fix(ui): disable event subscription it is not fully baked just yet * feat(ui): wip node editor * feat(ui): remove extraneous field types * feat(ui): nodes before deleting stuff * feat(ui): cleanup nodes ui stuff * feat(ui): hook up nodes to redux * fix(ui): fix handle * fix(ui): add basic node edges & connection validation * feat(ui): add connection validation styling * feat(ui): increase edge width * feat(ui): it blends * feat(ui): wip model handling and graph topology validation * feat(ui): validation connections w/ graphlib * docs(ui): update nodes doc * feat(ui): wip node editor * chore(ui): rebuild api, update types * add redux-dynamic-middlewares as a dependency * feat(ui): add url host transformation * feat(ui): handle already-connected fields * feat(ui): rewrite SqliteItemStore in sqlalchemy * fix(ui): fix sqlalchemy dynamic model instantiation * feat(ui, nodes): metadata wip * feat(ui, nodes): models * feat(ui, nodes): more metadata wip * feat(ui): wip range/iterate * fix(nodes): fix sqlite typing * feat(ui): export new type for invoke component * tests(nodes): fix test instantiation of ImageField * feat(nodes): fix LoadImageInvocation * feat(nodes): add `title` ui hint * feat(nodes): make ImageField attrs optional * feat(ui): wip nodes etc * feat(nodes): roll back sqlalchemy * fix(nodes): partially address feedback * fix(backend): roll back changes to pngwriter * feat(nodes): wip address metadata feedback * feat(nodes): add seeded rng to RandomRange * feat(nodes): address feedback * feat(nodes): move GET images error handling to DiskImageStorage * feat(nodes): move GET images error handling to DiskImageStorage * fix(nodes): fix image output schema customization * feat(ui): img2img/txt2img -> linear - remove txt2img and img2img tabs - add linear tab - add initial image selection to linear parameters accordion * feat(ui): tidy graph builders * feat(ui): tidy misc * feat(ui): improve invocation union types * feat(ui): wip metadata viewer recall * feat(ui): move fonts to normal deps * feat(nodes): fix broken upload * feat(nodes): add metadata module + tests, thumbnails - `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service` - Handles loading/parsing/building metadata, and creating png info objects - added tests for MetadataModule - Lifted thumbnail stuff to util * fix(nodes): revert change to RandomRangeInvocation * feat(nodes): address feedback - make metadata a service - rip out pydantic validation, implement metadata parsing as simple functions - update tests - address other minor feedback items * fix(nodes): fix other tests * fix(nodes): add metadata service to cli * fix(nodes): fix latents/image field parsing * feat(nodes): customise LatentsField schema * feat(nodes): move metadata parsing to frontend * fix(nodes): fix metadata test --------- Co-authored-by: maryhipp <maryhipp@gmail.com> Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
239 lines
8.3 KiB
Python
239 lines
8.3 KiB
Python
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
|
|
|
|
import os
|
|
from glob import glob
|
|
from abc import ABC, abstractmethod
|
|
from pathlib import Path
|
|
from queue import Queue
|
|
from typing import Dict, List, Tuple
|
|
|
|
from PIL.Image import Image
|
|
import PIL.Image as PILImage
|
|
from invokeai.app.api.models.images import ImageResponse, ImageResponseMetadata
|
|
from invokeai.app.models.image import ImageType
|
|
from invokeai.app.services.metadata import (
|
|
InvokeAIMetadata,
|
|
MetadataServiceBase,
|
|
build_invokeai_metadata_pnginfo,
|
|
)
|
|
from invokeai.app.services.item_storage import PaginatedResults
|
|
from invokeai.app.util.misc import get_timestamp
|
|
from invokeai.app.util.thumbnails import get_thumbnail_name, make_thumbnail
|
|
|
|
|
|
class ImageStorageBase(ABC):
|
|
"""Responsible for storing and retrieving images."""
|
|
|
|
@abstractmethod
|
|
def get(self, image_type: ImageType, image_name: str) -> Image:
|
|
"""Retrieves an image as PIL Image."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def list(
|
|
self, image_type: ImageType, page: int = 0, per_page: int = 10
|
|
) -> PaginatedResults[ImageResponse]:
|
|
"""Gets a paginated list of images."""
|
|
pass
|
|
|
|
# TODO: make this a bit more flexible for e.g. cloud storage
|
|
@abstractmethod
|
|
def get_path(
|
|
self, image_type: ImageType, image_name: str, is_thumbnail: bool = False
|
|
) -> str:
|
|
"""Gets the path to an image or its thumbnail."""
|
|
pass
|
|
|
|
# TODO: make this a bit more flexible for e.g. cloud storage
|
|
@abstractmethod
|
|
def validate_path(self, path: str) -> bool:
|
|
"""Validates an image path."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def save(
|
|
self,
|
|
image_type: ImageType,
|
|
image_name: str,
|
|
image: Image,
|
|
metadata: InvokeAIMetadata | None = None,
|
|
) -> Tuple[str, str, int]:
|
|
"""Saves an image and a 256x256 WEBP thumbnail. Returns a tuple of the image path, thumbnail path, and created timestamp."""
|
|
pass
|
|
|
|
@abstractmethod
|
|
def delete(self, image_type: ImageType, image_name: str) -> None:
|
|
"""Deletes an image and its thumbnail (if one exists)."""
|
|
pass
|
|
|
|
def create_name(self, context_id: str, node_id: str) -> str:
|
|
"""Creates a unique contextual image filename."""
|
|
return f"{context_id}_{node_id}_{str(get_timestamp())}.png"
|
|
|
|
|
|
class DiskImageStorage(ImageStorageBase):
|
|
"""Stores images on disk"""
|
|
|
|
__output_folder: str
|
|
__cache_ids: Queue # TODO: this is an incredibly naive cache
|
|
__cache: Dict[str, Image]
|
|
__max_cache_size: int
|
|
__metadata_service: MetadataServiceBase
|
|
|
|
def __init__(self, output_folder: str, metadata_service: MetadataServiceBase):
|
|
self.__output_folder = output_folder
|
|
self.__cache = dict()
|
|
self.__cache_ids = Queue()
|
|
self.__max_cache_size = 10 # TODO: get this from config
|
|
self.__metadata_service = metadata_service
|
|
|
|
Path(output_folder).mkdir(parents=True, exist_ok=True)
|
|
|
|
# TODO: don't hard-code. get/save/delete should maybe take subpath?
|
|
for image_type in ImageType:
|
|
Path(os.path.join(output_folder, image_type)).mkdir(
|
|
parents=True, exist_ok=True
|
|
)
|
|
Path(os.path.join(output_folder, image_type, "thumbnails")).mkdir(
|
|
parents=True, exist_ok=True
|
|
)
|
|
|
|
def list(
|
|
self, image_type: ImageType, page: int = 0, per_page: int = 10
|
|
) -> PaginatedResults[ImageResponse]:
|
|
dir_path = os.path.join(self.__output_folder, image_type)
|
|
image_paths = glob(f"{dir_path}/*.png")
|
|
count = len(image_paths)
|
|
|
|
sorted_image_paths = sorted(
|
|
glob(f"{dir_path}/*.png"), key=os.path.getctime, reverse=True
|
|
)
|
|
|
|
page_of_image_paths = sorted_image_paths[
|
|
page * per_page : (page + 1) * per_page
|
|
]
|
|
|
|
page_of_images: List[ImageResponse] = []
|
|
|
|
for path in page_of_image_paths:
|
|
filename = os.path.basename(path)
|
|
img = PILImage.open(path)
|
|
|
|
invokeai_metadata = self.__metadata_service.get_metadata(img)
|
|
|
|
page_of_images.append(
|
|
ImageResponse(
|
|
image_type=image_type.value,
|
|
image_name=filename,
|
|
# TODO: DiskImageStorage should not be building URLs...?
|
|
image_url=f"api/v1/images/{image_type.value}/{filename}",
|
|
thumbnail_url=f"api/v1/images/{image_type.value}/thumbnails/{os.path.splitext(filename)[0]}.webp",
|
|
# TODO: Creation of this object should happen elsewhere (?), just making it fit here so it works
|
|
metadata=ImageResponseMetadata(
|
|
created=int(os.path.getctime(path)),
|
|
width=img.width,
|
|
height=img.height,
|
|
invokeai=invokeai_metadata,
|
|
),
|
|
)
|
|
)
|
|
|
|
page_count_trunc = int(count / per_page)
|
|
page_count_mod = count % per_page
|
|
page_count = page_count_trunc if page_count_mod == 0 else page_count_trunc + 1
|
|
|
|
return PaginatedResults[ImageResponse](
|
|
items=page_of_images,
|
|
page=page,
|
|
pages=page_count,
|
|
per_page=per_page,
|
|
total=count,
|
|
)
|
|
|
|
def get(self, image_type: ImageType, image_name: str) -> Image:
|
|
image_path = self.get_path(image_type, image_name)
|
|
cache_item = self.__get_cache(image_path)
|
|
if cache_item:
|
|
return cache_item
|
|
|
|
image = PILImage.open(image_path)
|
|
self.__set_cache(image_path, image)
|
|
return image
|
|
|
|
# TODO: make this a bit more flexible for e.g. cloud storage
|
|
def get_path(
|
|
self, image_type: ImageType, image_name: str, is_thumbnail: bool = False
|
|
) -> str:
|
|
# strip out any relative path shenanigans
|
|
basename = os.path.basename(image_name)
|
|
|
|
if is_thumbnail:
|
|
path = os.path.join(
|
|
self.__output_folder, image_type, "thumbnails", basename
|
|
)
|
|
else:
|
|
path = os.path.join(self.__output_folder, image_type, basename)
|
|
|
|
return path
|
|
|
|
def validate_path(self, path: str) -> bool:
|
|
try:
|
|
os.stat(path)
|
|
return True
|
|
except Exception:
|
|
return False
|
|
|
|
def save(
|
|
self,
|
|
image_type: ImageType,
|
|
image_name: str,
|
|
image: Image,
|
|
metadata: InvokeAIMetadata | None = None,
|
|
) -> Tuple[str, str, int]:
|
|
image_path = self.get_path(image_type, image_name)
|
|
|
|
# TODO: Reading the image and then saving it strips the metadata...
|
|
if metadata:
|
|
pnginfo = build_invokeai_metadata_pnginfo(metadata=metadata)
|
|
image.save(image_path, "PNG", pnginfo=pnginfo)
|
|
else:
|
|
image.save(image_path) # this saved image has an empty info
|
|
|
|
thumbnail_name = get_thumbnail_name(image_name)
|
|
thumbnail_path = self.get_path(image_type, thumbnail_name, is_thumbnail=True)
|
|
thumbnail_image = make_thumbnail(image)
|
|
thumbnail_image.save(thumbnail_path)
|
|
|
|
self.__set_cache(image_path, image)
|
|
self.__set_cache(thumbnail_path, thumbnail_image)
|
|
|
|
return (image_path, thumbnail_path, int(os.path.getctime(image_path)))
|
|
|
|
def delete(self, image_type: ImageType, image_name: str) -> None:
|
|
image_path = self.get_path(image_type, image_name)
|
|
thumbnail_path = self.get_path(image_type, image_name, True)
|
|
if os.path.exists(image_path):
|
|
os.remove(image_path)
|
|
|
|
if image_path in self.__cache:
|
|
del self.__cache[image_path]
|
|
|
|
if os.path.exists(thumbnail_path):
|
|
os.remove(thumbnail_path)
|
|
|
|
if thumbnail_path in self.__cache:
|
|
del self.__cache[thumbnail_path]
|
|
|
|
def __get_cache(self, image_name: str) -> Image:
|
|
return None if image_name not in self.__cache else self.__cache[image_name]
|
|
|
|
def __set_cache(self, image_name: str, image: Image):
|
|
if not image_name in self.__cache:
|
|
self.__cache[image_name] = image
|
|
self.__cache_ids.put(
|
|
image_name
|
|
) # TODO: this should refresh position for LRU cache
|
|
if len(self.__cache) > self.__max_cache_size:
|
|
cache_id = self.__cache_ids.get()
|
|
del self.__cache[cache_id]
|