Kevin Turner
bc1bce18b0
Merge branch 'main' into feat/taesd
2023-08-31 20:26:10 -07:00
Lincoln Stein
2cb57ef301
fix baseinvocation call to __attribute__ to work with py3.9
2023-08-31 23:11:54 -04:00
blessedcoolant
6f162c5dec
experimental: Dilate mask if blurred in Color Correction
2023-09-01 11:12:30 +12:00
psychedelicious
ed72d51969
fix(nodes): fix primitives defaults for collections
2023-08-31 13:22:31 +10:00
user1
79db0e9e93
More cleanup after rebasing to main.
2023-08-30 18:29:06 -07:00
Sergey Borisov
d5267357b1
Pad conditioning tensors from clip and clip2 in sdxl
2023-08-30 21:28:40 -04:00
Sergey Borisov
e085eb63bd
Check noise and latents shapes, more informative error
2023-08-30 21:28:40 -04:00
user1
0c17f8604f
Resolving rebase conflict, redirecting control imports to invocations/control_adapter
2023-08-30 17:35:31 -07:00
user1
054edc4077
Oops, forgot to add control_adapter.py for control nodes in last refactor commit
2023-08-30 17:31:46 -07:00
user1
5a9993772d
Added ip_adapter_strength parameter to adjust weighting of IP-Adapter's added cross-attention layers
2023-08-30 17:28:30 -07:00
user1
f2cd9e9ae2
Working POC for IP-Adapters. Not fully nodified yet, lots of caveats, hardwired model paths, etc.
2023-08-30 17:28:30 -07:00
Lincoln Stein
715686477e
fix unknown PagingArgumentParser import error in ti-training
2023-08-30 17:49:19 -04:00
psychedelicious
24d44ca559
feat(nodes): add scheduler invocation
2023-08-30 22:35:47 +10:00
psychedelicious
044d4c107a
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 18:35:12 +10:00
psychedelicious
ae05d34584
fix(nodes): fix uploading image metadata retention
...
was causing failure to save images
2023-08-30 14:52:50 +10:00
psychedelicious
0ed6a141f1
Merge branch 'main' into feat/nodes-phase-5
2023-08-30 11:15:34 +10:00
Sergey Borisov
ca15b8b33e
Fix wrong timestep selection in some cases(dpmpp_sde)
2023-08-30 03:40:59 +03:00
blessedcoolant
258b0814a8
Merge branch 'main' into feat/nodes-phase-5
2023-08-30 02:33:49 +12:00
Sergey Borisov
121396f844
Fix tokenization log for sd models
2023-08-29 17:07:33 +03:00
blessedcoolant
a1398dec91
Merge branch 'main' into pr/4112
2023-08-29 12:56:59 +12:00
blessedcoolant
d0c74822eb
resolve: Merge conflicts
2023-08-29 12:08:00 +12:00
blessedcoolant
383d008529
Merge branch 'main' into feat/nodes-phase-5
2023-08-29 12:05:28 +12:00
blessedcoolant
6db19a8dee
fix: Connection type on Seamless Node VAE Input
2023-08-29 04:15:15 +12:00
blessedcoolant
ef58635a76
chore: black lint
2023-08-29 04:04:03 +12:00
StAlKeR7779
cd548f73fd
Merge branch 'main' into feat_compel_and
2023-08-28 18:31:41 +03:00
Kent Keirsey
421f5b7d75
Seamless Updates
2023-08-28 08:43:08 -04:00
blessedcoolant
3ef36707a8
chore: Black lint
2023-08-28 23:10:00 +12:00
Kent Keirsey
b9731cb434
Merge branch 'main' into Seamless
2023-08-28 00:12:23 -04:00
Kent Keirsey
1f476692da
Seamless fixes
2023-08-28 00:10:46 -04:00
Kent Keirsey
5fdd25501b
updates per stalkers comments
2023-08-27 22:54:53 -04:00
StAlKeR7779
ef3bf2803f
Merge branch 'main' into feat_compel_and
2023-08-28 04:11:35 +03:00
Kent Keirsey
19e0f360e7
Fix vae fields
2023-08-27 15:05:10 -04:00
Kent Keirsey
ea40a7844a
add VAE
2023-08-27 14:53:57 -04:00
Kent Keirsey
c6d00387a7
Revert old latent changes, update seamless
2023-08-27 14:15:37 -04:00
Kent Keirsey
3de45af734
updates
2023-08-27 14:13:00 -04:00
Sergey Borisov
526c7e7737
Provide antialias argument as behaviour will be changed in future(deprecation warning)
2023-08-27 20:04:55 +03:00
Sergey Borisov
1811b54727
Provide metadata to image creation call
2023-08-27 20:03:53 +03:00
Kent Keirsey
95883c2efd
Add Initial (non-working) Seamless Implementation
2023-08-27 12:29:11 -04:00
blessedcoolant
71c3955530
feat: Add Scale Before Processing To Canvas Txt2Img / Img2Img (w/ SDXL)
2023-08-27 08:26:23 +12:00
blessedcoolant
3f8d17d6b7
chore: Black linting
2023-08-27 06:17:08 +12:00
blessedcoolant
249048aae7
fix: Reorder DenoiseMask socket fields
2023-08-27 06:14:35 +12:00
blessedcoolant
c923d094c6
rename: Inpaint Mask to Denoise Mask
2023-08-27 05:50:13 +12:00
blessedcoolant
e9633a3adb
Merge branch 'main' into fix/inpaint_gen
2023-08-27 02:54:19 +12:00
Kevin Turner
dff466244d
Merge remote-tracking branch 'origin/main' into feat/taesd
...
# Conflicts:
# invokeai/app/invocations/latent.py
2023-08-25 15:21:47 -07:00
Kevin Turner
368ff17ed4
Merge branch 'main' into feat/dev_reload
2023-08-24 15:21:50 -07:00
maryhipp
e6fd1c3d1f
add optional field to type
2023-08-25 00:09:16 +10:00
psychedelicious
7caccb11fa
fix(backend): fix workflow not saving to image
2023-08-25 00:01:29 +10:00
psychedelicious
e22c797fa3
fix(db): fix typing on ImageRecordChanges
2023-08-24 22:13:05 +10:00
psychedelicious
2d8f7d425c
feat(nodes): retain image metadata on save
2023-08-24 22:10:24 +10:00
psychedelicious
7d1942e9f0
feat: workflow saving and loading
2023-08-24 21:42:32 +10:00
Millun Atluri
65feb92286
Merge branch 'main' into feat_compel_and
2023-08-24 17:38:35 +10:00
psychedelicious
79df46bad2
chore: flake8
2023-08-23 23:05:29 -04:00
blessedcoolant
2ba52b8921
fix: File Tile Infill being broken
2023-08-23 23:05:29 -04:00
blessedcoolant
49892faee4
experimental: LaMa Infill
2023-08-23 23:05:29 -04:00
Kevin Turner
54e844f7da
Merge branch 'main' into feat/dev_reload
2023-08-23 09:47:24 -07:00
blessedcoolant
f3b293b5cc
feat: Add Blank Image Node
2023-08-23 23:06:42 +10:00
psychedelicious
cd73085eb9
feat(nodes): add ui_order node field attribute
...
used by UI to sort fields in workflow editor
2023-08-23 23:06:42 +10:00
psychedelicious
5fc60d0539
fix(nodes): id field is not an InputField
2023-08-23 23:06:42 +10:00
Kevin Turner
98dcc8d8b3
Merge remote-tracking branch 'origin/main' into feat/dev_reload
2023-08-22 18:18:16 -07:00
Lincoln Stein
3f7ac556c6
Merge branch 'main' into refactor/rename-performance-options
2023-08-21 22:29:34 -04:00
Kevin Turner
56c052a747
Merge branch 'main' into feat/dev_reload
2023-08-21 18:22:31 -07:00
psychedelicious
be6ba57775
chore: flake8
2023-08-22 10:14:46 +10:00
Lincoln Stein
9d7dfeb857
Merge branch 'main' into refactor/rename-performance-options
2023-08-21 19:47:55 -04:00
Kevin Turner
76750b0121
doc(development): add section on hot reloading with --dev_reload
2023-08-21 16:45:39 -07:00
Kevin Turner
88963dbe6e
Merge remote-tracking branch 'origin/main' into feat/dev_reload
...
# Conflicts:
# invokeai/app/api_app.py
# invokeai/app/services/config.py
2023-08-21 09:04:31 -07:00
psychedelicious
535eb1db16
Merge branch 'main' into fix/stats/handle-exceptions
2023-08-21 19:19:32 +10:00
psychedelicious
d95773f50f
Revert "feat(nodes): make fields that accept connection input optional in OpenAPI schema"
...
This reverts commit 7325cbdd250153f347e3782265dd42783f7f1d00.
2023-08-21 19:17:36 +10:00
psychedelicious
bf04e913c2
feat(nodes): make primitive outputs not optional, fix primitive invocation defaults
2023-08-21 19:17:36 +10:00
psychedelicious
cdc49456e8
feat(api): add additional class attribute to invocations and outputs in OpenAPI schema
...
It is `"invocation"` for invocations and `"output"` for outputs. Clients may use this to confidently and positively identify if an OpenAPI schema object is an invocation or output, instead of using a potentially fragile heuristic.
2023-08-21 19:17:36 +10:00
psychedelicious
37dc2d9d4d
feat(nodes): update vae node tags
2023-08-21 19:17:36 +10:00
psychedelicious
6e1ddb671e
feat(nodes): make fields that accept connection input optional in OpenAPI schema
...
Doing this via `BaseInvocation`'s `Config.schema_extra()` means all clients get an accurate OpenAPI schema.
Shifts the responsibility of correct types to the backend, where previously it was on the client.
2023-08-21 19:17:36 +10:00
psychedelicious
496a2db15c
feat(nodes): make id, type required in BaseInvocation, BaseInvocationOutput
...
Doing this via these classes' `Config.schema_extra()` method makes it unintrusive and clients will get the correct types for these properties.
Shifts the responsibility of correct types to the backend, where previously it was on the client.
2023-08-21 19:17:36 +10:00
psychedelicious
5292eda0e4
feat(nodes): remove "Loader" from model nodes
...
They are not loaders, they are selectors - remove this to reduce confusion.
2023-08-21 19:17:36 +10:00
psychedelicious
0b9ae74192
fix(stats): RuntimeError: dictionary changed size during iteration
2023-08-21 19:17:36 +10:00
psychedelicious
484b572023
feat(nodes): primitives have value instead of a as field names
2023-08-21 19:17:36 +10:00
psychedelicious
cd9baf8092
fix(stats): fix InvocationStatsService types
...
- move docstrings to ABC
- `start_time: int` -> `start_time: float`
- remove class attribute assignments in `StatsContext`
- add `update_mem_stats()` to ABC
- add class attributes to ABC, because they are referenced in instances of the class. if they should not be on the ABC, then maybe there needs to be some restructuring
2023-08-21 19:17:36 +10:00
psychedelicious
81385d7d35
fix(stats): fix fail case when previous graph is invalid
...
When retrieving a graph, it is parsed through pydantic. It is possible that this graph is invalid, and an error is thrown.
Handle this by deleting the failed graph from the stats if this occurs.
2023-08-21 19:17:36 +10:00
psychedelicious
3d84e7756a
fix(nodes): fix field names
2023-08-21 19:17:36 +10:00
psychedelicious
98431b3de4
feat: add Scheduler as field type
...
- update node schemas
- add `UIType.Scheduler`
- add field type to schema parser, input components
2023-08-21 19:17:36 +10:00
psychedelicious
0909812c84
chore: black
2023-08-21 19:17:15 +10:00
psychedelicious
66c0aea9e7
fix(nodes): removed duplicate node
2023-08-21 19:17:15 +10:00
Damian Stewart
2bcded78e1
add BlendInvocation
2023-08-21 19:17:15 +10:00
Sergey Borisov
beb3e5aeb7
Report correctly to compel if we want get pooled in future(affects blend computation)
2023-08-21 19:05:40 +10:00
Lincoln Stein
5b6069b916
blackify (again)
2023-08-20 16:06:01 -04:00
Lincoln Stein
766cb887e4
resolve more flake8 problems
2023-08-20 15:57:15 -04:00
Lincoln Stein
8e6d88e98c
resolve merge conflicts
2023-08-20 15:26:52 -04:00
Kevin Turner
6f9c1c6d4e
Merge remote-tracking branch 'origin/dep/diffusers020' into feat/taesd
...
# Conflicts:
# invokeai/app/invocations/latent.py
2023-08-18 14:19:27 -07:00
Kevin Turner
811c82a677
lint: formatting
2023-08-18 14:06:14 -07:00
Kevin Turner
4f0e43ec1b
fix(TAESD): correct usage of singledispatchmethod so normal VAE still works
2023-08-18 14:05:12 -07:00
psychedelicious
1b70bd1380
fix(stats): fix InvocationStatsService types
...
- move docstrings to ABC
- `start_time: int` -> `start_time: float`
- remove class attribute assignments in `StatsContext`
- add `update_mem_stats()` to ABC
- add class attributes to ABC, because they are referenced in instances of the class. if they should not be on the ABC, then maybe there needs to be some restructuring
2023-08-18 21:35:03 +10:00
psychedelicious
d1d2d5a47d
fix(stats): fix fail case when previous graph is invalid
...
When retrieving a graph, it is parsed through pydantic. It is possible that this graph is invalid, and an error is thrown.
Handle this by deleting the failed graph from the stats if this occurs.
2023-08-18 21:34:55 +10:00
Millun Atluri
3798c8bdb0
Merge branch 'main' into feat_compel_and
2023-08-18 17:04:03 +10:00
psychedelicious
c49851e027
chore: minor cleanup after merge & flake8
2023-08-18 16:05:39 +10:00
psychedelicious
3c43594c26
Merge branch 'main' into fix/inpaint_gen
2023-08-18 15:57:48 +10:00
Martin Kristiansen
537ae2f901
Resolving merge conflicts for flake8
2023-08-18 15:52:04 +10:00
Kevin Turner
8611ffe32d
feat(TAESD): support TAESD — Tiny Autoencoder for Stable Diffusion
2023-08-17 20:08:53 -07:00
Kevin Turner
654dcd453f
feat(dev_reload): use jurigged to hot reload changes to Python source
2023-08-17 19:02:44 -07:00
Sergey Borisov
cfd827cfad
Added node for creating mask inpaint
2023-08-18 04:07:40 +03:00
Lincoln Stein
e9a294f733
Merge branch 'main' into fix/inpaint_gen
2023-08-17 16:13:33 -04:00
Lincoln Stein
b69f26c85c
add support for "balanced" attention slice size
2023-08-17 16:11:09 -04:00
Lincoln Stein
23b4e1cea0
Merge branch 'main' into refactor/rename-performance-options
2023-08-17 14:43:00 -04:00
Lincoln Stein
635a814dfb
fix up documentation
2023-08-17 14:32:05 -04:00
Lincoln Stein
c19835c2d0
wired attention configuration into backend
2023-08-17 14:20:45 -04:00
Lincoln Stein
ed38eaa10c
refactor InvokeAIAppConfig
2023-08-17 13:47:26 -04:00
blessedcoolant
b213335316
feat: Add InpaintMask Field type
2023-08-18 04:54:23 +12:00
Sergey Borisov
ff5c725586
Update mask field type
2023-08-17 19:35:03 +03:00
Sergey Borisov
bf0dfcac2f
Add inapint mask field class
2023-08-17 19:19:07 +03:00
Lincoln Stein
503e3bca54
revise config but need to migrate old format to new
2023-08-16 23:30:00 -04:00
Lincoln Stein
daf75a1361
blackify
2023-08-16 21:47:29 -04:00
Lincoln Stein
c39f8b478b
fix misplaced ram_used and ram_changed attributes
2023-08-16 21:39:18 -04:00
Lincoln Stein
2ca8611723
add +/- sign in front of RAM delta
2023-08-16 15:53:01 -04:00
Lincoln Stein
b12cf315a8
Merge branch 'main' into feat/collect-more-stats
2023-08-16 09:19:33 -04:00
psychedelicious
43b30355e4
feat: make primitive node titles consistent
2023-08-16 23:04:36 +10:00
Lincoln Stein
a93bd01353
fix bad merge
2023-08-16 08:53:07 -04:00
Lincoln Stein
be8edaf3fd
Merge branch 'main' into feat/collect-more-stats
2023-08-16 08:48:14 -04:00
Lincoln Stein
21e1c0a5f0
tweaked formatting
2023-08-15 22:25:30 -04:00
psychedelicious
8b1ec2685f
chore: black
2023-08-16 12:07:34 +10:00
psychedelicious
60c2c877d7
fix: add response model for star/unstar routes
...
- also implement pessimistic updates for starring, only changing the images that were successfully updated by backend
- some autoformat changes crept in
2023-08-16 12:07:34 +10:00
maryhipp
80b0c5eab4
change from pin to star
2023-08-16 12:07:34 +10:00
maryhipp
ee6a26a97d
update list images endpoint to sort by pinnedness and then created_at
2023-08-16 12:07:34 +10:00
maryhipp
04a9894e77
(api) add ability to pin and unpin images
2023-08-16 12:07:34 +10:00
Lincoln Stein
f9958de6be
added memory used to load models
2023-08-15 21:56:19 -04:00
Lincoln Stein
ec10aca91e
report RAM and RAM cache statistics
2023-08-15 21:00:30 -04:00
psychedelicious
2b7dd3e236
feat: add missing primitive collections
...
- add missing primitive collections
- remove `Seed` and `LoRAField` (they don't exist)
2023-08-16 09:54:38 +10:00
psychedelicious
fa884134d9
feat: rename ui_type_hint to ui_type
...
Just a bit more succinct while not losing any clarity.
2023-08-16 09:54:38 +10:00
psychedelicious
c48fd9c083
feat(nodes): refactor parameter/primitive nodes
...
Refine concept of "parameter" nodes to "primitives":
- integer
- float
- string
- boolean
- image
- latents
- conditioning
- color
Each primitive has:
- A field definition, if it is not already python primitive value. The field is how this primitive value is passed between nodes. Collections are lists of the field in node definitions. ex: `ImageField` & `list[ImageField]`
- A single output class. ex: `ImageOutput`
- A collection output class. ex: `ImageCollectionOutput`
- A node, which functions to load or pass on the primitive value. ex: `ImageInvocation` (in this case, `ImageInvocation` replaces `LoadImage`)
Plus a number of related changes:
- Reorganize these into `primitives.py`
- Update all nodes and logic to use primitives
- Consolidate "prompt" outputs into "string" & "mask" into "image" (there's no reason for these to be different, the function identically)
- Update default graphs & tests
- Regen frontend types & minor frontend tidy related to changes
2023-08-16 09:54:38 +10:00
psychedelicious
f49fc7fb55
feat: node editor
...
squashed rebase on main after backendd refactor
2023-08-16 09:54:38 +10:00
Lincoln Stein
a4b029d03c
write RAM usage and change after each generation
2023-08-15 18:21:31 -04:00
psychedelicious
9d3cd85bdd
chore: black
2023-08-14 13:02:33 +10:00
Sergey Borisov
409e5d01ba
Fix cpu_only schedulers(unipc)
2023-08-14 05:14:05 +03:00
Sergey Borisov
d63bb39475
Make dpmpp_sde(_k) use not random seed
2023-08-14 00:24:38 +03:00
Sergey Borisov
59ba9fc0f6
Flip bits in seed for sde/ancestral schedulers to have different noise from initial
2023-08-13 19:50:16 +03:00
Sergey Borisov
6e0beb1ed4
Fixes for second order scheduler timesteps
2023-08-13 19:31:47 +03:00
Sergey Borisov
94636ddb03
Fix empty prompt handling
2023-08-13 19:31:14 +03:00
blessedcoolant
499e89d6f6
feat: Add SDXL Negative Aesthetic Score
2023-08-14 04:02:36 +12:00
blessedcoolant
561951ad98
chore: Black linting
2023-08-13 21:28:39 +12:00
blessedcoolant
f296e5c41e
wip: Remove MaskBlur / Adjust color correction
2023-08-12 20:54:30 +12:00
blessedcoolant
6034fa12de
feat: Add Mask Blur node
2023-08-12 16:20:58 +12:00
Sergey Borisov
ce3675fc14
Apply denoising_start/end according on timestep value
2023-08-12 03:19:49 +03:00
blessedcoolant
f343ab0302
wip: Port Outpainting to new backend
2023-08-12 06:15:59 +12:00
Sergey Borisov
f3ae52ff97
Fix error at high denoising_start, fix unipc(cpu_only)
2023-08-11 15:46:16 +03:00
blessedcoolant
87ce4ab27c
fix: Update default_graph to use new DenoiseLatents
2023-08-11 22:21:13 +12:00
blessedcoolant
7c0023ad9e
feat: Remove TextToLatents / Rename Latents To Latents -> DenoiseLatents
2023-08-11 22:20:37 +12:00
blessedcoolant
231e665675
Merge branch 'main' into feat/refactor_generation_backend
2023-08-11 20:53:38 +12:00
Sergey Borisov
2ef6a8995b
Temporary force set vae to same precision as unet
2023-08-10 18:01:58 -04:00
Lincoln Stein
a969707e45
prevent vae: '' from crashing model
2023-08-10 17:33:04 -04:00
psychedelicious
49cce1eec6
feat: add app_version to image metadata
2023-08-10 14:22:39 +10:00
Sergey Borisov
e9ec5ab85c
Apply requested changes
...
Co-Authored-By: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
2023-08-10 06:19:22 +03:00
Sergey Borisov
17fed1c870
Fix merge conflict errors
2023-08-10 05:03:33 +03:00
Sergey Borisov
ade78b9591
Merge branch 'main' into feat/refactor_generation_backend
2023-08-10 04:32:16 +03:00
