xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-08-03 21:46:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize returned /api/global_subgraphs entries

Browse Source
This commit is contained in:
Jedrzej Kosinski 2025-10-21 19:48:48 -07:00
parent 49c42476e9
commit ea24f6bd23
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/subgraph_manager.py
View File

@ -44,6 +44,19 @@ class SubgraphManager:
entry['data'] = f.read() entry['data'] = f.read()
return entry return entry
async def sanitize_entry(self, entry: SubgraphEntry, remove_data=False) -> SubgraphEntry:
entry = entry.copy()
entry.pop('path', None)
if remove_data:
entry.pop('data', None)
return entry
async def sanitize_entries(self, entries: dict[str, SubgraphEntry], remove_data=False) -> dict[str, SubgraphEntry]:
entries = entries.copy()
for key in list(entries.keys()):
entries[key] = await self.sanitize_entry(entries[key], remove_data)
return entries
async def get_custom_node_subgraphs(self, loadedModules, force_reload=False): async def get_custom_node_subgraphs(self, loadedModules, force_reload=False):
# if not forced to reload and cached, return cache # if not forced to reload and cached, return cache
if not force_reload and self.cached_custom_node_subgraphs is not None: if not force_reload and self.cached_custom_node_subgraphs is not None:
@ -71,15 +84,14 @@ class SubgraphManager:
"path": file, "path": file,
"info": info, "info": info,
} }
await self.load_entry_data(entry)
subgraphs_dict[id] = entry subgraphs_dict[id] = entry
self.cached_custom_node_subgraphs = subgraphs_dict self.cached_custom_node_subgraphs = subgraphs_dict
return subgraphs_dict return subgraphs_dict
async def get_custom_node_subgraph(self, id: str): async def get_custom_node_subgraph(self, id: str, loadedModules):
subgraphs = await self.get_custom_node_subgraphs() subgraphs = await self.get_custom_node_subgraphs(loadedModules)
entry: SubgraphEntry = subgraphs.get(id, None) entry: SubgraphEntry = subgraphs.get(id, None)
if entry is not None: if entry is not None and entry.get('data', None) is None:
await self.load_entry_data(entry) await self.load_entry_data(entry)
return entry return entry
@ -89,10 +101,10 @@ class SubgraphManager:
subgraphs_dict = await self.get_custom_node_subgraphs(loadedModules) subgraphs_dict = await self.get_custom_node_subgraphs(loadedModules)
# NOTE: we may want to include other sources of global subgraphs such as templates in the future; # NOTE: we may want to include other sources of global subgraphs such as templates in the future;
# that's the reasoning for the current implementation # that's the reasoning for the current implementation
return web.json_response(subgraphs_dict) return web.json_response(await self.sanitize_entries(subgraphs_dict, remove_data=True))
@routes.get("/global_subgraphs/{id}") @routes.get("/global_subgraphs/{id}")
async def get_global_subgraph(request): async def get_global_subgraph(request):
id = request.match_info.get("id", None) id = request.match_info.get("id", None)
subgraph = await self.get_custom_node_subgraph(id) subgraph = await self.get_custom_node_subgraph(id, loadedModules)
return web.json_response(subgraph) return web.json_response(await self.sanitize_entry(subgraph))