move _stop route to api

This commit is contained in:
w-e-w 2023-06-12 18:15:27 +09:00
parent 9142be0a0d
commit b9664ab615
2 changed files with 9 additions and 9 deletions

View File

@ -208,8 +208,11 @@ class Api:
self.add_api_route("/sdapi/v1/reload-checkpoint", self.reloadapi, methods=["POST"]) self.add_api_route("/sdapi/v1/reload-checkpoint", self.reloadapi, methods=["POST"])
self.add_api_route("/sdapi/v1/scripts", self.get_scripts_list, methods=["GET"], response_model=models.ScriptsList) self.add_api_route("/sdapi/v1/scripts", self.get_scripts_list, methods=["GET"], response_model=models.ScriptsList)
self.add_api_route("/sdapi/v1/script-info", self.get_script_info, methods=["GET"], response_model=List[models.ScriptInfo]) self.add_api_route("/sdapi/v1/script-info", self.get_script_info, methods=["GET"], response_model=List[models.ScriptInfo])
if shared.cmd_opts.add_stop_route:
self.add_api_route("/sdapi/v1/quit-webui", self.quit_webui, methods=["POST"]) self.add_api_route("/sdapi/v1/quit-webui", self.quit_webui, methods=["POST"])
self.add_api_route("/sdapi/v1/restart-webui", self.restart_webui, methods=["POST"]) self.add_api_route("/sdapi/v1/restart-webui", self.restart_webui, methods=["POST"])
self.add_api_route("/_stop", self.stop_route, methods=["POST"])
self.default_script_arg_txt2img = [] self.default_script_arg_txt2img = []
self.default_script_arg_img2img = [] self.default_script_arg_img2img = []
@ -724,3 +727,7 @@ class Api:
def restart_webui(self): def restart_webui(self):
if restart.is_restartable(): if restart.is_restartable():
restart.restart_program() restart.restart_program()
def stop_route(request):
shared.state.server_command = "stop"
return Response("Stopping.")

View File

@ -362,11 +362,6 @@ def api_only():
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) 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)
def stop_route(request):
shared.state.server_command = "stop"
return Response("Stopping.")
def webui(): def webui():
launch_api = cmd_opts.api launch_api = cmd_opts.api
initialize() initialize()
@ -404,8 +399,6 @@ def webui():
"redoc_url": "/redoc", "redoc_url": "/redoc",
}, },
) )
if cmd_opts.add_stop_route:
app.add_route("/_stop", stop_route, methods=["POST"])
# after initial launch, disable --autolaunch for subsequent restarts # after initial launch, disable --autolaunch for subsequent restarts
cmd_opts.autolaunch = False cmd_opts.autolaunch = False