Merge branch 'refs/heads/dev' into proxy

# Conflicts:
#	StabilityMatrix.Avalonia/Languages/Resources.resx

Author: ionite34

.husky/task-runner.json

@@ -19,6 +19,12 @@
          "group": "generate-openapi",
          "command": "dotnet",
          "args": ["refitter", "--settings-file", "./StabilityMatrix.Core/Api/LykosAuthApi/.refitter"]
+      },
+      {
+         "name": "Run refitter for PromptGenApi",
+         "group": "generate-promptgen-openapi",
+         "command": "dotnet",
+         "args": ["refitter", "--settings-file", "./StabilityMatrix.Core/Api/PromptGen/.refitter"]
       }
    ]
 }

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
 ## v2.14.0-pre.2
+### Added
+- Added new package - [Stable Diffusion WebUI Forge - Classic](https://github.com/Haoming02/sd-webui-forge-classic)
+- Added Undo/Redo commands to text editor context menus
 ### Changed
 - Updated install for kohya_ss to support RTX 5000-series GPUs
 ### Fixed

StabilityMatrix.Avalonia/App.axaml.cs

@@ -53,6 +53,7 @@
 using StabilityMatrix.Avalonia.Views;
 using StabilityMatrix.Core.Api;
 using StabilityMatrix.Core.Api.LykosAuthApi;
+using StabilityMatrix.Core.Api.PromptGenApi;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Converters.Json;
 using StabilityMatrix.Core.Database;
@@ -133,6 +134,14 @@ public sealed class App : Application
 #else
     public const string LykosAccountApiBaseUrl = "https://account.lykos.ai/";
 #endif
+#if DEBUG
+    // ReSharper disable twice LocalizableElement
+    // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+    public static string PromptGenApiBaseUrl =>
+        Config?["PromptGenApiBaseUrl"] ?? "https://promptgen.lykos.ai/api";
+#else
+    public const string PromptGenApiBaseUrl = "https://promptgen.lykos.ai/api";
+#endif
 
     // ReSharper disable once MemberCanBePrivate.Global
     public IClassicDesktopStyleApplicationLifetime? DesktopLifetime =>
@@ -369,7 +378,7 @@ internal static void ConfigurePageViewModels(IServiceCollection services)
                 new MainWindowViewModel(
                     provider.GetRequiredService<ISettingsManager>(),
                     provider.GetRequiredService<IDiscordRichPresenceService>(),
-                    provider.GetRequiredService<ServiceManager<ViewModelBase>>(),
+                    provider.GetRequiredService<IServiceManager<ViewModelBase>>(),
                     provider.GetRequiredService<ITrackedDownloadService>(),
                     provider.GetRequiredService<IModelIndexService>(),
                     provider.GetRequiredService<Lazy<IModelDownloadLinkHandler>>(),
@@ -651,6 +660,21 @@ internal static IServiceCollection ConfigureServices()
                     new TokenAuthHeaderHandler(serviceProvider.GetRequiredService<LykosAuthTokenProvider>())
             );
 
+        services
+            .AddRefitClient<IPromptGenApi>(defaultRefitSettings)
+            .ConfigureHttpClient(c =>
+            {
+                c.BaseAddress = new Uri(PromptGenApiBaseUrl);
+                c.Timeout = TimeSpan.FromHours(1);
+                c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "");
+            })
+            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler { AllowAutoRedirect = false })
+            .AddPolicyHandler(retryPolicy)
+            .AddHttpMessageHandler(
+                serviceProvider =>
+                    new TokenAuthHeaderHandler(serviceProvider.GetRequiredService<LykosAuthTokenProvider>())
+            );
+
         services
             .AddRefitClient<ILykosAnalyticsApi>(defaultRefitSettings)
             .ConfigureHttpClient(c =>

StabilityMatrix.Avalonia/Controls/BetterDownloadableComboBox.cs

@@ -54,7 +54,7 @@ private static async Task PromptDownloadAsync(IDownloadableResource downloadable
         if (downloadable.DownloadableResource is not { } resource)
             return;
 
-        var vmFactory = App.Services.GetRequiredService<ServiceManager<ViewModelBase>>();
+        var vmFactory = App.Services.GetRequiredService<IServiceManager<ViewModelBase>>();
         var confirmDialog = vmFactory.Get<DownloadResourceViewModel>();
         confirmDialog.Resource = resource;
         confirmDialog.FileName = resource.FileName;

StabilityMatrix.Avalonia/Controls/EditorCommands.cs

@@ -13,4 +13,10 @@ public static class EditorCommands
 
     public static RelayCommand<TextEditor> PasteCommand { get; } =
         new(editor => editor?.Paste(), editor => editor?.CanPaste ?? false);
+
+    public static RelayCommand<TextEditor> UndoCommand { get; } =
+        new(editor => editor?.Undo(), editor => editor?.CanUndo ?? false);
+
+    public static RelayCommand<TextEditor> RedoCommand { get; } =
+        new(editor => editor?.Redo(), editor => editor?.CanRedo ?? false);
 }

StabilityMatrix.Avalonia/Controls/EditorFlyouts.axaml

@@ -1,27 +1,40 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-                    xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
-                    xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls">
-    <!-- Context menu for editors -->
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
+    xmlns:controls="clr-namespace:StabilityMatrix.Avalonia.Controls"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
+    <!--  Context menu for editors  -->
     <ui:FAMenuFlyout x:Key="EditorContextFlyout">
         <ui:MenuFlyoutItem
-            Text="Paste"
-            IconSource="Paste"
-            HotKey="Ctrl+V"
             Command="{x:Static controls:EditorCommands.PasteCommand}"
-            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"/>
+            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"
+            HotKey="Ctrl+V"
+            IconSource="Paste"
+            Text="Paste" />
         <ui:MenuFlyoutItem
-            Text="Copy"
-            IconSource="Copy"
-            HotKey="Ctrl+C"
             Command="{x:Static controls:EditorCommands.CopyCommand}"
-            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"/>
+            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"
+            HotKey="Ctrl+C"
+            IconSource="Copy"
+            Text="Copy" />
         <ui:MenuFlyoutItem
-            Text="Cut"
-            IconSource="Cut"
-            HotKey="Ctrl+X"
             Command="{x:Static controls:EditorCommands.CutCommand}"
-            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"/>
+            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"
+            HotKey="Ctrl+X"
+            IconSource="Cut"
+            Text="Cut" />
+        <ui:MenuFlyoutItem
+            Command="{x:Static controls:EditorCommands.UndoCommand}"
+            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"
+            HotKey="Ctrl+Z"
+            IconSource="Undo"
+            Text="Undo" />
+        <ui:MenuFlyoutItem
+            Command="{x:Static controls:EditorCommands.RedoCommand}"
+            CommandParameter="{Binding $parent[avaloniaEdit:TextEditor]}"
+            HotKey="Ctrl+Y"
+            IconSource="Redo"
+            Text="Redo" />
     </ui:FAMenuFlyout>
 </ResourceDictionary>

StabilityMatrix.Avalonia/Controls/FADownloadableComboBox.cs

@@ -55,7 +55,7 @@ private static async Task PromptDownloadAsync(IDownloadableResource downloadable
         if (downloadable.DownloadableResource is not { } resource)
             return;
 
-        var vmFactory = App.Services.GetRequiredService<ServiceManager<ViewModelBase>>();
+        var vmFactory = App.Services.GetRequiredService<IServiceManager<ViewModelBase>>();
         var confirmDialog = vmFactory.Get<DownloadResourceViewModel>();
         confirmDialog.Resource = resource;
         confirmDialog.FileName = resource.FileName;