2022-12-01 05:33:20 +00:00
|
|
|
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
|
|
|
|
|
|
|
|
from typing import Literal
|
2023-03-03 06:02:00 +00:00
|
|
|
|
|
|
|
import cv2 as cv
|
2022-12-01 05:33:20 +00:00
|
|
|
import numpy
|
|
|
|
from PIL import Image, ImageOps
|
2023-04-10 09:07:48 +00:00
|
|
|
from pydantic import BaseModel, Field
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-05-27 11:39:20 +00:00
|
|
|
from invokeai.app.models.image import ImageCategory, ImageField, ResourceOrigin
|
2023-04-10 22:24:48 +00:00
|
|
|
from .baseinvocation import BaseInvocation, InvocationContext, InvocationConfig
|
2023-05-24 05:50:55 +00:00
|
|
|
from .image import ImageOutput
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
|
2023-04-11 01:50:28 +00:00
|
|
|
class CvInvocationConfig(BaseModel):
|
2023-04-10 09:07:48 +00:00
|
|
|
"""Helper class to provide all OpenCV invocations with additional config"""
|
|
|
|
|
|
|
|
# Schema customisation
|
|
|
|
class Config(InvocationConfig):
|
|
|
|
schema_extra = {
|
|
|
|
"ui": {
|
|
|
|
"tags": ["cv", "image"],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-04-11 01:50:28 +00:00
|
|
|
class CvInpaintInvocation(BaseInvocation, CvInvocationConfig):
|
2022-12-01 05:33:20 +00:00
|
|
|
"""Simple inpaint using opencv."""
|
2023-05-24 05:50:55 +00:00
|
|
|
|
|
|
|
# fmt: off
|
2023-03-03 06:02:00 +00:00
|
|
|
type: Literal["cv_inpaint"] = "cv_inpaint"
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
# Inputs
|
|
|
|
image: ImageField = Field(default=None, description="The image to inpaint")
|
2023-03-03 20:25:08 +00:00
|
|
|
mask: ImageField = Field(default=None, description="The mask to use when inpainting")
|
2023-05-24 05:50:55 +00:00
|
|
|
# fmt: on
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
def invoke(self, context: InvocationContext) -> ImageOutput:
|
2023-05-24 05:50:55 +00:00
|
|
|
image = context.services.images.get_pil_image(
|
2023-05-27 11:39:20 +00:00
|
|
|
self.image.image_origin, self.image.image_name
|
2023-03-03 06:02:00 +00:00
|
|
|
)
|
2023-05-24 05:50:55 +00:00
|
|
|
mask = context.services.images.get_pil_image(
|
2023-05-27 11:39:20 +00:00
|
|
|
self.mask.image_origin, self.mask.image_name
|
2023-05-24 05:50:55 +00:00
|
|
|
)
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
# Convert to cv image/mask
|
|
|
|
# TODO: consider making these utility functions
|
2023-03-03 06:02:00 +00:00
|
|
|
cv_image = cv.cvtColor(numpy.array(image.convert("RGB")), cv.COLOR_RGB2BGR)
|
2023-05-24 05:50:55 +00:00
|
|
|
cv_mask = numpy.array(ImageOps.invert(mask.convert("L")))
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
# Inpaint
|
|
|
|
cv_inpainted = cv.inpaint(cv_image, cv_mask, 3, cv.INPAINT_TELEA)
|
|
|
|
|
|
|
|
# Convert back to Pillow
|
|
|
|
# TODO: consider making a utility function
|
|
|
|
image_inpainted = Image.fromarray(cv.cvtColor(cv_inpainted, cv.COLOR_BGR2RGB))
|
|
|
|
|
2023-05-24 05:50:55 +00:00
|
|
|
image_dto = context.services.images.create(
|
|
|
|
image=image_inpainted,
|
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-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(
|
|
|
|
image=ImageField(
|
|
|
|
image_name=image_dto.image_name,
|
2023-05-27 11:39:20 +00:00
|
|
|
image_origin=image_dto.image_origin,
|
2023-05-24 05:50:55 +00:00
|
|
|
),
|
|
|
|
width=image_dto.width,
|
|
|
|
height=image_dto.height,
|
2022-12-01 05:33:20 +00:00
|
|
|
)
|