diff --git a/CHANGELOG.md b/CHANGELOG.md index b0fd956fa..773a59419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2023-10-08 +## Update for 2023-10-09 - Final strech of the DEV branch before merge to master - Requires pending `diffusers==0.22.0` diff --git a/TODO.md b/TODO.md index e72f7fcf9..223f6d0db 100644 --- a/TODO.md +++ b/TODO.md @@ -41,6 +41,8 @@ Stuff to be added, in no particular order... - New inpainting canvas controls (move from backend to purely frontend) - New image browser (move from backend to purely frontend) - Change workflows from static/legacy to steps-based +- Video processing + ## Investigate diff --git a/installer.py b/installer.py index 539517aba..b4f9d0a2a 100644 --- a/installer.py +++ b/installer.py @@ -561,24 +561,18 @@ def install_repositories(): log.info('Verifying repositories') os.makedirs(os.path.join(os.path.dirname(__file__), 'repositories'), exist_ok=True) stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git") - # stable_diffusion_commit = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf") stable_diffusion_commit = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', None) clone(stable_diffusion_repo, d('stable-diffusion-stability-ai'), stable_diffusion_commit) taming_transformers_repo = os.environ.get('TAMING_TRANSFORMERS_REPO', "https://github.com/CompVis/taming-transformers.git") - # taming_transformers_commit = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HASH', "3ba01b241669f5ade541ce990f7650a3b8f65318") taming_transformers_commit = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HASH', None) clone(taming_transformers_repo, d('taming-transformers'), taming_transformers_commit) k_diffusion_repo = os.environ.get('K_DIFFUSION_REPO', 'https://github.com/crowsonkb/k-diffusion.git') - # k_diffusion_commit = os.environ.get('K_DIFFUSION_COMMIT_HASH', "b43db16749d51055f813255eea2fdf1def801919") - # k_diffusion_commit = os.environ.get('K_DIFFUSION_COMMIT_HASH', 'ab527a9') - k_diffusion_commit = os.environ.get('K_DIFFUSION_COMMIT_HASH', 'f4a74f1ec906cb62916f58288ec73ef0330ba446') + k_diffusion_commit = os.environ.get('K_DIFFUSION_COMMIT_HASH', '0455157') clone(k_diffusion_repo, d('k-diffusion'), k_diffusion_commit) codeformer_repo = os.environ.get('CODEFORMER_REPO', 'https://github.com/sczhou/CodeFormer.git') - # codeformer_commit = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af") codeformer_commit = os.environ.get('CODEFORMER_COMMIT_HASH', "7a584fd") clone(codeformer_repo, d('CodeFormer'), codeformer_commit) blip_repo = os.environ.get('BLIP_REPO', 'https://github.com/salesforce/BLIP.git') - # blip_commit = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9") blip_commit = os.environ.get('BLIP_COMMIT_HASH', None) clone(blip_repo, d('BLIP'), blip_commit) if args.profile: diff --git a/modules/ui.py b/modules/ui.py index 5c682933d..97b197f8e 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -543,7 +543,6 @@ def create_ui(startup_timer = None): negative_token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[txt2img_negative_prompt, steps], outputs=[negative_token_counter]) ui_extra_networks.setup_ui(extra_networks_ui, txt2img_gallery) - # log.debug(f'UI interface: tab=txt2img batch={show_batch.value} seed={show_seed.value} advanced={show_advanced.value} second_pass={show_second_pass.value}') timer.startup.record("ui-txt2img") @@ -674,9 +673,6 @@ def create_ui(startup_timer = None): scale_by.release(**on_change_args) button_update_resize_to.click(**on_change_args) - # the code below is meant to update the resolution label after the image in the image selection UI has changed. - # as it is now the event keeps firing continuously for inpaint edits, which ruins the page with constant requests. - # I assume this must be a gradio bug and for now we'll just do it for non-inpaint inputs. for component in [init_img, sketch]: component.change(fn=lambda: None, _js="updateImg2imgResizeToTextAfterChangingImage", inputs=[], outputs=[], show_progress=False) diff --git a/modules/ui_loadsave.py b/modules/ui_loadsave.py index 294d040c6..16b2df879 100644 --- a/modules/ui_loadsave.py +++ b/modules/ui_loadsave.py @@ -72,10 +72,14 @@ class UiLoadsave: apply_field(x, 'value') if type(x) == gr.Dropdown: def check_dropdown(val): + if x.choices is None: + errors.log.warning(f'UI: path={path} value={getattr(x, "value", None)}, choices={getattr(x, "choices", None)}') + return False + choices = [c[0] for c in x.choices] if type(x.choices[0]) == tuple else x.choices if getattr(x, 'multiselect', False): - return all(value in x.choices for value in val) + return all(value in choices for value in val) else: - return val in x.choices + return val in choices apply_field(x, 'value', check_dropdown, getattr(x, 'init_field', None)) def check_tab_id(tab_id):