Merge pull request LykosAI#622 from ionite34/fix-inference-lora

Fix Inference Lora resetting due to slider maximums & Add number format setting

StabilityMatrix.Avalonia/App.axaml.cs

@@ -301,7 +301,10 @@ private static void ConfigureServiceProvider()
 
         if (settingsManager.TryFindLibrary())
         {
-            Cultures.SetSupportedCultureOrDefault(settingsManager.Settings.Language);
+            Cultures.SetSupportedCultureOrDefault(
+                settingsManager.Settings.Language,
+                settingsManager.Settings.NumberFormatMode
+            );
         }
         else
         {

StabilityMatrix.Avalonia/Controls/Inference/ExtraNetworkCard.axaml

@@ -53,18 +53,15 @@
                                     Grid.Column="1"
                                     Margin="4,0,0,0"
                                     ValidationMode="InvalidInputOverwritten"
-                                    SmallChange="0.01"
+                                    SmallChange="0.05"
+                                    LargeChange="0.1"
+                                    Maximum="100"
+                                    Minimum="-100"
                                     SimpleNumberFormat="F2"
                                     Value="{Binding ModelWeight}"
                                     HorizontalAlignment="Stretch"
-                                    SpinButtonPlacementMode="Compact"/>
+                                    SpinButtonPlacementMode="Inline"/>
                             </Grid>
-                            <Slider
-                                Minimum="0"
-                                Maximum="1"
-                                Value="{Binding ModelWeight}"
-                                TickFrequency="0.25"
-                                TickPlacement="BottomRight"/>
                         </StackPanel>
 
                         <!-- CLIP Strength -->
@@ -79,18 +76,15 @@
                                     Grid.Column="1"
                                     Margin="4,0,0,0"
                                     ValidationMode="InvalidInputOverwritten"
-                                    SmallChange="0.01"
+                                    SmallChange="0.05"
+                                    LargeChange="0.1"
+                                    Maximum="100"
+                                    Minimum="-100"
                                     SimpleNumberFormat="F2"
                                     Value="{Binding ClipWeight}"
                                     HorizontalAlignment="Stretch"
-                                    SpinButtonPlacementMode="Compact"/>
+                                    SpinButtonPlacementMode="Inline"/>
                             </Grid>
-                            <Slider
-                                Minimum="0"
-                                Maximum="1"
-                                Value="{Binding ClipWeight}"
-                                TickFrequency="0.25"
-                                TickPlacement="BottomRight"/>
                         </StackPanel>
 
 

StabilityMatrix.Avalonia/Converters/NumberFormatModeSampleConverter.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+using StabilityMatrix.Core.Models.Settings;
+
+namespace StabilityMatrix.Avalonia.Converters;
+
+/// <summary>
+/// Converts a <see cref="NumberFormatMode"/> to a sample number string
+/// </summary>
+public class NumberFormatModeSampleConverter : IValueConverter
+{
+    /// <inheritdoc />
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not NumberFormatMode mode)
+            return null;
+
+        const double sample = 12345.67;
+
+        // Format the sample number based on the number format mode
+        return mode switch
+        {
+            NumberFormatMode.Default => sample.ToString("N2", culture),
+            NumberFormatMode.CurrentCulture => sample.ToString("N2", culture),
+            NumberFormatMode.InvariantCulture => sample.ToString("N2", CultureInfo.InvariantCulture),
+            _ => throw new ArgumentOutOfRangeException()
+        };
+    }
+
+    /// <inheritdoc />
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}

StabilityMatrix.Avalonia/Languages/Cultures.cs

@@ -1,8 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Threading;
 using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models.Settings;
 
 namespace StabilityMatrix.Avalonia.Languages;
 
@@ -13,23 +16,23 @@ public static class Cultures
 
     public static CultureInfo? Current => Resources.Culture;
 
