mirror of
https://github.com/Zyin055/Config-Presets.git
synced 2026-01-26 19:19:54 +00:00
edited gerschel's pr
basedir() needs to be called in the global space to get the full path. AVAILABLE_COMPONENTS doesn't need to be global anymore. don't use exception handling as logic for component_map[], bad practice. formatting tweaks.
This commit is contained in:
Zyin055
@@ -1,4 +1,4 @@
|
||||
import modules.scripts
|
||||
import modules.scripts as scripts
|
||||
import gradio as gr
|
||||
import json
|
||||
import os
|
||||
@@ -6,60 +6,49 @@ import platform
|
||||
import subprocess as sp
|
||||
|
||||
|
||||
#Acts like settings for components
|
||||
AVAILABLE_COMPONENTS = [
|
||||
"Sampling Steps",
|
||||
"Sampling method",
|
||||
"Width",
|
||||
"Height",
|
||||
"Highres. fix",
|
||||
"Denoising strength",
|
||||
"Batch count",
|
||||
"Batch size",
|
||||
"CFG Scale",
|
||||
"Seed",
|
||||
]
|
||||
|
||||
#ui_steps = None # "steps" component in ui.py:635, label='Sampling Steps'
|
||||
#ui_sampler_index = None # "steps" component in ui.py:636, label='Sampling method'
|
||||
#ui_width = None # "width" component in ui.py:639, label='Width'
|
||||
#ui_height = None # "height" component in ui.py:640, label='Height'
|
||||
#ui_enable_hr = None # "enable_hr" component in ui.py:645,label='Highres. fix'
|
||||
#ui_denoising_strength = None # "denoising_strength" component in ui.py:650, label='Denoising strength'
|
||||
#ui_batch_count = None # "batch_count" component in ui.py:653, label='Batch count'
|
||||
#ui_batch_size = None # "batch_size" component in ui.py:654, label='Batch size'
|
||||
#ui_cfg_scale = None # "cfg_scale" component in ui.py:656, label='CFG Scale'
|
||||
basedir = scripts.basedir() #C:\Stable Diffusion\extensions\Config-Presets needs to be set in global space to get the extra 'extensions\Config-Presets' path
|
||||
|
||||
|
||||
class Script(modules.scripts.Script):
|
||||
class Script(scripts.Script):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.component_map = {k:None for k in AVAILABLE_COMPONENTS}
|
||||
self.basedir = modules.scripts.basedir() #C:\Stable Diffusion\extensions\Config-Presets
|
||||
|
||||
#self.basedir = scripts.basedir() #C:\Stable Diffusion #use at global instead to get the extra 'extensions\Config-Presets' path.
|
||||
|
||||
component_labels = [
|
||||
"Sampling Steps",
|
||||
"Sampling method",
|
||||
"Width",
|
||||
"Height",
|
||||
"Highres. fix",
|
||||
"Denoising strength",
|
||||
"Batch count",
|
||||
"Batch size",
|
||||
"CFG Scale",
|
||||
]
|
||||
self.component_map = {k: None for k in component_labels} # gets filled up in after_component()
|
||||
|
||||
#Load config from file
|
||||
try:
|
||||
with open(f"{self.basedir}\\extensions\\Config-Presets\\config.json") as file:
|
||||
with open(f"{basedir}\\config.json") as file:
|
||||
self.config_presets = json.load(file)
|
||||
except FileNotFoundError:
|
||||
print(f"[ERROR] Config Presets: Could not find config file at '{self.basedir}\\extensions\\Config-Presets\\config.json'. The Config Presets dropdown will not work!")
|
||||
print(f"[ERROR] Config Presets: Could not find config file at '{basedir}\\config.json'. The Config Presets dropdown will not work!")
|
||||
|
||||
def title(self):
|
||||
return "Config Presets"
|
||||
|
||||
def show(self, is_img2img):
|
||||
#return True
|
||||
return modules.scripts.AlwaysVisible # hide this script in the Scripts dropdown
|
||||
return scripts.AlwaysVisible # hide this script in the Scripts dropdown
|
||||
|
||||
def after_component(self, component, **kwargs):
|
||||
|
||||
# Getting tricky using try block instead of `if label in dict`
|
||||
try:
|
||||
self.component_map[component.label]
|
||||
|
||||
if component.label in self.component_map:
|
||||
self.component_map[component.label] = component
|
||||
except KeyError:
|
||||
# Not the component we're looking for, not a real error, pass
|
||||
pass
|
||||
#print(f"DEBUG: found component: {component} {component.label}")
|
||||
|
||||
#if component.elem_id == "script_list": #bottom of the script dropdown
|
||||
#if component.elem_id == "txt2img_style2_index": #doesn't work, need to be added after all the components we edit are loaded
|
||||
@@ -69,39 +58,36 @@ class Script(modules.scripts.Script):
|
||||
preset_values.append(k)
|
||||
#print(f"Config Presets: added \"{k}\"")
|
||||
|
||||
|
||||
with gr.Column(scale=9):
|
||||
def config_preset_dropdown_change(dropdown_value):
|
||||
config_preset = self.config_presets[dropdown_value]
|
||||
print(f"Config Presets: changed to {dropdown_value}")
|
||||
|
||||
|
||||
if self.component_map["Highres. fix"]:
|
||||
#if we are text2img highres fix gets a component, if it's None still, continue
|
||||
|
||||
# if we are txt2img highres fix has a component
|
||||
return (config_preset["steps"] if "steps" in config_preset else self.component_map["Sampling Steps"].value,
|
||||
config_preset["sampler_index"] if "sampler_index" in config_preset else self.component_map["Sampling method"].value,
|
||||
config_preset["width"] if "width" in config_preset else self.component_map["Width"].value,
|
||||
config_preset["height"] if "height" in config_preset else self.component_map["Height"].value,
|
||||
config_preset["enable_hr"] if "enable_hr" in config_preset else self.component_map["Highres. fix"].value,
|
||||
config_preset["denoising_strength"] if "denoising_strength" in config_preset else self.component_map["Denoising strength"].value,
|
||||
config_preset["batch_count"] if "batch_count" in config_preset else self.component_map["Batch count"].value,
|
||||
config_preset["batch_size"] if "batch_size" in config_preset else self.component_map["Batch size"].value,
|
||||
config_preset["cfg_scale"] if "cfg_scale" in config_preset else self.component_map["CFG Scale"].value
|
||||
)
|
||||
config_preset["sampler_index"] if "sampler_index" in config_preset else self.component_map["Sampling method"].value,
|
||||
config_preset["width"] if "width" in config_preset else self.component_map["Width"].value,
|
||||
config_preset["height"] if "height" in config_preset else self.component_map["Height"].value,
|
||||
config_preset["enable_hr"] if "enable_hr" in config_preset else self.component_map["Highres. fix"].value,
|
||||
config_preset["denoising_strength"] if "denoising_strength" in config_preset else self.component_map["Denoising strength"].value,
|
||||
config_preset["batch_count"] if "batch_count" in config_preset else self.component_map["Batch count"].value,
|
||||
config_preset["batch_size"] if "batch_size" in config_preset else self.component_map["Batch size"].value,
|
||||
config_preset["cfg_scale"] if "cfg_scale" in config_preset else self.component_map["CFG Scale"].value,
|
||||
)
|
||||
|
||||
else:
|
||||
# if we are img2img highres fix component is empty
|
||||
return (config_preset["steps"] if "steps" in config_preset else self.component_map["Sampling Steps"].value,
|
||||
config_preset["sampler_index"] if "sampler_index" in config_preset else self.component_map["Sampling method"].value,
|
||||
config_preset["width"] if "width" in config_preset else self.component_map["Width"].value,
|
||||
config_preset["height"] if "height" in config_preset else self.component_map["Height"].value,
|
||||
#config_preset["enable_hr"] if "enable_hr" in config_preset else self.component_map["Highres. fix"].value,
|
||||
config_preset["denoising_strength"] if "denoising_strength" in config_preset else self.component_map["Denoising strength"].value,
|
||||
config_preset["batch_count"] if "batch_count" in config_preset else self.component_map["Batch count"].value,
|
||||
config_preset["batch_size"] if "batch_size" in config_preset else self.component_map["Batch size"].value,
|
||||
config_preset["cfg_scale"] if "cfg_scale" in config_preset else self.component_map["CFG Scale"].value
|
||||
)
|
||||
config_preset["sampler_index"] if "sampler_index" in config_preset else self.component_map["Sampling method"].value,
|
||||
config_preset["width"] if "width" in config_preset else self.component_map["Width"].value,
|
||||
config_preset["height"] if "height" in config_preset else self.component_map["Height"].value,
|
||||
#config_preset["enable_hr"] if "enable_hr" in config_preset else self.component_map["Highres. fix"].value,
|
||||
config_preset["denoising_strength"] if "denoising_strength" in config_preset else self.component_map["Denoising strength"].value,
|
||||
config_preset["batch_count"] if "batch_count" in config_preset else self.component_map["Batch count"].value,
|
||||
config_preset["batch_size"] if "batch_size" in config_preset else self.component_map["Batch size"].value,
|
||||
config_preset["cfg_scale"] if "cfg_scale" in config_preset else self.component_map["CFG Scale"].value,
|
||||
)
|
||||
|
||||
|
||||
config_preset_dropdown = gr.Dropdown(
|
||||
@@ -116,22 +102,38 @@ class Script(modules.scripts.Script):
|
||||
show_progress=False,
|
||||
inputs=[config_preset_dropdown],
|
||||
#outputs=[ui_steps, ui_sampler_index, ui_width, ui_height, ui_enable_hr, ui_denoising_strength, ui_batch_count, ui_batch_size, ui_cfg_scale],
|
||||
outputs = [self.component_map["Sampling Steps"],self.component_map["Sampling method"],self.component_map["Width"],self.component_map["Height"],self.component_map["Highres. fix"],self.component_map["Denoising strength"],self.component_map["Batch count"],self.component_map["Batch size"],self.component_map["CFG Scale"]]
|
||||
outputs=[self.component_map["Sampling Steps"],
|
||||
self.component_map["Sampling method"],
|
||||
self.component_map["Width"],
|
||||
self.component_map["Height"],
|
||||
self.component_map["Highres. fix"],
|
||||
self.component_map["Denoising strength"],
|
||||
self.component_map["Batch count"],
|
||||
self.component_map["Batch size"],
|
||||
self.component_map["CFG Scale"]]
|
||||
)
|
||||
else:
|
||||
config_preset_dropdown.change(
|
||||
config_preset_dropdown.change(
|
||||
fn=config_preset_dropdown_change,
|
||||
show_progress=False,
|
||||
inputs=[config_preset_dropdown],
|
||||
#outputs = list([self.component_map[e] for e in AVAILABLE_COMPONENTS if e != "Seeds" and e != "Highres. fix"]) # **** LIST COMPS FAIL W/ GRADIO'S IN/OUTPUTS
|
||||
outputs = [self.component_map["Sampling Steps"],self.component_map["Sampling method"],self.component_map["Width"],self.component_map["Height"],self.component_map["Denoising strength"],self.component_map["Batch count"],self.component_map["Batch size"],self.component_map["CFG Scale"]]
|
||||
outputs=[self.component_map["Sampling Steps"],
|
||||
self.component_map["Sampling method"],
|
||||
self.component_map["Width"],
|
||||
self.component_map["Height"],
|
||||
#self.component_map["Highres. fix"], no highres fix in img2img
|
||||
self.component_map["Denoising strength"],
|
||||
self.component_map["Batch count"],
|
||||
self.component_map["Batch size"],
|
||||
self.component_map["CFG Scale"]]
|
||||
)
|
||||
|
||||
config_preset_dropdown.change(
|
||||
fn=None,
|
||||
inputs=[],
|
||||
outputs=[],
|
||||
_js="function() { config_preset_dropdown_change() }",
|
||||
_js="function() { config_preset_dropdown_change() }", # JS is used to update the Highres fix row to show/hide it
|
||||
)
|
||||
|
||||
with gr.Column(scale=1, min_width=30):
|
||||
@@ -150,14 +152,12 @@ class Script(modules.scripts.Script):
|
||||
else:
|
||||
sp.Popen(["xdg-open", path])
|
||||
|
||||
#print(f"modules.scripts.basedir()={modules.scripts.basedir()}") # base SD folder
|
||||
|
||||
open_config_file_button = gr.Button( #tooltip is set in javascript/config_presets.js
|
||||
open_config_file_button = gr.Button( # tooltip is set in javascript/config_presets.js
|
||||
value="Edit...",
|
||||
elem_id="config_presets_open_config_file_button"
|
||||
)
|
||||
open_config_file_button.click(
|
||||
fn=lambda: open_file(f"{self.basedir}\\extensions\\Config-Presets\\config.json"),
|
||||
fn=lambda: open_file(f"{basedir}\\config.json"),
|
||||
inputs=[],
|
||||
outputs=[],
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user