From 54231d0cd5773cbb6441cf7522ea010a65e38c8b Mon Sep 17 00:00:00 2001 From: Samuele Lorefice Date: Sun, 12 Nov 2023 02:56:28 +0100 Subject: [PATCH] Removed pointless `required` keywords. Added missing Hidden inputField list. Added missing types. --- ComfySharp/ComfyClient.cs | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/ComfySharp/ComfyClient.cs b/ComfySharp/ComfyClient.cs index 809526d..c738b86 100644 --- a/ComfySharp/ComfyClient.cs +++ b/ComfySharp/ComfyClient.cs @@ -72,11 +72,11 @@ public class ComfyClient { [DataContract, JsonSerializable(typeof(Node))] public class Node { [DataMember(Name = "name")] - public required string Name { get; set; } + public string Name { get; set; } [DataMember(Name = "input")] - public required Input Input { get; set; } + public Input Input { get; set; } [DataMember(Name = "output")] - public required List Outputs { get; set; } + public List Outputs { get; set; } [DataMember(Name = "output_is_list")] public List OutputIsList { get; set; } [DataMember(Name = "output_name")] @@ -93,15 +93,22 @@ public class Node { [DataContract] public struct Input { - public required InputField[] Required { get; set; } - public InputField[] Optional { get; set; } + [DataMember] + public List Required { get; set; } + [DataMember] + public List Optional { get; set; } + [DataMember] + public List Hidden { get; set; } + + + } public struct InputField { [DataMember(Name = "name")] - public required string Name { get; set; } - public required List Type { get; set; } + public string Name { get; set; } + public PrimitiveType Type { get; set; } } public enum PrimitiveType { @@ -111,6 +118,7 @@ public enum PrimitiveType { CLIP_VISION_OUTPUT, CONDITIONING, CONTROL_NET, + EXTRA_PNGINFO, FLOAT, GLIGEN, IMAGE, @@ -118,10 +126,12 @@ public enum PrimitiveType { LATENT, MASK, MODEL, + PROMPT, SAMPLER, SIGMAS, STRING, STYLE_MODEL, + UNIQUE_ID, UPSCALE_MODEL, VAE, } @@ -129,11 +139,11 @@ public enum PrimitiveType { [DataContract, JsonSerializable(typeof(ImageInfo))] public class ImageInfo { [DataMember(Name = "name")] - public required string Name { get; set; } + public string Name { get; set; } [DataMember(Name = "subfolder")] - public required string Subfolder { get; set; } + public string Subfolder { get; set; } [DataMember(Name = "type")] - public required DirType Type { get; set; } + public DirType Type { get; set; } } [DataContract]