Skip to content

Commit

Permalink
add api() function to return webui() to how it was
Browse files Browse the repository at this point in the history
  • Loading branch information
AUTOMATIC1111 committed Oct 17, 2022
1 parent 71d42bb commit 964b63c
Showing 1 changed file with 41 additions and 38 deletions.
79 changes: 41 additions & 38 deletions webui.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,59 +87,62 @@ def initialize():
shared.opts.onchange("sd_hypernetwork", wrap_queued_call(lambda: modules.hypernetworks.hypernetwork.load_hypernetwork(shared.opts.sd_hypernetwork)))
shared.opts.onchange("sd_hypernetwork_strength", modules.hypernetworks.hypernetwork.apply_strength)


def webui():
initialize()

# make the program just exit at ctrl+c without waiting for anything
def sigint_handler(sig, frame):
print(f'Interrupted with signal {sig} in {frame}')
os._exit(0)

signal.signal(signal.SIGINT, sigint_handler)

if cmd_opts.api:
from modules.api.api import Api
api = Api()

api.launch(server_name="0.0.0.0" if cmd_opts.listen else "127.0.0.1",
port=cmd_opts.port if cmd_opts.port else 7861)

else:
while 1:
def api()
initialize()

demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)
from modules.api.api import Api
api = Api()
api.launch(server_name="0.0.0.0" if cmd_opts.listen else "127.0.0.1", port=cmd_opts.port if cmd_opts.port else 7861)

app, local_url, share_url = demo.launch(
share=cmd_opts.share,
server_name="0.0.0.0" if cmd_opts.listen else None,
server_port=cmd_opts.port,
debug=cmd_opts.gradio_debug,
auth=[tuple(cred.split(':')) for cred in cmd_opts.gradio_auth.strip('"').split(',')] if cmd_opts.gradio_auth else None,
inbrowser=cmd_opts.autolaunch,
prevent_thread_lock=True
)

app.add_middleware(GZipMiddleware, minimum_size=1000)
def webui():
initialize()

while 1:
while 1:

demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)

app, local_url, share_url = demo.launch(
share=cmd_opts.share,
server_name="0.0.0.0" if cmd_opts.listen else None,
server_port=cmd_opts.port,
debug=cmd_opts.gradio_debug,
auth=[tuple(cred.split(':')) for cred in cmd_opts.gradio_auth.strip('"').split(',')] if cmd_opts.gradio_auth else None,
inbrowser=cmd_opts.autolaunch,
prevent_thread_lock=True
)

app.add_middleware(GZipMiddleware, minimum_size=1000)

while 1:
time.sleep(0.5)
if getattr(demo, 'do_restart', False):
time.sleep(0.5)
demo.close()
time.sleep(0.5)
if getattr(demo, 'do_restart', False):
time.sleep(0.5)
demo.close()
time.sleep(0.5)
break
break

sd_samplers.set_samplers()
sd_samplers.set_samplers()

print('Reloading Custom Scripts')
modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))
print('Reloading modules: modules.ui')
importlib.reload(modules.ui)
print('Refreshing Model List')
modules.sd_models.list_models()
print('Restarting Gradio')
print('Reloading Custom Scripts')
modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))
print('Reloading modules: modules.ui')
importlib.reload(modules.ui)
print('Refreshing Model List')
modules.sd_models.list_models()
print('Restarting Gradio')


if __name__ == "__main__":
webui()
if cmd_opts.api:
api()
else:
webui()

0 comments on commit 964b63c

Please sign in to comment.