v0.5.1 - Vendor Builds, Volume Support, TextElement

Author: saddam213

DiffuseApp/DiffuseApp/App.xaml.cs

@@ -33,6 +33,7 @@ public partial class App : Application
         private static string _directoryBase;
         private static string _directoryData;
         private static string _directoryPython;
+        private readonly Settings _settings;
 
         public App()
         {
@@ -59,8 +60,8 @@ public App()
             builder.Logging.AddSerilog(logger: Log.Logger, dispose: true);
 
             // Add TensorStack.WPF
-            var settings = LoadSettingsFile();
-            builder.Services.AddWPFCommon<MainWindow, Settings>(settings);
+            _settings = LoadSettingsFile();
+            builder.Services.AddWPFCommon<MainWindow, Settings>(_settings);
 
             // Add sService
             builder.Services.AddSingleton<IHardwareService, HardwareService>();
@@ -140,6 +141,7 @@ private async Task AppShutdown()
         {
             using (_appHost)
             {
+                await SettingsManager.SaveAsync(_settings);
                 await _appHost.StopAsync();
                 DeregisterExceptionHandlers();
                 _appMutex.WaitOne();

DiffuseApp/DiffuseApp/Common/AudioModel.cs

@@ -14,6 +14,7 @@ public class AudioModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public bool IsDefault { get; set; }
         public AudioModelType Type { get; set; }

DiffuseApp/DiffuseApp/Common/ControlNetModel.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Text.Json.Serialization;
+using TensorStack.Common.Common;
 using TensorStack.WPF;
 
 namespace Diffuse.Common
@@ -10,6 +11,7 @@ public class ControlNetModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public string Path { get; set; }
         public ModelSourceType Source { get; set; }

DiffuseApp/DiffuseApp/Common/DiffusionModel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json.Serialization;
+using TensorStack.Common.Common;
 using TensorStack.Python.Common;
 using TensorStack.WPF;
 
@@ -12,6 +13,7 @@ public class DiffusionModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public string Pipeline { get; set; }
         public string Path { get; set; }

DiffuseApp/DiffuseApp/Common/ExtractModel.cs

@@ -15,6 +15,7 @@ public class ExtractModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public bool IsDefault { get; set; }
         public ExtractorType Type { get; set; }

DiffuseApp/DiffuseApp/Common/LoraAdapterModel.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Text.Json.Serialization;
+using TensorStack.Common.Common;
 using TensorStack.WPF;
 
 namespace Diffuse.Common
@@ -11,6 +12,7 @@ public class LoraAdapterModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public string Key { get; set; }
         public string Path { get; set; }

DiffuseApp/DiffuseApp/Common/TextInput.cs

@@ -16,6 +16,7 @@ public class UpscaleModel : BaseModel
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         public int Id { get; set; }
+        public BackendType Backend { get; set; }
         public string Name { get; set; }
         public bool IsDefault { get; set; }
         public int Channels { get; set; } = 3;

DiffuseApp/DiffuseApp/Common/UpscaleModel.cs

@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using TensorStack.Common.Common;
 using TensorStack.WPF;
 using TensorStack.WPF.Controls;
 
@@ -51,6 +52,7 @@ public Task<bool> AddAsync()
             ControlNetModel = new ControlNetModel
             {
                 Id = modelId,
+                Backend = BackendType.Pytorch,
                 Source = ModelSourceType.HuggingFace
             };
             return base.ShowDialogAsync();
@@ -158,7 +160,9 @@ private static ControlNetModel DeepClone(ControlNetModel controlNetModel, int mo
                 Id = modelId,
                 Name = controlNetModel.Name,
                 Path = controlNetModel.Path,
-                Pipeline = controlNetModel.Pipeline
+                Pipeline = controlNetModel.Pipeline,
+                Backend = controlNetModel.Backend,
+                Source = controlNetModel.Source,
             };
         }
     }

DiffuseApp/DiffuseApp/Dialogs/ControlNetModelDialog.xaml.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using TensorStack.Common;
+using TensorStack.Common.Common;
 using TensorStack.Python.Common;
 using TensorStack.WPF;
 using TensorStack.WPF.Controls;
@@ -104,6 +105,7 @@ public Task<bool> AddAsync()
             DiffusionModel = new DiffusionModel
             {
                 Id = modelId,
+                Backend = BackendType.Pytorch,
                 BaseType = DataType.Bfloat16,
                 MemoryProfile =
                 [
@@ -429,6 +431,7 @@ private static DiffusionModel DeepClone(DiffusionModel diffusionModel, int model
             return new DiffusionModel
             {
                 Id = modelId,
+                Backend = diffusionModel.Backend,
                 Name = diffusionModel.Name,
                 Path = diffusionModel.Path,
                 Variant = diffusionModel.Variant,