revert things to master

Author: royshil

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__":

modules/api/api.py

@@ -117,8 +117,6 @@ def img2imgapi(self, img2imgreq: StableDiffusionImg2ImgProcessingAPI):
 
         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)
 

modules/api/models.py

@@ -64,11 +64,7 @@ def merge_class_params(class_):
 
 
         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(