OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-01-19 21:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

add support for alwayson scripts for infotext API

Browse Source
This commit is contained in:
AUTOMATIC1111 2023-12-30 13:33:18 +03:00
parent 8b08b78c03
commit 0aacd4c72b
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
modules/api/api.py
View File

@ -312,8 +312,13 @@ class Api:
script_args[script.args_from:script.args_to] = ui_default_values script_args[script.args_from:script.args_to] = ui_default_values
return script_args return script_args
def init_script_args(self, request, default_script_args, selectable_scripts, selectable_idx, script_runner): def init_script_args(self, request, default_script_args, selectable_scripts, selectable_idx, script_runner, *, input_script_args=None):
script_args = default_script_args.copy() script_args = default_script_args.copy()
if input_script_args is not None:
for index, value in input_script_args.items():
script_args[index] = value
# position 0 in script_arg is the idx+1 of the selectable script that is going to be run when using scripts.scripts_*2img.run() # position 0 in script_arg is the idx+1 of the selectable script that is going to be run when using scripts.scripts_*2img.run()
if selectable_scripts: if selectable_scripts:
script_args[selectable_scripts.args_from:selectable_scripts.args_to] = request.script_args script_args[selectable_scripts.args_from:selectable_scripts.args_to] = request.script_args
@ -335,41 +340,58 @@ class Api:
script_args[alwayson_script.args_from + idx] = request.alwayson_scripts[alwayson_script_name]["args"][idx] script_args[alwayson_script.args_from + idx] = request.alwayson_scripts[alwayson_script_name]["args"][idx]
return script_args return script_args
def apply_infotext(self, request, tabname): def apply_infotext(self, request, tabname, *, script_runner=None, mentioned_script_args=None):
if not request.infotext: if not request.infotext:
return {} return {}
possible_fields = generation_parameters_copypaste.paste_fields[tabname]["fields"]
set_fields = request.model_dump(exclude_unset=True) if hasattr(request, "request") else request.dict(exclude_unset=True) # pydantic v1/v2 have differenrt names for this set_fields = request.model_dump(exclude_unset=True) if hasattr(request, "request") else request.dict(exclude_unset=True) # pydantic v1/v2 have differenrt names for this
params = generation_parameters_copypaste.parse_generation_parameters(request.infotext) params = generation_parameters_copypaste.parse_generation_parameters(request.infotext)
handled_fields = {} def get_field_value(field, params):
for field in generation_parameters_copypaste.paste_fields[tabname]["fields"]: value = field.function(params) if field.function else params.get(field.label)
if value is None:
return None
if field.api in request.__fields__:
target_type = request.__fields__[field.api].type_
else:
target_type = type(field.component.value)
if target_type == type(None):
return None
if not isinstance(value, target_type):
value = target_type(value)
return value
for field in possible_fields:
if not field.api: if not field.api:
continue continue
if field.api in set_fields: if field.api in set_fields:
continue continue
value = field.function(params) if field.function else params.get(field.label) value = get_field_value(field, params)
target_type = request.__fields__[field.api].type_ if value is not None:
setattr(request, field.api, value)
if value is None:
continue
if not isinstance(value, target_type):
value = target_type(value)
setattr(request, field.api, value)
handled_fields[field.label] = 1
if request.override_settings is None: if request.override_settings is None:
request.override_settings = {} request.override_settings = {}
overriden_settings = generation_parameters_copypaste.get_override_settings(params, skip_fields=handled_fields) overriden_settings = generation_parameters_copypaste.get_override_settings(params)
for infotext_text, setting_name, value in overriden_settings: for _, setting_name, value in overriden_settings:
if setting_name not in request.override_settings: if setting_name not in request.override_settings:
request.override_settings[setting_name] = value request.override_settings[setting_name] = value
if script_runner is not None and mentioned_script_args is not None:
indexes = {v: i for i, v in enumerate(script_runner.inputs)}
script_fields = ((field, indexes[field.component]) for field in possible_fields if field.component in indexes)
for field, index in script_fields:
mentioned_script_args[index] = get_field_value(field, params)
return params return params
def text2imgapi(self, txt2imgreq: models.StableDiffusionTxt2ImgProcessingAPI): def text2imgapi(self, txt2imgreq: models.StableDiffusionTxt2ImgProcessingAPI):
@ -380,7 +402,8 @@ class Api:
script_runner.initialize_scripts(False) script_runner.initialize_scripts(False)
ui.create_ui() ui.create_ui()
self.apply_infotext(txt2imgreq, "txt2img") infotext_script_args = {}
self.apply_infotext(txt2imgreq, "txt2img", script_runner=script_runner, mentioned_script_args=infotext_script_args)
if not self.default_script_arg_txt2img: if not self.default_script_arg_txt2img:
self.default_script_arg_txt2img = self.init_default_script_args(script_runner) self.default_script_arg_txt2img = self.init_default_script_args(script_runner)
@ -400,7 +423,7 @@ class Api:
args.pop('alwayson_scripts', None) args.pop('alwayson_scripts', None)
args.pop('infotext', None) args.pop('infotext', None)
script_args = self.init_script_args(txt2imgreq, self.default_script_arg_txt2img, selectable_scripts, selectable_script_idx, script_runner) script_args = self.init_script_args(txt2imgreq, self.default_script_arg_txt2img, selectable_scripts, selectable_script_idx, script_runner, input_script_args=infotext_script_args)
send_images = args.pop('send_images', True) send_images = args.pop('send_images', True)
args.pop('save_images', None) args.pop('save_images', None)