mirror of https://github.com/vladmandic/automatic
fix upscaler init causing server fail
Signed-off-by: vladmandic <mandic00@live.com>master
parent
d97191f342
commit
2fcabc8047
|
|
@ -430,6 +430,7 @@ def move_files(src_path: str, dest_path: str, ext_filter: str | None = None):
|
|||
def load_upscalers():
|
||||
# We can only do this 'magic' method to dynamically load upscalers if they are referenced, so we'll try to import any _model.py files before looking in __subclasses__
|
||||
t0 = time.time()
|
||||
shared.sd_upscalers = ['None']
|
||||
modules_dir = os.path.join(paths.script_path, "modules", "postprocess")
|
||||
for file in os.listdir(modules_dir):
|
||||
if "_model.py" in file:
|
||||
|
|
@ -449,6 +450,7 @@ def load_upscalers():
|
|||
used_classes[classname] = cls
|
||||
upscaler_types = []
|
||||
for cls in reversed(used_classes.values()):
|
||||
try:
|
||||
name = cls.__name__
|
||||
cmd_name = f"{name.lower().replace('upscaler', '')}_models_path"
|
||||
commandline_model_path = commandline_options.get(cmd_name, None)
|
||||
|
|
@ -457,6 +459,11 @@ def load_upscalers():
|
|||
scaler.model_download_path = commandline_model_path or scaler.model_path
|
||||
upscalers += scaler.scalers
|
||||
upscaler_types.append(name[8:])
|
||||
except Exception as e:
|
||||
log.error(f'Upscaler: {cls} {e}')
|
||||
if len(upscalers) == 0:
|
||||
log.warning('Upscalers: no data')
|
||||
upscalers = ['None']
|
||||
shared.sd_upscalers = upscalers
|
||||
t1 = time.time()
|
||||
log.info(f"Available Upscalers: items={len(shared.sd_upscalers)} downloaded={len([x for x in shared.sd_upscalers if x.data_path is not None and os.path.isfile(x.data_path)])} user={len([x for x in shared.sd_upscalers if x.custom])} time={t1-t0:.2f} types={upscaler_types}")
|
||||
|
|
|
|||
|
|
@ -365,6 +365,8 @@ def create_resize_inputs(tab, images, accordion=True, latent=False, non_zero=Tru
|
|||
with gr.Accordion(open=False, label="Resize", elem_classes=["small-accordion"], elem_id=f"{tab}_resize_group") if accordion else gr.Group():
|
||||
with gr.Row():
|
||||
available_upscalers = [x.name for x in shared.sd_upscalers]
|
||||
if len(available_upscalers) == 0:
|
||||
available_upscalers = ['None']
|
||||
if not latent:
|
||||
available_upscalers = [x for x in available_upscalers if not x.lower().startswith('latent')]
|
||||
resize_mode = gr.Dropdown(label=f"Mode{prefix}" if non_zero else "Resize mode", elem_id=f"{tab}_resize_mode", choices=shared.resize_modes, type="index", value='Fixed')
|
||||
|
|
|
|||
2
wiki
2
wiki
|
|
@ -1 +1 @@
|
|||
Subproject commit a9b73a50018a08a1ac35fb15c7f7c86515b79d13
|
||||
Subproject commit cbbbfc73af2366650cdf8cc71fabbf3a508b607b
|
||||
Loading…
Reference in New Issue