A lot of improvements

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.2",
+    "version": "8.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   }

src/ChatPrisma/App.xaml

@@ -16,6 +16,7 @@
                 <ResourceDictionary Source="/Themes/ButtonStyles.xaml" />
                 <ResourceDictionary Source="/Themes/TextBoxStyles.xaml" />
                 <ResourceDictionary Source="/Themes/ScrollBarStyles.xaml" />
+                <ResourceDictionary Source="/Themes/CheckBoxStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

src/ChatPrisma/App.xaml.cs

@@ -10,6 +10,7 @@
 using ChatPrisma.Services.KeyboardHooks;
 using ChatPrisma.Services.TextExtractor;
 using ChatPrisma.Services.TextWriter;
+using ChatPrisma.Services.UpdateOptions;
 using ChatPrisma.Services.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -98,7 +99,7 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
                     o.AppShutdownHeader = "Beenden";
                 });
             services.AddOptions<OpenAIOptions>()
-                .BindConfiguration("OpenAI")
+                .BindConfiguration(OpenAIOptions.Section)
                 .ValidateDataAnnotations()
                 .ValidateOnStart();
             services.AddOptions<ApplicationOptions>()
@@ -123,7 +124,7 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
                     o.CheckForUpdatesInBackground = true;
                     o.MinutesBetweenUpdateChecks = 30;
                 })
-                .BindConfiguration("Updater")
+                .BindConfiguration(UpdaterOptions.Section)
                 .ValidateDataAnnotations()
                 .ValidateOnStart();
             services.AddOptions<HotkeyOptions>()
@@ -134,15 +135,15 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
                     o.HotkeyDelayInMilliseconds = 500;
                     o.ClipboardDelayInMilliseconds = 500;
                 })
-                .BindConfiguration("Hotkey")
+                .BindConfiguration(HotkeyOptions.Section)
                 .ValidateDataAnnotations()
                 .ValidateOnStart();
             services.AddOptions<TextEnhancementOptions>()
                 .Configure(o =>
                 {
                     o.TextSize = 12;
                 })
-                .BindConfiguration("TextEnhancement")
+                .BindConfiguration(TextEnhancementOptions.Section)
                 .ValidateDataAnnotations()
                 .ValidateOnStart();
 
@@ -166,6 +167,7 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
             services.AddSingleton<IPackageExtractor, ZipPackageExtractor>();
             services.AddSingleton<IUpdateManager, UpdateManager>();
             services.AddSingleton<IAutoStartService, RegistryAutoStartService>();
+            services.AddSingleton<IUpdateOptionsService, UpdateOptionsService>();
 
             // Hosted Services
             services.AddHostedService<StartKeyboardHooksHostedService>();

src/ChatPrisma/ChatPrisma.csproj

@@ -7,6 +7,8 @@
         <UseWindowsForms>true</UseWindowsForms>
         <ApplicationIcon>Themes\Images\AppIcon.ico</ApplicationIcon>
         <UserSecretsId>Chat-Prisma-9c00c175-581f-4d2e-a2f2-5e67274af4d4</UserSecretsId>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <NoWarn>$(NoWarn);WFAC010</NoWarn>
     </PropertyGroup>
 
     <ItemGroup Label="Dependencies">
@@ -28,6 +30,19 @@
     <ItemGroup Label="Versioning">
         <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
     </ItemGroup>
+    <Target Name="AppManifestUpdate" 
+            DependsOnTargets="GetBuildVersion"
+            BeforeTargets="CoreCompile" 
+            Condition="'$(Configuration)' == 'Release'">
+      <PropertyGroup>
+        <AppManifestContents>$([System.IO.File]::ReadAllText('app.manifest'))</AppManifestContents>
+        <UpdatedAppManifestContents>$([System.Text.RegularExpressions.Regex]::Replace($(AppManifestContents), '\d+\.\d+\.\d+\.\d+', $(AssemblyVersion)))</UpdatedAppManifestContents>
+      </PropertyGroup>
+
+      <WriteLinesToFile File="app.manifest"
+                        Lines="$(UpdatedAppManifestContents)"
+                        Overwrite="true" />
+    </Target>
 
     <ItemGroup Label="Config">
         <None Update="appsettings.json" CopyToOutputDirectory="PreserveNewest" />

