Merge branch 'master' into CUDA

saddam213 · saddam213 · commit d78b326a14d2 · 2023-11-10T11:17:04.000+13:00
diff --git a/OnnxStack.UI/App.xaml.cs b/OnnxStack.UI/App.xaml.cs
@@ -17,7 +17,6 @@ namespace OnnxStack.UI
     public partial class App : Application
     {
         private static IHost _applicationHost;
-        private static ILogger<App> _logger;
 
         public App()
         {
diff --git a/OnnxStack.UI/MainWindow.xaml.cs b/OnnxStack.UI/MainWindow.xaml.cs
@@ -140,7 +140,10 @@ private async Task SaveImageFile(ImageResult imageResult)
 
                 var dialogResult = saveFileDialog.ShowDialog();
                 if (dialogResult == false)
+                {
                     _logger.LogInformation("Saving image canceled");
+                    return;
+                }
 
                 var result = await imageResult.SaveImageFile(saveFileDialog.FileName);
                 if (!result)
@@ -171,7 +174,10 @@ private async Task SaveBlueprintFile(ImageResult imageResult)
 
                 var dialogResult = saveFileDialog.ShowDialog();
                 if (dialogResult == false)
+                {
                     _logger.LogInformation("Saving image blueprint canceled");
+                    return;
+                }
 
                 var result = await imageResult.SaveBlueprintFile(saveFileDialog.FileName);
                 if (!result)
diff --git a/OnnxStack.UI/Models/ModelFileViewModel.cs b/OnnxStack.UI/Models/ModelFileViewModel.cs
@@ -15,6 +15,7 @@ public class ModelFileViewModel : INotifyPropertyChanged
         private ExecutionMode? _executionMode;
         private ExecutionProvider? _executionProvider;
         private bool _isOverrideEnabled;
+        private bool _hasChanged;
 
         public string OnnxModelPath
         {
@@ -64,10 +65,19 @@ public bool IsOverrideEnabled
             set { _isOverrideEnabled = value; NotifyPropertyChanged(); }
         }
 
+        public bool HasChanged
+        {
+            get { return _hasChanged; }
+            set { _hasChanged = value; NotifyPropertyChanged(); }
+        }
+
         #region INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
         public void NotifyPropertyChanged([CallerMemberName] string property = "")
         {
+            if (!property.Equals(nameof(HasChanged)) && !HasChanged)
+                HasChanged = true;
+
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
         }
         #endregion
diff --git a/OnnxStack.UI/Models/ModelSetViewModel.cs b/OnnxStack.UI/Models/ModelSetViewModel.cs
@@ -1,9 +1,11 @@
 ﻿using Microsoft.ML.OnnxRuntime;
 using OnnxStack.Core.Config;
 using OnnxStack.StableDiffusion.Enums;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace OnnxStack.UI.Views
@@ -33,6 +35,7 @@ public class ModelSetViewModel : INotifyPropertyChanged
         private string _progessText;
         private double _progressValue;
         private bool _isDownloading;
+        private bool _hasChanged;
 
         public string Name
         {
@@ -183,6 +186,12 @@ public bool IsTemplate
             set { _isTemplate = value; NotifyPropertyChanged(); }
         }
 
+        public bool HasChanged
+        {
+            get { return _hasChanged; }
+            set { _hasChanged = value; NotifyPropertyChanged(); }
+        }
+
 
         public IEnumerable<DiffuserType> GetDiffusers()
         {
@@ -200,8 +209,29 @@ public IEnumerable<DiffuserType> GetDiffusers()
         public event PropertyChangedEventHandler PropertyChanged;
         public void NotifyPropertyChanged([CallerMemberName] string property = "")
         {
+            if (!property.Equals(nameof(HasChanged)) && !HasChanged)
+                HasChanged = true;
+
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
         }
+
+        internal bool HasChanges()
+        {
+            if (HasChanged)
+                return true;
+
+            return ModelFiles?.Any(x => x.HasChanged) ?? false;
+        }
+
+        internal void ResetChanges()
+        {
+            HasChanged = false;
+            foreach (var modelFile in ModelFiles)
+            {
+                modelFile.HasChanged = false;
+            }
+        }
+
         #endregion
     }
 
diff --git a/OnnxStack.UI/Views/ModelView.xaml b/OnnxStack.UI/Views/ModelView.xaml
@@ -18,10 +18,12 @@
                     <TextBlock Text="Models" />
                 </StackPanel>
                 <StackPanel DockPanel.Dock="Bottom">
-                    <UniformGrid Columns="3">
+                    <UniformGrid Columns="5">
                         <Button Content="Add" Command="{Binding AddCommand}" />
                         <Button Content="Copy" Command="{Binding CopyCommand}" />
                         <Button Content="Remove" Command="{Binding RemoveCommand}" />
+                        <Button Content="Import" Command="{Binding ImportCommand}" />
+                        <Button Content="Export" Command="{Binding ExportCommand}" />
                     </UniformGrid>
                 </StackPanel>
                 <ListBox Margin="0,0,0,2"
@@ -63,7 +65,7 @@
                         <DataTemplate>
                             <DockPanel>
                                 <StackPanel DockPanel.Dock="Left">
-                                     <userControls:CachedImage ImageUrl="{Binding ModelTemplate.ImageIcon, IsAsync=True}" CacheName="{Binding Name}" Placeholder="{StaticResource PlaceholderIcon}" Height="34" Margin="0,1,3,1" RenderOptions.BitmapScalingMode="HighQuality" SnapsToDevicePixels="True"/>
+                                    <userControls:CachedImage ImageUrl="{Binding ModelTemplate.ImageIcon, IsAsync=True}" CacheName="{Binding Name}" Placeholder="{StaticResource PlaceholderIcon}" Height="34" Margin="0,1,3,1" RenderOptions.BitmapScalingMode="HighQuality" SnapsToDevicePixels="True"/>
                                 </StackPanel>
                                 <UniformGrid DockPanel.Dock="Right" Columns="1" Margin="2">
                                     <userControls:FontAwesome Icon="&#xf205;" IconStyle="Light" Size="12" VerticalAlignment="Center">
@@ -149,7 +151,7 @@
                     </StackPanel>
                     <StackPanel></StackPanel>
                 </DockPanel>
-                <TextBlock Text="This model has been converted to ONNX and tested with OnnxStack" />
+                <TextBlock Text="{Binding SelectedModelSet.ModelTemplate.Description}" />
 
                 <!--Preview Images-->
                 <TextBlock Text="Preview Images" Margin="0,20, 0, 0" />
@@ -392,16 +394,70 @@
 
 
                     </TabItem>
-                </TabControl>
-
 
+                    <TabItem Header="Details" Width="150" Padding="0,0,0,5">
 
+                        <StackPanel Margin="5">
+                            <UniformGrid Columns="3" >
+                                <DockPanel Margin="0,0,4,0">
+                                    <StackPanel DockPanel.Dock="Right" >
+                                        <TextBlock />
+                                        <Button Command="{Binding RenameCommand, ElementName=UI}" Content="Rename" Height="22" Padding="10,0" />
+                                    </StackPanel>
+                                    <StackPanel>
+                                        <TextBlock Text="Name" />
+                                        <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Name}" IsReadOnly="True"  />
+                                    </StackPanel>
+                                </DockPanel>
+                                <StackPanel Margin="0,0,4,0">
+                                    <TextBlock Text="Author" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Author}"  />
+                                </StackPanel>
+                            </UniformGrid>
+                            <StackPanel Margin="0,5,0,0">
+                                <TextBlock Text="Description" />
+                                <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Description}" />
+                            </StackPanel>
+                            <StackPanel Margin="0,5,0,0" >
+                                <TextBlock Text="Repository" />
+                                <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Repository}"  />
+                            </StackPanel>
+                            <UniformGrid>
+                                <StackPanel  Margin="0,5,5,0">
+                                    <TextBlock Text="Icon Image" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ImageIcon}"  />
+                                    <TextBlock Text="Preview Images" Margin="0,5,0,0"/>
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[0]}" Margin="0,2,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[1]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[2]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[3]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[4]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.Images[5]}" Margin="0,5,0,0" />
+                                </StackPanel>
 
+                                <StackPanel  Margin="5,5,0,0">
+                                    <TextBlock Text="Download Files" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[0]}" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[1]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[2]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[3]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[4]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[5]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[6]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[7]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[8]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[9]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[10]}" Margin="0,5,0,0" />
+                                    <TextBox Text="{Binding SelectedModelSet.ModelTemplate.ModelFiles[11]}" Margin="0,5,0,0" />
+                                </StackPanel>
 
+                            </UniformGrid>
+                        </StackPanel>
+                    </TabItem>
+                </TabControl>
 
             </DockPanel>
 
-
         </DockPanel>
 
         <DockPanel DockPanel.Dock="Bottom">
diff --git a/OnnxStack.UI/Views/ModelView.xaml.cs b/OnnxStack.UI/Views/ModelView.xaml.cs
diff --git a/OnnxStackCore.sln b/OnnxStackCore.sln

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ namespace OnnxStack.UI`
`17`	`17`	`public partial class App : Application`
`18`	`18`	`{`
`19`	`19`	`private static IHost _applicationHost;`
`20`		`- private static ILogger<App> _logger;`
`21`	`20`
`22`	`21`	`public App()`
`23`	`22`	`{`