v2.1.4

Author: legionfu

ChangeLog.md

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

javascript/state.core.js

@@ -723,13 +723,13 @@ state.core = (function () {
 
           state.utils.saveFile(filename, stored_config);
 
-          // fetch('https://api.lightflow.ai/openapi/access?action=export')
-          // .then(response => response.json())
-          // .then(config => {
-          //   console.log(config)
-          // }).catch(function(e) {
-          //   console.log("Oops, export callback error!");
-          // });
+          fetch('https://api.lightflow.ai/openapi/access?action=export')
+          .then(response => response.json())
+          .then(config => {
+            console.log(config)
+          }).catch(function(e) {
+            console.log("Oops, export callback error!");
+          });
 
         }
 
@@ -772,22 +772,28 @@ state.core = (function () {
         fetch(`/lightdiffusionflow/local/file_exist`, data)
         .then(response => response.json())
         .then(data => {
-            console.log("file_exist")
-            console.log(data)
-            if(!data || (data && confirm("Overwrite the existing file with the same name?")))
-            {
-              let stored_config = get_js_local_data()
-              data = {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({
-                  "file_name":filename,
-                  "file_data":stored_config,
-                  "overwrite":true
-                })
-              }
-              fetch("/lightdiffusionflow/local/save_flow_to_local",data)
+          if(!data || (data && confirm("Overwrite the existing file with the same name?")))
+          {
+            let stored_config = get_js_local_data()
+            let flow_data = {
+              method: 'POST',
+              headers: {'Content-Type': 'application/json'},
+              body: JSON.stringify({
+                "file_name":filename,
+                "file_data":stored_config,
+                "overwrite":true
+              })
             }
+            fetch("/lightdiffusionflow/local/save_flow_to_local",flow_data)
+            
+            fetch('https://api.lightflow.ai/openapi/access?action=save')
+            .then(response => response.json())
+            .then(config => {
+              console.log(config)
+            }).catch(function(e) {
+              console.log("Oops, export callback error!");
+            });
+          }
         });
       }
     },

javascript/state.utils.js

@@ -8,6 +8,10 @@ state.utils = {
     //console.log(state.extensions)
     // const button = gradioApp().getElementById("lightdiffusionflow_set_elements");
     // button.click();    
+    value = "新建文件夹\\anything-v5-PrtRE.safetensors"
+    value = value.replace("/","\\")
+    parts = value.split("\\")
+    console.log(parts[parts.length - 1])
   },
 
   target_is_newer_version: function(cur_version, target_version){
@@ -406,6 +410,9 @@ state.utils = {
 
       let value = store.get(id);
       if ( value ) { //&& value != 'None'
+        value = value.replace("/","\\")
+        let parts = value.split("\\")
+        value = parts[parts.length - 1]
 
         selectingQueue += 1;
         setTimeout(() => {
@@ -418,7 +425,11 @@ state.utils = {
             let successed = false
             for (li of items){
               // li.lastChild.wholeText.trim() === value
-              if (localized_value.replace(/^\s+|\s+$/g,"") === li.lastChild.wholeText.trim().replace(/^\s+|\s+$/g,"")) {
+              let option = li.lastChild.wholeText.trim().replace(/^\s+|\s+$/g,"")
+              option = option.replace("/","\\")
+              let parts = option.split("\\")
+              option = parts[parts.length - 1]
+              if (localized_value.replace(/^\s+|\s+$/g,"") === option) {
                 state.utils.triggerMouseEvent(li, 'mousedown');
                 successed = true
                 break
@@ -431,6 +442,10 @@ state.utils = {
 
                 // 去掉Hash比较
                 let text = li.lastChild.wholeText.trim()
+                text = text.replace("/","\\")
+                let parts = text.split("\\")
+                text = parts[parts.length - 1]
+                
                 let localized_value_no_hash = localized_value.replace(/\[[0-9A-Fa-f]{8,10}\]/,"").replace(/^\s+|\s+$/g,"")
                 let text_no_hash = text.replace(/\[[0-9A-Fa-f]{8,10}\]/, "").replace(/^\s+|\s+$/g,"")
 

scripts/lightdiffusionflow_version.py

@@ -1 +1 @@
-lightdiffusionflow_version = "v2.1.3"
+lightdiffusionflow_version = "v2.1.4"

scripts/state_api.py

@@ -68,31 +68,6 @@ def test_func():
   # global extensions_conponents, extensions_id_conponents
   # global Output_Log
   # print("test_func")
-  print("----------------------------")
-  # available_loras = []
-  import network
-  for network in networks.available_networks.keys():
-    print(networks.available_networks[network].name)
-    print(networks.available_networks[network].alias)
-    print(networks.available_networks[network].hash)
-    print(networks.available_networks[network].shorthash)
-    print(networks.available_networks[network].filename)
-  print("----------------------------")
-  # SearchingCheckPointByHashFromCivitai("efd248ef6c0e")
-  # SearchingCheckPointByHashFromCivitai("5BF8CE6E0E0097235E06614EDEA32DC0DF9066BAD550B6145C19C2B373D78D99")
-  # SearchingCheckPointByHashFromCivitai("5BF8CE6E0E00")
-  # print("----------------------------")
-
-  print("------ZhangSan'sSong------")
-  #hash = gen_file_sha256(r"A:\AIPainter\sd-webui-aki-v4.4\models\Lora\ZhangSan'sSong.safetensors")
-  hash = gen_file_sha256(r"A:\AIPainter\sd-webui-aki-v4.4\models\Lora\yaeMikoRealistic_yaemikoMixed.safetensors")
-  print(hash)
-
-  model_info = SearchingCheckPointByHashFromCivitai(hash)
-  print(model_info)
-  print(model_info["name"])
-  print(model_info["downloadUrl"])
-
   #print(Output_Log)
   #print(networks.available_networks)
   #print(preprocessor_filters)
@@ -222,8 +197,8 @@ def refresh_local_flows(*inputs):
   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']
-  print(inputs)
-  print(local_flow_list)
+  # print(inputs)
+  # print(local_flow_list)
   ret = []
   for dd in inputs:
     if dd in local_flow_list:
@@ -305,6 +280,13 @@ def set_dropdowns():
           if(option == new_value):
             matching_successed = True
             break
+          else:
+            #print(f"去掉多余文件夹路径---{temp_option}----{temp_new_value}----")
+            temp_option = os.path.split(option)[-1]
+            temp_new_value = os.path.split(new_value)[-1]
+            if(temp_option == temp_new_value):
+              matching_successed = True
+              break
 
           # 去掉模型的多余路径？
           # if(os.path.split(option)[-1] == os.path.split(new_value)[-1]):
@@ -1006,6 +988,7 @@ def read_file(self, params:file_params):
     file_content = ""
     with open(params.file_path, mode='r', encoding='UTF-8') as f:
       file_content = f.read()
+    return file_content
 
   def file_exist(self, params:file_params):
     print("file_exist")