src/ChatPrisma/Common/KeyboardHelper.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+
+namespace ChatPrisma.Common;
+
+public static class KeyboardHelper
+{
+    private static readonly Key[] s_allKeys = Enum.GetValues<Key>();
+
+    public static bool AnyKeyPressed()
+    {
+        foreach (var key in s_allKeys)
+        {
+            // Skip the None key
+            if (key == Key.None)
+                continue;
+
+            if (Keyboard.IsKeyDown(key))
+                return true;
+        }
+
+        return false;
+    }
+}

src/ChatPrisma/Common/TaskHelper.cs

@@ -0,0 +1,33 @@
+namespace ChatPrisma.Common;
+
+public static class TaskHelper
+{
+    public static async Task<bool> WaitUntil(Func<bool> condition, int timeoutInMilliseconds)
+    {
+        var result = await WaitUntil(() => (condition(), string.Empty), timeoutInMilliseconds);
+        return result.Success;
+    }
+    public static async Task<(bool Success, T? Data)> WaitUntil<T>(Func<(bool, T)> condition, int timeoutInMilliseconds)
+    {
+        using var cancellationTokenSource = new CancellationTokenSource(timeoutInMilliseconds);
+        var cancellationToken = cancellationTokenSource.Token;
+
+        try
+        {
+            // Wait until we reach the timeout or condition is true
+            while (true)
+            {
+                var (success, data) = condition();
+                if (success)
+                    return (true, data);
+
+                // This delay is cancellable and will throw an exception if the token is cancelled.
+                await Task.Delay(10, cancellationToken);
+            }
+        }
+        catch (TaskCanceledException)
+        {
+            return (Success: false, Data: default);
+        }
+    }
+}

src/ChatPrisma/Options/ApplicationOptions.cs

@@ -2,7 +2,7 @@
 
 namespace ChatPrisma.Options;
 
