Add "Core ML" to CivitAI model formats

Author: RupertAvery

Diffusion.Civitai/CivitaiClient.cs

@@ -56,18 +56,39 @@ private async Task<T> GetResponseResults<T>(HttpClient client, string url, Cance
 
             if (response.IsSuccessStatusCode)
             {
-                var options = new JsonSerializerOptions
-                {
-                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                    Converters =
-                    {
-                        new JsonStringEnumConverter()
-                    }
-                };
+                //var options = new JsonSerializerOptions
+                //{
+                //    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                //    Converters =
+                //    {
+                //        new JsonStringEnumConverter()
+                //    }
+                //};
+
+                var options = new JsonSerializerOptions();
+                options.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+                options.Converters.Add(new JsonStringEnumConverterWithAttributeSupport());
 
                 using (var responseStream = await response.Content.ReadAsStreamAsync(token))
                 {
                     results = await JsonSerializer.DeserializeAsync<T>(responseStream, options);
+
+                    //using var buffer = new MemoryStream();
+                    //await responseStream.CopyToAsync(buffer);
+                    //responseStream.Flush();
+                    //responseStream.Close();
+
+                    //buffer.Position = 0;
+                    //using var fs = new FileStream($"civitai-{DateTime.Now:yyyyMMddhhmmss}.json", FileMode.Create, FileAccess.Write);
+                    //await buffer.CopyToAsync(fs);
+                    //fs.Flush();
+                    //fs.Close();
+
+                    //buffer.Position = 0;
+                    //results = await JsonSerializer.DeserializeAsync<T>(buffer, options);
+
+                    //buffer.Close();
+
                 }
             }
             else

Diffusion.Civitai/Diffusion.Civitai.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="EnumExtensions.System.Text.Json" Version="1.1.0" />
+  </ItemGroup>
+
 </Project>

Diffusion.Civitai/Models/ModelFormat.cs

@@ -1,9 +1,13 @@
-namespace Diffusion.Civitai.Models;
+using System.Runtime.Serialization;
+
+namespace Diffusion.Civitai.Models;
 
 public enum ModelFormat
 {
     SafeTensor,
     PickleTensor,
     Diffusers,
+    [EnumMember(Value = "Core ML")]
+    CoreML,
     Other
 }

Diffusion.Toolkit/MainWindow.xaml.Models.cs

@@ -25,7 +25,7 @@ public async void DownloadCivitaiModels()
 
             var message = "This will download Civitai model info.\r\n\r\n" + "Are you sure you want to continue?";
 
-            var result = await _messagePopupManager.Show(message, "Download Civitai models", PopupButtons.YesNo);
+            var result = await _messagePopupManager.ShowCustom(message, "Download Civitai models", PopupButtons.YesNo, 500, 250);
 
             if (result == PopupResult.Yes)
             {

What's New v1.5.md

@@ -114,6 +114,7 @@ You can even use it on images without metadata and still use the other features
 
 ## Bugfixes
 
+* Add "Core ML" to CivitAI model formats
 * Loading a large image should no longer block the UI
 * Folder not updating after move (#152)
 * Crash opening app: "An unhandled exception occured: 'N' is an invalid start of a value  (#155) (thanks to kwaegel)