Merge branch 'main' into feat/cacheless

comfyui_manager/cm-cli.py

@@ -1046,18 +1046,16 @@ def save_snapshot(
 ):
     cmd_ctx.set_user_directory(user_directory)
 
-    if output is None:
-        print("[bold red]ERROR: missing output path[/bold red]")
-        raise typer.Exit(code=1)
-        
-    if(not output.endswith('.json') and not output.endswith('.yaml')):
-        print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
-        raise typer.Exit(code=1)
+    if output is not None:
+        if(not output.endswith('.json') and not output.endswith('.yaml')):
+            print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
+            raise typer.Exit(code=1)
     
-    dir_path = os.path.dirname(output)
-    if(dir_path != '' and not os.path.exists(dir_path)):
-        print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
-        raise typer.Exit(code=1)
+        dir_path = os.path.dirname(output)
+        
+        if(dir_path != '' and not os.path.exists(dir_path)):
+            print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
+            raise typer.Exit(code=1)
         
     path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
     print(f"Current snapshot is saved as `{path}`")

comfyui_manager/glob/manager_core.py

@@ -255,7 +255,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

@@ -1344,6 +1344,12 @@ async def disable_node(request):
 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