Merge pull request #1067 from ionite34/fix-onloaded-stuff-analyzer

Author: ionite34

CHANGELOG.md

@@ -9,12 +9,15 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Changed
 - Updated Inference Extra Networks (Lora / LyCORIS) base model filtering to consider SDXL variations (e.g., Noob AI / Illustrious) as compatible, unrecognized models or models with no base model will be considered compatible.
 - Changed hotkey for Inference prompt weight adjustment to (`⌘+Up`/`⌘+Down`) on macOS
+- Improved style consistency of Inference Prompt action buttons on top right
+- (Internal) Improved log console formatting & colorization for development
 ### Fixed
 - Fixed Inference hotkey weight adjustment multi-line behavior, now works as expected like the first line.
 - Fixed updates to versions with commit hash version parts not being recognized when the current version has no commit hash part.
 - Fixed Inference Extra Networks card not updating with newly added model files.
 - Fixed incorrect ROCmLibs being installed for RX 6800/6800XT users of Comfy-Zluda or AMDGPU-Forge
 - Fixed missing text when missing localized versions for Italian and Chinese languages
+- Fixed Python Packages dialog errors and potentially other issues due to concurrent OnLoaded events
 
 ## v2.14.0
 ### Added

StabilityMatrix.Analyzers.CodeFixes/StabilityMatrix.Analyzers.CodeFixes.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+</Project>

StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs

@@ -391,10 +391,11 @@ private void OnLoaded(object? sender, RoutedEventArgs? e)
         }
 
         // Also call the vm's OnLoad
-        if (Content is Control { DataContext: ViewModelBase viewModel })
+        // (UserControlBase handles this now, so we don't need to)
+        /*if (Content is Control { DataContext: ViewModelBase viewModel })
         {
             viewModel.OnLoaded();
             Dispatcher.UIThread.InvokeAsync(viewModel.OnLoadedAsync).SafeFireAndForget();
-        }
+        }*/
     }
 }

StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@@ -164,6 +164,14 @@
     <ItemGroup>
         <ProjectReference Include="..\Avalonia.Gif\Avalonia.Gif.csproj" />
         <ProjectReference Include="..\StabilityMatrix.Core\StabilityMatrix.Core.csproj" />
+        <ProjectReference Include="..\analyzers\StabilityMatrix.Analyzers\StabilityMatrix.Analyzers.csproj"
+                          PrivateAssets="all"
+                          ReferenceOutputAssembly="false"
+                          OutputItemType="Analyzer" />
+        <ProjectReference Include="..\analyzers\StabilityMatrix.Analyzers.CodeFixes\StabilityMatrix.Analyzers.CodeFixes.csproj"
+                          PrivateAssets="all"
+                          ReferenceOutputAssembly="false"
+                          OutputItemType="Analyzer" />
     </ItemGroup>
 
     <ItemGroup Condition="$(SM_IncludeLogWindow) == 'true'">

StabilityMatrix.Avalonia/ViewModels/Dialogs/ConfirmDeleteDialogViewModel.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Primitives;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Injectio.Attributes;

StabilityMatrix.Avalonia/ViewModels/Dialogs/DownloadResourceViewModel.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;

StabilityMatrix.Avalonia/ViewModels/Dialogs/EnvVarsViewModel.cs

@@ -1,18 +1,19 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Injectio.Attributes;
+using StabilityMatrix.Avalonia.Controls;
 using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.ViewModels.Base;
+using StabilityMatrix.Avalonia.Views.Dialogs;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Models;
 
 namespace StabilityMatrix.Avalonia.ViewModels.Dialogs;
 
-[View(typeof(EnvVarsViewModel))]
+[View(typeof(EnvVarsDialog))]
 [ManagedService]
 [RegisterTransient<EnvVarsViewModel>]
 public partial class EnvVarsViewModel : ContentDialogViewModelBase
@@ -43,4 +44,15 @@ private void RemoveSelectedRow(int selectedIndex)
             Debug.WriteLine($"RemoveSelectedRow: Index {selectedIndex} out of range");
         }
     }
+
+    public override BetterContentDialog GetDialog()
+    {
+        var dialog = base.GetDialog();
+
+        dialog.PrimaryButtonText = Resources.Action_Save;
+        dialog.IsPrimaryButtonEnabled = true;
+        dialog.CloseButtonText = Resources.Action_Cancel;
+
+        return dialog;
+    }
 }

StabilityMatrix.Avalonia/ViewModels/Dialogs/LaunchOptionsViewModel.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.ComponentModel;
-using System.Linq;
 using System.Reactive.Linq;
-using System.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FuzzySharp;
 using Injectio.Attributes;
