cn数量读取问题修复，同时兼容新旧版本

output_log函数返回值不匹配的问题

Author: legionfu

javascript/state.core.js

@@ -104,6 +104,11 @@ state.core = (function () {
   }
 
   let img_elem_keys=[];
+
+  function get_imgs_elem_key(){
+    return img_elem_keys;
+  }
+
   function init() {
 
     //console.log(window.localization)
@@ -697,5 +702,5 @@ state.core = (function () {
     }
   };
 
-  return { init,actions };
+  return { init, actions };
 }());

javascript/state.ext.general.js

@@ -170,7 +170,7 @@ function general_ext(tab_name, extension_name, root_container) {
     }
   }
   function handleSelects() {
-
+    
     let root_selects = root_not_tabs.container.querySelectorAll('.gradio-dropdown');
     root_selects.forEach(function (root_select) {
       if(cnTabs.length == 0){
@@ -184,7 +184,7 @@ function general_ext(tab_name, extension_name, root_container) {
             break
           }
         }
-        if(needsHandle){handleCheckbox(root_select, root_not_tabs.store)}
+        if(needsHandle){handleSelect(root_select, root_not_tabs.store)}
       } // else
     });
 

javascript/state.utils.js

@@ -243,7 +243,7 @@ state.utils = {
 
       }
     } catch (error) {
-      console.error('[state]: Error:', error);
+      console.warn('[state]: Error:', error);
     }
   },
   // handleSelect: function handleSelect(select, id, store) {
@@ -282,7 +282,7 @@ state.utils = {
   //       });
   //     }, 150);
   //   } catch (error) {
-  //     console.error('[state]: Error:', error);
+  //     console.warn('[state]: Error:', error);
   //   }
   // },
 
@@ -317,13 +317,14 @@ state.utils = {
       }, 150);
 
     } catch (error) {
-      console.error(`accordion:${accordion}, id:${id}`)
-      console.error('[state]: Error:', error);
+      console.warn(`accordion:${accordion}, id:${id}`)
+      console.warn('[state]: Error:', error);
     }
 
   },
   handleSelect: function handleSelect(select, id, store, force=false) {
     try {
+
       let value = store.get(id);
       if (value ) { //&& value != 'None'
 
@@ -442,7 +443,7 @@ state.utils = {
         });
       }, 150);
     } catch (error) {
-      console.error('[state]: Error:', error);
+      console.warn('[state]: Error:', error);
     }
   },
   handleMultipleSelect: function handleMultipleSelect(select, id, store) {
@@ -492,7 +493,7 @@ state.utils = {
         store.set(id, selected);
       });
     } catch (error) {
-      console.error('[state]: Error:', error);
+      console.warn('[state]: Error:', error);
     }
   },
   txtToId: function txtToId(txt) {

scripts/lightdiffusionflow_config.py

@@ -61,14 +61,18 @@ def init():
       json_str = f.read()
       webui_settings = json.loads(json_str)
 
-    Multi_ControlNet  = webui_settings["control_net_max_models_num"]
+    Multi_ControlNet = webui_settings.get("control_net_unit_count", None) # controlnet数量，新版名字
+    if(Multi_ControlNet == None):
+      Multi_ControlNet = webui_settings.get("control_net_max_models_num", 0)
+    print(f"Multi_ControlNet = {Multi_ControlNet}")
     if(Multi_ControlNet == 1):
       Image_Components_Key.append(f"txt2img_controlnet_ControlNet_input_image")
       Image_Components_Key.append(f"img2img_controlnet_ControlNet_input_image")
     else:
       for i in range(Multi_ControlNet):
         Image_Components_Key.append(f"txt2img_controlnet_ControlNet-{i}_input_image")
         Image_Components_Key.append(f"img2img_controlnet_ControlNet-{i}_input_image")
+        
   except:
     pass
 

scripts/state_api.py

@@ -114,7 +114,7 @@ def on_after_component(component, **kwargs):
 
     #State_Comps["test_button"].click(test_func,_js="state.utils.testFunction",inputs=[])
 
-    State_Comps["refresh_log"].click(add_output_log,inputs=[],outputs=State_Comps["outlog"])
+    State_Comps["refresh_log"].click(add_output_log,inputs=[],outputs=[State_Comps["outlog"][0], State_Comps["outlog"][1]])
 
     input_component = State_Comps["background_import"] #State_Comps["import"][0]
     State_Comps["set_file_button"].click(set_lightdiffusionflow_file,inputs=[],outputs=[input_component])