From e0ea0151ed4c38df78f523150bd8b187a0cf556b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 11 Mar 2023 08:40:06 -0500 Subject: [PATCH] post merge cleanup --- extensions-builtin/sd-extension-system-info | 2 +- modules/api/api.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 78a20ac98..5dc29a21e 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 78a20ac98469db71b660a8e066238927e264d0bf +Subproject commit 5dc29a21e96fbd9596bd792da5f0acb4ccbb76f2 diff --git a/modules/api/api.py b/modules/api/api.py index 376f7f048..df793ce4d 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -149,6 +149,7 @@ class Api: self.add_api_route("/sdapi/v1/preprocess", self.preprocess, methods=["POST"], response_model=PreprocessResponse) self.add_api_route("/sdapi/v1/train/embedding", self.train_embedding, methods=["POST"], response_model=TrainResponse) self.add_api_route("/sdapi/v1/train/hypernetwork", self.train_hypernetwork, methods=["POST"], response_model=TrainResponse) + self.add_api_route("/sdapi/v1/shutdown", self.shutdown, methods=["POST"]) self.add_api_route("/sdapi/v1/memory", self.get_memory, methods=["GET"], response_model=MemoryResponse) self.add_api_route("/sdapi/v1/scripts", self.get_scripts_list, methods=["GET"], response_model=ScriptsList) @@ -523,6 +524,16 @@ class Api: shared.state.end() return TrainResponse(info="train embedding error: {error}".format(error=error)) + def shutdown(self): + print('shutdown request received') + # from modules.shared import demo + # demo.close() + # time.sleep(0.5) + # import sys + # sys.exit(0) + import os + os._exit(0) + def get_memory(self): try: import os, psutil