纠正旧版序号问题

Author: legionfu

ChangeLog.md

@@ -1,4 +1,4 @@
-## 2.1.2
+## 2.1.3
 
 ### Features:
  * 缺失LoRA模型提示。

javascript/state.utils.js

@@ -7,43 +7,7 @@ state.utils = {
   testFunction: function testFunction() {
     //console.log(state.extensions)
     // const button = gradioApp().getElementById("lightdiffusionflow_set_elements");
-    // button.click();
-    json_obj = {
-      "state-ext-control-net-txt2img_0-enable": "true",
-      "state-ext-control-net-txt2img_0-canny-high-threshold": "255",
-      "state-ext-control-net-txt2img_3-enable": "true",
-      "state-ext-control-net-txt2img_0-starting-control-step": "1",
-      "state-ext-control-net-txt2img_0-canny-low-threshold": "255",
-      "state-ext-control-net-txt2img_0-control-weight": "2",
-      "state-ext-control-net-txt2img_3-control-type": "OpenPose",
-      "state-ext-control-net-txt2img_0-control-mode": "ControlNet is more important",
-      "state-ext-control-net-txt2img_0-control-type": "Canny",
-      "state-setting_sd_model_checkpoint": "majicmixRealistic_betterV2V25.safetensors [d7e2ac2f4a]",
-      "state-ext-control-net-txt2img_0-preprocessor-resolution": "2048",
-      "state-ext-control-net-txt2img-tab": "ControlNet Unit 3 ",
-      "state-ext-control-net-txt2img_1-enable": "false",
-      "state-tab": "txt2img ",
-      "state-ext-control-net-txt2img-toggled": "true",
-      "txt2img_controlnet_ControlNet-1_input_image": "data:image",
-      "state-ext-control-net-txt2img_0-preprocessor": "canny",
-      "state-ext-control-net-txt2img_0-model": "control_v11p_sd15_canny [d14c016b]",
-      "state-ext-control-net-txt2img_3-preprocessor": "openpose_full",
-      "state-ext-control-net-txt2img_3-model": "control_v11p_sd15_openpose [cab727d4]"
-  }
-
-  console.log(json_obj["state-ext-control-net-txt2img_0-enable"])
-  console.log(json_obj["state-ext-control-net-txt2img_0-enabl1e"])
-
-  },
-
-  fix_old_json_error: function fix_old_json_error(json_obj){
-    
-    cn_index = 1
-    for (let cn_index=1; cn_index < 10; cn_index++){
-      
-    }
-
-    return json_obj
+    // button.click();    
   },
 
   target_is_newer_version: function(cur_version, target_version){

scripts/state_api.py

@@ -188,6 +188,11 @@ def set_dropdowns():
           if(option == new_value):
             matching_successed = True
             break
+
+          # 去掉模型的多余路径？
+          # if(os.path.split(option)[-1] == os.path.split(new_value)[-1]):
+          #   matching_successed = True
+          #   break
 
         # 没有完全匹配
         if(not matching_successed):
@@ -358,7 +363,7 @@ def get_lora_from_prompt(prompt):
   #print(available_loras)
 
   missing_loras = []
-  re_lora_prompt = re.compile("<lora:([\w_\s.]+):([\d.]+)>", re.IGNORECASE)
+  re_lora_prompt = re.compile("<lora:([\w_\s.]+):([ \d.]+)>", re.IGNORECASE)
   results = re.findall(re_lora_prompt, prompt)
   # print("使用到的lora:")
   # print(results)
@@ -494,6 +499,72 @@ def func_for_invisiblebutton():
   return Webui_Comps_Cur_Val[temp_index], next_index, Output_Log, Output_Log 
 
 
+def config_filter(config):
+  global extensions_id_conponents
+  new_config = config
+  for comp_type in extensions_id_conponents.keys():
+    for comp_id in extensions_id_conponents[comp_type].keys():
+      try:
+        # 筛掉python相关组件的默认值选项
+        default_val = extensions_id_conponents[comp_type][comp_id].get_config()["value"]
+        if(default_val == new_config[comp_id]):
+          del new_config[comp_id]
+      except KeyError as e:
+        pass
+
+  # 处理旧版插件保存的错误参数问题
+  #print("-------处理错误-------")
+  #print(new_config)
+  print("-------处理错误-------")
+  found_tabs = []
+  fixed_config = {}
+  for param in new_config.keys():
+    res = re.match("state-ext-control-net-txt2img_([0-9]+)-(.+)",param)
+    if(res != None):
+      if(res.group(2) not in ["presets","preprocessor","model"]):
+        try:
+          found_tabs.index(res.group(1))
+        except ValueError:
+          found_tabs.append(res.group(1))
+
+  for param in new_config.keys():
+
+    # 缝缝补补。。。 js保存的参数因为是汉语反推回英文，所以就会有 model->模型->models 的情况。
+    res = re.search("[-_](model|models|checkpoint|checkpoints)$",param)
+    if(res != None):
+      for key in ["model","models","checkpoint","checkpoints"]:
+        target_word = str(res.group()).replace(res.group(1),key)
+        new_param = re.sub("[-_](model|models|checkpoint|checkpoints)($|[_-])", target_word, param)
+        fixed_config[new_param] = new_config[param]
+
+    # 纠正编号
+    res = re.match("state-ext-control-net-txt2img_([0-9]+)-(.+)",param)
+    if(res != None):
+      if(res.group(1) != "0" and res.group(2) not in ["presets","preprocessor","model"]):
+        tab_num = int(res.group(1))
+        if(tab_num%3 == 0):
+          try:
+            found_tabs.index(str(tab_num/3))
+            # 如果是9 如果发现3的位置有参数，就还需要检查一下1
+            if(tab_num == 9):
+              found_tabs.index("1")
+          except ValueError:
+            new_key = f"state-ext-control-net-txt2img_{int(tab_num/3)}-{res.group(2)}"
+            fixed_config[new_key] = new_config[param]
+            print(f" {param} 改为 {new_key}")
+            continue
+
+    # 其余参数照搬
+    fixed_config[param] = new_config[param]
+
+  #print("-------处理错误-------")
+  #print(fixed_config)
+  print("-------处理错误-------")
+
+  new_config = fixed_config
+  return new_config
+
+
 def fn_import_workflow(workflow_file):
   global workflow_json, Output_Log
   global extensions_id_conponents, Webui_Comps_Cur_Val, temp_index, next_index
@@ -516,6 +587,8 @@ def fn_import_workflow(workflow_file):
     else:
       print("invalid file!")
 
+  workflow_json = config_filter(workflow_json)
+
   Webui_Comps_Cur_Val = []
   for key in extensions_id_conponents["image"].keys():
   #for key in lf_config.Image_Components_Key:
@@ -561,8 +634,9 @@ def fn_import_workflow(workflow_file):
     #   for short_hash in loras_info.keys():
     #     if(loras_info[short_hash].name == lora_name or loras_info[short_hash].alias == lora_name):
     #       pass
-  except KeyError:
+  except KeyError as e:
     pass
+    #print(f"except missing loras error: {e}")
 
   #print(Webui_Comps_Cur_Val)
   #set_elements()
@@ -632,18 +706,7 @@ def get_ext_list(self):
     return ext_str
 
   def useless_config_filter(self, config:config_params):
-    global extensions_id_conponents
-    new_config = config.config_data
-    for comp_type in extensions_id_conponents.keys():
-      for comp_id in extensions_id_conponents[comp_type].keys():
-        try:
-          # 筛掉python相关组件的默认值选项
-          default_val = extensions_id_conponents[comp_type][comp_id].get_config()["value"]
-          if(default_val == new_config[comp_id]):
-            del new_config[comp_id]
-        except KeyError as e:
-          pass
-    return new_config
+    return config_filter(config.config_data)
 
   def get_lightdiffusionflow_config(self, onlyimg:bool = False):
     global workflow_json, extensions_id_conponents, extensions_id_conponents_value
@@ -884,7 +947,7 @@ def after_component(self, component, **kwargs):
     get_script_container(component)
 
     if (isinstance(component, gr.Button) and kwargs["elem_id"] == "img2img_generation_info_button"): # 加载到最后一个组件了。   兼容旧版，暂时不使用“img2img_preview_filename”
-      
+
       searching_extensions_title()
       #print(extensions_conponents)
 
@@ -929,7 +992,7 @@ def after_component(self, component, **kwargs):
         except KeyError as e:
           pass
 
-      #print(extensions_conponents) # 整理好的第三方插件用到的组件
+      # print(extensions_conponents) # 整理好的第三方插件用到的组件
       # --------------------------------------组件分类--------------------------------------------------
 
       if(self.is_img2img):
@@ -1065,11 +1128,26 @@ def custom_ui(self):
             invisible_buttons[elem_id] = gr.Button(value=elem_id, elem_id=elem_id, visible=False)
 
 
+
+def on_after_component(component, **kwargs):
+  global Webui_Comps
+
+  # img2img和txt2img面板以外的组件信息只能在这里获取
+  # 如果希望python里控制这些组件，还需要把部分代码移到这里实现
+  try:
+    if(Webui_Comps.get(kwargs["elem_id"], None) == None):
+      Webui_Comps[kwargs["elem_id"]] = component
+      #if( kwargs["elem_id"] == "setting_sd_model_checkpoint"):
+      #  print("--------------setting_sd_model_checkpoint---------------")
+  except KeyError:
+    pass
+
+
 def on_before_reload():
   lightdiffusionflow_config.init()
 
 # add callbacks
 api = StateApi()
 script_callbacks.on_app_started(api.start)
-#script_callbacks.on_after_component(on_after_component)
+script_callbacks.on_after_component(on_after_component)
 script_callbacks.on_before_reload(on_before_reload)