Commit Graph

1060 Commits

Author SHA1 Message Date
Manuel Schmid 3e9d66c5f6
Merge branch 'feature/automatically-describe-uov-image'
# Conflicts:
#	webui.py
2024-01-15 13:37:15 +01:00
Manuel Schmid 5c1d2e8172
feat: automatically describe image on uov image upload if prompt is empty 2024-01-15 13:25:51 +01:00
Manuel Schmid f25bf49894
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/config.py
#	modules/flags.py
#	webui.py
2024-01-14 23:40:24 +01:00
Manuel Schmid 5b633f6cf8
refactor: rename image_extension to image_file_extension 2024-01-14 23:38:36 +01:00
Manuel Schmid b18ae4343d
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	webui.py
2024-01-14 23:22:03 +01:00
Manuel Schmid 2b802da365
feat: always show image_extension element
this is now possible due to image extension support in gradio via https://github.com/lllyasviel/Fooocus/pull/1932
2024-01-14 21:59:24 +01:00
Manuel Schmid dc6c02540a
Merge branch 'feature/use-consistent-file-name-in-gradio' into jpg_config_image_extension
# Conflicts:
#	modules/async_worker.py
#	modules/private_logger.py
2024-01-14 21:47:05 +01:00
Manuel Schmid eeb57f3ff5
chore: code cleanup, remove redundant if statement 2024-01-14 21:20:13 +01:00
Manuel Schmid 1779fa0f3a
feat: use args temp path if given 2024-01-14 21:19:01 +01:00
Manuel Schmid 161b988522
feat: delete temp images after yielding to gradio 2024-01-14 21:16:16 +01:00
Manuel Schmid 3c855bd331
feat: use consistent file name in gradio
returns and uses filepaths instead of numpy image by saving to temp dir
uses double the temp dir file storage on disk as it saves to temp dir and gradio temp dir when displaying the image, but reuses logged output image
2024-01-14 20:21:33 +01:00
Manuel Schmid 26f31ff2bd
feat: add webp to image_extensions
supported image extemsions: see https://pillow.readthedocs.io/en/stable/handbook/image-file-formats.html
2024-01-14 14:25:52 +01:00
Manuel Schmid d79c1d5a27
refactor: change label 2024-01-14 14:25:01 +01:00
Manuel Schmid 694763447d
fix: add missing image_extension parameter to log call 2024-01-14 14:23:36 +01:00
eddyizm 2bd7ae1e6d
disabled if image log flag is passed in 2024-01-12 23:29:30 -08:00
eddyizm 07791dd0af
check flag before displaying image extension radio button 2024-01-12 23:01:22 -08:00
eddyizm ab3acb7817
moved image extension to webui via async worker. Passing as parameter to log and get_current_html_path functions per feedback 2024-01-12 22:49:07 -08:00
Manuel Schmid 79b7eef5ee
fix: remove uppercase image names 2024-01-12 22:36:48 +01:00
eddyizm 9dfa1a99e3
moved function to config module 2024-01-10 19:06:40 -08:00
Manuel Schmid faa09aea9d
update readme PRs 2024-01-10 21:06:08 +01:00
Manuel Schmid 2f6c0a8ca1
Merge branch 'patch-2' 2024-01-10 20:57:24 +01:00
Manuel Schmid c69fd4df80
feat: update blue_pencil-XL to latest stable version 3.1.0
also see https://civitai.com/models/119012?modelVersionId=293405
2024-01-10 20:54:32 +01:00
eddyizm e1697272ec
feature: added flag, config and ui update for image extension change #1789 2024-01-10 09:36:27 -08:00
Manuel Schmid 1ff3efd56b
Merge branch 'feature/update-juggernaut-xl-to-v8'
# Conflicts:
#	css/style.css
2024-01-10 11:02:10 +01:00
Manuel Schmid 851de15f95
Merge branch 'main_upstream' into feature/update-juggernaut-xl-to-v8 2024-01-10 11:01:21 +01:00
Manuel Schmid 92684132b5
clean up model download URL query parameters 2024-01-10 11:00:39 +01:00
Chris Rohrer dc5b5238c8
fix: prevent cutting off overlay (#1829)
Co-authored-by: Christoph Rohrer <christoph.rohrer@odt.net>
2024-01-09 17:50:47 -08:00
Manuel Schmid f136e78df7
Merge branch 'crohrer_main'
# Conflicts:
#	css/style.css
2024-01-09 14:35:01 +01:00
Manuel Schmid 0299d04856
Merge branch 'hotfix/rename-preview-images'
# Conflicts:
#	css/style.css
#	javascript/script.js
#	modules/ui_gradio_extensions.py
2024-01-09 14:33:02 +01:00
Manuel Schmid 5a75599c63
Merge branch 'main_upstream' into hotfix/rename-preview-images
# Conflicts:
#	sdxl_styles/samples/academia.jpg
#	sdxl_styles/samples/baroque.jpg
#	sdxl_styles/samples/caricature.jpg
#	sdxl_styles/samples/constructivism.jpg
#	sdxl_styles/samples/cubism.jpg
#	sdxl_styles/samples/dadaism.jpg
#	sdxl_styles/samples/expressionism.jpg
#	sdxl_styles/samples/fauvism.jpg
#	sdxl_styles/samples/futurism.jpg
#	sdxl_styles/samples/glitchcore.jpg
#	sdxl_styles/samples/idyllic.jpg
#	sdxl_styles/samples/impressionism.jpg
#	sdxl_styles/samples/medievalism.jpg
#	sdxl_styles/samples/minimalism.jpg
#	sdxl_styles/samples/neoclassicism.jpg
#	sdxl_styles/samples/rococo.jpg
#	sdxl_styles/samples/sketchup.jpg
#	sdxl_styles/samples/suprematism.jpg
#	sdxl_styles/samples/surrealism.jpg
#	sdxl_styles/samples/terragen.jpg
2024-01-09 14:07:06 +01:00
Christoph Rohrer cca4cf3574 fix: prevent cutting off overlay 2024-01-09 11:50:27 +01:00
lllyasviel 6261f17561
Update Version (#1821) 2024-01-08 17:01:52 -08:00
lllyasviel fee997d929
git is now case sensitive (#1820) 2024-01-08 16:55:36 -08:00
cocktailpeanut c48d6e7404
fix --disable-in-browser (#1718) 2024-01-08 10:46:12 -08:00
lllyasviel 888cc08405
fix #1807 (#1814) 2024-01-08 10:41:02 -08:00
Manuel Schmid d6b5aa4dcd
feat: optimise image filesize, compress jpg 80% 2024-01-08 16:44:10 +01:00
Manuel Schmid 88586ddfc8
fix: rename uppercase files to lowercase 2024-01-08 16:38:25 +01:00
Chris Rohrer f298ebca76
feat: adds preview overlay for styles (#1762)
* feat: adds preview overlay for styles

* fix: implement correct path resolution for all OS

solves issues for Windows

* fix: makes preview overlay also work with other languages

* feat: scale down images to 258x200, fix aspect ratio in css

reduces file size from 19,6MB to 3,4MB

* fix: adjust z-index to correctly overlay gradio border pulse when generating images

* update files

* version

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
Co-authored-by: lllyasviel <lyuminzhang@outlook.com>
2024-01-07 15:10:42 -08:00
Manuel Schmid 21bceb6d51
Merge branch 'feature/update-juggernaut-xl-to-v8' 2024-01-07 16:18:58 +01:00
Manuel Schmid 896fbc6185
feat: update JuggernautXL from v6 to v8 2024-01-07 15:47:07 +01:00
Manuel Schmid 1351e29eff
Merge branch 'vikrantrathore/patch-2' 2024-01-07 15:42:36 +01:00
Manuel Schmid 7bdb976bf9
Update presets/anime.json 2024-01-07 15:30:59 +01:00
Manuel Schmid e8a2eb0bbc
Merge branch 'crohrer_main' 2024-01-07 14:41:24 +01:00
Manuel Schmid 80b4c5d615
Merge branch 'hotfix/fix-file-sort' 2024-01-07 14:41:09 +01:00
Manuel Schmid 74eec84a61
fix: correctly sort files, display deepest dir level first 2024-01-07 14:28:12 +01:00
Manuel Schmid d5f25eedea
feat: scale down images to 258x200, fix aspect ratio in css
reduces file size from 19,6MB to 3,4MB
2024-01-07 12:03:18 +01:00
Manuel Schmid bb57ed452c
Merge branch 'crohrer_main' 2024-01-06 12:59:55 +01:00
Manuel Schmid 6a75a8347a
Merge branch 'main' of github.com:mashb1t/Fooocus 2024-01-06 12:58:45 +01:00
Chris Rohrer d03441a079 Merge branch 'main' of github.com:crohrer/Fooocus 2024-01-06 10:55:28 +01:00
Chris Rohrer 4dd85d7d5d fix: makes preview overlay also work with other languages 2024-01-06 10:55:14 +01:00