Merge pull request #1041 from ionite34/proxy

Author: ionite34

.aiexclude

@@ -0,0 +1,30 @@
+# Docs
+LICENSE
+CHANGELOG.md
+
+# Legacy
+StabilityMatrix/
+
+# Tests
+*.verified.*
+
+# Misc projects
+StabilityMatrix.Native/
+StabilityMatrix.Native.*/
+StabilityMatrix.Avalonia.Diagnostics/
+StabilityMatrix.Avalonia.Diagnostics/
+StabilityMatrix.UITests/
+
+# Vendored
+Avalonia.Gif/
+
+# Configs
+*.editorconfig
+*.DotSettings
+
+# Assets
+*.svg
+StabilityMatrix.Avalonia/Assets/Fonts/
+StabilityMatrix.Avalonia/Assets/linux-x64/
+StabilityMatrix.Avalonia/Assets/macos-arm64/
+StabilityMatrix.Avalonia/Assets/win-x64/

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ## v2.14.0-pre.2
 ### Added
 - Added new package - [Stable Diffusion WebUI Forge - Classic](https://github.com/Haoming02/sd-webui-forge-classic)
+- Added Accelerated Model Discovery (Beta) (⚡ icon in Civitai Browser) for Insider+ supporters. Utilizes an optimized connection for dramatically faster, more responsive browsing of online model repositories.
 - Added Undo/Redo commands to text editor context menus
 ### Changed
 - Updated install for kohya_ss to support RTX 5000-series GPUs

StabilityMatrix.Avalonia/App.axaml

@@ -30,6 +30,7 @@
                 <ResourceInclude Source="Styles/FAComboBoxStyles.axaml" />
                 <ResourceInclude Source="Controls/Inference/ImageFolderCard.axaml" />
                 <ResourceInclude Source="Controls/VendorLabs/Themes/BetterAsyncImage.axaml" />
+                <ResourceInclude Source="Styles/ControlThemes/ButtonStyles.Accelerator.axaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <ControlRecycling x:Key="ControlRecyclingKey" />

StabilityMatrix.Avalonia/App.axaml.cs

@@ -3,16 +3,11 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 using Apizr;
 using Apizr.Logging;
 using AsyncAwaitBestPractices;
@@ -47,7 +42,6 @@
 using Polly.Extensions.Http;
 using Polly.Timeout;
 using Refit;
-using Sentry;
 using StabilityMatrix.Avalonia.Behaviors;
 using StabilityMatrix.Avalonia.Helpers;
 using StabilityMatrix.Avalonia.Languages;
@@ -450,7 +444,7 @@ internal static IServiceCollection ConfigureServices()
 
         Config = new ConfigurationBuilder()
             .SetBasePath(Directory.GetCurrentDirectory())
-            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
             .AddEnvironmentVariables()
             .Build();
 
@@ -536,11 +530,12 @@ internal static IServiceCollection ConfigureServices()
                     if (retryCount > 3)
                     {
                         Logger.Info(
-                            "Retry attempt {Count}/{Max} after {Seconds:N2}s due to {Exception}",
+                            "Retry attempt {Count}/{Max} after {Seconds:N2}s due to ({Status}) {Msg}",
                             retryCount,
                             6,
                             timeSpan.TotalSeconds,
-                            result.Exception?.ToString()
+                            result?.Result?.StatusCode,
+                            result?.Result?.ToString()
                         );
                     }
                 }
@@ -563,11 +558,12 @@ internal static IServiceCollection ConfigureServices()
                     if (retryCount > 4)
                     {
                         Logger.Info(
-                            "Retry attempt {Count}/{Max} after {Seconds:N2}s due to {Exception}",
+                            "Retry attempt {Count}/{Max} after {Seconds:N2}s due to ({Status}) {Msg}",
                             retryCount,
                             7,
                             timeSpan.TotalSeconds,
-                            result.Exception?.ToString()
+                            result?.Result?.StatusCode,
+                            result?.Result?.ToString()
                         );
                     }
                 }
@@ -612,6 +608,20 @@ internal static IServiceCollection ConfigureServices()
             })
             .AddPolicyHandler(retryPolicyLonger);
 
