Simplify ModelTemplate website and repository metadata

Author: saddam213

OnnxStack.UI/Dialogs/UpdateModelMetadataDialog.xaml

@@ -104,7 +104,7 @@
                     </StackPanel>
                     <StackPanel Margin="0,0,4,0" >
                         <TextBlock Text="Repository" />
-                        <TextBox Text="{Binding RepositoryClone}"  />
+                        <TextBox Text="{Binding Repository}"  />
                     </StackPanel>
                 </DockPanel>
                 <TextBlock Text="Direct Download" FontSize="15" FontWeight="DemiBold" Margin="0,15,0,0"/>

OnnxStack.UI/Dialogs/UpdateModelMetadataDialog.xaml.cs

@@ -80,12 +80,12 @@ public string IconImage
             set { _iconImage = value; NotifyPropertyChanged(); }
         }
 
-        private string _repositoryClone;
+        private string _repository;
 
-        public string RepositoryClone
+        public string Repository
         {
-            get { return _repositoryClone; }
-            set { _repositoryClone = value; NotifyPropertyChanged(); }
+            get { return _repository; }
+            set { _repository = value; NotifyPropertyChanged(); }
         }
 
         private string _repositoryBranch;
@@ -105,15 +105,13 @@ public bool ShowDialog(ModelTemplateViewModel modelTemplate)
         {
             _modelTemplate = modelTemplate;
 
-            Website = _modelTemplate.Repository;
+            Website = _modelTemplate.Website;
             Author = _modelTemplate.Author;
             Description = _modelTemplate.Description;
             IconImage = _modelTemplate.ImageIcon;
-
-            var repository = _modelTemplate.RepositoryClone?.Split("-b", StringSplitOptions.TrimEntries);
-            RepositoryClone = repository?.FirstOrDefault();
-            RepositoryBranch = repository?.LastOrDefault();
-
+            Repository = _modelTemplate.Repository;
+            RepositoryBranch = _modelTemplate.RepositoryBranch;
+           
             for (int i = 0; i < 4; i++)
             {
                 PreviewImages.Add(_modelTemplate.PreviewImages?.ElementAtOrDefault(i));
@@ -129,13 +127,12 @@ public bool ShowDialog(ModelTemplateViewModel modelTemplate)
         private Task Save()
         {
             // validate links;
-            _modelTemplate.Repository = Website;
+            _modelTemplate.Website = Website;
             _modelTemplate.Author = Author;
             _modelTemplate.ImageIcon = IconImage;
             _modelTemplate.Description = Description;
-            _modelTemplate.RepositoryClone = string.IsNullOrEmpty(_repositoryBranch)
-                ? RepositoryClone
-                : $"{_repositoryClone} -b {_repositoryBranch}";
+            _modelTemplate.Repository = Repository;
+            _modelTemplate.RepositoryBranch = RepositoryBranch;
             _modelTemplate.PreviewImages = PreviewImages.Where(x => !string.IsNullOrEmpty(x)).ToList();
             _modelTemplate.RepositoryFiles = RepositoryFiles.Where(x => !string.IsNullOrEmpty(x)).ToList();
 

OnnxStack.UI/Dialogs/ViewModelMetadataDialog.xaml

@@ -37,7 +37,7 @@
                 </StackPanel>
                 <StackPanel Margin="0,0,4,0" >
                     <TextBlock Text="Website" FontWeight="DemiBold" Margin="0,15,0,0" Opacity=".7"/>
-                    <TextBlock Text="{Binding ModelTemplate.Repository, TargetNullValue=Unknown}"  />
+                    <TextBlock Text="{Binding ModelTemplate.Website, TargetNullValue=Unknown}"  />
                 </StackPanel>
             </DockPanel>
 
@@ -51,7 +51,7 @@
 
             <StackPanel>
                 <TextBlock Text="Repository Clone" FontWeight="DemiBold" Margin="0,15,0,0" Opacity=".7"/>
-                <TextBlock Text="{Binding ModelTemplate.RepositoryClone, TargetNullValue=Unknown}"  />
+                <TextBlock Text="{Binding ModelTemplate.Repository, TargetNullValue=Unknown}"  />
             </StackPanel>
 
             <TextBlock Text="Direct Download Files" FontWeight="DemiBold" Margin="0,15,0,0" Opacity=".7"/>

OnnxStack.UI/Views/ModelSettingsView.xaml.cs

@@ -810,18 +810,31 @@ public string Description
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public StableDiffusionModelTemplate StableDiffusionTemplate { get; set; }
 
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        public string Website { get; set; }
+
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public string Repository { get; set; }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string RepositoryClone { get; set; }
+        public string RepositoryBranch { get; set; }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public List<string> RepositoryFiles { get; set; }
 
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         public List<string> PreviewImages { get; set; }
 
+        [JsonIgnore]
+        public string RepositoryClone
+        {
+            get
+            {
+                return string.IsNullOrEmpty(RepositoryBranch)
+                ? Repository
+                : $"{Repository} -b {RepositoryBranch}";
+            }
+        }
 
         [JsonIgnore]
         public bool IsInstalled
@@ -859,14 +872,16 @@ public string ErrorMessage
         }
 
         [JsonIgnore]
-        public bool IsRepositoryCloneEnabled => !string.IsNullOrEmpty(RepositoryClone);
+        public bool IsRepositoryCloneEnabled => !string.IsNullOrEmpty(Repository);
 
         [JsonIgnore]
         public bool IsRepositoryDownloadEnabled => !RepositoryFiles.IsNullOrEmpty();
 
         [JsonIgnore]
         public CancellationTokenSource CancellationTokenSource { get; set; }
 
+
+
         #region INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
 

OnnxStack.UI/appsettings.json

@@ -44,6 +44,7 @@
     "DefaultIntraOpNumThreads": 0,
     "DefaultExecutionMode": "ORT_SEQUENTIAL",
     "DefaultExecutionProvider": "DirectML",
+
     "Templates": [
       {
         "Name": "StableDiffusion",
@@ -207,7 +208,7 @@
           ]
         },
         "Repository": "https://huggingface.co/runwayml/stable-diffusion-v1-5",
-        "RepositoryClone": "https://huggingface.co/runwayml/stable-diffusion-v1-5 -b onnx",
+        "RepositoryBranch": "onnx",
         "RepositoryFiles": [
           "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/onnx/unet/model.onnx",
           "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/onnx/unet/weights.pb",