-public class ApplicationOptions
+public record ApplicationOptions
 {
     [Required]
     public string ApplicationName { get; set; } = default!;

src/ChatPrisma/Options/HotkeyOptions.cs

@@ -1,14 +1,15 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ChatPrisma.Options
+namespace ChatPrisma.Options;
+
+public record HotkeyOptions
 {
-    public class HotkeyOptions
-    {
-        [Required]
-        public string Key { get; set; } = default!;
-        [Required]
-        public string KeyModifiers { get; set; } = default!;
-        public int HotkeyDelayInMilliseconds { get; set; }
-        public int ClipboardDelayInMilliseconds { get; set; }
-    }
+    public const string Section = "Hotkey";
+
+    [Required]
+    public string Key { get; set; } = default!;
+    [Required]
+    public string KeyModifiers { get; set; } = default!;
+    public int HotkeyDelayInMilliseconds { get; set; }
+    public int ClipboardDelayInMilliseconds { get; set; }
 }

src/ChatPrisma/Options/OpenAIOptions.cs

@@ -2,11 +2,11 @@
 
 namespace ChatPrisma.Options;
 
-public class OpenAIOptions
+public record OpenAIOptions
 {
-    [Required]
-    public string Model { get; set; } = default!;
+    public const string Section = "OpenAI";
 
-    [Required]
-    public string ApiKey { get; set; } = default!;
+    public string? Model { get; set; }
+
+    public string? ApiKey { get; set; }
 }

src/ChatPrisma/Options/TextEnhancementOptions.cs

@@ -1,7 +1,9 @@
 namespace ChatPrisma.Options;
 
-public class TextEnhancementOptions
+public record TextEnhancementOptions
 {
+    public const string Section = "TextEnhancement";
+
     public int TextSize { get; set; }
     public string? CustomInstructions { get; set; }
 }

src/ChatPrisma/Options/UpdaterOptions.cs

@@ -2,8 +2,10 @@
 
 namespace ChatPrisma.Options;
 
-public class UpdaterOptions
+public record UpdaterOptions
 {
+    public const string Section = "Updater";
+
     [Required]
     public string GitHubUsername { get; set; } = default!;
     [Required]

src/ChatPrisma/Services/ChatBot/OpenAIChatBotService.cs

@@ -8,10 +8,21 @@ namespace ChatPrisma.Services.ChatBot;
 
 public class OpenAIChatBotService(IOptionsMonitor<OpenAIOptions> openAiConfig, ILogger<OpenAIChatBotService> logger) : IChatBotService
 {
-    private readonly OpenAIClient _client = new(openAiConfig.CurrentValue.ApiKey ?? throw new PrismaException("OpenAI API Key is missing"));
-
     public async IAsyncEnumerable<string> GetResponse(List<PrismaChatMessage> messages, [EnumeratorCancellation] CancellationToken token = default)
     {
+        var client = this.GetClient();
+        if (client is null)
+        {
+            yield return "Bitte tragen Sie einen OpenAI API-Key in den Einstellungen ein.";
+            yield break;
+        }
+
+        if (string.IsNullOrWhiteSpace(openAiConfig.CurrentValue.Model))
+        {
+            yield return "Bitte tragen Sie ein OpenAI Model in den Einstellungen ein.";
+            yield break;
+        }
+
         var chatCompletionsOptions = new ChatCompletionsOptions();
         foreach (var message in messages)
         {
@@ -20,7 +31,7 @@ public async IAsyncEnumerable<string> GetResponse(List<PrismaChatMessage> messag
 
         logger.LogInformation("Calling ChatGPT model {Model}", openAiConfig.CurrentValue.Model);
 
-        var response = await this._client.GetChatCompletionsStreamingAsync(openAiConfig.CurrentValue.Model, chatCompletionsOptions, token);
+        var response = await client.GetChatCompletionsStreamingAsync(openAiConfig.CurrentValue.Model, chatCompletionsOptions, token);
 
         using var completions = response.Value;
 
@@ -46,4 +57,17 @@ private ChatMessage ConvertChatMessage(PrismaChatMessage message)
 
         return new ChatMessage(openAiChatRole, message.Content);
     }
+
+    private (OpenAIClient Client, string ApiKey)? _lastClient;
+    private OpenAIClient? GetClient()
+    {
+        if (this._lastClient is null || this._lastClient.Value.ApiKey != openAiConfig.CurrentValue.ApiKey)
+        {
+            _lastClient = string.IsNullOrWhiteSpace(openAiConfig.CurrentValue.ApiKey) is false
+                ? (new OpenAIClient(openAiConfig.CurrentValue.ApiKey), openAiConfig.CurrentValue.ApiKey)
+                : null;
+        }
+
+        return _lastClient?.Client;
+    }
 }

src/ChatPrisma/Services/Dialogs/DialogService.cs

@@ -54,7 +54,14 @@ public class DialogService(IServiceProvider serviceProvider, IOptionsMonitor<App
         // Need an await for the caller to yield
         await Task.Yield();
 
-        return window.ShowDialog();
+        var result = window.ShowDialog();
+
+        if (viewModel is IFinalize finalize)
+        {
+            await finalize.FinalizeAsync();
+        }
+
+        return result;
     }
 
     private Type ResolveViewType(object viewModel)

src/ChatPrisma/Services/Dialogs/IFinalize.cs

@@ -0,0 +1,6 @@
+namespace ChatPrisma.Services.Dialogs;
+
+public interface IFinalize
+{
+    Task FinalizeAsync();
+}