From df6a7ebfe8cc4da23861e3e2583693bb7808d573 Mon Sep 17 00:00:00 2001
From: Roy Shilkrot <roy.shil@gmail.com>
Date: Mon, 31 Oct 2022 11:50:33 -0400
Subject: [PATCH] revert things to master

---
 launch.py             | 2 +-
 modules/api/api.py    | 2 --
 modules/api/models.py | 6 +-----
 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(