@@ -58,7 +54,7 @@ public partial class LaunchOptionsViewModel : ContentDialogViewModelBase
         {
             Title = text.ToLowerInvariant(),
             Type = LaunchOptionType.Bool,
-            Options = Array.Empty<LaunchOption>()
+            Options = Array.Empty<LaunchOption>(),
         };
 
         var extracted = Process.ExtractTop(searchCard, Cards, c => c.Title.ToLowerInvariant());

StabilityMatrix.Avalonia/ViewModels/Dialogs/LykosLoginViewModel.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Net;
-using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
@@ -57,11 +54,11 @@ IServiceManager<ViewModelBase> vmFactory
 
     public string SignupFooterMarkdown { get; } =
         """
-                                                  By signing up, you are creating a
-                                                  [lykos.ai](https://lykos.ai) Account and agree to our
-                                                  [Terms](https://lykos.ai/terms-and-conditions) and
-                                                  [Privacy Policy](https://lykos.ai/privacy)
-                                                  """;
+            By signing up, you are creating a
+            [lykos.ai](https://lykos.ai) Account and agree to our
+            [Terms](https://lykos.ai/terms-and-conditions) and
+            [Privacy Policy](https://lykos.ai/privacy)
+            """;
 
     private bool CanExecuteContinueButtonClick()
     {
@@ -90,12 +87,11 @@ private async Task LoginAsync()
         {
             LoginError = e.StatusCode switch
             {
-                HttpStatusCode.Unauthorized
-                    => new AppException(
-                        "Incorrect email or password",
-                        "Please try again or reset your password"
-                    ),
-                _ => new AppException("Failed to login", $"{e.StatusCode} - {e.Message}")
+                HttpStatusCode.Unauthorized => new AppException(
+                    "Incorrect email or password",
+                    "Please try again or reset your password"
+                ),
+                _ => new AppException("Failed to login", $"{e.StatusCode} - {e.Message}"),
             };
         }
     }
@@ -136,7 +132,7 @@ public override TaskDialog GetDialog()
         dialog.Buttons = new List<TaskDialogButton>
         {
             GetCommandButton(Resources.Action_Continue, ContinueButtonClickCommand),
-            GetCloseButton()
+            GetCloseButton(),
         };
         return dialog;
     }

StabilityMatrix.Avalonia/ViewModels/Dialogs/UpdateViewModel.cs

@@ -1,17 +1,10 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using DynamicData;
 using Injectio.Attributes;
 using Microsoft.Extensions.Logging;
 using Semver;
 using StabilityMatrix.Avalonia.Languages;
-using StabilityMatrix.Avalonia.Models;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Avalonia.Views.Dialogs;
 using StabilityMatrix.Core.Attributes;
@@ -254,21 +247,18 @@ internal async Task<string> GetReleaseNotes(string changelogUrl)
 
         var results = pattern
             .Matches(markdown)
-            .Select(
-                m =>
-                    new
-                    {
-                        Block = m.Groups[1].Value.Trim(),
-                        Version = SemVersion.TryParse(
-                            m.Groups[2].Value.Trim(),
-                            SemVersionStyles.AllowV,
-                            out var version
-                        )
-                            ? version
-                            : null,
-                        Content = m.Groups[3].Value.Trim()
-                    }
-            )
+            .Select(m => new
+            {
+                Block = m.Groups[1].Value.Trim(),
+                Version = SemVersion.TryParse(
+                    m.Groups[2].Value.Trim(),
+                    SemVersionStyles.AllowV,
+                    out var version
+                )
+                    ? version
+                    : null,
+                Content = m.Groups[3].Value.Trim(),
+            })
             .Where(x => x.Version is not null)
             .ToList();
 
@@ -288,8 +278,8 @@ out var version
         // Support for previous pre-release without changelogs
         if (currentVersionBlock == -1)
         {
-            currentVersionBlock = results.FindIndex(
-                x => x.Version == currentVersion.WithoutPrereleaseOrMetadata()
+            currentVersionBlock = results.FindIndex(x =>
+                x.Version == currentVersion.WithoutPrereleaseOrMetadata()
             );
 
             // Add 1 if found to include the current release
@@ -308,15 +298,14 @@ out var version
         // Filter out pre-releases
         var blocks = results
             .Take(currentVersionBlock)
-            .Where(
-                x =>
-                    x.Version!.PrereleaseIdentifiers.Count == 0
-                    || x.Version.PrereleaseIdentifiers[0].Value switch
-                    {
-                        "pre" when maxChannel >= UpdateChannel.Preview => true,
-                        "dev" when maxChannel >= UpdateChannel.Development => true,
-                        _ => false
-                    }
+            .Where(x =>
+                x.Version!.PrereleaseIdentifiers.Count == 0
+                || x.Version.PrereleaseIdentifiers[0].Value switch
+                {
+                    "pre" when maxChannel >= UpdateChannel.Preview => true,
+                    "dev" when maxChannel >= UpdateChannel.Development => true,
+                    _ => false,
+                }
             )
             .Select(x => x.Block);