Commit Graph

760 Commits

Author SHA1 Message Date
AUTOMATIC1111 1d71c36de2 third time's the charm 2023-07-08 15:21:29 +03:00
AUTOMATIC1111 9043b91649 additional changes for merge conflict for #11337 2023-07-08 15:14:24 +03:00
AUTOMATIC1111 ec9bbda3da
Merge branch 'dev' into img2img-batch-png-info 2023-07-08 15:10:10 +03:00
AUTOMATIC1111 46c2b1e202
Merge pull request #11660 from neilmahaseth/patch-1
Fix UnicodeEncodeError when writing to file CLIP Interrogator Batch Mode
2023-07-08 13:10:03 +03:00
Neil Mahseth c258dd34a8
Fix UnicodeEncodeError when writing to file CLIP Interrogator Batch Mode
The code snippet print(interrogation_function(img), file=open(os.path.join(ii_output_dir, f"{left}.txt"), 'a')) raises a UnicodeEncodeError with the message "'charmap' codec can't encode character '\u016b' in position 129". This error occurs because the default encoding used by the open() function cannot handle certain Unicode characters.

To fix this issue, the encoding parameter needs to be explicitly specified when opening the file. By using an appropriate encoding, such as 'utf-8', we can ensure that Unicode characters are properly encoded and written to the file.

The updated code should be modified as follows:

