Commit Graph

374 Commits

Author SHA1 Message Date
Roman Schmitz ac10e51364
add auth to --listen and readme (#2127)
* Update webui.py

* Update readme.md

* Update webui.py

Only enable AuthN for --listen and --share

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>

* docs: rephrase documentation changes for auth

---------

Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
2024-02-10 18:15:51 +01:00
Manuel Schmid b281375ce2
feat: add exif data processing (saving and loading) 2024-02-04 23:29:48 +01:00
Manuel Schmid ceefba9b69
Merge branch 'feature/add-metadata-to-files'
# Conflicts:
#	language/en.json
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	modules/meta_parser.py
#	modules/private_logger.py
#	modules/util.py
#	webui.py
2024-02-04 21:09:24 +01:00
Manuel Schmid dfb48fd754
feat: add better handling for image import with empty metadata 2024-02-04 19:24:45 +01:00
Manuel Schmid 1419231e74
feat: prevent config reset by renaming metadata_scheme to match config options 2024-02-03 22:41:26 +01:00
Manuel Schmid f745d40687
refactor: merge metadata.py into meta_parser.py 2024-02-02 01:55:32 +01:00
Manuel Schmid b438f7b43f
chore: check and remove ToDo's 2024-02-02 01:45:08 +01:00
Manuel Schmid 934bdb180a
feat: add translations and hint for image prompt parameters 2024-02-02 01:35:49 +01:00
Manuel Schmid 9bdb65ec5d
feat: add metadata handling for all non-img2img parameters 2024-01-31 01:18:09 +01:00
Manuel Schmid 7772eb7965
refactor: add flag for refiner_swap_method 2024-01-31 01:17:10 +01:00
Manuel Schmid e93a345ccf
feat: code cleanup, do not queue metadata preview on image upload 2024-01-30 00:20:46 +01:00
Manuel Schmid e541097451
wip: code cleanup, update todos 2024-01-29 21:54:22 +01:00
Manuel Schmid 20e53028a4
refactor: use central flag for ControlNet image count 2024-01-29 14:27:51 +01:00
Manuel Schmid c3ab9f1f30
refactor: use central flag for LoRA count 2024-01-29 14:26:56 +01:00
Manuel Schmid 13d0341a02
feat: sort styles after metadata import 2024-01-29 01:52:42 +01:00
Manuel Schmid cbc63ebba3
feat: add enums for Performance, Steps and StepsUOV
also move MetadataSchema enum to prevent circular dependency
2024-01-28 20:01:33 +01:00
Manuel Schmid 7ddd4e5209
wip: optimize handling for metadata in Gradio calls 2024-01-28 19:58:36 +01:00
Manuel Schmid ee21c2b6bc
feat: rename metadata tab and import button label 2024-01-28 18:02:15 +01:00
Manuel Schmid f3010313fc
wip: add metadata mapping, reading and writing
applying data after reading currently not functional for A1111
2024-01-28 05:35:44 +01:00
Manuel Schmid f8f081b33f
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	launch.py
#	modules/config.py
#	presets/realistic.json
#	webui.py
2024-01-28 00:58:36 +01:00
Manuel Schmid 6031f85f49
Merge branch 'main_upstream' into feature/add-preset-selection
# Conflicts:
#	modules/config.py
#	presets/realistic.json
2024-01-28 00:57:03 +01:00
Manuel Schmid 7185abb8ba
Merge branch 'main_upstream'
# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
2024-01-27 21:09:08 +01:00
Manuel Schmid 1ae495f6b8
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	requirements_versions.txt
#	webui.py
2024-01-26 11:32:53 +01:00
Manuel Schmid 338004c2e5
feat: optimize gradio element visibility changes and data provisioning 2024-01-26 02:08:27 +01:00
Manuel Schmid 3812228758
Merge branch 'main_upstream' into feature/add-metadata-to-files 2024-01-25 21:01:51 +01:00
rayronvictor 860ac91b16 Merge remote-tracking branch 'upstream/feature/add-inpaint-mask-generation' into feature/add-inpaint-mask-generation
# Conflicts:
#	webui.py
2024-01-25 16:49:19 -03:00
rayronvictor 228a0aaeea Add SAM support 2024-01-25 16:45:02 -03:00
Manuel Schmid 366984ca64
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	webui.py
2024-01-25 10:48:40 +01:00
Manuel Schmid d2b697f33b
refactor: rename cloth_category to inpaint_mask_cloth_category 2024-01-25 10:47:34 +01:00
rayronvictor f0fb9783e1 Add options to u2net_cloth_seg 2024-01-24 21:26:23 -03:00
Manuel Schmid e196a35ce2
Merge branch 'feature/add-inpaint-mask-generation'
# Conflicts:
#	modules/config.py
#	requirements_versions.txt
2024-01-24 02:46:09 +01:00
Manuel Schmid db5512fb93
feat: add inpaint mask generation functionality
uses rembg, see https://github.com/danielgatis/rembg
2024-01-24 02:22:50 +01:00
Manuel Schmid d7c1f4a6aa
Merge branch 'hotfix/prevent-skipping-and-stopping-by-other-users'
# Conflicts:
#	modules/advanced_parameters.py
#	modules/async_worker.py
#	webui.py
2024-01-22 23:15:18 +01:00
Manuel Schmid 25c157b177
Merge commit '4912599f6e5c2ef01acf5d4f0bbcba236fa5c63f'
# Conflicts:
#	webui.py
2024-01-22 21:53:08 +01:00
Manuel Schmid 148eddf48d
Merge branch 'feature/extract-advanced-parameters' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	webui.py
2024-01-22 21:31:24 +01:00
Manuel Schmid f3222b0f27
feat: extract attribute controlnet_softness 2024-01-22 20:09:24 +01:00
Manuel Schmid 4ce27aeb0f
feat: extract inpaint_ctrls attributes
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
2024-01-22 19:20:04 +01:00
Manuel Schmid eb1d3938fe
feat: extract freeu_ctrls attributes
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
2024-01-22 19:19:40 +01:00
Manuel Schmid cfb70c0278
feat: extract attribute refiner_swap_method 2024-01-22 19:10:32 +01:00
Manuel Schmid 2d8ca41ce5
feat: extract attribute canny_high_threshold 2024-01-22 19:08:54 +01:00
Manuel Schmid ec486443ea
feat: extract attribute canny_low_threshold 2024-01-22 19:06:10 +01:00
Manuel Schmid 9f194a91fa
feat: extract attribute skipping_cn_preprocessor 2024-01-22 18:54:25 +01:00
Manuel Schmid 0bf41591a6
feat: extract attribute debugging_cn_preprocessor 2024-01-22 18:52:41 +01:00
Manuel Schmid 6289e5daea
feat: extract attribute mixing_image_prompt_and_inpaint 2024-01-22 18:51:12 +01:00
Manuel Schmid cce9871cc5
feat: extract attribute mixing_image_prompt_and_vary_upscale 2024-01-22 18:49:29 +01:00
Manuel Schmid 2ab5593d71
feat: extract attribute overwrite_upscale_strength 2024-01-22 18:46:47 +01:00
Manuel Schmid 22af976c51
feat: extract attribute overwrite_vary_strength 2024-01-22 18:45:01 +01:00
Manuel Schmid 9f4a00e868
feat: extract attribute overwrite_height 2024-01-22 18:42:54 +01:00
Manuel Schmid 2eed5a28f2
feat: extract attribute overwrite_width 2024-01-22 18:41:02 +01:00
Manuel Schmid 2b1f501462
feat: extract attribute overwrite_switch 2024-01-22 18:38:20 +01:00
Manuel Schmid df35033cc9
feat: extract attribute overwrite_step 2024-01-22 18:34:40 +01:00
Manuel Schmid 217be190bb
feat: extract attribute generate_image_grid 2024-01-22 18:23:10 +01:00
Manuel Schmid d72573aca4
feat: extract attribute scheduler_name 2024-01-22 18:06:11 +01:00
Manuel Schmid e54bad87f1
feat: extract attribute sampler_name 2024-01-22 18:00:27 +01:00
Manuel Schmid fc3da75baf
feat: extract attribute adaptive_cfg 2024-01-22 17:31:18 +01:00
Manuel Schmid 618b01764c
feat: extract attribute adm_scaler_end 2024-01-22 17:11:27 +01:00
Manuel Schmid 64dcdbbef3
feat: extract attribute adm_scaler_negative 2024-01-22 17:03:50 +01:00
Manuel Schmid 3607059224
feat: extract attribute adm_scaler_positive 2024-01-22 17:01:32 +01:00
Manuel Schmid 79a63491fe
feat: extract attribute disable_preview 2024-01-22 16:58:46 +01:00
rsl8 f6d67d7655
Make the private log url path relative (#1948) 2024-01-20 22:04:44 -08:00
Manuel Schmid 4912599f6e
feat: update history link date after each generation
prevents outdated date in link after midnight
2024-01-19 01:00:28 +01:00
Manuel Schmid 72d1e48def
Merge branch 'jpg_config_image_extension'
# Conflicts:
#	modules/async_worker.py
#	modules/flags.py
#	modules/private_logger.py
#	webui.py
2024-01-19 00:14:44 +01:00
Manuel Schmid 7e52a1de8f
refactor: rename image_file_extension to output_format 2024-01-19 00:06:07 +01:00
Manuel Schmid addd5ef3bd
Merge branch 'feature/add-metadata-to-files'
# Conflicts:
#	args_manager.py
#	modules/async_worker.py
#	modules/config.py
#	modules/private_logger.py
#	modules/util.py
2024-01-16 00:50:46 +01:00
Manuel Schmid ba5d0b6eaf
refactor: rename metadata_schema to metadata_scheme 2024-01-15 23:59:57 +01:00
Manuel Schmid a2153dba7d
fix: correctlyy hide/show metadata schema on app start 2024-01-15 23:20:43 +01:00
Manuel Schmid 191f8148e4
feat: add support for A1111 metadata schema
cf2772fab0/modules/processing.py (L672)
2024-01-15 21:16:52 +01:00
Manuel Schmid 493e484122
feat: add argument disable_metadata 2024-01-15 19:11:40 +01:00
Manuel Schmid 8d56318bed
feat: add config and checkbox for save_metadata_to_images 2024-01-15 18:54:49 +01:00
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 161b988522
feat: delete temp images after yielding to gradio 2024-01-14 21:16:16 +01:00
Manuel Schmid d79c1d5a27
refactor: change label 2024-01-14 14:25:01 +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
eddyizm 9dfa1a99e3
moved function to config module 2024-01-10 19:06:40 -08: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 b5bb4eb8b1
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	webui.py
2024-01-05 21:54:46 +01:00
Manuel Schmid 4900837786
feat: add argument --disable-preset-selection
useful for cloud provisioning to prevent model switches and keep models loaded
2024-01-05 21:53:06 +01:00
Manuel Schmid 04ba1604f4
fix: use currentTask instead of ctrls after merging upstream 2024-01-04 18:12:11 +01:00
Manuel Schmid e68c8aa0a7
Merge branch 'main_upstream' into hotfix/prevent-skipping-and-stopping-by-other-users
# Conflicts:
#	webui.py
2024-01-04 18:07:06 +01:00
Manuel Schmid 62d2a3a454
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	webui.py
2024-01-02 22:40:23 +01:00
Manuel Schmid e86b7f56bc
Merge branch 'main_upstream' into feature/add-preset-selection 2024-01-02 22:24:25 +01:00
Manuel Schmid 2fa3cf6c3f
DRY output parameter handling 2024-01-02 22:23:11 +01:00
Manuel Schmid 925ba509f7
Merge branch 'main_upstream'
# Conflicts:
#	modules/advanced_parameters.py
2024-01-02 18:00:26 +01:00
lllyasviel e5af760db8 mask upload 2024-01-02 08:21:50 -08:00
xhoxye b5163e057f
Fooocus mask enhance, mask upload and invert.蒙版增强功能,上传蒙版、反转手涂蒙版 (#1645)
* Update webui.py

Added a mask upload interface.添加蒙版上传界面。

* Add mask upload feature

Add mask upload feature.添加蒙版上传功能。

* Add mask upload feature

Add mask upload feature.添加蒙版上传功能。

* Try to fix the problem when drawing mates with external enrichment.

Swap the judgment criteria and try to fix the problem when drawing mates with external enrichment.
调换判断条件,尝试修复和外部扩充绘制配合时出现的问题

* 修改注释

* 修改注释

* Update readme.md

更新日志

* Add mask upload check box,

Add check box, default does not show mask upload box, check it and then show it.
添加复选框,默认不显示蒙版上传框,勾选后再显示。

* back to normal

还原

* Try adding a mask inversion feature

Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。

* Try adding a mask inversion feature

Try adding a mask inversion feature.
尝试添加蒙版反转功能。
增加一个复选框来决定是否将蒙版反转。

* Fixed word errors

* Fix the words of the description
2024-01-02 07:17:02 -08:00
Manuel Schmid 0099dd4783
Merge branch 'feature/add-preset-selection'
# Conflicts:
#	webui.py
2024-01-01 18:50:43 +01:00
Manuel Schmid 55bb233a3e
use state_is_generating for preset selection change 2024-01-01 18:49:01 +01:00
Manuel Schmid 9d8881d052
Merge branch 'main_upstream' into feature/add-preset-selection 2024-01-01 18:41:54 +01:00
Manuel Schmid c7a5638f54
Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	webui.py
2023-12-30 14:40:49 +01:00
lllyasviel eb0b4d51ef
fix #1608 (#1635) 2023-12-28 08:22:50 -08:00
lllyasviel 2f6ebbf876 some fix for previous PRs 2023-12-28 08:07:43 -08:00
Manuel Schmid 48b1324a26
add default_max_image_number to config, use as maximum in default_image_number (#1616) 2023-12-28 07:48:30 -08:00