设置页面增加保存flow的默认路径选项

Author: legionfu

ChangeLog.md

@@ -4,6 +4,7 @@
  * 增加本地保存Flow配置功能，可直接下拉列表选择已保存的Flow文件。（导入或使用新flow之前，建议先刷新页面，目前插件暂时没有重置参数的功能）
  * 增加记录额外LoRA模型数据，以便导入时从Civitai搜索缺失的lora模型。
  * 模型模糊匹配优化，增加匹配子文件夹下的模型。
+ * 设置页面增加保存flow的默认路径选项，以及相同作用的命令行选项"--local-flows-path"。
 
 ### Bug Fixes:
  * 修复了部分已知的参数设置失败的问题，如ControlNet在Canny模式下的"Canny Low/Hight Threshold"等参数。

preload.py

@@ -0,0 +1,4 @@
+import argparse
+
+def preload(parser: argparse.ArgumentParser):
+  parser.add_argument("--local-flows-path", type=str, default="models/LightDiffusionFlow", help="Path to save flow files.")

scripts/lightdiffusionflow_config.py

@@ -1,11 +1,13 @@
-import json
+import json,os
+from modules.paths_internal import data_path
 
 PNGINFO_2_LIGHTDIFFUSIONFLOW = {}
 PNGINFO_CN_2_LIGHTDIFFUSIONFLOW = {}
 Image_Components_Key = {}
 LoRAs_In_Use = "loras_in_use"
 Flow_Save_mode = "All"
 Auto_Fix_Params = True
+Local_Flows_Path = "models/LightDiffusionFlow"
 
 class OutputPrompt_English:
 
@@ -145,10 +147,35 @@ def note_for_save_mode():
 
 OutputPrompt = OutputPrompt_English
 
+def create_local_flow_path():
+  global Local_Flows_Path
+  
+  if os.path.isabs(Local_Flows_Path):
+    flows_path = Local_Flows_Path
+  else:
+    flows_path = os.path.join(data_path, Local_Flows_Path) 
+  flows_path = flows_path.replace("\\","/") # linux下反斜杠有问题
+  #print(flows_path)
+  try:
+    if(not os.path.exists(flows_path)):
+      os.makedirs(flows_path)
+      if(os.path.exists(flows_path)):
+        print(f"本地文件夹'{flows_path}'创建成功！")
+      else:
+        print(f"本地文件夹'{flows_path}'创建失败！")
+  except BaseException as e:
+    pass
+  if(not os.path.exists(flows_path)):
+    print(f"The creation of the folder '{Local_Flows_Path}' has failed! Please create this folder manually to ensure the proper functioning of the extension.")
+    print(f"创建文件夹'{Local_Flows_Path}'失败！请手动创建该文件夹，以保证插件功能正常运行。")
+
+  Local_Flows_Path = flows_path
+
+
 # 改成函数调用，修改配置之后能及时刷新
 def init():
   global PNGINFO_2_LIGHTDIFFUSIONFLOW,PNGINFO_CN_2_LIGHTDIFFUSIONFLOW
