1
0
Fork 0
Commit Graph

1464 Commits

Author SHA1 Message Date
HoopyFreud ed03222234
Update tile.py
Fixed extra noise source imports
2023-07-09 14:11:25 -04:00
Sean Sube 2cc4feefe9
fix(api): save prompt with wildcards replaced in EXIF data 2023-07-09 11:51:14 -05:00
HoopyFreud 306f7e9989 linting 2023-07-09 01:02:27 -04:00
HoopyFreud 08172a7236 new tiled inpainting method 2023-07-09 00:56:20 -04:00
HoopyFreud 3fbf9baae6 linting 2023-07-08 21:30:54 -04:00
HoopyFreud 80e124554d
Update tile.py
Accommodated no-source tiles better
2023-07-08 21:27:28 -04:00
HoopyFreud 757fb0d6a8
Update run.py
Added variable overlap to txt2img
2023-07-08 21:26:45 -04:00
HoopyFreud 2d24ed8ff8 tiling in txt2img, subtiling in txt2img and img2img 2023-07-08 20:48:40 -04:00
HoopyFreud 098873b89c
Merge branch 'main' into main 2023-07-08 10:18:19 -04:00
HoopyFreud 8085015d2a linted 2023-07-08 10:17:35 -04:00
HoopyFreud 332946d8d5
Update tile.py
Fixed logging
2023-07-08 10:03:06 -04:00
HoopyFreud 05e8addb06
Update tile.py
Update spiral tiling
2023-07-06 22:46:36 -04:00
HoopyFreud cecee8653b
Update run.py
Use overlap in img2img
2023-07-06 22:46:03 -04:00
HoopyFreud 36b94bac82
Update params.py
Change default tiling
2023-07-06 22:44:53 -04:00
Sean Sube f7fc442ba5
fix(api): keep network tokens while replacing wildcards in the saved prompt 2023-07-06 21:16:51 -05:00
Sean Sube b8c0bb03e8
apply lint 2023-07-06 18:46:21 -05:00
Sean Sube e65de8115e
feat(api): do not repeat wildcard values 2023-07-06 18:10:08 -05:00
Sean Sube 2121c7aa5d
feat(scripts): add json and parquet support to prompt book parser 2023-07-06 08:11:43 -05:00
Sean Sube 818d222ff8
apply lint 2023-07-05 23:05:47 -05:00
Sean Sube de8105ec60
feat(scripts): add script to parse prompt books 2023-07-05 23:05:00 -05:00
Sean Sube 1133321179
chore(scripts): reduce timeout for slow release tests 2023-07-05 23:04:38 -05:00
Sean Sube 17a710197c
feat(api): ignore comments and empty lines in wildcard files 2023-07-05 23:04:11 -05:00
Sean Sube 15c26cd74b
fix(api): remove tile size limit for img2img and outpaint stages 2023-07-05 17:16:30 -05:00
Sean Sube 3798ea77e7
fix(api): collect final images from SD upscale stage 2023-07-05 08:22:29 -05:00
Sean Sube fed4315095
fix(api): remove unintentional tuple in img2img pipe 2023-07-05 06:50:33 -05:00
Sean Sube c0dd4e96dc
fix(api): handle panoramic outpainting output 2023-07-04 20:44:48 -05:00
Sean Sube 0b5f554cf4
re-parse input prompt before saving metadata 2023-07-04 20:13:45 -05:00
Sean Sube 42e6f356a9
fix(api): unwrap results of img2img chain 2023-07-04 18:48:07 -05:00
Sean Sube 10050263bf
create batch size latents 2023-07-04 17:27:10 -05:00
Sean Sube 89dbf81335
fix(api): pass batch size and eta params to txt2img stage 2023-07-04 17:24:37 -05:00
Sean Sube 17b90ef2d7
use correct pipeline output 2023-07-04 17:14:25 -05:00
Sean Sube ac55fbd7d0
replace wildcards properly 2023-07-04 17:12:10 -05:00
Sean Sube a3f6fca989
init wildcards as dict 2023-07-04 16:57:44 -05:00
Sean Sube 933ee50375
load wildcards from models subdir 2023-07-04 16:56:39 -05:00
Sean Sube ec4662690f
use extension when loading wildcards 2023-07-04 16:55:26 -05:00
Sean Sube fa3a36ed25
fix(api): replace unknown wildcards with empty string 2023-07-04 16:54:17 -05:00
Sean Sube c8a9dd4475
feat(api): add support for wildcards 2023-07-04 16:41:54 -05:00
Sean Sube b816307994
fix(api): send tile filters as correct type 2023-07-04 16:40:02 -05:00
Sean Sube 6425a91fe3
fix(api): support multiple outputs from txt2img stage 2023-07-04 16:24:47 -05:00
Sean Sube 7c1b85f793
fix(api): define tile size for logging 2023-07-04 16:22:24 -05:00
Sean Sube 99a073aed2
update API entrypoints for multi-image 2023-07-04 13:56:02 -05:00
Sean Sube e1fcbb9093
start updating chain logic for multiple outputs 2023-07-04 13:47:31 -05:00
Sean Sube 37185252a5
feat(api): make pipeline stages support multiple images 2023-07-04 13:29:58 -05:00
Sean Sube f718087a54
lint(api): make chain pipeline logs more consistent 2023-07-04 12:27:17 -05:00
Sean Sube d1ecef9f2e
apply lint 2023-07-04 12:09:46 -05:00
Sean Sube 6ec7777f77
lint(api): type fixes and hints throughout 2023-07-04 10:20:28 -05:00
Sean Sube 5d13629ee8
fix(api): log number of tiles contributing to each image pixel 2023-07-03 11:39:48 -05:00
Sean Sube ed953f518a
feat(api): apply overlap to highres upscaling stage 2023-07-03 11:34:17 -05:00
Sean Sube 47b10945ff
fix(api): use consistent cache key for each model type 2023-07-03 11:33:56 -05:00
Sean Sube a9fa76737e
fix(api): pass strength to LPW pipe from img2img blend 2023-07-03 08:27:37 -05:00
Sean Sube 3653723742
lint(api): move tile gradient logs to debug level 2023-07-03 08:05:57 -05:00
Sean Sube 197dc48b06
fix(api): make img2img blend work with LPW 2023-07-03 08:05:30 -05:00
Sean Sube 12698d38eb
fix(api): remove inner loops in upscale stages 2023-07-02 20:38:52 -05:00
Sean Sube 99c91a301c
feat: make enabling highres a parameter of its own 2023-07-02 19:08:40 -05:00
Sean Sube 3edf5e6c4d
fix(api): handle unlimited size stages correctly 2023-07-02 18:57:11 -05:00
Sean Sube d8ec93a619
feat(api): pass tile size param to most pipeline stages 2023-07-02 18:54:10 -05:00
Sean Sube c515d25dd4
fix(api): use upscaling method param in highres 2023-07-02 18:45:22 -05:00
Sean Sube 8781f7fda0
fix(api): make tiling compatible with source stages 2023-07-02 18:31:47 -05:00
Sean Sube 2a9e4a24a3
lint(api): make all other stages inherit from base stage 2023-07-02 18:21:21 -05:00
Sean Sube c9a1ace40b
fix(api): tile stages based on input image or size param 2023-07-02 18:14:52 -05:00
Sean Sube d98ecc023d
fix(api): do not overlap upscale tiles during highres 2023-07-02 17:13:16 -05:00
Sean Sube 5d18779e27
fix(api): add progress bars to release tests 2023-07-02 13:18:00 -05:00
Sean Sube a7be651032
fix(api): remove nested tiling in highres 2023-07-02 12:39:59 -05:00
Sean Sube eef055eddd
fix(api): log tile size and overlap 2023-07-02 05:15:01 -05:00
Sean Sube 4b84188f6e
fix(api): make panorama switch mode based on kwargs 2023-07-01 15:04:12 -05:00
Sean Sube db86108dc5
apply lint 2023-07-01 14:39:02 -05:00
Sean Sube 8dbecd6947
lint(api): avoid shadowing params var 2023-07-01 12:38:26 -05:00
Sean Sube 7736430fe7
fix(api): pass overlap params to tile calculation 2023-07-01 12:36:17 -05:00
Sean Sube f20afeb58f
fix(api): mark panorama outpainting tests as very slow, update refs 2023-07-01 12:33:21 -05:00
Sean Sube 2913cd0382
feat(api): make chain stages into classes with max tile size and step count estimate 2023-07-01 12:33:14 -05:00
Sean Sube 5e1b70091c
feat(api): remove size restrictions on most pipelines 2023-07-01 12:33:04 -05:00
Sean Sube 934dabb39e
fix(api): pass mask and sources to blending pipeline in correct order 2023-07-01 12:32:39 -05:00
Sean Sube 5556478669
fix(api): pass upscale params to correction stages 2023-07-01 12:32:30 -05:00
Sean Sube fcaeb8cb42
fix(api): add non-square txt2img test 2023-07-01 12:32:22 -05:00
Sean Sube 5378619ef2
fix(api): add name filter and MSE multiplier args to release tests 2023-07-01 12:32:18 -05:00
Sean Sube d9f251c88b
fix(api): repair progress for API pipelines 2023-07-01 12:32:05 -05:00
Sean Sube 2d10252564
fix(api): use kwargs for chain stages 2023-07-01 12:31:59 -05:00
Sean Sube 7a73c9ff61
fix(api): pass additional params to new stages 2023-07-01 12:31:41 -05:00
Sean Sube 7a951065e4
# This is a combination of 3 commits.
# This is the 1st commit message:

