sd webui 1.6以前的版本兼容问题解决

Author: legionfu

ChangeLog.md

@@ -1,3 +1,8 @@
+## 2.1.1
+
+### Bug Fixes:
+ * sd webui v1.6.0 之前的版本兼容问题解决。
+
 ## 2.1.0
 
 ### Bug Fixes:

javascript/state.core.js

@@ -74,6 +74,7 @@ state.core = (function () {
 
   let store = null;
   let timer = null;
+  let sd_versions = "0.0.0"
 
   function hasSetting(id, tab) {
     return true // 需要默认保存全部选项 不需要判断
@@ -113,6 +114,10 @@ state.core = (function () {
 
     //console.log(window.localization)
     fetch('/lightdiffusionflow/local/refresh_ui') // 刷新页面触发python重置图片数据
+    .then(response => response.json())
+    .then(data => {
+      sd_versions = data
+    });
 
     fetch('/lightdiffusionflow/local/get_imgs_elem_key') //初始化部分图片组件id, 后续设置onchanged事件
       .then(response => response.json())
@@ -730,6 +735,9 @@ state.core = (function () {
     },
     output_error: function (msg, msg_style="color:Tomato;"){
       actions.output_log(msg,msg_style)
+    },
+    get_sd_version: function (){
+      return sd_versions
     }
   };
 

javascript/state.ext.general.js

@@ -154,46 +154,73 @@ function general_ext(tab_name, extension_name, root_container) {
 
   }
 
-  function handleSelect(select, index, store) {
+  function handleSelect(select, store) {
     let translations = state.utils.reverseTranslation(select.querySelector('label').firstChild.textContent)
-    // for (var text of translations){
-    //   var id = state.utils.txtToId(text);
-    //   var value = store.get(id);
-    //   if (value) {break}
-    // }
+    for (var text of translations){
+      var id = state.utils.txtToId(text);
+      var value = store.get(id);
+      if (value) {break}
+    }
     //id = state.utils.txtToId(translations[0]);
     //if (value) { //前面不需要判断是否有值，因为需要执行handleSelect绑定onchange事件
-    //state.utils.handleSelect(select, id, store, force=true);
+    state.utils.handleSelect(select, id, store, force=true);
     //}
 
-    let id = state.constants.LS_PREFIX+LS_PREFIX+"dropdown_"+index
-    state.utils.onContentChange(select, function (el) {
-      console.log(`onContentChange ${id}`)
-      let selected = el.querySelector('span.single-select');
-      if (selected) {
-        store.setWithNoPrefix(id, selected.textContent);
-      } else {
-        // new gradio version...
-        let input = el.querySelector('input');
-        if (input) {
-          store.setWithNoPrefix(id, input.value);
-        }
-      }
-
-    });
+    // let id = state.constants.LS_PREFIX+LS_PREFIX+"dropdown_"+index
+    // state.utils.onContentChange(select, function (el) {
+    //   console.log(`onContentChange ${id}`)
+    //   let selected = el.querySelector('span.single-select');
+    //   if (selected) {
+    //     store.setWithNoPrefix(id, selected.textContent);
+    //   } else {
+    //     // new gradio version...
+    //     let input = el.querySelector('input');
+    //     if (input) {
+    //       store.setWithNoPrefix(id, input.value);
+    //     }
+    //   }
+    // });
 
     if (id === 'preprocessor' && value && value.toLowerCase() !== 'none') {
       state.utils.onNextUiUpdates(handleSliders); // update new sliders if needed
     }
   }
   function handleSelects() {
-    //let select_index = 0
+    // let root_selects = root_not_tabs.container.querySelectorAll('.gradio-dropdown');
+    // root_selects.forEach(function (root_select) {
+    //   if(cnTabs.length == 0){
+    //     handleSelect(root_select, global_dropdown_index[ext_name], root_not_tabs.store)
+    //     global_dropdown_index[ext_name] += 1
+    //     console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
+    //   }
+    //   else{
+    //     let needsHandle = true
+    //     for(let tab of cnTabs){
+    //       if(tab.container.contains(root_select)){
+    //         needsHandle = false
+    //         break
+    //       }
+    //     }
+    //     if(needsHandle){
+    //       handleSelect(root_select, global_dropdown_index[ext_name], root_not_tabs.store)
+    //       global_dropdown_index[ext_name] += 1
+    //       console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
+    //     }
+    //   } // else
+    // });
+
+    // cnTabs.forEach(({ container, store }) => {
+    //   container.querySelectorAll('.gradio-dropdown').forEach(select => {
+    //     handleSelect(select, global_dropdown_index[ext_name], store)
+    //     global_dropdown_index[ext_name] += 1
+    //     console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
+    //   });
+    // });
+
     let root_selects = root_not_tabs.container.querySelectorAll('.gradio-dropdown');
     root_selects.forEach(function (root_select) {
       if(cnTabs.length == 0){
-        handleSelect(root_select, global_dropdown_index[ext_name], root_not_tabs.store)
-        global_dropdown_index[ext_name] += 1
-        console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
+        handleSelect(root_select, root_not_tabs.store)
       }
       else{
         let needsHandle = true
@@ -203,19 +230,13 @@ function general_ext(tab_name, extension_name, root_container) {
             break
           }
         }
-        if(needsHandle){
-          handleSelect(root_select, global_dropdown_index[ext_name], root_not_tabs.store)
-          global_dropdown_index[ext_name] += 1
-          console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
-        }
+        if(needsHandle){handleSelect(root_select, root_not_tabs.store)}
       } // else
     });
 
     cnTabs.forEach(({ container, store }) => {
       container.querySelectorAll('.gradio-dropdown').forEach(select => {
-        handleSelect(select, global_dropdown_index[ext_name], store)
-        global_dropdown_index[ext_name] += 1
-        console.log(`global_dropdown_index = ${global_dropdown_index[ext_name]}`)
+        handleSelect(select, store)
       });
     });
 
@@ -327,7 +348,10 @@ function general_ext(tab_name, extension_name, root_container) {
       handleTabs();
       handleCheckboxes();
       handleTextAreas();
-      //handleSelects();
+      if(state.utils.target_is_newer_version(state.core.actions.get_sd_version(), "v1.6.0")){
+        console.log("-----------general handleSelects-------")
+        handleSelects();
+      }
       handleSliders();
       handleRadioButtons();
     }, 500);
@@ -423,17 +447,17 @@ function general_ext_main(tab){
       let ext_name = title.replace(" ","-").toLowerCase()
       console.log(ext_name)
 
-      if(!global_dropdown_index[ext_name]){
-        global_dropdown_index[ext_name] = 0
-      }
+      // if(!global_dropdown_index[ext_name]){
+      //   global_dropdown_index[ext_name] = 0
+      // }
       general_ext(cur_tab_name, ext_name, root_container).init();
     }
 
   }
   return {init}
 }
 
-global_dropdown_index = {} // py里是不分txt2img和img2img的，但是这里是需要区分的。。
+//global_dropdown_index = {} // py里是不分txt2img和img2img的，但是这里是需要区分的。。
 
 const TABS = ['txt2img', 'img2img'];
 for (tab of TABS){

javascript/state.utils.js

@@ -10,6 +10,33 @@ state.utils = {
     // button.click();
   },
 
+  target_is_newer_version: function(cur_version, target_version){
+
+    let cur = cur_version.replace("v","")
+    cur = cur.split(".")
+
+    let target = target_version.replace("v","")
+    target = target.split(".")
+    let version_len = Math.min(cur.length, target.length)
+
+    // 逐个版本号比较  v1.2.3 和 v1.2比较时，只比较前面两个数字
+    for (let i=0; i < version_len; i++){
+      if(Number(cur[i]) > Number(target[i])){
+        return false
+      }
+      else if(Number(cur[i]) < Number(target[i])){
+        return true
+      }
+    }
+
+    // 前面的版本号一样，再看谁的版本号更长
+    if(cur.length >= target.length){
+      return false
+    }
+
+    return true
+  },
+
   searchCheckPointByHash: async function searchCheckPointByHash(hash){
     let downloadUrl = undefined
     hash_str = hash.replace("[","").replace("]","").replace(/^\s+|\s+$/g,"")
@@ -353,26 +380,28 @@ state.utils = {
               }
             }
 
-            let hash_pos = localized_value.search(/\[[0-9A-Fa-f]{10}\]/)
+            let hash_res = localized_value.match(/\[[0-9A-Fa-f]{8,10}\]/)
             if(!successed){ // && hash_pos != -1 找不到对应选项 并且选项里有10位哈希值
               for (li of items){
 
                 // 去掉Hash比较
                 let text = li.lastChild.wholeText.trim()
-                let localized_value_no_hash = localized_value.replace(/\[[0-9A-Fa-f]{10}\]/,"").replace(/^\s+|\s+$/g,"")
-                let text_no_hash = text.replace(/\[[0-9A-Fa-f]{10}\]/, "").replace(/^\s+|\s+$/g,"")
+                let localized_value_no_hash = localized_value.replace(/\[[0-9A-Fa-f]{8,10}\]/,"").replace(/^\s+|\s+$/g,"")
+                let text_no_hash = text.replace(/\[[0-9A-Fa-f]{8,10}\]/, "").replace(/^\s+|\s+$/g,"")
 
                 if (localized_value_no_hash === text_no_hash) {
                   successed = true
                 }
 
                 // 只比较Hash
-                if(!successed){
-                  let hash_str = localized_value.substring(hash_pos,hash_pos+12).replace(/^\s+|\s+$/g,"")
-                  let text_hash_pos = text.search(/\[[0-9A-Fa-f]{10}\]/)
-                  let text_hash = text.substring(text_hash_pos, text_hash_pos+12).replace(/^\s+|\s+$/g,"")
-                  if (hash_str === text_hash) {
-                    successed = true
+                if(!successed && hash_res != null){
+                  let hash_str = hash_res[0].replace(/^\s+|\s+$/g,"")
+                  let text_hash_res = text.match(/\[[0-9A-Fa-f]{8,10}\]/)
+                  if(text_hash_res != null){
+                    let text_hash = text_hash_res[0].replace(/^\s+|\s+$/g,"")
+                    if (hash_str === text_hash) {
+                      successed = true
+                    }
                   }
                 }
 
@@ -395,9 +424,9 @@ state.utils = {
               else{
                 state.core.actions.output_error(`\'${option_name}\' import failed! The option \'${value}\' was not found!`)
               }
-              if(hash_pos != -1){
+              if(hash_res != null){
                 let model_name = value
-                let hash_str = localized_value.substring(hash_pos,hash_pos+12)
+                let hash_str = hash_res[0]
                 state.utils.searchCheckPointByHash(hash_str).then( downloadUrl => {
                   if(downloadUrl != undefined){
                     let warning_str = encodeURIComponent(`click to download \

scripts/lightdiffusionflow_version.py

@@ -1 +1 @@
-lightdiffusionflow_version = "v2.1.0"
+lightdiffusionflow_version = "v2.1.1"

scripts/state_api.py

@@ -19,7 +19,7 @@
 import modules.generation_parameters_copypaste as parameters_copypaste
 from modules.generation_parameters_copypaste import paste_fields, registered_param_bindings, parse_generation_parameters
 from modules.sd_models import checkpoints_list
-
+import launch
 
 from scripts import lightdiffusionflow_version, lightdiffusionflow_config
 import scripts.lightdiffusionflow_config as lf_config
@@ -681,7 +681,9 @@ def refresh_ui(self):
     global workflow_json, Output_Log
     workflow_json = {}
     Output_Log = ""
-    print("refresh_ui")
+    print("refresh_ui")  
+    tag = launch.git_tag()
+    return tag
 
   def set_preload(self, params:file_params):
     global Need_Preload,Preload_File
@@ -799,7 +801,6 @@ def after_component(self, component, **kwargs):
 
     if (isinstance(component, gr.Button) and kwargs["elem_id"] == "img2img_generation_info_button"): # 加载到最后一个组件了。   兼容旧版，暂时不使用“img2img_preview_filename”
 
-
       searching_extensions_title()
       #print(extensions_conponents)