resolve revies

Author: phanthaiduong22

app/SharedWebComponents/Models/StreamingMessage.cs

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+namespace SharedWebComponents.Models;
+
+internal class StreamingMessage
+{
+    public string Type { get; set; } = "";
+    public object? Content { get; set; }
+} 

app/SharedWebComponents/Pages/Chat.razor.cs

@@ -3,6 +3,7 @@
 namespace SharedWebComponents.Pages;
 using Microsoft.AspNetCore.SignalR.Client;
 using System.Text.Json;
+using SharedWebComponents.Models;
 
 public sealed partial class Chat : IAsyncDisposable
 {
@@ -250,28 +251,6 @@ private async Task OnAskQuestionAsync(string question)
         await OnAskClickedAsync();
     }
 
-    private async Task OnStreamingToggled(bool isEnabled)
-    {
-        _useStreaming = isEnabled;
-        if (isEnabled)
-        {
-            await ConnectToHub();
-        }
-        else
-        {
-            await DisconnectFromHub();
-        }
-    }
-
-    private async Task DisconnectFromHub()
-    {
-        if (_hubConnection is not null)
-        {
-            await _hubConnection.DisposeAsync();
-            _hubConnection = null;
-        }
-    }
-
     private void UpdateAnswerInMap(string answer, string? citationBaseUrl = null)
     {
         var currentResponse = _questionAndAnswerMap[_currentQuestion];
@@ -354,10 +333,4 @@ private void UpdateImagesInMap(SupportingImageRecord[] images)
             });
         }
     }
-}
-
-internal class StreamingMessage
-{
-    public string Type { get; set; } = "";
-    public object? Content { get; set; }
-}
+}

app/backend/Extensions/WebApplicationExtensions.cs

@@ -16,8 +16,6 @@ internal static WebApplication MapApi(this WebApplication app)
         // Long-form chat w/ contextual history endpoint
         api.MapPost("chat", OnPostChatAsync);
 
-        api.MapPost("chat/stream", OnPostChatStreamingAsync);
-
         // Upload a document
         api.MapPost("documents", OnPostDocumentAsync);
 
@@ -93,24 +91,6 @@ private static async Task<IResult> OnPostChatAsync(
         return Results.BadRequest();
     }
 
-    private static async Task<IResult> OnPostChatStreamingAsync(
-        ChatRequest request,
-        ReadRetrieveReadChatService chatService,
-        CancellationToken cancellationToken)
-    {
-        if (request is { History.Length: > 0 })
-        {
-            await chatService.ReplyStreamingAsync(
-                request.History,
-                request.Overrides,
-                request.ConnectionId,
-                cancellationToken);
-
-            return TypedResults.Ok();
-        }
-        return Results.BadRequest();
-    }
-
     private static async Task<IResult> OnPostDocumentAsync(
         [FromForm] IFormFileCollection files,
         [FromServices] AzureBlobStorageService service,

app/backend/Hubs/ChatHub.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.SignalR;
+using System;
 
 namespace MinimalApi.Hubs;
 
@@ -9,32 +10,14 @@ public class ChatHub : Hub
 
     public ChatHub(ReadRetrieveReadChatService chatService)
     {
-        _chatService = chatService;
+        _chatService = chatService ?? throw new ArgumentNullException(nameof(chatService));
     }
 
     public async Task SendChatRequest(ChatRequest request)
     {
-        try
-        {
-            request.ConnectionId = Context.ConnectionId;
-            await _chatService.ReplyStreamingAsync(
-                request.History,
-                request.Overrides,
-                request.ConnectionId);
-        }
-        catch
-        {
-            throw;
-        }
-    }
-
-    public override async Task OnConnectedAsync()
-    {
-        await base.OnConnectedAsync();
-    }
-
-    public override async Task OnDisconnectedAsync(Exception? exception)
-    {
-        await base.OnDisconnectedAsync(exception);
+        await _chatService.ReplyStreamingAsync(
+            request.History,
+            request.Overrides,
+            Context.ConnectionId);
     }
 }

app/backend/Program.cs

@@ -23,15 +23,24 @@
 {
     static string? GetEnvVar(string key) => Environment.GetEnvironmentVariable(key);
 
-    var endpoint = GetEnvVar("AZURE_SIGNALR_ENDPOINT")
-        ?? throw new InvalidOperationException("AZURE_SIGNALR_ENDPOINT is not configured");
-    var clientId = GetEnvVar("AZURE_CLIENT_ID")
-        ?? throw new InvalidOperationException("AZURE_CLIENT_ID is not configured");
-    
-    options.Endpoints = new[] 
-    { 
-        new ServiceEndpoint(new Uri(endpoint), new ManagedIdentityCredential(clientId))
-    };
+    // Try to get endpoint and client ID first
+    var endpoint = GetEnvVar("AZURE_SIGNALR_ENDPOINT");
+    var clientId = GetEnvVar("AZURE_CLIENT_ID");
+
+    if (endpoint != null && clientId != null)
+    {
+        options.Endpoints = new[] 
+        { 
+            new ServiceEndpoint(new Uri(endpoint), new ManagedIdentityCredential(clientId))
+        };
+    }
+    else
+    {
+        // Fall back to connection string
+        var connectionString = GetEnvVar("AZURE_SIGNALR_CONNECTION_STRING")
+            ?? throw new InvalidOperationException("Neither managed identity credentials nor connection string are configured for Azure SignalR");
+        options.ConnectionString = connectionString;
+    }
 });
 
 if (builder.Environment.IsDevelopment())

app/shared/Shared/Models/ChatRequest.cs

@@ -10,7 +10,4 @@ public record class ChatRequest(
     ) : ApproachRequest(Approach.RetrieveThenRead)
 {
     public string? LastUserQuestion => History?.Last(m => m.Role == "user")?.Content;
-    
-    [JsonPropertyName("connectionId")]
-    public string? ConnectionId { get; set; }
 }