+        services
+            .AddRefitClient<ILykosModelDiscoveryApi>(defaultRefitSettings)
+            .ConfigureHttpClient(c =>
+            {
+                c.BaseAddress = new Uri("https://discovery.lykos.ai/api/v1");
+                c.Timeout = TimeSpan.FromHours(1);
+                c.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "");
+            })
+            .AddPolicyHandler(retryPolicy)
+            .AddHttpMessageHandler(
+                serviceProvider =>
+                    new TokenAuthHeaderHandler(serviceProvider.GetRequiredService<LykosAuthTokenProvider>())
+            );
+
         services
             .AddRefitClient<IPyPiApi>(defaultRefitSettings)
             .ConfigureHttpClient(c =>
@@ -1061,10 +1071,53 @@ private static LoggingConfiguration ConfigureLogging()
                 .ForLogger()
                 .FilterMinLevel(NLog.LogLevel.Trace)
                 .WriteTo(
-                    new ConsoleTarget("console")
+                    new ColoredConsoleTarget("console")
                     {
-                        Layout = "[${level:uppercase=true}]\t${logger:shortName=true}\t${message}",
-                        DetectConsoleAvailable = true
+                        Layout =
+                            "[${level:uppercase=true}]\t${logger:shortName=true}\t${message}${onexception:\n${exception:format=tostring}}",
+                        DetectConsoleAvailable = true,
+                        EnableAnsiOutput = true,
+                        WordHighlightingRules =
+                        {
+                            new ConsoleWordHighlightingRule(
+                                "[TRACE]",
+                                ConsoleOutputColor.DarkGray,
+                                ConsoleOutputColor.NoChange
+                            ),
+                            new ConsoleWordHighlightingRule(
+                                "[DEBUG]",
+                                ConsoleOutputColor.Gray,
+                                ConsoleOutputColor.NoChange
+                            ),
+                            new ConsoleWordHighlightingRule(
+                                "[INFO]",
+                                ConsoleOutputColor.DarkGreen,
+                                ConsoleOutputColor.NoChange
+                            ),
+                            new ConsoleWordHighlightingRule(
+                                "[WARN]",
+                                ConsoleOutputColor.Yellow,
+                                ConsoleOutputColor.NoChange
+                            ),
+                            new ConsoleWordHighlightingRule(
+                                "[ERROR]",
+                                ConsoleOutputColor.White,
+                                ConsoleOutputColor.Red
+                            ),
+                            new ConsoleWordHighlightingRule(
+                                "[FATAL]",
+                                ConsoleOutputColor.Black,
+                                ConsoleOutputColor.DarkRed
+                            )
+                        },
+                        RowHighlightingRules =
+                        {
+                            new ConsoleRowHighlightingRule(
+                                "level == LogLevel.Trace",
+                                ConsoleOutputColor.Gray,
+                                ConsoleOutputColor.NoChange
+                            ),
+                        }
                     }
                 )
                 .WithAsync();

StabilityMatrix.Avalonia/Controls/VendorLabs/Cache/CacheBase.cs

@@ -8,6 +8,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -337,6 +338,7 @@ private static ulong CreateHash64(string str)
         return value;
     }
 
+    [DebuggerDisableUserUnhandledExceptions]
     private async Task<T?> GetItemAsync(
         Uri uri,
         bool throwOnError,
@@ -375,7 +377,8 @@ CancellationToken cancellationToken
         }
         catch (Exception ex)
         {
-            System.Diagnostics.Debug.WriteLine(ex.Message);
+            Debug.WriteLine($"Image loading failed for (url={uri}, file={fileName}): {ex.Message}");
+
             if (throwOnError)
             {
                 throw;
@@ -506,6 +509,7 @@ CancellationToken cancellationToken
         return instance;
     }
 
+    [DebuggerDisableUserUnhandledExceptions]
     private async Task<T?> DownloadFileAsync(
         Uri uri,
         string baseFile,

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -1201,6 +1201,9 @@ public static CompletionList SampleCompletionList
                 .ToArray();
         });
 
+    public static SponsorshipPromptViewModel SponsorshipPromptViewModel =>
+        DialogFactory.Get<SponsorshipPromptViewModel>(vm => { });
+
     public static OpenArtWorkflowViewModel OpenArtWorkflowViewModel =>
         new(Services.GetRequiredService<ISettingsManager>(), Services.GetRequiredService<IPackageFactory>())
         {

StabilityMatrix.Avalonia/Extensions/SkiaExtensions.cs

@@ -172,4 +172,15 @@ public static Bitmap ToAvaloniaBitmap(this SKImage image, Vector dpi)
             pixmap.RowBytes
         );
     }
+
+    public static PixelFormat ToAvaloniaPixelFormat(this SKColorType colorType)
+    {
+        // ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault
+        return colorType switch
+        {
+            SKColorType.Rgba8888 => PixelFormat.Rgba8888,
+            SKColorType.Bgra8888 => PixelFormat.Bgra8888,
+            _ => throw new NotSupportedException($"Unsupported SKColorType: {colorType}")
+        };
+    }
 }