-    public static readonly Dictionary<string, CultureInfo> SupportedCulturesByCode = new Dictionary<
-        string,
-        CultureInfo
-    >
-    {
-        ["en-US"] = Default,
-        ["ja-JP"] = new("ja-JP"),
-        ["zh-Hans"] = new("zh-Hans"),
-        ["zh-Hant"] = new("zh-Hant"),
-        ["it-IT"] = new("it-IT"),
-        ["fr-FR"] = new("fr-FR"),
-        ["es"] = new("es"),
-        ["ru-RU"] = new("ru-RU"),
-        ["tr-TR"] = new("tr-TR"),
-        ["de"] = new("de"),
-        ["pt-PT"] = new("pt-PT")
-    };
+    public static NumberFormatInfo CurrentNumberFormat => Thread.CurrentThread.CurrentCulture.NumberFormat;
+
+    public static readonly Dictionary<string, CultureInfo> SupportedCulturesByCode =
+        new()
+        {
+            ["en-US"] = Default,
+            ["ja-JP"] = new CultureInfo("ja-JP"),
+            ["zh-Hans"] = new CultureInfo("zh-Hans"),
+            ["zh-Hant"] = new CultureInfo("zh-Hant"),
+            ["it-IT"] = new CultureInfo("it-IT"),
+            ["fr-FR"] = new CultureInfo("fr-FR"),
+            ["es"] = new CultureInfo("es"),
+            ["ru-RU"] = new CultureInfo("ru-RU"),
+            ["tr-TR"] = new CultureInfo("tr-TR"),
+            ["de"] = new CultureInfo("de"),
+            ["pt-PT"] = new CultureInfo("pt-PT")
+        };
 
     public static IReadOnlyList<CultureInfo> SupportedCultures =>
         SupportedCulturesByCode.Values.ToImmutableList();
@@ -44,11 +47,19 @@ public static CultureInfo GetSupportedCultureOrDefault(string? cultureCode)
         return culture;
     }
 
-    public static void SetSupportedCultureOrDefault(string? cultureCode)
+    public static void SetSupportedCultureOrDefault(string? cultureCode, NumberFormatInfo numberFormat)
+    {
+        if (!TrySetSupportedCulture(cultureCode, numberFormat))
+        {
+            TrySetSupportedCulture(Default, numberFormat);
+        }
+    }
+
+    public static void SetSupportedCultureOrDefault(string? cultureCode, NumberFormatMode numberFormatMode)
     {
-        if (!TrySetSupportedCulture(cultureCode))
+        if (!TrySetSupportedCulture(cultureCode, numberFormatMode))
         {
-            TrySetSupportedCulture(Default);
+            TrySetSupportedCulture(Default, numberFormatMode);
         }
     }
 
