Skip to content

Fix stale LLM node running state #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MEIS-DaCaiTou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix stale LLM node running state #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions static/js/smart-canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,19 @@ function mediaItemForStorage(item){
delete clean.tempCloudUrl;
return clean;
}
function clearPersistedRunState(target){
if(!target || typeof target !== 'object') return target;
if(Object.prototype.hasOwnProperty.call(target, 'running')) target.running = false;
['outputs', 'outputSlots'].forEach(key => {
if(Array.isArray(target[key])) target[key].forEach(clearPersistedRunState);
});
return target;
}
function canvasForStorage(){
const clean = JSON.parse(JSON.stringify(canvas || {}));
clean.settings = settingsForStorage(canvasDefaultSmartSettings || initialSmartSettings);
(clean.nodes || []).forEach(node => {
clearPersistedRunState(node);
if(Array.isArray(node.images)) node.images = node.images.map(mediaItemForStorage);
if(node.runSettings) node.runSettings = settingsForStorage(node.runSettings);
});
Expand Down Expand Up @@ -1116,9 +1125,12 @@ function resolveChatProviderId(providerId=''){
if(providers.some(p => p.id === providerId)) return providerId;
return providers[0]?.id || 'comfly';
}
function isConcreteChatModel(model){
return Boolean(model) && !String(model).includes('*');
}
function providerChatModels(providerId){
const provider = chatApiProviders().find(p => p.id === providerId);
return [...new Set(provider?.chat_models || [])];
return [...new Set(provider?.chat_models || [])].filter(isConcreteChatModel);
}
function resolveChatModel(model='', providerId=''){
const models = providerChatModels(resolveChatProviderId(providerId));
Expand Down Expand Up @@ -3840,7 +3852,10 @@ async function loadCanvas(){
canvas = data.canvas;
document.title = canvas.title || tr('canvas.smartCanvas');
document.getElementById('smartTitle').textContent = canvas.title || tr('canvas.smartCanvas');
nodes = (Array.isArray(canvas.nodes) ? canvas.nodes : []).map(normalizeLegacySmartNode).filter(Boolean);
nodes = (Array.isArray(canvas.nodes) ? canvas.nodes : [])
.map(normalizeLegacySmartNode)
.filter(Boolean)
.map(clearPersistedRunState);
nodes.forEach(n => {
const pendingTasks = smartPendingTasks(n);
if(pendingTasks.length){
Expand Down Expand Up @@ -9570,6 +9585,7 @@ function coolNodeRunningState(node, ms=2000){
if(current){
current.running = false;
render();
scheduleSave();
}
}, ms);
return token;
Expand Down Expand Up @@ -10621,6 +10637,7 @@ async function runPromptLLMNode(nodeId){
} finally {
node.running = false;
render();
scheduleSave();
}
}
function comfyFieldKind(field){
Expand Down