Skip to content

Commit 376accc

Browse files
author
legionfu
committed
Core模式测试
1 parent 899d896 commit 376accc

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

scripts/lightdiffusionflow_config.py

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
PNGINFO_CN_2_LIGHTDIFFUSIONFLOW = {}
55
Image_Components_Key = {}
66
LoRAs_In_Use = "loras_in_use"
7+
Flow_Save_mode = "All"
78

89
class OutputPrompt_English:
910

@@ -28,10 +29,16 @@ def no_option(option_name, value):
2829
The option '<b style='color:Red;'>{value}</b>' was not found!'''
2930

3031
def missing_extensions(ext_list:[]):
31-
error_str = "Note: <b style='color:Orange;'>Found missing extensions.</b></p>"
32-
for ext in ext_list:
33-
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
34-
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> "
32+
if(Flow_Save_mode == "Core"):
33+
error_str = "Note: <b style='color:Orange;'>The current flow file contains parameters for other plugins:</b></p>"
34+
for ext in ext_list:
35+
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
36+
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> "
37+
else:
38+
error_str = "Note: <b style='color:Orange;'>Found missing extensions.</b></p>"
39+
for ext in ext_list:
40+
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
41+
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> "
3542
return error_str
3643

3744
def missing_loras(loras_list:[]):
@@ -76,10 +83,17 @@ def no_option(option_name, value):
7683
未找到选项'<b style='color:Red;'>{value}</b>'!'''
7784

7885
def missing_extensions(ext_list:[]):
79-
error_str = "注意, <b style='color:Orange;'>发现缺失的插件:</b></p>"
80-
for ext in ext_list:
81-
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
82-
error_str+="<b style='color:Orange;'>以上插件缺失提示仅供参考,请注意辨别实际情况下您所需要安装的插件。</b></p> "
86+
global Flow_Save_mode
87+
if(Flow_Save_mode == "Core"):
88+
error_str = "注意, <b style='color:Orange;'>当前flow文件含有其他插件参数:</b></p>"
89+
for ext in ext_list:
90+
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
91+
error_str+="<b style='color:Orange;'>可切换至'ALL'模式加载更多参数。(提示仅供参考,请根据实际情况选择插件模式。)</b></p> "
92+
else:
93+
error_str = "注意, <b style='color:Orange;'>发现缺失的插件:</b></p>"
94+
for ext in ext_list:
95+
error_str+="<p>- <b style='color:Orange;'>"+ext+"</b></p> "
96+
error_str+="<b style='color:Orange;'>以上插件缺失提示仅供参考,请注意辨别实际情况下您所需要安装的插件。</b></p> "
8397
return error_str
8498

8599
def missing_loras(loras_list:[]):
@@ -105,7 +119,6 @@ def note_for_save_mode():
105119

106120

107121
OutputPrompt = OutputPrompt_English
108-
Flow_Save_mode = "Core"
109122

110123
# 改成函数调用,修改配置之后能及时刷新
111124
def init():

scripts/state_api.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,9 @@ def config_filter(config):
532532
if(res != None):
533533
for key in ["model","models","checkpoint","checkpoints"]:
534534
target_word = str(res.group()).replace(res.group(1),key)
535-
new_param = re.sub("[-_](model|models|checkpoint|checkpoints)($|[_-])", target_word, param)
535+
new_param = re.sub("[-_](model|models|checkpoint|checkpoints)$", target_word, param)
536536
fixed_config[new_param] = new_config[param]
537+
#print(f"根据{param},补充{new_param}")
537538

538539
# 纠正编号
539540
res = re.match("state-ext-control-net-(txt2img|img2img)_([0-9]+)-(.+)",param)
@@ -1114,7 +1115,7 @@ def custom_ui(self):
11141115
State_Comps["background_import"] = gr.File(label="LightDiffusionFlow File",file_count="single",
11151116
file_types=[File_extension],visible=False)
11161117
State_Comps["json2js"] = gr.Textbox(label="json2js",visible=False)
1117-
State_Comps["test_button"] = gr.Button(value='测试',elem_id='test_button',visible=True)
1118+
State_Comps["test_button"] = gr.Button(value='测试',elem_id='test_button',visible=False)
11181119
State_Comps["refresh_log"] = gr.Button(value='刷新日志',elem_id='img2img_invisible_refresh_log',visible=False)
11191120
State_Comps["set_dropdowns"] = gr.Button(value='设置部分参数',elem_id='lightdiffusionflow_set_dropdowns',visible=False)
11201121
State_Comps["set_js_params"] = gr.Button(value='设置剩下的js参数',elem_id='lightdiffusionflow_set_js_params',visible=False)

scripts/state_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def on_ui_settings():
2121

2222
shared.opts.add_option("lightdiffusionflow-mode",
2323
shared.OptionInfo(
24-
"Core",
24+
"All",
2525
f"模式/mode: ({OutputPrompt.note_for_save_mode()})",
2626
gr.Dropdown,
2727
lambda: {

0 commit comments

Comments
 (0)