Model configuration access

Author: saddam213

OnnxStack.StableDiffusion/Config/ControlNetModelSet.cs

@@ -8,8 +8,6 @@ namespace OnnxStack.StableDiffusion.Config
 {
     public record ControlNetModelSet : IOnnxModelSetConfig
     {
-        public ControlNetType Type { get; set; }
-        public DiffuserPipelineType PipelineType { get; set; }
         public string Name { get; set; }
         public bool IsEnabled { get; set; }
         public int DeviceId { get; set; }

OnnxStack.StableDiffusion/Models/AutoEncoderModel.cs

@@ -5,13 +5,14 @@ namespace OnnxStack.StableDiffusion.Models
 {
     public class AutoEncoderModel : OnnxModelSession
     {
-        private readonly float _scaleFactor;
+        private readonly AutoEncoderModelConfig _configuration;
+
         public AutoEncoderModel(AutoEncoderModelConfig configuration) : base(configuration)
         {
-            _scaleFactor = configuration.ScaleFactor;
+            _configuration = configuration;
         }
 
-        public float ScaleFactor => _scaleFactor;
+        public float ScaleFactor => _configuration.ScaleFactor;
     }
 
     public record AutoEncoderModelConfig : OnnxModelConfig

OnnxStack.StableDiffusion/Models/ControlNetModel.cs

@@ -1,20 +1,28 @@
 using Microsoft.ML.OnnxRuntime;
 using OnnxStack.Core.Config;
 using OnnxStack.Core.Model;
+using OnnxStack.StableDiffusion.Enums;
 
 namespace OnnxStack.StableDiffusion.Models
 {
     public class ControlNetModel : OnnxModelSession
     {
+        private readonly ControlNetModelConfig _configuration;
         public ControlNetModel(ControlNetModelConfig configuration)
-            : base(configuration) { }
+            : base(configuration)
+        {
+            _configuration = configuration;
+        }
+
+        public ControlNetType Type => _configuration.Type;
+        public DiffuserPipelineType PipelineType => _configuration.PipelineType;
 
         public static ControlNetModel Create(ControlNetModelConfig configuration)
         {
             return new ControlNetModel(configuration);
         }
 
-        public static ControlNetModel Create(string modelFile, int deviceId = 0, ExecutionProvider executionProvider = ExecutionProvider.DirectML)
+        public static ControlNetModel Create(string modelFile, ControlNetType type, DiffuserPipelineType pipeline, int deviceId = 0, ExecutionProvider executionProvider = ExecutionProvider.DirectML)
         {
             var configuration = new ControlNetModelConfig
             {
@@ -23,11 +31,17 @@ public static ControlNetModel Create(string modelFile, int deviceId = 0, Executi
                 ExecutionMode = ExecutionMode.ORT_SEQUENTIAL,
                 InterOpNumThreads = 0,
                 IntraOpNumThreads = 0,
-                OnnxModelPath = modelFile
+                OnnxModelPath = modelFile,
+                Type = type,
+                PipelineType = pipeline,
             };
             return new ControlNetModel(configuration);
         }
     }
 
-    public record ControlNetModelConfig : OnnxModelConfig;
+    public record ControlNetModelConfig : OnnxModelConfig
+    {
+        public ControlNetType Type { get; set; }
+        public DiffuserPipelineType PipelineType { get; set; }
+    }
 }

OnnxStack.StableDiffusion/Models/TextEncoderModel.cs

@@ -5,9 +5,11 @@ namespace OnnxStack.StableDiffusion.Models
 {
     public class TextEncoderModel : OnnxModelSession
     {
+        private readonly TextEncoderModelConfig _configuration;
+
         public TextEncoderModel(TextEncoderModelConfig configuration) : base(configuration)
         {
-
+            _configuration = configuration;
         }
     }
 

OnnxStack.StableDiffusion/Models/TokenizerModel.cs

@@ -5,23 +5,17 @@ namespace OnnxStack.StableDiffusion.Models
 {
     public class TokenizerModel : OnnxModelSession
     {
-        private readonly int _padTokenId;
-        private readonly int _blankTokenId;
-        private readonly int _tokenizerLimit;
-        private readonly int _tokenizerLength;
+        private readonly TokenizerModelConfig _configuration;
 
         public TokenizerModel(TokenizerModelConfig configuration) : base(configuration)
         {
-            _padTokenId = configuration.PadTokenId;
-            _blankTokenId = configuration.BlankTokenId;
-            _tokenizerLimit = configuration.TokenizerLimit;
-            _tokenizerLength = configuration.TokenizerLength;
+            _configuration = configuration;
         }
 
-        public int TokenizerLimit => _tokenizerLimit;
-        public int TokenizerLength => _tokenizerLength;
-        public int PadTokenId => _padTokenId;
-        public int BlankTokenId => _blankTokenId;
+        public int TokenizerLimit => _configuration.TokenizerLimit;
+        public int TokenizerLength => _configuration.TokenizerLength;
+        public int PadTokenId => _configuration.PadTokenId;
+        public int BlankTokenId => _configuration.BlankTokenId;
     }
 
     public record TokenizerModelConfig : OnnxModelConfig

OnnxStack.StableDiffusion/Models/UNetConditionModel.cs

@@ -6,13 +6,14 @@ namespace OnnxStack.StableDiffusion.Models
 {
     public class UNetConditionModel : OnnxModelSession
     {
-        private readonly ModelType _modelType;
+        private readonly UNetConditionModelConfig _configuration;
+
         public UNetConditionModel(UNetConditionModelConfig configuration) : base(configuration)
         {
-            _modelType = configuration.ModelType;
+            _configuration = configuration;
         }
 
-        public ModelType ModelType => _modelType;
+        public ModelType ModelType => _configuration.ModelType;
     }