minor fixes

TODO.md

@@ -63,3 +63,4 @@ Tech that can be integrated as part of the core workflow...
 - update `transformers`
 - `git submodule set-url extensions-builtin/clip-interrogator-ext https://github.com/Dahvikiin/clip-interrogator-ext.git`
 - upate `gradio`
+- extra network refresh breaks if new extra network type found

javascript/extraNetworks.js

@@ -27,7 +27,7 @@ function setupExtraNetworksForTab(tabname) {
 
   intersectionObserver = new IntersectionObserver((entries) => {
     if (!en) return
-    for (el of Array.from(gradioApp().querySelectorAll('.extra-network-cards'))) el.style.height = window.opts.extra_networks_height + 'vh';
+    for (el of Array.from(gradioApp().querySelectorAll('.extra-networks-page'))) el.style.height = window.opts.extra_networks_height + 'vh';
     if (entries[0].intersectionRatio > 0) {
       if (window.opts.extra_networks_card_cover === 'cover') {
         en.style.transition = '';

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 is not None (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) and (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 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

@@ -42,8 +42,9 @@ yapf
 scikit-image
 basicsr
 compel
+typing-extensions==4.7.1
 antlr4-python3-runtime==4.9.3
-pydantic==1.10.9
+pydantic==1.10.11
 requests==2.31.0
 tqdm==4.65.0
 accelerate==0.20.3
@@ -62,4 +63,3 @@ tomesd==0.1.3
 urllib3==1.26.15
 Pillow==9.5.0
 timm==0.6.13
-typing-extensions==4.6.3

webui.py

@@ -32,7 +32,6 @@ 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")