pass size to txt2img stage

# This is the commit message #2:

pass highres and upscale params

# This is the commit message #3:

pass correct strength param
2023-07-01 12:30:53 -05:00
Sean Sube af416c252d
feat(api): make chain pipeline work without a source image 2023-07-01 12:30:43 -05:00
Sean Sube fd3e65eafc
feat(api): start using chain pipelines for all images 2023-07-01 12:30:30 -05:00
Sean Sube 7c8dc7a6b6
feat(api): create hash file for models without one 2023-06-27 08:17:21 -05:00
Sean Sube 16cf5bb863
fix(api): strip trailing newlines when reading hash from file 2023-06-27 07:33:23 -05:00
Sean Sube e3a458a736
feat(api): read model hash from file 2023-06-27 07:28:59 -05:00
Sean Sube 0029943c7d
fix(api): use diffusion model name without path when looking up hashes 2023-06-27 07:09:40 -05:00
Sean Sube 7cbb4197ba
fix(api): handle empty negative prompts in exif data 2023-06-26 21:38:55 -05:00
Sean Sube 732eb9913e
add hash field to extras schema and user guide 2023-06-26 19:18:20 -05:00
Sean Sube 062b1c47aa
feat(api): write model hashes to image exif 2023-06-26 17:24:34 -05:00
Sean Sube 003a350a6c
feat(api): include version number in logs 2023-06-26 17:24:03 -05:00
Sean Sube 01811abf5a
add loras to exif params 2023-06-26 07:48:39 -05:00
Sean Sube 14e920c6e1
add newlines to make params compatible 2023-06-26 07:24:25 -05:00
Sean Sube f142f83ad5
dump json parameters to str before writing to exif 2023-06-26 07:14:32 -05:00
Sean Sube 91c6c62159
remove unused output param 2023-06-26 07:06:31 -05:00
Sean Sube 7e21b9539e
feat(api): embed image parameters in EXIF data (#383) 2023-06-26 07:03:06 -05:00
Sean Sube 9d08676caa
fix(api): add version for omegaconf 2023-06-19 18:12:56 -05:00
Sean Sube 03402dba67
fix(api): pin pip dependencies, add requirements to renovate 2023-06-19 18:02:00 -05:00
Sean Sube 7db53a82df
fix(api): correctly handle sliced kernels 2023-06-17 14:51:58 -05:00
Sean Sube 1506f51ff4
fix(api): handle more SwinIR models 2023-06-16 21:53:49 -05:00
Sean Sube 12e489b761
fix(api): use correct tile size for highres upscaling 2023-06-16 21:22:00 -05:00
Sean Sube 5713957026
fix(api): keep kernel slices within bounds 2023-06-16 20:49:43 -05:00
Sean Sube c1a4484b75
apply lint 2023-06-16 20:43:28 -05:00
Sean Sube 81d2e93709
chore(scripts): update DPM test ref for fp16 2023-06-16 20:42:48 -05:00
Sean Sube 719b34967f
fix(api): handle blending of mismatched kernels 2023-06-16 20:41:25 -05:00
Sean Sube f8d59ab65a
fix(api): swap dimensions for non-upscaling highres modes 2023-06-15 22:39:16 -05:00
Sean Sube 7b0bed7aea
fix(api): use tile size for all highres scaling methods 2023-06-14 22:52:56 -05:00
Sean Sube dcea248b7b
fix(api): skip prompt parsing patch when using LPW 2023-06-11 07:52:46 -05:00
Sean Sube d47dab8182
fix(api): make LPW pipeline valid again 2023-06-11 07:39:29 -05:00
Sean Sube 82a80bb60b
fix(api): ensure gradient points are always in order 2023-06-10 15:20:17 -05:00
Sean Sube ac2eceb0ac
fix(api): remove trailing space from param name 2023-06-10 11:54:33 -05:00
Sean Sube e64b813ac0
fix(api): pass inpaint param to checkpoint extraction 2023-06-10 11:52:25 -05:00
Sean Sube 665cf57a86
fix typo 2023-06-10 11:30:47 -05:00
HoopyFreud 22ff0be758 fix inpainting conversion via torch 2023-06-10 12:01:02 -04:00
Sean Sube c399430274
fix(scripts): only mark release tests as failed after retrying 2023-06-09 17:41:21 -05:00
Sean Sube 732b07eb46
fix(api): skip gradient blending when tiles do not overlap 2023-06-09 17:24:08 -05:00
Sean Sube f4d944acbe
apply lint 2023-06-08 07:20:19 -05:00
Sean Sube 3f00da9681
feat(api): add option for CPU-only conversion on systems with CUDA 2023-06-08 07:20:03 -05:00
Sean Sube 8215a1bf8a
fix(api): do not overlap tiles by default 2023-06-08 07:09:10 -05:00
Sean Sube 55614cd9a1
fix(scripts): restore MSE calculation, update some test refs 2023-06-07 21:13:09 -05:00
Sean Sube 7ec2597afb
apply lint 2023-06-07 07:42:56 -05:00
Sean Sube b92853d438
fix(api): limit latent padding to tile size 2023-06-06 08:14:09 -05:00
Sean Sube 78e606b049
lint(api): move some progress messages to info level 2023-06-05 23:47:32 -05:00
Sean Sube 6b1ce37592
fix(api): pad partial latents when working with tiles 2023-06-05 23:44:42 -05:00
Sean Sube 2a160411a6
get type from ORT model 2023-06-05 23:26:11 -05:00
Sean Sube 6cb7ed58be
apply lint 2023-06-05 23:18:13 -05:00
Sean Sube 395a632946
fix(api): use VAE model dtype when converting sample 2023-06-05 23:16:34 -05:00
Sean Sube 6a09404243
disable histogram matching for now 2023-06-03 21:00:59 -05:00
Sean Sube 7a00d5d446
fix overlap factor 2023-06-03 20:56:56 -05:00
Sean Sube 1abd7060dc
remove second uint conversion 2023-06-03 20:46:46 -05:00
Sean Sube e79a157957
blend in float, paste results back into scratch texture 2023-06-03 20:38:16 -05:00
Sean Sube 55e5f73d20
apply lint 2023-06-03 20:35:33 -05:00
Sean Sube ec8f367316
use overlap param, apply to spiral tiling as well 2023-06-03 20:35:21 -05:00
Sean Sube e64be674ea
crop count layer 2023-06-03 14:02:58 -05:00
Sean Sube 3bdf3692f4
crop output image 2023-06-03 13:50:27 -05:00
Sean Sube 20bf5ecbfc
use scaled dims for max 2023-06-03 13:28:09 -05:00
Sean Sube 51c5b63090
use adjusted tile for gradients, repeat mask based on output shape 2023-06-03 13:17:20 -05:00
Sean Sube ec4ee49806
use mask for count 2023-06-03 12:22:50 -05:00
Sean Sube 4810ca858a
fix(api): correct name of torch extraction var 2023-06-03 09:52:31 -05:00
Sean Sube a19bf06003
attempt gradient blending of tiles 2023-06-03 09:51:44 -05:00
Sean Sube 6317094c5f
feat(api): histogram equalization and blending for highres tiling 2023-06-02 01:14:40 -05:00
Sean Sube 4dc192a2c7
apply lint 2023-05-28 19:44:16 -05:00
Sean Sube 3e966096ce
fix(api): call venv during setup scripts (#378) 2023-05-28 19:43:21 -05:00
Sean Sube 00b1bec7a9
fix(api): skip loading custom VAE after torch extraction (#379) 2023-05-27 12:31:08 -05:00
Sean Sube 3adafeaa3d
fix(api): switch back to torch extraction for now (#379) 2023-05-27 12:29:17 -05:00
Sean Sube 86d458a0c6
fix(api): avoid passing cache path before sanitizing config name 2023-05-27 12:27:33 -05:00
Sean Sube 24f1ecc0eb
fix(api): load local custom VAE from within model path 2023-05-27 11:26:16 -05:00
Sean Sube 1562f4011e
replace pydantic polyfill 2023-05-20 20:19:41 -05:00
Sean Sube eb53238fd5
do not override source after fetch 2023-05-20 20:15:19 -05:00
Sean Sube df2e854dcc
fix load_yaml import 2023-05-20 20:09:45 -05:00
Sean Sube 9fa1f0387b
add env var for torch extraction 2023-05-20 20:06:54 -05:00
Sean Sube 9c28154dee
feat(api): add option to reload CNet for conversion 2023-05-20 15:19:38 -05:00
Sean Sube 20107f559a
use Torch working model for conversion 2023-05-20 15:12:39 -05:00
Sean Sube 339441cb16
fix(api): restore old checkpoint conversion code path 2023-05-20 13:41:23 -05:00
Sean Sube 44ad5150b2
fix(scripts): add test ref for img2img panorama 2023-05-20 13:38:47 -05:00
Sean Sube 5ede55499a
fix(api): add arpeggio parser to base requirements 2023-05-15 00:08:25 -05:00
Sean Sube fe80e61e79
fix CNet conversion condition 2023-05-14 20:53:12 -05:00
Sean Sube b6a4cbaae1
fix(api): collate CNet after unloading UNet 2023-05-14 20:43:16 -05:00
Sean Sube 01ab864a55
collate UNet after unloading original, add option to skip pipeline loading test 2023-05-14 20:29:18 -05:00
Sean Sube 56fa0729b5
fix conversion context 2023-05-14 20:05:49 -05:00
Sean Sube 0d51d61728
feat(api): add env vars for controlnet conversion and opset 2023-05-14 20:04:43 -05:00
Sean Sube a99388645a
correct import 2023-05-14 19:56:40 -05:00
Sean Sube 579c5f9e97
fix(api): scope patched imports and run GC after patching 2023-05-14 19:54:57 -05:00
Sean Sube f53e8c1761
feat(scripts): add release tests for panorama and upscaling with correction 2023-05-14 19:31:17 -05:00
Sean Sube e2035c3fbf
fix(api): run GC during diffusers conversion, add flag to skip ControlNet (#369) 2023-05-14 19:30:30 -05:00
Sean Sube e96bd0fca4
feat(api): add lock to conversion endpoint 2023-05-10 08:17:22 -05:00
Sean Sube cbc4166f10
fix(scripts): add more release tests 2023-05-09 21:51:17 -05:00
Sean Sube bbd779a9c6
feat(scripts): add retries to release tests 2023-05-09 20:55:48 -05:00
Sean Sube dde1e2daad
fix(api): correctly pass noise level to SD upscaling 2023-05-09 20:25:00 -05:00
Sean Sube eb100f647d
fix(api): remove device and patch calls to fix SD upscaling 2023-05-09 18:22:29 -05:00
Sean Sube f1856cb0d2
reload models and extras after conversion 2023-05-08 21:59:27 -05:00
Sean Sube 6f38d35c73
default content type, use arg parser for override 2023-05-08 21:56:05 -05:00
Sean Sube c992c03584
write extras as string, override conversion args from endpoint 2023-05-08 21:49:36 -05:00
Sean Sube a03f89a62c
fix(api): add env var for admin token 2023-05-08 21:42:25 -05:00
Sean Sube 534fc70e29
implement conversion endpoint 2023-05-08 21:40:51 -05:00
Sean Sube d39c7920a2
feat(api): add endpoints to manage extras file 2023-05-06 16:49:02 -05:00
Sean Sube 0f1298824c
feat(api): start adding support for multiple prompt parsers 2023-05-06 11:41:57 -05:00
Sean Sube 98f99b1523
fix(api): update VAE tiling params every time pipeline is used 2023-05-05 20:27:27 -05:00
Sean Sube da6aa15afc
fix(api): fully qualify HF models (#371) 2023-05-05 18:33:54 -05:00
Sean Sube 88fa126d69
Merge branch 'feat/373-non-square-inpaint' 2023-05-03 23:07:17 -05:00
Sean Sube 23aaf656d3
fix(api): match mask and image size before adding noise (#373) 2023-05-03 23:05:40 -05:00
Sean Sube d66bf9e54f
fix(api): download pretrained models from HF correctly (#371) 2023-05-03 22:21:04 -05:00
Sean Sube b6692f068e
fix(api): parse config files as JSON or YAML depending on extension (#370) 2023-05-03 22:15:17 -05:00
Sean Sube e68e405633
fix: limit UNet stride to tile size 2023-05-03 19:21:32 -05:00
Sean Sube 3b02fc5768
feat: add UNet stride as its own parameter 2023-05-03 19:15:05 -05:00
Sean Sube ac4aef6ae3
resize mask to cover source image before trimming 2023-05-02 21:15:14 -05:00
Sean Sube c8bc175239
fix(api): keep aspect ratio of mask for non-square sources (#373) 2023-05-02 20:52:28 -05:00
Sean Sube 98386cb385
fix(api): update latent window size on VAE patches 2023-05-02 19:57:26 -05:00
Sean Sube 55a1e46fc3
fix(api): update panorama params when using cached pipeline 2023-05-02 18:46:49 -05:00
Sean Sube a8869c06a4
reduce tile by latent scale before passing to pipeline 2023-05-01 23:40:17 -05:00
Sean Sube 8b57767f4a
fix chain stage loading 2023-05-01 23:25:55 -05:00
Sean Sube 95725fff79
feat(api): add tile size and stride to image parameters 2023-05-01 23:21:25 -05:00
Sean Sube 746e33b1f5
slice mask for views 2023-05-01 19:40:19 -05:00
Sean Sube e8d6ab64c1
add view iteration to panoramic inpaint 2023-05-01 19:09:52 -05:00
Sean Sube ca611f03df
enable all valid inpaint pipes 2023-05-01 18:58:29 -05:00
Sean Sube 71b95182a1
feat(api): add inpaint to panorama pipeline 2023-05-01 18:53:46 -05:00
Sean Sube a57d90ca02
fix(api): add convertible pipelines to extras schema 2023-04-30 21:23:44 -05:00
Sean Sube 5dfb09bd3c
fix(api): use existing progress counter for highres and loopback 2023-04-30 17:27:51 -05:00
Sean Sube 852c57c08a
fix(api): add pytorch_lightning to optional reqs (#366) 2023-04-30 17:19:03 -05:00
Sean Sube 124014b8b5
fix(exe): copy entrypoint script to correct location before bundling 2023-04-30 14:56:24 -05:00
Sean Sube 572a5159ad
fix(api): limit fp16 ops for v2.1 models (#364) 2023-04-30 08:49:34 -05:00
Sean Sube ea9d15fdd2
chore(api): prepare log configs for detailed log levels 2023-04-30 07:35:09 -05:00