2023-07-15 15:06:50 +00:00
|
|
|
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654) & the InvokeAI Team
|
2023-07-17 11:00:22 +00:00
|
|
|
from pathlib import Path
|
2023-08-17 22:45:25 +00:00
|
|
|
from typing import Literal
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-07-15 15:06:50 +00:00
|
|
|
import cv2 as cv
|
|
|
|
import numpy as np
|
|
|
|
from basicsr.archs.rrdbnet_arch import RRDBNet
|
|
|
|
from PIL import Image
|
|
|
|
from realesrgan import RealESRGANer
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-08-18 14:57:18 +00:00
|
|
|
from invokeai.app.invocations.primitives import ImageField, ImageOutput
|
2023-08-14 09:41:29 +00:00
|
|
|
from invokeai.app.models.image import ImageCategory, ResourceOrigin
|
2022-12-01 05:33:20 +00:00
|
|
|
|
feat(nodes): move all invocation metadata (type, title, tags, category) to decorator
All invocation metadata (type, title, tags and category) are now defined in decorators.
The decorators add the `type: Literal["invocation_type"]: "invocation_type"` field to the invocation.
Category is a new invocation metadata, but it is not used by the frontend just yet.
- `@invocation()` decorator for invocations
```py
@invocation(
"sdxl_compel_prompt",
title="SDXL Prompt",
tags=["sdxl", "compel", "prompt"],
category="conditioning",
)
class SDXLCompelPromptInvocation(BaseInvocation, SDXLPromptInvocationBase):
...
```
- `@invocation_output()` decorator for invocation outputs
```py
@invocation_output("clip_skip_output")
class ClipSkipInvocationOutput(BaseInvocationOutput):
...
```
- update invocation docs
- add category to decorator
- regen frontend types
2023-08-30 08:35:12 +00:00
|
|
|
from .baseinvocation import BaseInvocation, InputField, InvocationContext, invocation
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-07-15 15:06:50 +00:00
|
|
|
# TODO: Populate this from disk?
|
|
|
|
# TODO: Use model manager to load?
|
2023-07-17 11:00:22 +00:00
|
|
|
ESRGAN_MODELS = Literal[
|
2023-07-15 15:06:50 +00:00
|
|
|
"RealESRGAN_x4plus.pth",
|
|
|
|
"RealESRGAN_x4plus_anime_6B.pth",
|
|
|
|
"ESRGAN_SRx4_DF2KOST_official-ff704c30.pth",
|
2023-07-17 11:00:22 +00:00
|
|
|
"RealESRGAN_x2plus.pth",
|
2023-07-15 15:06:50 +00:00
|
|
|
]
|
2023-05-24 05:50:55 +00:00
|
|
|
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-10-04 00:36:09 +00:00
|
|
|
@invocation("esrgan", title="Upscale (RealESRGAN)", tags=["esrgan", "upscale"], category="esrgan", version="1.0.1")
|
2023-07-17 11:00:22 +00:00
|
|
|
class ESRGANInvocation(BaseInvocation):
|
2023-07-15 15:06:50 +00:00
|
|
|
"""Upscales an image using RealESRGAN."""
|
2023-04-10 09:07:48 +00:00
|
|
|
|
2023-08-14 03:23:09 +00:00
|
|
|
image: ImageField = InputField(description="The input image")
|
|
|
|
model_name: ESRGAN_MODELS = InputField(default="RealESRGAN_x4plus.pth", description="The Real-ESRGAN model to use")
|
2023-10-04 01:43:16 +00:00
|
|
|
tile_size: int = InputField(
|
|
|
|
default=512, ge=0, description="Tile size for tiled ESRGAN upscaling (0=tiling disabled)"
|
|
|
|
)
|
2023-07-18 14:26:45 +00:00
|
|
|
|
2022-12-01 05:33:20 +00:00
|
|
|
def invoke(self, context: InvocationContext) -> ImageOutput:
|
2023-07-16 00:54:52 +00:00
|
|
|
image = context.services.images.get_pil_image(self.image.image_name)
|
|
|
|
models_path = context.services.configuration.models_path
|
2023-07-15 15:06:50 +00:00
|
|
|
|
|
|
|
rrdbnet_model = None
|
|
|
|
netscale = None
|
2023-07-16 00:54:52 +00:00
|
|
|
esrgan_model_path = None
|
2023-07-15 15:06:50 +00:00
|
|
|
|
|
|
|
if self.model_name in [
|
|
|
|
"RealESRGAN_x4plus.pth",
|
|
|
|
"ESRGAN_SRx4_DF2KOST_official-ff704c30.pth",
|
|
|
|
]:
|
|
|
|
# x4 RRDBNet model
|
|
|
|
rrdbnet_model = RRDBNet(
|
|
|
|
num_in_ch=3,
|
|
|
|
num_out_ch=3,
|
|
|
|
num_feat=64,
|
|
|
|
num_block=23,
|
|
|
|
num_grow_ch=32,
|
|
|
|
scale=4,
|
|
|
|
)
|
|
|
|
netscale = 4
|
2023-07-16 00:54:52 +00:00
|
|
|
elif self.model_name in ["RealESRGAN_x4plus_anime_6B.pth"]:
|
2023-07-15 15:06:50 +00:00
|
|
|
# x4 RRDBNet model, 6 blocks
|
|
|
|
rrdbnet_model = RRDBNet(
|
|
|
|
num_in_ch=3,
|
|
|
|
num_out_ch=3,
|
|
|
|
num_feat=64,
|
2023-07-16 00:54:52 +00:00
|
|
|
num_block=6, # 6 blocks
|
2023-07-15 15:06:50 +00:00
|
|
|
num_grow_ch=32,
|
|
|
|
scale=4,
|
|
|
|
)
|
|
|
|
netscale = 4
|
2023-07-17 11:00:22 +00:00
|
|
|
elif self.model_name in ["RealESRGAN_x2plus.pth"]:
|
|
|
|
# x2 RRDBNet model
|
|
|
|
rrdbnet_model = RRDBNet(
|
|
|
|
num_in_ch=3,
|
|
|
|
num_out_ch=3,
|
|
|
|
num_feat=64,
|
|
|
|
num_block=23,
|
|
|
|
num_grow_ch=32,
|
|
|
|
scale=2,
|
|
|
|
)
|
|
|
|
netscale = 2
|
2023-07-15 15:06:50 +00:00
|
|
|
else:
|
|
|
|
msg = f"Invalid RealESRGAN model: {self.model_name}"
|
|
|
|
context.services.logger.error(msg)
|
|
|
|
raise ValueError(msg)
|
|
|
|
|
2023-07-16 00:54:52 +00:00
|
|
|
esrgan_model_path = Path(f"core/upscaling/realesrgan/{self.model_name}")
|
2023-07-15 15:06:50 +00:00
|
|
|
|
|
|
|
upsampler = RealESRGANer(
|
|
|
|
scale=netscale,
|
2023-07-16 00:54:52 +00:00
|
|
|
model_path=str(models_path / esrgan_model_path),
|
2023-07-15 15:06:50 +00:00
|
|
|
model=rrdbnet_model,
|
|
|
|
half=False,
|
2023-10-04 00:36:09 +00:00
|
|
|
tile=self.tile_size,
|
2022-12-01 05:33:20 +00:00
|
|
|
)
|
|
|
|
|
2023-07-15 15:06:50 +00:00
|
|
|
# prepare image - Real-ESRGAN uses cv2 internally, and cv2 uses BGR vs RGB for PIL
|
|
|
|
cv_image = cv.cvtColor(np.array(image.convert("RGB")), cv.COLOR_RGB2BGR)
|
|
|
|
|
|
|
|
# We can pass an `outscale` value here, but it just resizes the image by that factor after
|
|
|
|
# upscaling, so it's kinda pointless for our purposes. If you want something other than 4x
|
|
|
|
# upscaling, you'll need to add a resize node after this one.
|
|
|
|
upscaled_image, img_mode = upsampler.enhance(cv_image)
|
|
|
|
|
|
|
|
# back to PIL
|
|
|
|
pil_image = Image.fromarray(cv.cvtColor(upscaled_image, cv.COLOR_BGR2RGB)).convert("RGBA")
|
|
|
|
|
2023-05-24 05:50:55 +00:00
|
|
|
image_dto = context.services.images.create(
|
2023-07-15 15:06:50 +00:00
|
|
|
image=pil_image,
|
2023-05-27 11:39:20 +00:00
|
|
|
image_origin=ResourceOrigin.INTERNAL,
|
2023-05-24 05:50:55 +00:00
|
|
|
image_category=ImageCategory.GENERAL,
|
|
|
|
node_id=self.id,
|
|
|
|
session_id=context.graph_execution_state_id,
|
2023-05-26 01:39:19 +00:00
|
|
|
is_intermediate=self.is_intermediate,
|
2023-08-24 11:42:32 +00:00
|
|
|
workflow=self.workflow,
|
2023-03-03 06:02:00 +00:00
|
|
|
)
|
Partial migration of UI to nodes API (#3195)
* 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>
2023-04-22 03:10:20 +00:00
|
|
|
|
2023-05-24 05:50:55 +00:00
|
|
|
return ImageOutput(
|
2023-06-14 11:40:09 +00:00
|
|
|
image=ImageField(image_name=image_dto.image_name),
|
2023-05-24 05:50:55 +00:00
|
|
|
width=image_dto.width,
|
|
|
|
height=image_dto.height,
|
2022-12-01 05:33:20 +00:00
|
|
|
)
|