python
Copy code
print(interrogation_function(img), file=open(os.path.join(ii_output_dir, f"{left}.txt"), 'a', encoding='utf-8'))
By making this change, the code will no longer raise the UnicodeEncodeError and will correctly handle Unicode characters during the file write operation.
2023-07-06 22:02:47 +05:30
AUTOMATIC1111 fa31dd80f5
Merge pull request #11315 from guming3d/master
fix: adding elem_id for img2img resize to and resize by tabs
2023-06-27 08:53:10 +03:00
Ferdinand Weynschenk c4c63dd5e4 resolve linter 2023-06-20 14:03:42 +02:00
Ferdinand Weynschenk 928bd42da4 PNG info support at img2img batch 2023-06-20 13:33:36 +02:00
George Gu d2ccdcdc97 fix: adding elem_id for img2img resize to and resize by tabs 2023-06-19 10:16:18 +08:00
w-e-w 96e446218c link footer API to Wiki when API is not active 2023-06-06 18:58:44 +09:00
AUTOMATIC1111 7a7a201d81
Merge pull request #10956 from akx/len
Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions
2023-06-05 11:06:37 +03:00
AUTOMATIC1111 efc4c79b5e
Merge pull request #10980 from AUTOMATIC1111/sysinfo
Added sysinfo tab to settings
2023-06-04 11:16:32 +03:00
AUTOMATIC f98f4f73aa infer styles from prompts, and an option to control the behavior 2023-06-04 10:56:48 +03:00
AUTOMATIC 7393c1f99c Added sysinfo tab to settings 2023-06-03 13:55:35 +03:00
Aarni Koskela 51864790fd Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions 2023-06-02 15:07:10 +03:00
catboxanon 7dca8e7698 Support dynamic sort of extra networks 2023-06-02 04:08:45 +00:00
AUTOMATIC b3390a9840 Merge branch 'dev' into startup-profile 2023-06-01 08:42:50 +03:00
AUTOMATIC 8a561d94e6 use ui_reorder_list rather than ui_reorder for UI reorder option to make the program not break when reverting to old version 2023-05-31 23:05:44 +03:00
AUTOMATIC1111 fae8bdfa48 Merge pull request #10785 from nyqui/fix-hires.fix
fix "hires. fix" prompt sharing same labels with txt2img_prompt
2023-05-31 22:54:24 +03:00
AUTOMATIC df02498d03 add an option to show selected setting in main txt2img/img2img UI
split some code from ui.py into ui_settings.py ui_gradio_edxtensions.py
add before_process callback for scripts
add ability for alwayson scripts to specify section and let user reorder those sections
2023-05-31 22:40:09 +03:00
AUTOMATIC 583fb9f066 change UI reorder setting to multiselect 2023-05-31 20:31:17 +03:00
AUTOMATIC 05933840f0 rename print_error to report, use it with together with package name 2023-05-31 19:56:37 +03:00
AUTOMATIC1111 52b8752e62
Merge branch 'dev' into report-error 2023-05-31 19:15:21 +03:00
AUTOMATIC1111 e7439b5cbe
Merge pull request #10785 from nyqui/fix-hires.fix
fix "hires. fix" prompt sharing same labels with txt2img_prompt
2023-05-31 18:40:00 +03:00
Aarni Koskela 00dfe27f59 Add & use modules.errors.print_error where currently printing exception info by hand 2023-05-29 09:17:30 +03:00
nyqui bae2fca523
fix "hires. fix" prompt/neg sharing same labels as txt2img_prompt/negative_prompt 2023-05-28 22:59:29 +09:00
AUTOMATIC ee65e72931 repair file paste for Firefox from #10615
remove animation when pasting files into prompt
rework two dragdrop js files into one
2023-05-22 09:49:59 +03:00
AUTOMATIC fe73d6439a Revert "change width/heights slider steps to 64 from 8"
This reverts commit 9a86932c8b.
2023-05-21 17:35:19 +03:00
AUTOMATIC 0cc05fc492 work on startup profile display 2023-05-21 00:41:41 +03:00
catboxanon 373903d851 hiresfix prompt: add classes, update css sel 2023-05-20 19:34:50 +00:00
catboxanon b2b06eee02
Support edit attn shortcut in hires fix prompts 2023-05-20 13:31:18 -04:00
AUTOMATIC 9a86932c8b change width/heights slider steps to 64 from 8 2023-05-19 18:49:39 +03:00
AUTOMATIC bd877d7b5a rework #10519 2023-05-18 22:49:00 +03:00
AUTOMATIC1111 2e006fa500
Merge pull request #10519 from catboxanon/patch/hires-input-release-event
Improve width/height slider responsiveness
2023-05-18 20:32:21 +03:00
catboxanon 57275da903
Reorder variable assignment 2023-05-18 13:25:32 -04:00
AUTOMATIC ff0e17174f rework hires prompts/sampler code to among other things support different extra networks in first/second pass
rework quoting for infotext items that have commas in them to use json (should be backwards compatible except for cases where it didn't work previously)
add some locals from processing function into the Processing class as fields
2023-05-18 20:16:09 +03:00
catboxanon 63c02314cc
.change -> .release for hires input
Improves overall UI responsiveness.
2023-05-18 13:06:13 -04:00
AUTOMATIC 5ec2c294ee Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext 2023-05-18 17:57:16 +03:00
AUTOMATIC bb431df52b python linter fixes 2023-05-18 10:16:33 +03:00
AUTOMATIC1111 182330ae40
Merge branch 'dev' into ngrok-py 2023-05-18 10:12:17 +03:00
AUTOMATIC 3694379f26 rework #8863 to work with all img2img tabs 2023-05-18 00:03:16 +03:00
AUTOMATIC 973ae87309 Merge remote-tracking branch 'pieresimakp/img2img-detect-image-size' into dev 2023-05-17 23:49:39 +03:00
AUTOMATIC 61ee563df9 option to specify editor height for img2img 2023-05-17 23:42:01 +03:00
AUTOMATIC e5dd4b4ebf remove some code duplication from #9348 2023-05-17 23:27:06 +03:00
AUTOMATIC1111 04b4508a66
Merge branch 'dev' into improve-frontend-responsiveness 2023-05-17 23:18:56 +03:00
AUTOMATIC b397f63e00 add option to reorder tabs
fix Reload UI not working
2023-05-17 23:11:33 +03:00
Aarni Koskela 85b4f89926 Replace state.need_restart with state.server_command + replace poll loop with signal 2023-05-17 10:15:03 +03:00
bobzilladev 0d31f20cbd Use ngrok-py library 2023-05-16 16:09:41 -04:00
AUTOMATIC 6302978ff8 restore nqsp in footer that was lost during linting 2023-05-16 15:14:44 +03:00
AUTOMATIC1111 86ff43b930 Merge pull request #10335 from akx/l10n-dis-take-2
Localization fixes
2023-05-13 20:46:50 +03:00
Aarni Koskela 1f57b948b7 Move localization to its own script block and load it first 2023-05-13 19:15:13 +03:00
Aarni Koskela 49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
AUTOMATIC 8aa87c564a add UI to edit defaults
allow setting defaults for elements in extensions' tabs
fix a problem with ESRGAN upscalers disappearing after UI reload
implicit change: HTML element id for train tab from tab_ti to tab_train (will this break things?)
2023-05-10 23:41:08 +03:00
AUTOMATIC 3ec7b705c7 suggestions and fixes from the PR 2023-05-10 21:21:32 +03:00
AUTOMATIC a5121e7a06 fixes for B007 2023-05-10 11:37:18 +03:00
AUTOMATIC 028d3f6425 ruff auto fixes 2023-05-10 11:05:02 +03:00
AUTOMATIC 4b854806d9 F401 fixes for ruff 2023-05-10 09:02:23 +03:00
AUTOMATIC f741a98bac imports cleanup for ruff 2023-05-10 08:43:42 +03:00
AUTOMATIC 96d6ca4199 manual fixes for ruff 2023-05-10 08:25:25 +03:00
AUTOMATIC 762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
Aarni Koskela 3ba6c3c83c Fix up string formatting/concatenation to f-strings where feasible 2023-05-09 22:25:39 +03:00
AUTOMATIC ad6ec02261 prevent Reload UI button/link from reloading the page when it's not yet ready 2023-05-09 11:42:47 +03:00
AUTOMATIC 2b96a7b694 add links to wiki for filename pattern settings
add extended info for quicksettings setting
2023-05-08 16:46:35 +03:00
AUTOMATIC 5edb0acfeb use multiselect for quicksettings (this also resets the existing setting) 2023-05-08 15:38:25 +03:00
AUTOMATIC fc966c0299 do not show licenses page when user selects Show all pages in settings 2023-05-08 15:30:32 +03:00
AUTOMATIC ab4ab4e595 add version to infotext, footer and console output when starting 2023-05-08 15:23:49 +03:00
AUTOMATIC b1717c0a48 do not load wait for shared.sd_model to load at startup 2023-05-02 09:08:00 +03:00
AUTOMATIC f15b7e52e3 Add a comment and partial fix for the issue when the inpaint UI is unresponsive after using it. 2023-05-01 13:47:46 +03:00
AUTOMATIC c48ab36cb9 alternate restore progress button implementation 2023-04-29 22:16:54 +03:00
AUTOMATIC bd9700405a Revert "Merge pull request #7595 from siutin/feature/restore-progress"
This reverts commit 80987c36f9, reversing
changes made to 2e78e65a22.
2023-04-29 22:15:20 +03:00
AUTOMATIC1111 15c4e78b44
Merge branch 'dev' into feature/restore-progress 2023-04-29 22:13:40 +03:00
AUTOMATIC e40b2d947d change gradio callback from change to release in a bunch of places now that it's fixed in gradio 2023-04-29 19:39:22 +03:00
AUTOMATIC1111 0e0e70c273
Merge pull request #8924 from kurilee/master
Add option "keep original size" to textual inversion images preprocess
2023-04-29 18:51:12 +03:00
AUTOMATIC1111 b615a2ed11
Merge pull request #9108 from AUTOMATIC1111/img2img-scale-by
add "resize by" and "resize to" tabs to img2img
2023-04-29 18:21:28 +03:00
AUTOMATIC1111 eabecc21ec
Update modules/ui.py
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-29 18:20:11 +03:00
AUTOMATIC1111 88c7debb02
Merge branch 'dev' into ui-config-tabs 2023-04-29 17:42:57 +03:00
AUTOMATIC1111 8987764395
Merge pull request #9312 from space-nuko/save-merge-recipe
Embed model merge metadata in .safetensors file
2023-04-29 17:15:01 +03:00
AUTOMATIC1111 e6cbfcfe5b
Merge branch 'dev' into gradio-theme-support 2023-04-29 12:45:43 +03:00
AUTOMATIC1111 dda839f686
Merge pull request #9693 from racinmat/hidable_buttons
adds label to buttons to make them hide
2023-04-29 11:05:51 +03:00
AUTOMATIC 101a18fc84 bump gradio to 3.27 2023-04-29 09:17:35 +03:00
Matěj Račinský eddcdb8061 adds label to buttons to make them hide 2023-04-17 23:48:28 +02:00
siutin 984970068c multi users support 2023-04-17 01:06:28 +08:00
space-nuko 7201d940a4 Improve frontend responsiveness for some buttons 2023-04-03 21:27:48 -05:00
space-nuko d132481058 Embed model merge metadata in .safetensors file 2023-04-02 17:41:55 -05:00
siutin 90366b8d85 tool button 2023-03-30 17:20:09 +08:00
siutin 4242e194e4 add a button to restore the current progress 2023-03-30 17:20:09 +08:00
space-nuko 67955ca9e5 Make selected tab configurable with UI config 2023-03-29 13:07:12 -05:00
AUTOMATIC 22bcc7be42 attempted fix for infinite loading for settings that some people experience 2023-03-29 08:58:29 +03:00
AUTOMATIC d667fc435f add "resize by" and "resize to" tabs to img2img 2023-03-28 22:23:40 +03:00
AUTOMATIC 433b3ab701 Revert "Merge pull request #7931 from space-nuko/img2img-enhance"
This reverts commit 4268759370, reversing
changes made to 1b63afbedc.
2023-03-28 20:36:57 +03:00
AUTOMATIC1111 4268759370
Merge pull request #7931 from space-nuko/img2img-enhance
Add `Upscale by` and `Upscaler` options to img2img
2023-03-28 20:21:25 +03:00
AUTOMATIC 77f9db3b08 serve css as independent files 2023-03-27 12:59:12 +03:00
space-nuko c9647c8d23 Support Gradio's theme API 2023-03-25 16:11:41 -04:00
space-nuko c5f9f7c237 Use .success() callback on img2img preview inputs change 2023-03-25 14:26:36 -04:00
space-nuko 7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
space-nuko 68999d0b15 Add upscale slider to img2img 2023-03-25 12:52:35 -04:00
pieresimakp fb72066ef6 fixed button position 2023-03-25 23:03:22 +08:00
pieresimakp e3b9d0e3e8 Merge branch 'master' into img2img-detect-image-size 2023-03-25 23:00:45 +08:00
kurilee b2fc7dba2e Add option "keep original size" to textual inversion images preprocess 2023-03-25 22:45:41 +08:00
AUTOMATIC1111 956ed9a737
Merge pull request #8780 from Brawlence/master
Unload and re-load checkpoint to VRAM on request (API & Manual)
2023-03-25 12:03:26 +03:00