DarthAffe/StableDiffusion.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/StableDiffusion.NET.git synced 2025-12-12 13:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed vae to be required for flux models and allow all non null inputs

Browse Source
This commit is contained in:
Darth Affe 2024-08-25 16:41:19 +02:00
parent da9f612c03
commit ae70f7e5f0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
StableDiffusion.NET/Models/Builder/Extensions/DiffusionModelBuilderExtension.cs
View File

@ -9,7 +9,7 @@ public static class DiffusionModelBuilderExtension
public static T WithVae<T>(this T builder, string vaePath)
where T : IDiffusionModelBuilder
{
ArgumentException.ThrowIfNullOrWhiteSpace(vaePath);
ArgumentNullException.ThrowIfNull(vaePath);
if (!string.IsNullOrWhiteSpace(builder.Parameter.TaesdPath)) throw new ArgumentException("TAESD is already enabled. VAE and TAESD are mutually exclusive.", nameof(vaePath));
@ -21,7 +21,7 @@ public static class DiffusionModelBuilderExtension
public static T WithTaesd<T>(this T builder, string taesdPath)
where T : IDiffusionModelBuilder
{
ArgumentException.ThrowIfNullOrWhiteSpace(taesdPath);
ArgumentNullException.ThrowIfNull(taesdPath);
if (!string.IsNullOrWhiteSpace(builder.Parameter.VaePath)) throw new ArgumentException("VAE is already enabled. TAESD and VAE are mutually exclusive.", nameof(taesdPath));
@ -33,7 +33,7 @@ public static class DiffusionModelBuilderExtension
public static T WithLoraSupport<T>(this T builder, string loraModelDirectory)
where T : IDiffusionModelBuilder
{
ArgumentException.ThrowIfNullOrWhiteSpace(loraModelDirectory);
ArgumentNullException.ThrowIfNull(loraModelDirectory);
builder.Parameter.LoraModelDirectory = loraModelDirectory;
@ -43,7 +43,7 @@ public static class DiffusionModelBuilderExtension
public static T WithEmbeddingSupport<T>(this T builder, string embeddingsDirectory)
where T : IDiffusionModelBuilder
{
ArgumentException.ThrowIfNullOrWhiteSpace(embeddingsDirectory);
ArgumentNullException.ThrowIfNull(embeddingsDirectory);
builder.Parameter.EmbeddingsDirectory = embeddingsDirectory;
@ -53,7 +53,7 @@ public static class DiffusionModelBuilderExtension
public static T WithControlNet<T>(this T builder, string controlNetPath)
where T : IDiffusionModelBuilder
{
ArgumentException.ThrowIfNullOrWhiteSpace(controlNetPath);
ArgumentNullException.ThrowIfNull(controlNetPath);
builder.Parameter.ControlNetPath = controlNetPath;

4
StableDiffusion.NET/Models/Builder/FluxModelBuilder.cs
View File

@ -15,9 +15,9 @@ public sealed class FluxModelBuilder : IDiffusionModelBuilder, IQuantizedModelBu
#region Constructors
public FluxModelBuilder(string diffusionModelPath, string clipLPath, string t5xxlPath)
public FluxModelBuilder(string diffusionModelPath, string clipLPath, string t5xxlPath, string vaePath)
{
Parameter = new DiffusionModelParameter { DiffusionModelType = DiffusionModelType.Flux, DiffusionModelPath = diffusionModelPath, ClipLPath = clipLPath, T5xxlPath = t5xxlPath };
Parameter = new DiffusionModelParameter { DiffusionModelType = DiffusionModelType.Flux, DiffusionModelPath = diffusionModelPath, ClipLPath = clipLPath, T5xxlPath = t5xxlPath, VaePath = vaePath };
}
#endregion

2
StableDiffusion.NET/Models/Builder/ModelBuilder.cs
View File

@ -6,6 +6,6 @@ namespace StableDiffusion.NET;
public static class ModelBuilder
{
public static StableDiffusionModelBuilder StableDiffusion(string modelPath) => new(modelPath);
public static FluxModelBuilder Flux(string diffusionModelPath, string clipLPath, string t5xxlPath) => new(diffusionModelPath, clipLPath, t5xxlPath);
public static FluxModelBuilder Flux(string diffusionModelPath, string clipLPath, string t5xxlPath, string vaePath) => new(diffusionModelPath, clipLPath, t5xxlPath, vaePath);
public static ESRGANModelBuilder ESRGAN(string modelPath) => new(modelPath);
}