2022-12-01 05:33:20 +00:00
|
|
|
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
|
|
|
|
|
2023-03-10 04:28:06 +00:00
|
|
|
from functools import partial
|
2023-05-04 14:06:34 +00:00
|
|
|
from typing import Literal, Optional, Union, get_args
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-04-30 02:32:19 +00:00
|
|
|
import torch
|
2023-06-01 22:09:49 +00:00
|
|
|
from diffusers import ControlNetModel
|
2023-04-10 09:07:48 +00:00
|
|
|
from pydantic import BaseModel, Field
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-06-01 22:09:49 +00:00
|
|
|
from invokeai.app.models.image import (ColorField, ImageCategory, ImageField,
|
|
|
|
ResourceOrigin)
|
2023-05-06 09:05:47 +00:00
|
|
|
from invokeai.app.util.misc import SEED_MAX, get_random_seed
|
2023-05-04 14:06:34 +00:00
|
|
|
from invokeai.backend.generator.inpaint import infill_methods
|
2023-06-01 22:09:49 +00:00
|
|
|
|
2023-06-17 16:39:51 +00:00
|
|
|
from ...backend.generator import Inpaint, InvokeAIGenerator
|
2023-03-10 04:28:06 +00:00
|
|
|
from ...backend.stable_diffusion import PipelineIntermediateState
|
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
|
|
|
from ..util.step_callback import stable_diffusion_step_callback
|
2023-06-01 22:09:49 +00:00
|
|
|
from .baseinvocation import BaseInvocation, InvocationConfig, InvocationContext
|
|
|
|
from .image import ImageOutput
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
import re
|
|
|
|
from ...backend.model_management.lora import ModelPatcher
|
|
|
|
from ...backend.stable_diffusion.diffusers_pipeline import StableDiffusionGeneratorPipeline
|
2023-06-17 16:20:24 +00:00
|
|
|
from .model import UNetField, VaeField
|
|
|
|
from .compel import ConditioningField
|
2023-06-16 20:17:18 +00:00
|
|
|
from contextlib import contextmanager, ExitStack, ContextDecorator
|
|
|
|
|
2023-04-10 09:07:48 +00:00
|
|
|
SAMPLER_NAME_VALUES = Literal[tuple(InvokeAIGenerator.schedulers())]
|
2023-05-04 14:06:34 +00:00
|
|
|
INFILL_METHODS = Literal[tuple(infill_methods())]
|
2023-05-24 14:28:04 +00:00
|
|
|
DEFAULT_INFILL_METHOD = (
|
|
|
|
"patchmatch" if "patchmatch" in get_args(INFILL_METHODS) else "tile"
|
|
|
|
)
|
|
|
|
|
2023-04-10 09:07:48 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
from .latent import get_scheduler
|
2023-04-10 09:07:48 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
class OldModelContext(ContextDecorator):
|
|
|
|
model: StableDiffusionGeneratorPipeline
|
2023-04-10 09:07:48 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
def __init__(self, model):
|
|
|
|
self.model = model
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
def __enter__(self):
|
|
|
|
return self.model
|
2023-03-03 06:02:00 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
def __exit__(self, *exc):
|
|
|
|
return False
|
|
|
|
|
|
|
|
class OldModelInfo:
|
|
|
|
name: str
|
|
|
|
hash: str
|
|
|
|
context: OldModelContext
|
|
|
|
|
|
|
|
def __init__(self, name: str, hash: str, model: StableDiffusionGeneratorPipeline):
|
|
|
|
self.name = name
|
|
|
|
self.hash = hash
|
|
|
|
self.context = OldModelContext(
|
|
|
|
model=model,
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
class InpaintInvocation(BaseInvocation):
|
|
|
|
"""Generates an image using inpaint."""
|
|
|
|
|
|
|
|
type: Literal["inpaint"] = "inpaint"
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-06-17 16:20:24 +00:00
|
|
|
positive_conditioning: Optional[ConditioningField] = Field(description="Positive conditioning for generation")
|
|
|
|
negative_conditioning: Optional[ConditioningField] = Field(description="Negative conditioning for generation")
|
2023-05-11 00:57:08 +00:00
|
|
|
seed: int = Field(ge=0, le=SEED_MAX, description="The seed to use (omit for random)", default_factory=get_random_seed)
|
2023-05-04 14:06:34 +00:00
|
|
|
steps: int = Field(default=30, gt=0, description="The number of steps to use to generate the image")
|
2023-04-24 10:35:31 +00:00
|
|
|
width: int = Field(default=512, multiple_of=8, gt=0, description="The width of the resulting image", )
|
|
|
|
height: int = Field(default=512, multiple_of=8, gt=0, description="The height of the resulting image", )
|
2023-05-04 12:13:10 +00:00
|
|
|
cfg_scale: float = Field(default=7.5, ge=1, description="The Classifier-Free Guidance, higher values may result in a result closer to the prompt", )
|
2023-05-24 20:45:21 +00:00
|
|
|
scheduler: SAMPLER_NAME_VALUES = Field(default="euler", description="The scheduler to use" )
|
2023-06-16 20:17:18 +00:00
|
|
|
unet: UNetField = Field(default=None, description="UNet model")
|
|
|
|
vae: VaeField = Field(default=None, description="Vae model")
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
# Inputs
|
2023-03-03 06:02:00 +00:00
|
|
|
image: Union[ImageField, None] = Field(description="The input image")
|
|
|
|
strength: float = Field(
|
|
|
|
default=0.75, gt=0, le=1, description="The strength of the original image"
|
|
|
|
)
|
|
|
|
fit: bool = Field(
|
|
|
|
default=True,
|
|
|
|
description="Whether or not the result should be fit to the aspect ratio of the input image",
|
|
|
|
)
|
2022-12-01 05:33:20 +00:00
|
|
|
|
|
|
|
# Inputs
|
2023-03-03 06:02:00 +00:00
|
|
|
mask: Union[ImageField, None] = Field(description="The mask")
|
2023-05-04 14:06:34 +00:00
|
|
|
seam_size: int = Field(default=96, ge=1, description="The seam inpaint size (px)")
|
2023-05-24 14:28:04 +00:00
|
|
|
seam_blur: int = Field(
|
|
|
|
default=16, ge=0, description="The seam inpaint blur radius (px)"
|
|
|
|
)
|
2023-05-04 14:06:34 +00:00
|
|
|
seam_strength: float = Field(
|
|
|
|
default=0.75, gt=0, le=1, description="The seam inpaint strength"
|
|
|
|
)
|
2023-05-24 14:28:04 +00:00
|
|
|
seam_steps: int = Field(
|
|
|
|
default=30, ge=1, description="The number of steps to use for seam inpaint"
|
|
|
|
)
|
|
|
|
tile_size: int = Field(
|
|
|
|
default=32, ge=1, description="The tile infill method size (px)"
|
|
|
|
)
|
|
|
|
infill_method: INFILL_METHODS = Field(
|
|
|
|
default=DEFAULT_INFILL_METHOD,
|
|
|
|
description="The method used to infill empty regions (px)",
|
|
|
|
)
|
|
|
|
inpaint_width: Optional[int] = Field(
|
|
|
|
default=None,
|
|
|
|
multiple_of=8,
|
|
|
|
gt=0,
|
|
|
|
description="The width of the inpaint region (px)",
|
|
|
|
)
|
|
|
|
inpaint_height: Optional[int] = Field(
|
|
|
|
default=None,
|
|
|
|
multiple_of=8,
|
|
|
|
gt=0,
|
|
|
|
description="The height of the inpaint region (px)",
|
|
|
|
)
|
|
|
|
inpaint_fill: Optional[ColorField] = Field(
|
|
|
|
default=ColorField(r=127, g=127, b=127, a=255),
|
|
|
|
description="The solid infill method color",
|
|
|
|
)
|
2023-03-03 06:02:00 +00:00
|
|
|
inpaint_replace: float = Field(
|
|
|
|
default=0.0,
|
|
|
|
ge=0.0,
|
|
|
|
le=1.0,
|
|
|
|
description="The amount by which to replace masked areas with latent noise",
|
|
|
|
)
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
# Schema customisation
|
|
|
|
class Config(InvocationConfig):
|
|
|
|
schema_extra = {
|
|
|
|
"ui": {
|
|
|
|
"tags": ["stable-diffusion", "image"],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2023-03-18 10:37:50 +00:00
|
|
|
def dispatch_progress(
|
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
|
|
|
self,
|
|
|
|
context: InvocationContext,
|
|
|
|
source_node_id: str,
|
|
|
|
intermediate_state: PipelineIntermediateState,
|
|
|
|
) -> None:
|
|
|
|
stable_diffusion_step_callback(
|
|
|
|
context=context,
|
|
|
|
intermediate_state=intermediate_state,
|
|
|
|
node=self.dict(),
|
|
|
|
source_node_id=source_node_id,
|
|
|
|
)
|
2023-03-18 10:37:50 +00:00
|
|
|
|
2023-06-17 16:20:24 +00:00
|
|
|
def get_conditioning(self, context):
|
|
|
|
c, extra_conditioning_info = context.services.latents.get(self.positive_conditioning.conditioning_name)
|
|
|
|
uc, _ = context.services.latents.get(self.negative_conditioning.conditioning_name)
|
|
|
|
|
|
|
|
return (uc, c, extra_conditioning_info)
|
|
|
|
|
2023-06-16 20:17:18 +00:00
|
|
|
@contextmanager
|
2023-06-17 16:20:24 +00:00
|
|
|
def load_model_old_way(self, context, scheduler):
|
|
|
|
unet_info = context.services.model_manager.get_model(**self.unet.unet.dict())
|
|
|
|
vae_info = context.services.model_manager.get_model(**self.vae.vae.dict())
|
|
|
|
|
|
|
|
#unet = unet_info.context.model
|
|
|
|
#vae = vae_info.context.model
|
2023-06-16 20:17:18 +00:00
|
|
|
|
2023-06-17 16:20:24 +00:00
|
|
|
with ExitStack() as stack:
|
2023-06-16 20:17:18 +00:00
|
|
|
loras = [(stack.enter_context(context.services.model_manager.get_model(**lora.dict(exclude={"weight"}))), lora.weight) for lora in self.unet.loras]
|
2023-06-17 16:20:24 +00:00
|
|
|
|
|
|
|
with vae_info as vae,\
|
|
|
|
unet_info as unet,\
|
|
|
|
ModelPatcher.apply_lora_unet(unet, loras):
|
|
|
|
|
|
|
|
device = context.services.model_manager.mgr.cache.execution_device
|
|
|
|
dtype = context.services.model_manager.mgr.cache.precision
|
2023-06-16 20:17:18 +00:00
|
|
|
|
|
|
|
pipeline = StableDiffusionGeneratorPipeline(
|
|
|
|
vae=vae,
|
2023-06-17 16:20:24 +00:00
|
|
|
text_encoder=None,
|
|
|
|
tokenizer=None,
|
2023-06-16 20:17:18 +00:00
|
|
|
unet=unet,
|
|
|
|
scheduler=scheduler,
|
|
|
|
safety_checker=None,
|
|
|
|
feature_extractor=None,
|
|
|
|
requires_safety_checker=False,
|
|
|
|
precision="float16" if dtype == torch.float16 else "float32",
|
|
|
|
execution_device=device,
|
|
|
|
)
|
|
|
|
|
|
|
|
yield OldModelInfo(
|
|
|
|
name=self.unet.unet.model_name,
|
|
|
|
hash="<NO-HASH>",
|
|
|
|
model=pipeline,
|
|
|
|
)
|
|
|
|
|
2022-12-01 05:33:20 +00:00
|
|
|
def invoke(self, context: InvocationContext) -> ImageOutput:
|
2023-03-03 06:02:00 +00:00
|
|
|
image = (
|
|
|
|
None
|
|
|
|
if self.image is None
|
2023-06-14 11:40:09 +00:00
|
|
|
else context.services.images.get_pil_image(self.image.image_name)
|
2023-03-03 06:02:00 +00:00
|
|
|
)
|
|
|
|
mask = (
|
|
|
|
None
|
|
|
|
if self.mask is None
|
2023-06-14 11:40:09 +00:00
|
|
|
else context.services.images.get_pil_image(self.mask.image_name)
|
2023-03-03 06:02:00 +00:00
|
|
|
)
|
2022-12-01 05:33:20 +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
|
|
|
# Get the source node id (we are invoking the prepared node)
|
|
|
|
graph_execution_state = context.services.graph_execution_manager.get(
|
|
|
|
context.graph_execution_state_id
|
|
|
|
)
|
|
|
|
source_node_id = graph_execution_state.prepared_source_mapping[self.id]
|
2023-04-10 09:07:48 +00:00
|
|
|
|
2023-06-17 16:20:24 +00:00
|
|
|
conditioning = self.get_conditioning(context)
|
|
|
|
scheduler = get_scheduler(
|
|
|
|
context=context,
|
|
|
|
scheduler_info=self.unet.scheduler,
|
|
|
|
scheduler_name=self.scheduler,
|
|
|
|
)
|
|
|
|
|
|
|
|
with self.load_model_old_way(context, scheduler) as model:
|
2023-06-16 20:17:18 +00:00
|
|
|
outputs = Inpaint(model).generate(
|
2023-06-17 16:20:24 +00:00
|
|
|
conditioning=conditioning,
|
|
|
|
scheduler=scheduler,
|
2023-06-16 20:17:18 +00:00
|
|
|
init_image=image,
|
|
|
|
mask_image=mask,
|
|
|
|
step_callback=partial(self.dispatch_progress, context, source_node_id),
|
|
|
|
**self.dict(
|
2023-06-17 16:20:24 +00:00
|
|
|
exclude={"positive_conditioning", "negative_conditioning", "scheduler", "image", "mask"}
|
2023-06-16 20:17:18 +00:00
|
|
|
), # Shorthand for passing all of the parameters above manually
|
|
|
|
)
|
2023-03-18 10:37:50 +00:00
|
|
|
|
|
|
|
# Outputs is an infinite iterator that will return a new InvokeAIGeneratorOutput object
|
|
|
|
# each time it is called. We only need the first one.
|
|
|
|
generator_output = next(outputs)
|
2022-12-01 05:33:20 +00:00
|
|
|
|
2023-05-24 14:28:04 +00:00
|
|
|
image_dto = context.services.images.create(
|
|
|
|
image=generator_output.image,
|
2023-05-27 11:39:20 +00:00
|
|
|
image_origin=ResourceOrigin.INTERNAL,
|
2023-05-24 14:28:04 +00:00
|
|
|
image_category=ImageCategory.GENERAL,
|
|
|
|
session_id=context.graph_execution_state_id,
|
|
|
|
node_id=self.id,
|
2023-05-26 01:39:19 +00:00
|
|
|
is_intermediate=self.is_intermediate,
|
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 14:28:04 +00:00
|
|
|
return ImageOutput(
|
2023-06-14 11:40:09 +00:00
|
|
|
image=ImageField(image_name=image_dto.image_name),
|
2023-05-24 14:28:04 +00:00
|
|
|
width=image_dto.width,
|
|
|
|
height=image_dto.height,
|
2022-12-01 05:33:20 +00:00
|
|
|
)
|