Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor & deduplicate web UI boot code #10557

Merged
merged 10 commits into from
May 20, 2023
5 changes: 5 additions & 0 deletions modules/extra_networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ def register_extra_network(extra_network):
extra_network_registry[extra_network.name] = extra_network


def register_default_extra_networks():
from modules.extra_networks_hypernet import ExtraNetworkHypernet
register_extra_network(ExtraNetworkHypernet())


class ExtraNetworkParams:
def __init__(self, items=None):
self.items = items or []
Expand Down
21 changes: 10 additions & 11 deletions modules/scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ def orderby(basedir):
sys.path = syspath
current_basedir = paths.script_path

global scripts_txt2img, scripts_img2img, scripts_postproc

scripts_txt2img = ScriptRunner()
scripts_img2img = ScriptRunner()
scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()


def wrap_call(func, filename, funcname, *args, default=None, **kwargs):
try:
Expand Down Expand Up @@ -527,9 +533,9 @@ def reload_sources(self, cache):
self.scripts[si].args_to = args_to


scripts_txt2img = ScriptRunner()
scripts_img2img = ScriptRunner()
scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
scripts_txt2img: ScriptRunner = None
scripts_img2img: ScriptRunner = None
scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None
scripts_current: ScriptRunner = None


Expand All @@ -539,14 +545,7 @@ def reload_script_body_only():
scripts_img2img.reload_sources(cache)


def reload_scripts():
global scripts_txt2img, scripts_img2img, scripts_postproc

load_scripts()

scripts_txt2img = ScriptRunner()
scripts_img2img = ScriptRunner()
scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
reload_scripts = load_scripts # compatibility alias


def add_classes_to_gradio_component(comp):
Expand Down
1 change: 0 additions & 1 deletion modules/sd_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ def setup_model():
if not os.path.exists(model_path):
os.makedirs(model_path)

list_models()
enable_midas_autodownload()


Expand Down
11 changes: 10 additions & 1 deletion modules/ui_extra_networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,19 @@ def find_description(self, path):
return None


def intialize():
def initialize():
extra_pages.clear()


def register_default_pages():
from modules.ui_extra_networks_textual_inversion import ExtraNetworksPageTextualInversion
from modules.ui_extra_networks_hypernets import ExtraNetworksPageHypernetworks
from modules.ui_extra_networks_checkpoints import ExtraNetworksPageCheckpoints
register_page(ExtraNetworksPageTextualInversion())
register_page(ExtraNetworksPageHypernetworks())
register_page(ExtraNetworksPageCheckpoints())


class ExtraNetworksUi:
def __init__(self):
self.pages = None
Expand Down
Loading