[AOT] Clean up some AOT issues in Advanced Paste module

src/modules/AdvancedPaste/AdvancedPaste/Helpers/AdvancedPasteJsonSerializerContext.cs

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+using AdvancedPaste.Models.KernelQueryCache;
+
+namespace AdvancedPaste.Helpers;
+
+[JsonSerializable(typeof(PersistedCache))]
+[JsonSerializable(typeof(LogEvent))]
+[JsonSourceGenerationOptions(UseStringEnumConverter = true)]
+public sealed partial class AdvancedPasteJsonSerializerContext : JsonSerializerContext
+{
+}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/LogEvent.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json;
+using AdvancedPaste.Models.KernelQueryCache;
+using AdvancedPaste.Telemetry;
+
+namespace AdvancedPaste.Helpers
+{
+    public class LogEvent
+    {
+        public LogEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string actionChain)
+        {
+            CacheUsed = cacheUsed;
+            IsSavedQuery = isSavedQuery;
+            PromptTokens = promptTokens;
+            CompletionTokens = completionTokens;
+            ModelName = modelName;
+            ActionChain = actionChain;
+        }
+
+        public LogEvent(AdvancedPasteSemanticKernelFormatEvent semanticKernalFormatEvent)
+        {
+            CacheUsed = semanticKernalFormatEvent.CacheUsed;
+            IsSavedQuery = semanticKernalFormatEvent.IsSavedQuery;
+            PromptTokens = semanticKernalFormatEvent.PromptTokens;
+            CompletionTokens = semanticKernalFormatEvent.CompletionTokens;
+            ModelName = semanticKernalFormatEvent.ModelName;
+            ActionChain = semanticKernalFormatEvent.ActionChain;
+        }
+
+        public LogEvent(AdvancedPasteGenerateCustomFormatEvent generateCustomFormatEvent)
+        {
+            PromptTokens = generateCustomFormatEvent.PromptTokens;
+            CompletionTokens = generateCustomFormatEvent.CompletionTokens;
+            ModelName = generateCustomFormatEvent.ModelName;
+        }
+
+        public bool IsSavedQuery { get; set; }
+
+        public bool CacheUsed { get; set; }
+
+        public int PromptTokens { get; set; }
+
+        public int CompletionTokens { get; set; }
+
+        public string ModelName { get; set; }
+
+        public string ActionChain { get; set; }
+
+        public string ToJsonString() => JsonSerializer.Serialize(this, AdvancedPasteJsonSerializerContext.Default.PersistedCache);
+    }
+}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeMethods.cs

@@ -18,7 +18,7 @@ internal struct INPUT
 
             internal static int Size
             {
-                get { return Marshal.SizeOf(typeof(INPUT)); }
+                get { return Marshal.SizeOf<INPUT>(); }
             }
         }
 

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -16,7 +16,7 @@
 
 namespace AdvancedPaste.Settings
 {
-    internal sealed class UserSettings : IUserSettings, IDisposable
+    internal sealed partial class UserSettings : IUserSettings, IDisposable
     {
         private readonly SettingsUtils _settingsUtils;
         private readonly TaskScheduler _taskScheduler;

src/modules/AdvancedPaste/AdvancedPaste/Models/KernelQueryCache/PersistedCache.cs

@@ -15,23 +15,15 @@ public sealed class PersistedCache : ISettingsConfig
 {
     public record class CacheItem(CacheKey CacheKey, CacheValue CacheValue);
 
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        Converters =
-        {
-            new JsonStringEnumConverter(),
-        },
-    };
-
-    public static PersistedCache FromJsonString(string json) => JsonSerializer.Deserialize<PersistedCache>(json, SerializerOptions);
+    public static PersistedCache FromJsonString(string json) => JsonSerializer.Deserialize<PersistedCache>(json, AdvancedPasteJsonSerializerContext.Default.PersistedCache);
 
     public string Version { get; init; }
 
     public List<CacheItem> Items { get; init; } = [];
 
     public string GetModuleName() => Constants.AdvancedPasteModuleName;
 
-    public string ToJsonString() => JsonSerializer.Serialize(this, SerializerOptions);
+    public string ToJsonString() => JsonSerializer.Serialize(this, AdvancedPasteJsonSerializerContext.Default.PersistedCache);
 
     public override string ToString() => ToJsonString();
 

src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs

@@ -174,9 +174,8 @@ private void LogResult(bool cacheUsed, bool isSavedQuery, IEnumerable<ActionChai
     {
         AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(cacheUsed, isSavedQuery, usage.PromptTokens, usage.CompletionTokens, ModelName, AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
         PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
-
-        var logEvent = new { telemetryEvent.CacheUsed, telemetryEvent.IsSavedQuery, telemetryEvent.PromptTokens, telemetryEvent.CompletionTokens, telemetryEvent.ModelName, telemetryEvent.ActionChain };
-        Logger.LogDebug($"{nameof(TransformClipboardAsync)} complete; {JsonSerializer.Serialize(logEvent)}");
+        var logEvent = new LogEvent(telemetryEvent);
+        Logger.LogDebug($"{nameof(TransformClipboardAsync)} complete; {logEvent.ToJsonString()}");
     }
 
     private Kernel CreateKernel()

src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/CustomTextTransformService.cs

@@ -85,9 +85,9 @@ public async Task<string> TransformTextAsync(string prompt, string inputText)
             var usage = response.Usage;
             AdvancedPasteGenerateCustomFormatEvent telemetryEvent = new(usage.PromptTokens, usage.CompletionTokens, ModelName);
             PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
+            var logEvent = new LogEvent(telemetryEvent);
 
-            var logEvent = new { telemetryEvent.PromptTokens, telemetryEvent.CompletionTokens, telemetryEvent.ModelName };
-            Logger.LogDebug($"{nameof(TransformTextAsync)} complete; {JsonSerializer.Serialize(logEvent)}");
+            Logger.LogDebug($"{nameof(TransformTextAsync)} complete; {logEvent.ToJsonString()}");
 
             return response.Choices[0].Text;
         }