@@ -62,6 +73,59 @@ public static bool TrySetSupportedCulture(string? cultureCode)
         if (Current?.Name != culture.Name)
         {
             Resources.Culture = culture;
+
+            Thread.CurrentThread.CurrentCulture = culture;
+            Thread.CurrentThread.CurrentUICulture = culture;
+
+            EventManager.Instance.OnCultureChanged(culture);
+        }
+
+        return true;
+    }
+
+    public static bool TrySetSupportedCulture(string? cultureCode, NumberFormatInfo numberFormat)
+    {
+        if (cultureCode is null || !SupportedCulturesByCode.TryGetValue(cultureCode, out var culture))
+        {
+            return false;
+        }
+
+        if (Current?.Name != culture.Name || CurrentNumberFormat != numberFormat)
+        {
+            Resources.Culture = culture;
+
+            var cultureInfo = GetCultureInfoWithNumberFormat(culture, numberFormat);
+            Thread.CurrentThread.CurrentCulture = cultureInfo;
+            Thread.CurrentThread.CurrentUICulture = cultureInfo;
+
+            EventManager.Instance.OnCultureChanged(culture);
+        }
+
+        return true;
+    }
+
+    public static bool TrySetSupportedCulture(string? cultureCode, NumberFormatMode numberFormatMode)
+    {
+        if (cultureCode is null || !SupportedCulturesByCode.TryGetValue(cultureCode, out var culture))
+        {
+            return false;
+        }
+
+        var numberFormat = numberFormatMode switch
+        {
+            NumberFormatMode.CurrentCulture => culture.NumberFormat,
+            NumberFormatMode.InvariantCulture => CultureInfo.InvariantCulture.NumberFormat,
+            _ => culture.NumberFormat,
+        };
+
+        if (Current?.Name != culture.Name || CurrentNumberFormat != numberFormat)
+        {
+            Resources.Culture = culture;
+
+            var cultureInfo = GetCultureInfoWithNumberFormat(culture, numberFormat);
+            Thread.CurrentThread.CurrentCulture = cultureInfo;
+            Thread.CurrentThread.CurrentUICulture = cultureInfo;
+
             EventManager.Instance.OnCultureChanged(culture);
         }
 
@@ -72,4 +136,27 @@ public static bool TrySetSupportedCulture(CultureInfo? cultureInfo)
     {
         return cultureInfo is not null && TrySetSupportedCulture(cultureInfo.Name);
     }
+
+    public static bool TrySetSupportedCulture(CultureInfo? cultureInfo, NumberFormatInfo numberFormat)
+    {
+        return cultureInfo is not null && TrySetSupportedCulture(cultureInfo.Name, numberFormat);
+    }
+
+    public static bool TrySetSupportedCulture(CultureInfo? cultureInfo, NumberFormatMode numberFormatMode)
+    {
+        return cultureInfo is not null && TrySetSupportedCulture(cultureInfo.Name, numberFormatMode);
+    }
+
+    // ReSharper disable once SuggestBaseTypeForParameter
+    private static CultureInfo GetCultureInfoWithNumberFormat(
+        CultureInfo culture,
+        NumberFormatInfo numberFormat
+    )
+    {
+        ArgumentNullException.ThrowIfNull(culture);
+
+        var cultureInfo = (CultureInfo)culture.Clone();
+        cultureInfo.NumberFormat = numberFormat;
+        return cultureInfo;
+    }
 }

StabilityMatrix.Avalonia/Languages/Resources.resx

@@ -1077,4 +1077,7 @@
   <data name="Label_CLIPStrength" xml:space="preserve">
     <value>CLIP Strength</value>
   </data>
+  <data name="Label_NumberFormat" xml:space="preserve">
+    <value>Number Format</value>
+  </data>
 </root>

StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs

@@ -101,6 +101,12 @@ public partial class MainSettingsViewModel : PageViewModelBase
     // ReSharper disable once MemberCanBeMadeStatic.Global
     public IReadOnlyList<CultureInfo> AvailableLanguages => Cultures.SupportedCultures;
 
+    [ObservableProperty]
+    private NumberFormatMode selectedNumberFormatMode;
+
+    public IReadOnlyList<NumberFormatMode> NumberFormatModes { get; } =
+        Enum.GetValues<NumberFormatMode>().Where(mode => mode != default).ToList();
+
     public IReadOnlyList<float> AnimationScaleOptions { get; } =
         new[] { 0f, 0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 1.75f, 2f, };
 
@@ -228,6 +234,13 @@ IAccountsService accountsService
             true
         );
 
+        settingsManager.RelayPropertyFor(
+            this,
+            vm => vm.SelectedNumberFormatMode,
+            settings => settings.NumberFormatMode,
+            true
+        );
+
         DebugThrowAsyncExceptionCommand.WithNotificationErrorHandler(notificationService, LogLevel.Warn);
 
         hardwareInfoUpdateTimer.Tick += OnHardwareInfoUpdateTimerTick;
@@ -298,7 +311,7 @@ partial void OnSelectedLanguageChanged(CultureInfo? oldValue, CultureInfo newVal
         {
             Logger.Info("Changing language from {Old} to {New}", oldValue, newValue);
 
-            Cultures.TrySetSupportedCulture(newValue);
+            Cultures.TrySetSupportedCulture(newValue, settingsManager.Settings.NumberFormatMode);
             settingsManager.Transaction(s => s.Language = newValue.Name);
 
             var dialog = new BetterContentDialog