cleanup before merge

.gitmodules

@@ -17,29 +17,29 @@
   url = https://github.com/kohya-ss/sd-scripts
   ignore = dirty
 [submodule "extensions-builtin/clip-interrogator-ext"]
-	path = extensions-builtin/clip-interrogator-ext
-	url = https://github.com/Dahvikiin/clip-interrogator-ext.git
+  path = extensions-builtin/clip-interrogator-ext
+  url = https://github.com/Dahvikiin/clip-interrogator-ext.git
   ignore = dirty
 [submodule "extensions-builtin/sd-webui-controlnet"]
-	path = extensions-builtin/sd-webui-controlnet
-	url = https://github.com/Mikubill/sd-webui-controlnet
+  path = extensions-builtin/sd-webui-controlnet
+  url = https://github.com/Mikubill/sd-webui-controlnet
   ignore = dirty
 [submodule "modules/lycoris"]
-	path = modules/lycoris
-	url = https://github.com/KohakuBlueleaf/LyCORIS
+  path = modules/lycoris
+  url = https://github.com/KohakuBlueleaf/LyCORIS
   ignore = dirty
 [submodule "extensions-builtin/stable-diffusion-webui-rembg"]
-	path = extensions-builtin/stable-diffusion-webui-rembg
-	url = https://github.com/AUTOMATIC1111/stable-diffusion-webui-rembg
+  path = extensions-builtin/stable-diffusion-webui-rembg
+  url = https://github.com/AUTOMATIC1111/stable-diffusion-webui-rembg
   ignore = dirty
 [submodule "extensions-builtin/a1111-sd-webui-lycoris"]
-	path = extensions-builtin/a1111-sd-webui-lycoris
-	url = https://github.com/KohakuBlueleaf/a1111-sd-webui-lycoris
+  path = extensions-builtin/a1111-sd-webui-lycoris
+  url = https://github.com/KohakuBlueleaf/a1111-sd-webui-lycoris
   ignore = dirty
 [submodule "extensions-builtin/multidiffusion-upscaler-for-automatic1111"]
-	path = extensions-builtin/multidiffusion-upscaler-for-automatic1111
-	url = https://github.com/pkuliyi2015/multidiffusion-upscaler-for-automatic1111
+  path = extensions-builtin/multidiffusion-upscaler-for-automatic1111 
+  url = https://github.com/pkuliyi2015/multidiffusion-upscaler-for-automatic1111
   ignore = dirty
 [submodule "extensions-builtin/sd-webui-agent-scheduler"]
-	path = extensions-builtin/sd-webui-agent-scheduler
-	url = https://github.com/ArtVentureX/sd-webui-agent-scheduler
+  path = extensions-builtin/sd-webui-agent-scheduler
+  url = https://github.com/ArtVentureX/sd-webui-agent-scheduler

TODO.md

@@ -60,6 +60,6 @@ Tech that can be integrated as part of the core workflow...
 - git-rebasin
 - additional upscalers
 - new image browser
-- `fp8`
 - update `transformers`
 - `git submodule set-url extensions-builtin/clip-interrogator-ext https://github.com/Dahvikiin/clip-interrogator-ext.git`
+- upate `gradio`

modules/api/models.py

@@ -1,7 +1,6 @@
 import inspect
 from typing import Any, Optional, Dict, List
 from pydantic import BaseModel, Field, create_model # pylint: disable=no-name-in-module
-from typing_extensions import Literal
 from inflection import underscore
 from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img
 import modules.shared as shared
@@ -133,7 +132,7 @@ class ImageToImageResponse(BaseModel):
     info: str
 
 class ExtrasBaseRequest(BaseModel):
-    resize_mode: Literal[0, 1] = Field(default=0, title="Resize Mode", description="Sets the resize mode: 0 to upscale by upscaling_resize amount, 1 to upscale up to upscaling_resize_h x upscaling_resize_w.")
+    resize_mode: float = Field(default=0, title="Resize Mode", description="Sets the resize mode: 0 to upscale by upscaling_resize amount, 1 to upscale up to upscaling_resize_h x upscaling_resize_w.")
     show_extras_results: bool = Field(default=True, title="Show results", description="Should the backend return the generated image?")
     gfpgan_visibility: float = Field(default=0, title="GFPGAN Visibility", ge=0, le=1, allow_inf_nan=False, description="Sets the visibility of GFPGAN, values should be between 0 and 1.")
     codeformer_visibility: float = Field(default=0, title="CodeFormer Visibility", ge=0, le=1, allow_inf_nan=False, description="Sets the visibility of CodeFormer, values should be between 0 and 1.")

modules/sd_models.py

@@ -583,10 +583,10 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No
         shared.opts.data['sd_model_checkpoint'] = "runwayml/stable-diffusion-v1-5"
 
     if op == 'model' or op == 'dict':
-        if model_data.sd_model is not None and (checkpoint_info.hash == model_data.sd_model.sd_checkpoint_info.hash): # trying to load the same model
+        if model_data.sd_model is not None and checkpoint_info is not None (checkpoint_info.hash == model_data.sd_model.sd_checkpoint_info.hash): # trying to load the same model
             return
     else:
-        if model_data.sd_refiner is not None and (checkpoint_info.hash == model_data.sd_refiner.sd_checkpoint_info.hash): # trying to load the same model
+        if model_data.sd_refiner is not None and checkpoint_info is not None and (checkpoint_info.hash == model_data.sd_refiner.sd_checkpoint_info.hash): # trying to load the same model
             return
 
     shared.log.debug(f'Diffusers load config: {diffusers_load_config}')

requirements.txt

@@ -43,7 +43,6 @@ scikit-image
 basicsr
 compel
 antlr4-python3-runtime==4.9.3
-typing-extensions==4.6.3
 pydantic==1.10.9
 requests==2.31.0
 tqdm==4.65.0
@@ -63,3 +62,4 @@ tomesd==0.1.3
 urllib3==1.26.15
 Pillow==9.5.0
 timm==0.6.13
+typing-extensions==4.6.3

webui.py

@@ -32,6 +32,7 @@ warnings.filterwarnings(action="ignore", category=UserWarning, module="torchvisi
 startup_timer.record("torch")
 
 errors.log.debug('Loading Gradio')
+import typing_extensions # pylint: disable=W0611,C0411
 from fastapi import FastAPI # pylint: disable=W0611,C0411
 import gradio # pylint: disable=W0611,C0411
 startup_timer.record("gradio")