From 61953c5e34a236d223c985817525cc998b66547e Mon Sep 17 00:00:00 2001 From: Andres Date: Mon, 26 Feb 2024 09:30:50 -0500 Subject: [PATCH 1/2] Resolved conflict in config.py and applied stashed changes --- config.py | 5 ++++- plugin.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config.py b/config.py index 268dfc9..411aa1d 100644 --- a/config.py +++ b/config.py @@ -13,7 +13,10 @@ "loras": [], "inverters": [], "scheduler": "pndm", - "controlnet": "lllyasviel/sd-controlnet-canny" + "controlnet": "lllyasviel/sd-controlnet-canny", + "sd_turbo_model_name": "stabilityai/sdxl-turbo", + "controlnet": "lllyasviel/sd-controlnet-canny", + "model_urls": {"segment-anything": "https://dl.fbaipublicfiles.com/segment_anything/sam_vit_h_4b8939.pth"} } endpoints = { "generate_image": { diff --git a/plugin.py b/plugin.py index 5f96941..96896c2 100644 --- a/plugin.py +++ b/plugin.py @@ -100,6 +100,20 @@ def shutdown(): threading.Thread(target=self_terminate, daemon=True).start() return {"success": True} +@app.post("/plugins/install") +def install_plugin(): + # Make sure to create an instance of SD correctly with the required arguments + #sd_plugin = SD(arguments=Namespace(plugin=plugin, config=config, endpoints=endpoints)) + sd_plugin.on_install(sd_plugin.config.get('model_urls', {}), sd_plugin.progress_callback) + #sd_plugin.install_plugin() + return {"message": "Plugin installation started"} + +@app.post("/plugins/uninstall") +def uninstall_plugin(): + #sd_plugin.uninstall_plugin() # Assuming this method triggers the on_uninstall logic + sd_plugin.on_uninstall(sd_plugin.progress_callback) + return {"message": "Plugin uninstallation started"} + class SD(Plugin): """ Prediction inference. From ff77fb8a7485566c26f0ddb312ba3806de7bd80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Carvajal?= <85122975+andresca94@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:55:31 -0400 Subject: [PATCH 2/2] Update plugin.py --- plugin.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugin.py b/plugin.py index 96896c2..6904077 100644 --- a/plugin.py +++ b/plugin.py @@ -102,15 +102,11 @@ def shutdown(): @app.post("/plugins/install") def install_plugin(): - # Make sure to create an instance of SD correctly with the required arguments - #sd_plugin = SD(arguments=Namespace(plugin=plugin, config=config, endpoints=endpoints)) sd_plugin.on_install(sd_plugin.config.get('model_urls', {}), sd_plugin.progress_callback) - #sd_plugin.install_plugin() return {"message": "Plugin installation started"} @app.post("/plugins/uninstall") def uninstall_plugin(): - #sd_plugin.uninstall_plugin() # Assuming this method triggers the on_uninstall logic sd_plugin.on_uninstall(sd_plugin.progress_callback) return {"message": "Plugin uninstallation started"} @@ -304,4 +300,4 @@ def load_textual_inversion(self): def controlnet_predict(self, prompt: str, image, seed): embed_prompt, generator = self.prep_inputs(seed, prompt) output_img = self.controlpipe(prompt_embeds=embed_prompt, generator=generator, image = image, num_inference_steps=25).images[0] - return output_img \ No newline at end of file + return output_img