Merge branch 'main' into feat/queue_batch

comfyui_manager/glob/manager_core.py

@@ -261,7 +261,7 @@ comfy_ui_revision = "Unknown"
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
 
 channel_dict = None
-valid_channels = set()
+valid_channels = {'default', 'local'}
 channel_list = None
 
 

comfyui_manager/glob/manager_server.py

@@ -1571,6 +1571,12 @@ async def _disable_node(json_data):
 async def check_whitelist_for_model(item):
     json_obj = await core.get_data_by_mode('cache', 'model-list.json')
 
+    for x in json_obj.get('models', []):
+        if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
+            return True
+
+    json_obj = await core.get_data_by_mode('local', 'model-list.json')
+
     for x in json_obj.get('models', []):
         if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
             return True

comfyui_manager/js/comfyui-manager.js

@@ -665,7 +665,7 @@ async function onQueueStatus(event) {
 		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
 	}
 	else if(event.detail.status == 'all-done') {
-//		reset_action_buttons();
+		reset_action_buttons();
 	}
 	else if(event.detail.status == 'batch-done') {
 		if(batch_id != event.detail.batch_id) {