aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Shilkrot <roy.shil@gmail.com>2022-10-31 15:50:33 +0000
committerRoy Shilkrot <roy.shil@gmail.com>2022-10-31 15:50:33 +0000
commitdf6a7ebfe8cc4da23861e3e2583693bb7808d573 (patch)
treea87497705b450fca0d2a2ae71de563390ba946ea
parent509fd1459bacfe0dcde1e5792ea3e046aa9f4d24 (diff)
downloadstable-diffusion-webui-gfx803-df6a7ebfe8cc4da23861e3e2583693bb7808d573.tar.gz
stable-diffusion-webui-gfx803-df6a7ebfe8cc4da23861e3e2583693bb7808d573.tar.bz2
stable-diffusion-webui-gfx803-df6a7ebfe8cc4da23861e3e2583693bb7808d573.zip
revert things to master
-rw-r--r--launch.py2
-rw-r--r--modules/api/api.py2
-rw-r--r--modules/api/models.py6
3 files changed, 2 insertions, 8 deletions
diff --git a/launch.py b/launch.py
index fe9cef3c..958336f2 100644
--- a/launch.py
+++ b/launch.py
@@ -220,7 +220,7 @@ def tests(argv):
def start_webui():
print(f"Launching Web UI with arguments: {' '.join(sys.argv[1:])}")
import webui
- webui.webui_or_api()
+ webui.webui()
if __name__ == "__main__":
diff --git a/modules/api/api.py b/modules/api/api.py
index c510a833..6a903e4c 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -117,8 +117,6 @@ class Api:
return ImageToImageResponse(images=b64images, parameters=vars(img2imgreq), info=processed.js())
- def extrasapi(self):
- raise NotImplementedError
def extras_single_image_api(self, req: ExtrasSingleImageRequest):
reqDict = setUpscalers(req)
diff --git a/modules/api/models.py b/modules/api/models.py
index 035a7179..82ab29b8 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -64,11 +64,7 @@ class PydanticModelGenerator:
self._model_name = model_name
-
- if class_instance is not None:
- self._class_data = merge_class_params(class_instance)
- else:
- self._class_data = {}
+ self._class_data = merge_class_params(class_instance)
self._model_def = [
ModelDef(