Core模式测试

Author: legionfu

scripts/lightdiffusionflow_config.py

@@ -4,6 +4,7 @@
 PNGINFO_CN_2_LIGHTDIFFUSIONFLOW = {}
 Image_Components_Key = {}
 LoRAs_In_Use = "loras_in_use"
+Flow_Save_mode = "All"
 
 class OutputPrompt_English:
 
@@ -28,10 +29,16 @@ def no_option(option_name, value):
     The option '<b style='color:Red;'>{value}</b>' was not found!'''
 
   def missing_extensions(ext_list:[]):
-    error_str = "Note: <b style='color:Orange;'>Found missing extensions.</b></p>"
-    for ext in ext_list:
-      error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
-    error_str+="<b style='color:Orange;'>The above Extension Missing Reminder is for reference only. Please determine the necessary plugins based on your actual needs and specific conditions.</b></p> "
+    if(Flow_Save_mode == "Core"):
+      error_str = "Note:  <b style='color:Orange;'>The current flow file contains parameters for other plugins:</b></p>"
+      for ext in ext_list:
+        error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
+      error_str+="<b style='color:Orange;'>You can switch to 'ALL' mode to load more parameters. (This prompt is for reference only, please choose the plugin mode according to the actual situation.)</b></p> "
+    else:
+      error_str = "Note: <b style='color:Orange;'>Found missing extensions.</b></p>"
+      for ext in ext_list:
+        error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
+      error_str+="<b style='color:Orange;'>The above Extension Missing Reminder is for reference only. Please determine the necessary plugins based on your actual needs and specific conditions.</b></p> "
     return error_str
 
   def missing_loras(loras_list:[]):
@@ -76,10 +83,17 @@ def no_option(option_name, value):
     未找到选项'<b style='color:Red;'>{value}</b>'!'''
 
   def missing_extensions(ext_list:[]):
-    error_str = "注意, <b style='color:Orange;'>发现缺失的插件:</b></p>"
-    for ext in ext_list:
-      error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
-    error_str+="<b style='color:Orange;'>以上插件缺失提示仅供参考，请注意辨别实际情况下您所需要安装的插件。</b></p> "
+    global Flow_Save_mode
+    if(Flow_Save_mode == "Core"):
+      error_str = "注意, <b style='color:Orange;'>当前flow文件含有其他插件参数:</b></p>"
+      for ext in ext_list:
+        error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
+      error_str+="<b style='color:Orange;'>可切换至'ALL'模式加载更多参数。（提示仅供参考，请根据实际情况选择插件模式。）</b></p> "
+    else:
+      error_str = "注意, <b style='color:Orange;'>发现缺失的插件:</b></p>"
+      for ext in ext_list:
+        error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
+      error_str+="<b style='color:Orange;'>以上插件缺失提示仅供参考，请注意辨别实际情况下您所需要安装的插件。</b></p> "
     return error_str
 
   def missing_loras(loras_list:[]):
@@ -105,7 +119,6 @@ def note_for_save_mode():
 
 
 OutputPrompt = OutputPrompt_English
-Flow_Save_mode = "Core"
 
 # 改成函数调用，修改配置之后能及时刷新
 def init():

scripts/state_api.py

@@ -532,8 +532,9 @@ def config_filter(config):
     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)
+        new_param = re.sub("[-_](model|models|checkpoint|checkpoints)$", target_word, param)
         fixed_config[new_param] = new_config[param]
+        #print(f"根据{param}，补充{new_param}")
 
     # 纠正编号
     res = re.match("state-ext-control-net-(txt2img|img2img)_([0-9]+)-(.+)",param)
@@ -1114,7 +1115,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)

scripts/state_settings.py

@@ -21,7 +21,7 @@ def on_ui_settings():
 
   shared.opts.add_option("lightdiffusionflow-mode",
     shared.OptionInfo(
-      "Core",
+      "All",
       f"模式/mode: ({OutputPrompt.note_for_save_mode()})",
       gr.Dropdown, 
       lambda: {