diff --git a/modules/lora b/modules/lora index ac4935bf7..18f171d88 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit ac4935bf79942f966d7b6578e8fbb9ee5f12d4ad +Subproject commit 18f171d885d4c870bd1c0656f7247e9649df62fd diff --git a/modules/scripts.py b/modules/scripts.py index 5e844215d..3427f4d9b 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -18,7 +18,6 @@ class Script: args_from = None args_to = None alwayson = False - is_txt2img = False is_img2img = False @@ -37,7 +36,6 @@ class Script: def title(self): """this function should return the title of the script. This is what will be displayed in the dropdown menu.""" - raise NotImplementedError() def ui(self, is_img2img): @@ -45,19 +43,16 @@ class Script: The return value should be an array of all components that are used in processing. Values of those returned components will be passed to run() and process() functions. """ - pass # pylint: disable=unnecessary-pass def show(self, is_img2img): # pylint: disable=unused-argument """ is_img2img is True if this function is called for the img2img interface, and Fasle otherwise - This function should return: - False if the script should not be shown in UI at all - True if the script should be shown in UI if it's selected in the scripts dropdown - script.AlwaysVisible if the script should be shown in UI at all times """ - return True def run(self, p, *args): @@ -65,12 +60,9 @@ class Script: This function is called if the script has been selected in the script dropdown. It must do all processing and return the Processed object with results, same as one returned by processing.process_images. - Usually the processing is done by calling the processing.process_images function. - args contains all values returned by components from ui() """ - pass # pylint: disable=unnecessary-pass def process(self, p, *args): @@ -79,52 +71,44 @@ class Script: You can modify the processing object (p) here, inject hooks, etc. args contains all values returned by components from ui() """ - pass # pylint: disable=unnecessary-pass def before_process_batch(self, p, *args, **kwargs): """ Called before extra networks are parsed from the prompt, so you can add new extra network keywords to the prompt with this callback. - **kwargs will have those items: - batch_number - index of current batch, from 0 to number of batches-1 - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things - seeds - list of seeds for current batch - subseeds - list of subseeds for current batch """ - pass # pylint: disable=unnecessary-pass def process_batch(self, p, *args, **kwargs): """ Same as process(), but called for every batch. - **kwargs will have those items: - batch_number - index of current batch, from 0 to number of batches-1 - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things - seeds - list of seeds for current batch - subseeds - list of subseeds for current batch """ - pass # pylint: disable=unnecessary-pass def postprocess_batch(self, p, *args, **kwargs): """ Same as process_batch(), but called for every batch after it has been generated. - **kwargs will have same items as process_batch, and also: - batch_number - index of current batch, from 0 to number of batches-1 - images - torch tensor with all generated images, with values ranging from 0 to 1; """ - pass # pylint: disable=unnecessary-pass def postprocess_image(self, p, pp: PostprocessImageArgs, *args): """ Called for every image after it has been generated. """ - pass # pylint: disable=unnecessary-pass def postprocess(self, p, processed, *args): @@ -132,7 +116,6 @@ class Script: This function is called after processing ends for AlwaysVisible scripts. args contains all values returned by components from ui() """ - pass # pylint: disable=unnecessary-pass def before_component(self, component, **kwargs): @@ -142,14 +125,12 @@ class Script: This can be useful to inject your own components somewhere in the middle of vanilla UI. You can return created components in the ui() function to add them to the list of arguments for your processing functions """ - pass # pylint: disable=unnecessary-pass def after_component(self, component, **kwargs): """ Called after a component is created. Same as above. """ - pass # pylint: disable=unnecessary-pass def describe(self): @@ -158,11 +139,9 @@ class Script: def elem_id(self, item_id): """helper function to generate id for a HTML element, constructs final id out of script name, tab and user-supplied item_id""" - need_tabname = self.show(True) == self.show(False) tabname = ('img2img' if self.is_img2img else 'txt2txt') + "_" if need_tabname else "" title = re.sub(r'[^a-z_0-9]', '', re.sub(r'\s', '_', self.title().lower())) - return f'script_{tabname}{title}_{item_id}' @@ -178,7 +157,6 @@ def basedir(): ScriptFile = namedtuple("ScriptFile", ["basedir", "filename", "path", "priority"]) - scripts_data = [] postprocessing_scripts_data = [] ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedir", "module"]) @@ -186,16 +164,13 @@ ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedi def list_scripts(scriptdirname, extension): tmp_list = [] - base = os.path.join(paths.script_path, scriptdirname) if os.path.exists(base): for filename in sorted(os.listdir(base)): tmp_list.append(ScriptFile(paths.script_path, filename, os.path.join(base, filename), '50')) - for ext in extensions.active(): tmp_list += ext.list_files(scriptdirname, extension) - - scripts_list = [] + priority_list = [] for script in tmp_list: if os.path.splitext(script.path)[1].lower() == extension and os.path.isfile(script.path): if script.basedir == paths.script_path: @@ -213,25 +188,20 @@ def list_scripts(scriptdirname, extension): priority = priority + str(f.read().strip()) else: priority = priority + script.priority - scripts_list.append(ScriptFile(script.basedir, script.filename, script.path, priority)) - - priority_sort = sorted(scripts_list, key=lambda item: item.priority + item.path.lower(), reverse=False) + priority_list.append(ScriptFile(script.basedir, script.filename, script.path, priority)) + priority_sort = sorted(priority_list, key=lambda item: item.priority + item.path.lower(), reverse=False) return priority_sort def list_files_with_name(filename): res = [] - dirs = [paths.script_path] + [ext.path for ext in extensions.active()] - for dirpath in dirs: if not os.path.isdir(dirpath): continue - path = os.path.join(dirpath, filename) if os.path.isfile(path): res.append(path) - return res @@ -240,16 +210,13 @@ def load_scripts(): scripts_data.clear() postprocessing_scripts_data.clear() script_callbacks.clear_callbacks() - scripts_list = list_scripts("scripts", ".py") - syspath = sys.path def register_scripts_from_module(module): for _key, script_class in module.__dict__.items(): if type(script_class) != type: continue - if issubclass(script_class, Script): scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module)) elif issubclass(script_class, scripts_postprocessing.ScriptPostprocessing): @@ -275,7 +242,6 @@ def wrap_call(func, filename, funcname, *args, default=None, **kwargs): return res except Exception as e: errors.display(e, f'Calling script: {filename}/{funcname}') - return default @@ -295,7 +261,6 @@ class ScriptRunner: self.scripts.clear() self.alwayson_scripts.clear() self.selectable_scripts.clear() - auto_processing_scripts = scripts_auto_postprocessing.create_auto_preprocessing_script_data() for script_class, path, _basedir, _script_module in auto_processing_scripts + scripts_data: @@ -303,42 +268,32 @@ class ScriptRunner: script.filename = path script.is_txt2img = not is_img2img script.is_img2img = is_img2img - visibility = script.show(script.is_img2img) - if visibility == AlwaysVisible: self.scripts.append(script) self.alwayson_scripts.append(script) script.alwayson = True - elif visibility: self.scripts.append(script) self.selectable_scripts.append(script) def setup_ui(self): self.titles = [wrap_call(script.title, script.filename, "title") or f"{script.filename} [error]" for script in self.selectable_scripts] - inputs = [None] inputs_alwayson = [True] def create_script_ui(script, inputs, inputs_alwayson): script.args_from = len(inputs) script.args_to = len(inputs) - controls = wrap_call(script.ui, script.filename, "ui", script.is_img2img) - if controls is None: return - for control in controls: control.custom_script_source = os.path.basename(script.filename) - if script.infotext_fields is not None: self.infotext_fields += script.infotext_fields - if script.paste_field_names is not None: self.paste_field_names += script.paste_field_names - inputs += controls inputs_alwayson += [script.alwayson for _ in controls] script.args_to = len(inputs) @@ -348,37 +303,26 @@ class ScriptRunner: create_script_ui(script, inputs, inputs_alwayson) script.group = group - dropdown = gr.Dropdown(label="Script", elem_id="script_list", choices=["None"] + self.titles, value="None", type="index") inputs[0] = dropdown - for script in self.selectable_scripts: with gr.Group(visible=False) as group: create_script_ui(script, inputs, inputs_alwayson) - script.group = group def select_script(script_index): selected_script = self.selectable_scripts[script_index - 1] if script_index>0 else None - return [gr.update(visible=selected_script == s) for s in self.selectable_scripts] def init_field(title): """called when an initial value is set from ui-config.json to show script's UI components""" - if title == 'None': return - script_index = self.titles.index(title) self.selectable_scripts[script_index].group.visible = True dropdown.init_field = init_field - - dropdown.change( - fn=select_script, - inputs=[dropdown], - outputs=[script.group for script in self.selectable_scripts] - ) + dropdown.change(fn=select_script, inputs=[dropdown], outputs=[script.group for script in self.selectable_scripts]) def onload_script_visibility(params): title = params.get('Script', None) @@ -392,37 +336,26 @@ class ScriptRunner: self.infotext_fields.append( (dropdown, lambda x: gr.update(value=x.get('Script', 'None'))) ) self.infotext_fields.extend( [(script.group, onload_script_visibility) for script in self.selectable_scripts] ) - return inputs def run(self, p, *args): script_index = args[0] - if script_index == 0: return None - script = self.selectable_scripts[script_index-1] - if script is None: return None - script_args = args[script.args_from:script.args_to] processed = script.run(p, *script_args) - shared.total_tqdm.clear() - return processed def process(self, p): for script in self.alwayson_scripts: - # from rich import print try: - # print(f'HERE: {script.filename} from {script.args_from} to {script.args_to} args {p.script_args}') script_args = p.script_args[script.args_from:script.args_to] script.process(p, *script_args) except Exception as e: - # from modules.errors import console - # console.print_exception(show_locals=True, max_frames=10, extra_lines=2, theme="ansi_dark", word_wrap=False, width=min([console.width, 200])) errors.display(e, f'Running script process: {script.filename}') def before_process_batch(self, p, **kwargs): @@ -436,8 +369,6 @@ class ScriptRunner: def process_batch(self, p, **kwargs): for script in self.alwayson_scripts: try: - if p.script_args[0] == 'enabled': - return script_args = p.script_args[script.args_from:script.args_to] script.process_batch(p, *script_args, **kwargs) except Exception as e: @@ -446,8 +377,6 @@ class ScriptRunner: def postprocess(self, p, processed): for script in self.alwayson_scripts: try: - if p.script_args[0] == 'enabled': - return script_args = p.script_args[script.args_from:script.args_to] script.postprocess(p, processed, *script_args) except Exception as e: @@ -456,8 +385,6 @@ class ScriptRunner: def postprocess_batch(self, p, images, **kwargs): for script in self.alwayson_scripts: try: - if p.script_args[0] == 'enabled': - return script_args = p.script_args[script.args_from:script.args_to] script.postprocess_batch(p, *script_args, images=images, **kwargs) except Exception as e: @@ -490,12 +417,10 @@ class ScriptRunner: args_from = script.args_from args_to = script.args_to filename = script.filename - module = cache.get(filename, None) if module is None: module = script_loading.load_module(script.filename) cache[filename] = module - for _key, script_class in module.__dict__.items(): if type(script_class) == type and issubclass(script_class, Script): self.scripts[si] = script_class() @@ -518,9 +443,7 @@ def reload_script_body_only(): def reload_scripts(): global scripts_txt2img, scripts_img2img, scripts_postproc # pylint: disable=global-statement - load_scripts() - scripts_txt2img = ScriptRunner() scripts_img2img = ScriptRunner() scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner() @@ -536,27 +459,19 @@ def add_classes_to_gradio_component(comp): if elem_classes is None: elem_classes = [] comp.elem_classes = ["gradio-" + comp.get_block_name(), *(elem_classes)] - if getattr(comp, 'multiselect', False): comp.elem_classes.append('multiselect') - def IOComponent_init(self, *args, **kwargs): if scripts_current is not None: scripts_current.before_component(self, **kwargs) - script_callbacks.before_component_callback(self, **kwargs) - res = original_IOComponent_init(self, *args, **kwargs) # pylint: disable=assignment-from-no-return - add_classes_to_gradio_component(self) - script_callbacks.after_component_callback(self, **kwargs) - if scripts_current is not None: scripts_current.after_component(self, **kwargs) - return res @@ -566,9 +481,7 @@ gr.components.IOComponent.__init__ = IOComponent_init def BlockContext_init(self, *args, **kwargs): res = original_BlockContext_init(self, *args, **kwargs) # pylint: disable=assignment-from-no-return - add_classes_to_gradio_component(self) - return res