-  global OutputPrompt,Flow_Save_mode,Auto_Fix_Params,Image_Components_Key
+  global OutputPrompt,Flow_Save_mode,Auto_Fix_Params,Local_Flows_Path,Image_Components_Key
   # PNG Info的功能除了主要的选项以外其他的都靠第三方插件的主动支持，后续再考虑能否有优化的办法
   #print(parameters_copypaste.paste_fields) 
   PNGINFO_2_LIGHTDIFFUSIONFLOW = {
@@ -206,6 +233,16 @@ def init():
       except:
         pass
 
+      # 本地flow保存位置，先读本地设置，再读命令行设置
+      try:
+        Local_Flows_Path = webui_settings["lightdiffusionflow-local-flows-path"]
+      except:
+        pass
+      if shared.cmd_opts.local_flows_path:
+        Local_Flows_Path = shared.cmd_opts.local_flows_path
+      create_local_flow_path()
+
+
       language_successed = False
       auto_language = False
       try:

scripts/state_api.py

@@ -31,6 +31,7 @@
 Auto_Fix_Params = lf_config.Auto_Fix_Params
 LoRAs_In_Use = lf_config.LoRAs_In_Use
 OutputPrompt = lf_config.OutputPrompt
+Local_Flows_Path = lf_config.Local_Flows_Path #"models/LightDiffusionFlow"
 
 # current_path = os.path.abspath(os.path.dirname(__file__))
 # sys.path.append(os.path.join(current_path,"lib"))
@@ -50,25 +51,6 @@
 txt2img_script_container = None
 img2img_script_container = None
 
-local_flows_path = "models/LightDiffusionFlow"
-if True:
-  flows_path = os.path.join(data_path, local_flows_path) 
-  flows_path = flows_path.replace("\\","/") # linux下反斜杠有问题
-  print(flows_path)
-  try:
-    if(not os.path.exists(flows_path)):
-      os.makedirs(flows_path)
-      if(os.path.exists(flows_path)):
-        print(f"本地文件夹'{flows_path}'创建成功！")
-      else:
-        print(f"本地文件夹'{flows_path}'创建失败！")
-  except BaseException as e:
-    pass
-
-  if(not os.path.exists(flows_path)):
-    print(f"The creation of the folder '{local_flows_path}' has failed! Please create this folder manually to ensure the proper functioning of the extension.")
-    print(f"创建文件夹'{local_flows_path}'失败！请手动创建该文件夹，以保证插件功能正常运行。")
-
 local_flow_list = []
 Need_Preload = False
 Preload_File = r""
@@ -211,11 +193,11 @@ def SearchingCheckPointByHashFromCivitai(hash:str):
 
 def refresh_local_flows(*inputs):
   print("refresh_local_flows")
-  global local_flow_list,local_flows_path
+  global local_flow_list,Local_Flows_Path
   try:
-    flows_path = os.path.join(data_path, local_flows_path) 
-    local_flow_list = [f for f in os.listdir(flows_path) if os.path.isfile(
-        os.path.join(flows_path, f)) and os.path.splitext(f)[-1] == '.flow']
+    #flows_path = os.path.join(data_path, Local_Flows_Path) 
+    local_flow_list = [f for f in os.listdir(Local_Flows_Path) if os.path.isfile(
+        os.path.join(Local_Flows_Path, f)) and os.path.splitext(f)[-1] == '.flow']
   except:
     local_flow_list = []
   # print(inputs)
@@ -231,11 +213,11 @@ def refresh_local_flows(*inputs):
   return ret
 
 def apply_local_flow(selected):
-  global local_flow_list,local_flows_path
+  global local_flow_list,Local_Flows_Path
   global Need_Preload,Preload_File
 
   if(selected != "" and selected != None):
-    flow_path = os.path.join(data_path, local_flows_path, selected) 
+    flow_path = os.path.join(Local_Flows_Path, selected) 
     if(os.path.exists(flow_path)):
       print("OK,Local File!")
       print(flow_path)
@@ -244,9 +226,9 @@ def apply_local_flow(selected):
       gr.Info(clear_markup(OutputPrompt.startimport()))
 
 def delete_local_flow(selected):
-  global local_flow_list,local_flows_path
+  global local_flow_list,Local_Flows_Path
   if(selected != "" and selected != None):
-    flow_path = os.path.join(data_path, local_flows_path, selected) 
+    flow_path = os.path.join(Local_Flows_Path, selected) 
     if(os.path.exists(flow_path)):
       os.remove(flow_path)
       print("Local File Deleted!")
@@ -1014,7 +996,7 @@ def read_file(self, params:file_params):
   def file_exist(self, params:file_params):
     print("file_exist")
     if(not os.path.exists(params.file_path)):
-      flow_path = os.path.join(data_path, local_flows_path, params.file_path) 
+      flow_path = os.path.join(Local_Flows_Path, params.file_path) 
       if(os.path.exists(flow_path)):
         return True
       else:
@@ -1084,7 +1066,7 @@ def need_preload(self):
     return ""
 
   def saveFlowToLocal(self, data_to_save:savefile_params):
-    global local_flows_path
+    global Local_Flows_Path
     global add_output_log
 
     overall_data = {}
@@ -1107,7 +1089,7 @@ def saveFlowToLocal(self, data_to_save:savefile_params):
     # 过滤掉一些没用的默认值的信息
     overall_data = config_filter(overall_data)
 
-    flow_path = os.path.join(data_path, local_flows_path, data_to_save.file_name) 
+    flow_path = os.path.join(Local_Flows_Path, data_to_save.file_name) 
     print(flow_path)
     if(not os.path.exists(flow_path) or (data_to_save.overwrite)):
       with open(flow_path,"w") as f:
@@ -1353,11 +1335,11 @@ def custom_ui(self):
     if(Flow_Save_mode == "Core"):
       save_mode = " (only ControlNet)"
 
-    global local_flow_list,local_flows_path
+    global local_flow_list,Local_Flows_Path
     try:
-      flows_path = os.path.join(data_path, local_flows_path) 
-      local_flow_list = [f for f in os.listdir(flows_path) if os.path.isfile(
-          os.path.join(flows_path, f)) and os.path.splitext(f)[-1] == '.flow']
+      #flows_path = os.path.join(data_path, Local_Flows_Path) 
+      local_flow_list = [f for f in os.listdir(Local_Flows_Path) if os.path.isfile(
+          os.path.join(Local_Flows_Path, f)) and os.path.splitext(f)[-1] == '.flow']
     except:
       local_flow_list = []
 

scripts/state_settings.py

@@ -14,7 +14,7 @@ def on_ui_settings():
   shared.opts.add_option("lightdiffusionflow-language",
     shared.OptionInfo(
       "default",
-      "显示语言/language", 
+      "显示语言/Language", 
       gr.Dropdown, 
       lambda: {
         "choices": ["default","中文","english"]
@@ -24,13 +24,21 @@ def on_ui_settings():
   shared.opts.add_option("lightdiffusionflow-mode",
     shared.OptionInfo(
       "All",
-      f"模式/mode: ({OutputPrompt.note_for_save_mode()})",
+      f"模式/Mode: ({OutputPrompt.note_for_save_mode()})",
       gr.Dropdown, 
       lambda: {
         "choices": ["Core","All"]
       }, section=section)
   )
 
+  shared.opts.add_option("lightdiffusionflow-local-flows-path",
+    shared.OptionInfo(
+      default="models/LightDiffusionFlow",
+      label=f"本地保存的flow文件路径/Local path to save flow files",
+      #component=gr.TextBox,
+      section=section)
+  )
+
   shared.opts.add_option("lightdiffusionflow-auto-fix-params",
     shared.OptionInfo(
       True,
@@ -40,4 +48,5 @@ def on_ui_settings():
       section=section)
   )
 
+
 scripts.script_callbacks.on_ui_settings(on_ui_settings)