插件改名，修复导入PNG Info出现的KeyError bug

Author: legionfu

LICENSE

@@ -3,7 +3,7 @@
     <img alt="" src="https://img.shields.io/badge/Python-FFD43B?style=for-the-badge&logo=python&logoColor=blue" />
 </p>
 
-# stable-diffusion-lightspeedflow
+# stable-diffusion-lightdiffusionflow
 
 [**English**](./README.md) | [**中文**](./README_CN.md)
 

README.md

@@ -3,7 +3,7 @@
     <img alt="" src="https://img.shields.io/badge/Python-FFD43B?style=for-the-badge&logo=python&logoColor=blue" />
 </p>
 
-# stable-diffusion-lightspeedflow
+# stable-diffusion-lightdiffusionflow
 
 [**English**](./README.md) | [**中文**](./README_CN.md)
 

README_CN.md

@@ -83,13 +83,13 @@ state.core = (function () {
 
   function fn_timer(){
 
-    fetch('/lightspeedflow/local/need_preload')
+    fetch('/lightdiffusionflow/local/need_preload')
       .then(response => response.json())
       .then(data => {
         //console.log(`fn_timer ${data}`)
         if (data != ""){
-          //state.core.actions.handleLightSpeedFlow([{"name":data}]);
-          const btn1 = gradioApp().querySelector(`button#set_lightspeedflow_file`);
+          //state.core.actions.handleLightDiffusionFlow([{"name":data}]);
+          const btn1 = gradioApp().querySelector(`button#set_lightdiffusionflow_file`);
           state.utils.triggerMouseEvent(btn1);
           setTimeout(() => {
             const btn2 = gradioApp().querySelector(`button#preload_button`);
@@ -107,9 +107,9 @@ state.core = (function () {
   function init() {
 
     //console.log(window.localization)
-    fetch('/lightspeedflow/local/refresh_ui') // 刷新页面触发python重置图片数据
+    fetch('/lightdiffusionflow/local/refresh_ui') // 刷新页面触发python重置图片数据
 
-    fetch('/lightspeedflow/local/get_imgs_elem_key') //初始化部分图片组件id, 后续设置onchanged事件
+    fetch('/lightdiffusionflow/local/get_imgs_elem_key') //初始化部分图片组件id, 后续设置onchanged事件
       .then(response => response.json())
       .then(data => {
         img_elem_keys = data.split(",")
@@ -118,7 +118,7 @@ state.core = (function () {
         });
 
         // 等上面的组件ID同步过来后 再加载其他配置
-        fetch('/lightspeedflow/local/config.json?_=' + (+new Date()))
+        fetch('/lightdiffusionflow/local/config.json?_=' + (+new Date()))
           .then(response => response.json())
           .then(config => {          
             try {
@@ -477,7 +477,7 @@ state.core = (function () {
     //   }
     // },
     applyState: function () {
-      fetch('/lightspeedflow/local/config.json?_=' + (+new Date()))
+      fetch('/lightdiffusionflow/local/config.json?_=' + (+new Date()))
         .then(response => response.json())
         .then(config => {
           try {
@@ -533,7 +533,7 @@ state.core = (function () {
         store.set(`img2img_seed`,state.utils.getCurSeed('img2img'))
       }
 
-      fetch('/lightspeedflow/local/lightspeedflow_config?onlyimg=true')
+      fetch('/lightdiffusionflow/local/lightdiffusionflow_config?onlyimg=true')
         .then(response => response.json())
         .then(config => {
           config = JSON.parse(config)
@@ -562,18 +562,18 @@ state.core = (function () {
         }).catch(error => console.error('[state]: Error getting JSON file:', error));
 
       //config = JSON.stringify(store.getAll(), null, 4);
-      //fetch(`/lightspeedflow/local/ExportLightSpeedFlow?config=${config}`)
+      //fetch(`/lightdiffusionflow/local/ExportLightDiffusionFlow?config=${config}`)
     },
 
-    handleLightSpeedFlow: function (fileInput){
+    handleLightDiffusionFlow: function (fileInput){
       actions.output_log("Start parsing settings...")
       console.log(fileInput)
       let temp_fileInput = undefined
       try{temp_fileInput = fileInput[0]} catch(error){}
       if ( !temp_fileInput ) {temp_fileInput = fileInput}
       if ( !temp_fileInput ) {
         //alert('Please select a JSON file!');
-        actions.output_log("Please select a valid lightspeedflow or image file!")
+        actions.output_log("Please select a valid lightdiffusionflow or image file!")
         return;
       }
 
@@ -590,11 +590,11 @@ state.core = (function () {
             "img_path":file_name
           })
         }
-        fetch(`/lightspeedflow/local/png_info`, data)
+        fetch(`/lightdiffusionflow/local/png_info`, data)
           .then(response => response.json())
           .then(data => {
             console.log(data)
-            actions.importLightSpeedFlow(data)
+            actions.importLightDiffusionFlow(data)
           });
       }
       else{
@@ -604,7 +604,7 @@ state.core = (function () {
         const reader = new FileReader();
         reader.onload = function (event) {
           console.log(event)
-          actions.importLightSpeedFlow(event.target.result)
+          actions.importLightDiffusionFlow(event.target.result)
         };
         try{ reader.readAsText(file); } catch (error) {
           console.log("read from python")
@@ -616,27 +616,27 @@ state.core = (function () {
                 "file_path":temp_fileInput.name
               })
             }
-            fetch(`/lightspeedflow/local/read_file`, data)
+            fetch(`/lightdiffusionflow/local/read_file`, data)
               .then(response => response.json())
               .then(data => {
                 //console.log(data)
-                actions.importLightSpeedFlow(data)
+                actions.importLightDiffusionFlow(data)
               });
           }
 
         }
       }
       return fileInput
     },
-    importLightSpeedFlow: function (inputData){
+    importLightDiffusionFlow: function (inputData){
 
       forEachElement_WithoutTabs(IMAGES_WITHOUT_PREFIX, (image_id) => {
         state.utils.clearImage(getElement(image_id));
       });
 
       let json_obj = {}
       try { json_obj = JSON.parse(inputData) } catch (error) {
-        actions.output_log("Please select a valid lightspeedflow or image file!")
+        actions.output_log("Please select a valid lightdiffusionflow or image file!")
         return;
       }
       console.log(json_obj)
@@ -685,13 +685,15 @@ state.core = (function () {
 
     },
     output_log: function (msg, style=""){
-      fetch(`/lightspeedflow/local/output_log?msg=${msg}&style=${style}`)
+      fetch(`/lightdiffusionflow/local/output_log?msg=${msg}&style=${style}`).then(() => {
+        gradioApp().getElementById("txt2img_invisible_refresh_log").click();
+      });
     },
     output_warning: function (msg, style="color:Orange;"){
-      fetch(`/lightspeedflow/local/output_log?msg=${msg}&style=${style}`)
+      actions.output_log(msg,style)
     },
     output_error: function (msg, style="color:Tomato;"){
-      fetch(`/lightspeedflow/local/output_log?msg=${msg}&style=${style}`)
+      actions.output_log(msg,style)
     }
   };
 

javascript/state.core.js

@@ -247,7 +247,7 @@ function general_ext_main(tab){
       }
 
       if(title == undefined 
-        || title.toLowerCase() == "lightspeedflow" // 自己存自己就不用了
+        || title.toLowerCase() == "lightdiffusionflow" // 自己存自己就不用了
       ){continue}
 
       let translations = state.utils.reverseTranslation(title)

javascript/state.ext.general.js

@@ -4,12 +4,7 @@ state = window.state;
 state.utils = {
 
   testFunction: function testFunction() {
-    
     //console.log(state.extensions)
-    let str = "chilloutmix_Ni.safetensors [7234b76e42]"
-    let res = str.search(/\[[0-9A-Fa-f]{10}\]/)
-    res = str.substring(res,res+12)
-    console.log(res)
   },
 
   searchCheckPointByHash: async function searchCheckPointByHash(hash){
@@ -228,7 +223,7 @@ state.utils = {
           console.warn('[state]: Error:', error);
         }
 
-        fetch(`/lightspeedflow/local/imgs_callback`, data)
+        fetch(`/lightdiffusionflow/local/imgs_callback`, data)
       });
     }, 150);
   },
@@ -389,11 +384,13 @@ state.utils = {
               state.core.actions.output_error(`\'${option_name}\' import failed! The option \'${value}\' was not found!`)
             }
             if(hash_pos != -1){
+              let model_name = value
               let hash_str = localized_value.substring(hash_pos,hash_pos+12)
               state.utils.searchCheckPointByHash(hash_str).then( downloadUrl => {
                 if(downloadUrl != undefined){
-                  state.core.actions.output_warning(`click to download \
-                  <a style ="text-decoration:underline;color:cornflowerblue;", href="${downloadUrl}"> ${value} </a>`)
+                  let warning_str = encodeURIComponent(`click to download \
+                  <a style ='text-decoration:underline;color:cornflowerblue;', href='${downloadUrl}'> ${model_name} </a>`)
+                  state.core.actions.output_warning(warning_str)
                 }
               });
             }
@@ -508,7 +505,7 @@ state.utils = {
     console.log(url)
     const link = document.createElement('a');
     link.href = url;
-    link.download = fileName + '.lightspeedflow';
+    link.download = fileName + '.lightdiffusionflow';
     document.body.appendChild(link);
     link.click();
     link.parentNode.removeChild(link);

javascript/state.utils.js

@@ -1,16 +1,16 @@
 import json
 import modules.shared as shared
 
-PNGINFO_2_LIGHTSPEEDFLOW = {}
-PNGINFO_CN_2_LIGHTSPEEDFLOW = {}
+PNGINFO_2_LIGHTDIFFUSIONFLOW = {}
+PNGINFO_CN_2_LIGHTDIFFUSIONFLOW = {}
 Image_Components_Key = {}
 
 # 改成函数调用，修改配置之后能及时刷新
 def init():
-  global PNGINFO_2_LIGHTSPEEDFLOW,PNGINFO_CN_2_LIGHTSPEEDFLOW,Image_Components_Key
+  global PNGINFO_2_LIGHTDIFFUSIONFLOW,PNGINFO_CN_2_LIGHTDIFFUSIONFLOW,Image_Components_Key
   # PNG Info的功能除了主要的选项以外其他的都靠第三方插件的主动支持，后续再考虑能否有优化的办法
   #print(parameters_copypaste.paste_fields) 
-  PNGINFO_2_LIGHTSPEEDFLOW = {
+  PNGINFO_2_LIGHTDIFFUSIONFLOW = {
     "Prompt": "state-txt2img_prompt",
     "Negative prompt": "state-txt2img_neg_prompt",
     "Steps": "state-txt2img_steps",
@@ -31,12 +31,15 @@ def init():
     "ENSD": "setting_eta_noise_seed_delta"
   }
 
-  PNGINFO_CN_2_LIGHTSPEEDFLOW = {
+  PNGINFO_CN_2_LIGHTDIFFUSIONFLOW = {
+    "Module": "state-ext-control-net-txt2img_0-preprocessor",
     "preprocessor": "state-ext-control-net-txt2img_0-preprocessor",
     "model": "state-ext-control-net-txt2img_0-model",
     "weight": "state-ext-control-net-txt2img_0-control-weight",
     "starting": "state-ext-control-net-txt2img_0-starting-control-step",
     "ending": "state-ext-control-net-txt2img_0-guidance-end-(t)",
+    "guidance start": "state-ext-control-net-txt2img_0-starting-control-step",
+    "guidance end": "state-ext-control-net-txt2img_0-ending-control-step",
     "resize mode": "state-ext-control-net-txt2img_0-resize-mode",
     "pixel perfect": "state-ext-control-net-txt2img_0-pixel-perfect",
     "control mode": "state-ext-control-net-txt2img_0-control-mode",

scripts/lightspeedflow_config.py renamed to scripts/lightdiffusionflow_config.py

@@ -0,0 +1 @@
+lightdiffusionflow_version = "v2.0.2"