Merge main

webapi/Controllers/MaintenanceController.cs

@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System.Threading;
-using System.Threading.Tasks;
 using CopilotChat.WebApi.Models.Response;
 using CopilotChat.WebApi.Options;
-using CopilotChat.WebApi.Services.MemoryMigration;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -41,25 +39,11 @@ public MaintenanceController(
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    public async Task<ActionResult<MaintenanceResult?>> GetMaintenanceStatusAsync(
-        [FromServices] IChatMigrationMonitor migrationMonitor,
+    public ActionResult<MaintenanceResult?> GetMaintenanceStatusAsync(
         CancellationToken cancellationToken = default)
     {
         MaintenanceResult? result = null;
 
-        var migrationStatus = await migrationMonitor.GetCurrentStatusAsync(cancellationToken);
-
-        if (migrationStatus != ChatMigrationStatus.None)
-        {
-            result =
-                new MaintenanceResult
-                {
-                    Title = "Migrating Chat Memory",
-                    Message = "An upgrade requires that all non-document memories be migrated.  This may take several minutes...",
-                    Note = "Note: All document memories will need to be re-imported.",
-                };
-        }
-
         if (this._serviceOptions.Value.InMaintenance)
         {
             result = new MaintenanceResult(); // Default maintenance message

webapi/Extensions/ServiceExtensions.cs

@@ -10,7 +10,6 @@
 using CopilotChat.WebApi.Models.Storage;
 using CopilotChat.WebApi.Options;
 using CopilotChat.WebApi.Services;
-using CopilotChat.WebApi.Services.MemoryMigration;
 using CopilotChat.WebApi.Storage;
 using CopilotChat.WebApi.Utilities;
 using Microsoft.AspNetCore.Authentication;
@@ -129,19 +128,9 @@ internal static IServiceCollection AddPlugins(this IServiceCollection services,
 
     internal static IServiceCollection AddMaintenanceServices(this IServiceCollection services)
     {
-        // Inject migration services
-        services.AddSingleton<IChatMigrationMonitor, ChatMigrationMonitor>();
-        services.AddSingleton<IChatMemoryMigrationService, ChatMemoryMigrationService>();
-
-        // Inject actions so they can be part of the action-list.
-        services.AddSingleton<ChatMigrationMaintenanceAction>();
+        // Inject action stub
         services.AddSingleton<IReadOnlyList<IMaintenanceAction>>(
-            sp =>
-                (IReadOnlyList<IMaintenanceAction>)
-                new[]
-                {
-                    sp.GetRequiredService<ChatMigrationMaintenanceAction>(),
-                });
+            sp => (IReadOnlyList<IMaintenanceAction>)Array.Empty<IMaintenanceAction>());
 
         return services;
     }