导入导出筛去默认值的参数

Author: legionfu

javascript/state.core.js

@@ -714,7 +714,6 @@ state.core = (function () {
     },
     importLightDiffusionFlow: function (inputData){
 
-      
       forEachElement_WithoutTabs(IMAGES_WITHOUT_PREFIX, (image_id) => {
         state.utils.clearImage(getElement(image_id));
       });
@@ -726,39 +725,47 @@ state.core = (function () {
         return;
       }
 
-      // 缺少的插件
-      console.log(ext_list)
-      missing_ext_list = []
-      for (let key in json_obj){
-        ext_name = key.match(/ext-(\S+)-(txt2img|img2img)/)
-        console.log(key)
-        if(ext_name != null){
-          ext_name = ext_name[1]
-          console.log(ext_name)
-          if(ext_list.indexOf(ext_name) === -1){
-            if(missing_ext_list.indexOf(ext_name) === -1){
-              missing_ext_list.push(ext_name)
+      // 筛选掉默认值参数
+      let data = {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          "config_data":json_obj
+        })
+      }
+      fetch(`/lightdiffusionflow/local/useless_config_filter`, data)
+      .then(response => response.json())
+      .then(data => {
+        json_obj = data
+        console.log(ext_list)
+        // 缺少的插件
+        missing_ext_list = []
+        for (let key in json_obj){
+          ext_name = key.match(/ext-(\S+)-(txt2img|img2img)/)
+          console.log(key)
+          if(ext_name != null){
+            ext_name = ext_name[1]
+            console.log(ext_name)
+            if(ext_list.indexOf(ext_name) === -1){
+              if(missing_ext_list.indexOf(ext_name) === -1){
+                missing_ext_list.push(ext_name)
+              }
             }
           }
         }
-      }
 
-      if(missing_ext_list.length > 0){
-        // error_str = "Error: <b style='color:Red;'>Found missing extensions.</b></p>"
-        // for (ext of missing_ext_list){
-        //   error_str+="<p>- <b style='color:Red;'>"+ext+"</b></p>"
-        // }
-        // actions.output_log(error_str)
-        actions.preset_output_log("missing_exts","",missing_ext_list.join(';'))
-      }
+        if(missing_ext_list.length > 0){
+          actions.preset_output_log("missing_exts","",missing_ext_list.join(';'))
+        }
 
-      forEachElement_WithoutTabs(IMAGES_WITHOUT_PREFIX, (image_id) => {
-        json_obj[image_id] = ""
+        forEachElement_WithoutTabs(IMAGES_WITHOUT_PREFIX, (image_id) => {
+          json_obj[image_id] = ""
+        });
+        // webui主界面 没有localization相关的兼容问题 所以不用管
+        store.clear();
+        store.load(json_obj);
+        actions.applyState();
       });
-      // webui主界面 没有localization相关的兼容问题 所以不用管
-      store.clear();
-      store.load(json_obj);
-      actions.applyState();
       return;
     },
     startImportImage: function (index){

javascript/state.utils.js

@@ -8,9 +8,6 @@ state.utils = {
     //console.log(state.extensions)
     // const button = gradioApp().getElementById("lightdiffusionflow_set_elements");
     // button.click();
-
-    ext_name = "state-ext-control-net-img2img_2-presets".match(/ext-([a-zA-z0-9\-]+)-txt2img/)
-    console.log(ext_name)
   },
 
   target_is_newer_version: function(cur_version, target_version){

scripts/lightdiffusionflow_config.py

@@ -19,17 +19,17 @@ def import_completed():
     return "<b style='color:LimeGreen;'>import completed!</b>"
 
   def alternative_option(target_value, new_value):
-    return f'''Note: '<b style='color:Orange;'>{target_value}</b>' not found.\
+    return f'''Note: '<b style='color:Orange;'>{target_value}</b>' not found,<br>\
       An approximate match '<b style='color:Orange;'>{new_value}</b>' has been automatically selected as replacement.'''
 
   def no_option(option_name, value):
-    return f'''Error: '<b style='color:Red;'>{option_name}</b>' import failed!\
+    return f'''Error: '<b style='color:Red;'>{option_name}</b>' import failed!<br>\
     The option '<b style='color:Red;'>{value}</b>' was not found!'''
 
   def missing_extensions(ext_list:[]):
-    error_str = "Error: <b style='color:Red;'>Found missing extensions.</b></p>"
+    error_str = "Note: <b style='color:Orange;'>Found missing extensions.</b></p>"
     for ext in ext_list:
-      error_str+="<p>- <b style='color:Red;'>"+ext+"</b></p> "
+      error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
     return error_str
 
   def click_to_download(file_name, file_url):
@@ -52,19 +52,19 @@ def import_completed():
     return "<b style='color:LimeGreen;'>导入完成!</b>"
 
   def alternative_option(target_value, new_value):
-    return f'''注意: 未找到选项'<b style='color:Orange;'>{target_value}</b>'.\
+    return f'''注意: 未找到选项'<b style='color:Orange;'>{target_value}</b>',<br>\
       已使用近似选项'<b style='color:Orange;'>{new_value}</b>'代替.'''
 
   def no_option(option_name, value):
     if(option_name == "stable diffusion checkpoint"):
       return f'''未找到大模型'<b style='color:Orange;'>{value}</b>'!'''
-    return f'''错误: '<b style='color:Red;'>{option_name}</b>'导入失败!\
+    return f'''错误: '<b style='color:Red;'>{option_name}</b>'导入失败!<br>\
     未找到选项'<b style='color:Red;'>{value}</b>'!'''
 
   def missing_extensions(ext_list:[]):
-    error_str = "错误, <b style='color:Red;'>发现缺失的插件:</b></p>"
+    error_str = "注意, <b style='color:Orange;'>发现缺失的插件:</b></p>"
     for ext in ext_list:
-      error_str+="<p>- <b style='color:Red;'>"+ext+"</b></p> "
+      error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
     return error_str
 
   def click_to_download(file_name, file_url):

scripts/state_api.py

@@ -48,23 +48,13 @@
 
 def test_func():
   global extensions_conponents, extensions_id_conponents
+  global Output_Log
   print("test_func")
-  # res = re.search(r"(\[[0-9A-Fa-f]{8,10}\])", "control_v11p_sd15_scribble [d4ba51aafd]")
-  # print(res)
+  print(Output_Log)
+
   #from scripts.processor import preprocessor_filters
   #print(preprocessor_filters)
 
-  cn_model_name = "control_v1p_sd15_qrco1de_monster [5e5778cb]"
-
-  cn_type_list = ['canny','depth','normalmap','openpose','mlsd','lineart_anime','lineart','softedge','scribble',
-    'seg','shuffle','tile','inpaint','ip2p','brightness','illumination','qrcode_monster','qrcode','normalbae']
-
-  type_pattern = "("+"|".join(cn_type_list)+")"
-  print(type_pattern)
-  res = re.search(type_pattern,cn_model_name)
-  if(res != None):
-    print(res.group())
-
   #print(extensions_id_conponents["dropdown"]["state-ext-control-net-txt2img_0-model"].get_config())
 
   # print(parameters_copypaste.paste_fields)
@@ -150,16 +140,6 @@ def cn_get_model_type(cn_model_name):
   if(res != None):
     return res.group()
 
-  # #cn_model_name = "control_v1p_sd15_qrcode_monster [5e5778cb]"
-  # res = re.search(r"(\[[0-9A-Fa-f]{8,10}\])", cn_model_name)
-  # if(res != None):
-  #   cn_model_hash_val = res.group(1)
-  #   cn_model_no_hash = cn_model_name.replace(cn_model_hash_val,"").rstrip().lower()
-  # else:
-  #   cn_model_no_hash = cn_model_name.rstrip().lower()
-  # model_type = cn_model_no_hash.split("_")[-1]
-  # print(model_type)
-  # return model_type
   return None
 
 def set_dropdowns():
@@ -508,6 +488,9 @@ def fn_import_workflow(workflow_file):
   # return tuple(return_vals)
   return str(temp_index)#, Output_Log, Output_Log
 
+class config_params(BaseModel):
+  config_data:dict
+
 class imgs_callback_params(BaseModel):
   id:str
   img:str
@@ -529,7 +512,7 @@ def add_api_route(self, path: str, endpoint, **kwargs):
     return self.app.add_api_route(self.get_path(path), endpoint, **kwargs)
 
   def start(self, _: gr.Blocks, app: FastAPI):
-    print("-----------------state_api start------------------")
+    print("----------------- light_diffusion_flow api start------------------")
 
     self.app = app 
     # 读取本地的config.json
@@ -542,6 +525,7 @@ def start(self, _: gr.Blocks, app: FastAPI):
     self.add_api_route('/local/get_ext_list', self.get_ext_list, methods=['GET']) 
     # 用户设置了新图片 触发回调保存到 workflow_json
     self.add_api_route('/local/imgs_callback', self.imgs_callback, methods=['POST']) 
+    self.add_api_route('/local/useless_config_filter', self.useless_config_filter, methods=['POST'])
     # 刷新页面之后触发
     self.add_api_route('/local/refresh_ui', self.refresh_ui, methods=['GET']) 
     self.add_api_route('/local/output_log', add_output_log, methods=['GET']) 
@@ -565,6 +549,20 @@ def get_ext_list(self):
       pass
     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
+
   def get_lightdiffusionflow_config(self, onlyimg:bool = False):
     global workflow_json, extensions_id_conponents, extensions_id_conponents_value
     temp_json = {}
@@ -963,7 +961,7 @@ def custom_ui(self):
         State_Comps["background_import"] = gr.File(label="LightDiffusionFlow File",file_count="single",
            file_types=[File_extension],visible=False)
         State_Comps["json2js"] = gr.Textbox(label="json2js",visible=False)
-        State_Comps["test_button"] = gr.Button(value='测试',elem_id='test_button',visible=True)
+        State_Comps["test_button"] = gr.Button(value='测试',elem_id='test_button',visible=False)
         State_Comps["refresh_log"] = gr.Button(value='刷新日志',elem_id='img2img_invisible_refresh_log',visible=False)
         State_Comps["set_dropdowns"] = gr.Button(value='设置部分参数',elem_id='lightdiffusionflow_set_dropdowns',visible=False)
         State_Comps["set_js_params"] = gr.Button(value='设置剩下的js参数',elem_id='lightdiffusionflow_set_js_params',visible=False)