Skip to content

Commit c9a10cd

Browse files
committed
preview metadata should have ExtraData
1 parent 651b14a commit c9a10cd

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

src/BuiltinExtensions/ComfyUIBackend/ComfyUIAPIAbstractBackend.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public async Task AwaitJobLive(string workflow, string batchId, Action<object> t
240240
metadataObj.Remove("exactbackendid");
241241
metadataObj["is_preview"] = true;
242242
metadataObj["preview_notice"] = "Image is not done generating";
243-
string previewMetadata = T2IParamInput.MetadataToString(new JObject() { ["sui_image_params"] = metadataObj });
243+
string previewMetadata = T2IParamInput.MetadataToString(new JObject() { ["sui_image_params"] = metadataObj, ["sui_extra_data"] = user_input.BuildExtraDataJObject() });
244244
int expectedNodes = workflowJson.Count;
245245
string id = null;
246246
ClientWebSocket socket = null;

src/Text2Image/T2IParamInput.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,9 @@ public JObject GenParameterMetadata()
376376
return output;
377377
}
378378

379-
/// <summary>Keys for <see cref="ExtraMeta"/> that identify lists of extra models to track, as a pair of (key, model-sub-type).</summary>
380-
public static List<(string, string)> ModelListExtraKeys = [("used_embeddings", "Embedding"), ("loras", "LoRA")];
381-
382-
/// <summary>Generates a metadata JSON object for this input's data.</summary>
383-
public JObject GenFullMetadataObject()
379+
/// <summary>Builds the basic sui_extra_data object for metadata.</summary>
380+
public JObject BuildExtraDataJObject()
384381
{
385-
JObject paramData = GenParameterMetadata();
386-
paramData["swarm_version"] = Utilities.Version;
387382
JObject extraData = [];
388383
foreach ((string key, object val) in ExtraMeta)
389384
{
@@ -393,6 +388,18 @@ public JObject GenFullMetadataObject()
393388
extraData[key] = token;
394389
}
395390
}
391+
return extraData;
392+
}
393+
394+
/// <summary>Keys for <see cref="ExtraMeta"/> that identify lists of extra models to track, as a pair of (key, model-sub-type).</summary>
395+
public static List<(string, string)> ModelListExtraKeys = [("used_embeddings", "Embedding"), ("loras", "LoRA")];
396+
397+
/// <summary>Generates a metadata JSON object for this input's data.</summary>
398+
public JObject GenFullMetadataObject()
399+
{
400+
JObject paramData = GenParameterMetadata();
401+
paramData["swarm_version"] = Utilities.Version;
402+
JObject extraData = BuildExtraDataJObject();
396403
JArray unused = [];
397404
foreach (string key in InternalSet.ValuesInput.Keys)
398405
{

0 commit comments

Comments
 (0)