Merge pull request LykosAI#914 from ionite34/fix-inference-json

Fix JsonValue deserialize error with Inference with .net 9
LykosAI · Dec 14, 2024 · 34456d7 · 34456d7
2 parents 4e4a97b + 8553cd1
commit 34456d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+        <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -71,6 +71,7 @@
     <PackageVersion Include="Sylvan.Data.Csv" Version="1.3.9" />
     <PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="URISchemeTools" Version="1.0.2" />
     <PackageVersion Include="Websocket.Client" Version="5.1.2" />
     <PackageVersion Include="YamlDotNet" Version="16.0.0" />

diff --git a/StabilityMatrix.Core/Models/Api/Comfy/ComfyInputInfo.cs b/StabilityMatrix.Core/Models/Api/Comfy/ComfyInputInfo.cs
@@ -7,10 +7,10 @@ namespace StabilityMatrix.Core.Models.Api.Comfy;
 public class ComfyInputInfo
 {
     [JsonPropertyName("required")]
-    public Dictionary<string, JsonValue>? Required { get; set; }
+    public Dictionary<string, JsonNode>? Required { get; set; }
 
     [JsonPropertyName("optional")]
-    public Dictionary<string, JsonValue>? Optional { get; set; }
+    public Dictionary<string, JsonNode>? Optional { get; set; }
 
     public List<string>? GetRequiredValueAsNestedList(string key)
     {