Merge pull request #194 from microsoft/dev

fix: Merging Dev fixes to main branch

Author: Roopan-Microsoft

App/backend-api/Microsoft.GS.DPS.Host/API/KernelMemory/KernelMemory.cs

@@ -49,6 +49,17 @@ DPS.API.KernelMemory kernelMemory
                                                                                  Summary = $"{fileExtension} file is Unsupported file type" });
                     }
 
+                    // Checking File Size: O byte/kb file not allowed
+                    if (file == null || file.Length == 0)
+                    {
+                        return Results.BadRequest(new DocumentImportedResult()
+                        {
+                            DocumentId = string.Empty,
+                            MimeType = contentType,
+                            Summary = "The file is empty and cannot be uploaded. Please select a valid file."
+                        });
+                    }
+
                     var result = await kernelMemory.ImportDocument(fileStream, file.FileName, contentType);
 
                     //Return HTTP 202 with Location Header

App/backend-api/Microsoft.GS.DPS/API/ChatHost/ChatHost.cs

@@ -191,9 +191,41 @@ public async Task<ChatResponse> Chat(ChatRequest chatRequest)
                                         }
             };
 
-            //Get Response from ChatCompletionService
-            ChatMessageContent returnedChatMessageContent = await _chatCompletionService.GetChatMessageContentAsync(chatHistory, executionSettings);
+            ChatMessageContent returnedChatMessageContent;
+            try
+            {
 
+                //Get Response from ChatCompletionService
+                returnedChatMessageContent = await _chatCompletionService.GetChatMessageContentAsync(chatHistory, executionSettings);
+            }
+            catch (HttpOperationException ex) when (ex.Message.Contains("content_filter", StringComparison.OrdinalIgnoreCase))
+            {
+                
+                Console.WriteLine($"Exception Message: {ex.Message}");
+                
+                //if content filter triggered providing fallback response
+                returnedChatMessageContent = new ChatMessageContent
+                {
+                    Content = "Sorry, your request couldn't be processed as it may contain sensitive or restricted content. Please rephrase your query and try again."
+                };
+            }
+            catch(Exception ex)
+            {
+                Console.WriteLine($"unexpected error: {ex.Message}");
+             
+                    returnedChatMessageContent = new ChatMessageContent
+                    {
+                        Content = "An error occured while processing request, try again"
+                    };
+                
+            }
+            if (returnedChatMessageContent == null)
+            {
+                returnedChatMessageContent = new ChatMessageContent
+                {
+                    Content = "No response"
+                };
+            }
             //Just in case returnedChatMessageContent.Content has ```json ``` block, Strip it first
             if (returnedChatMessageContent.Content != null && returnedChatMessageContent.Content.Contains("```json", StringComparison.OrdinalIgnoreCase))
                 returnedChatMessageContent.Content = returnedChatMessageContent.Content.Replace("```json", "").Replace("```", "");
@@ -202,13 +234,21 @@ public async Task<ChatResponse> Chat(ChatRequest chatRequest)
 
             try
             {
-                //Adding for non English Response.
-                returnedChatMessageContent.Content = System.Text.Encoding.UTF8.GetString(System.Text.Encoding.UTF8.GetBytes(returnedChatMessageContent.Content));
-                answerObject = JsonSerializer.Deserialize<Answer>(returnedChatMessageContent.Content, options: new JsonSerializerOptions
+                if (returnedChatMessageContent != null && !string.IsNullOrWhiteSpace(returnedChatMessageContent.Content))
                 {
-                    PropertyNameCaseInsensitive = true,
-                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-                });
+
+                    //Adding for non English Response.
+                    returnedChatMessageContent.Content = System.Text.Encoding.UTF8.GetString(System.Text.Encoding.UTF8.GetBytes(returnedChatMessageContent.Content));
+                    answerObject = JsonSerializer.Deserialize<Answer>(returnedChatMessageContent.Content, options: new JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                    });
+                }
+                else
+                {
+                    throw new NullReferenceException("returnedChatMessageContent or its Content is null.");
+                }
             }
             catch
             {

App/frontend-app/src/components/chat/chatRoom.tsx

@@ -289,7 +289,9 @@ export function ChatRoom({ searchResultDocuments, selectedDocuments, chatWithDoc
     };
 
     function handleSend(ev: TextareaSubmitEvents, data: TextareaValueData) {
-        makeApiRequest(data.value);
+        if (data.value.trim() !='') {               
+            makeApiRequest(data.value);
+        }
     }
 
     // const handleOpenReference = async (referenceId: string, chunkTexts: string[]) => {

App/frontend-app/src/components/uploadButton/uploadButton.tsx

@@ -24,7 +24,7 @@ import { getFileTypeIconProps } from "@fluentui/react-file-type-icons";
 const UploadDocumentsDialog = () => {
   const [isOpen, setIsOpen] = useState(false);
   const [uploadingFiles, setUploadingFiles] = useState<
-    { name: string; progress: number; status: string }[]
+    { name: string; progress: number; status: string; errorMsg:string }[]
   >([]);
   const [isUploading, setIsUploading] = useState(false);
 
@@ -35,6 +35,7 @@ const UploadDocumentsDialog = () => {
       name: file.name,
       progress: 0,
       status: "uploading",
+      errorMsg : ""
     }));
     setUploadingFiles((prev) => [...prev, ...newFiles]);
 
@@ -52,18 +53,19 @@ const UploadDocumentsDialog = () => {
         setUploadingFiles((prev) =>
           prev.map((f, index) =>
             index === prev.length - acceptedFiles.length + i
-              ? { ...f, progress: 100, status: "success" }
+              ? { ...f, progress: 100, status: "success", errorMsg: "" }
               : f
           )
         );
-      } catch (error) {
-        console.error("Error uploading file:", error);
+      } catch (error:any) {
+        const errorMessage = error.message.replace(/^Error:\s*/, ""); // Remove "Error: " prefix
+        const parsedError = JSON.parse(errorMessage);
 
         // Update file status to error
         setUploadingFiles((prev) =>
           prev.map((f, index) =>
             index === prev.length - acceptedFiles.length + i
-              ? { ...f, progress: 100, status: "error" }
+              ? { ...f, progress: 100, status: "error", errorMsg: parsedError.summary}
               : f
           )
         );
@@ -188,13 +190,17 @@ const UploadDocumentsDialog = () => {
                   )}
                 </div>
                 <ProgressBar value={file.progress} />
-                <span>
+                <span
+                style={{
+                  color: file.status === "error" ? "red" : "inherit", // Apply red color only for error messages
+                }}>
                   {file.status === "uploading"
                     ? "Uploading..."
                     : file.status === "success"
                     ? "Upload complete"
-                    : "Upload failed"}
+                    : file.errorMsg}
                 </span>
+                <span>{}</span>
               </div>
             ))}
           </DialogContent>

Deployment/resourcedeployment.ps1

@@ -176,15 +176,18 @@ function DeployAzureResources([string]$location, [string]$modelLocation) {
         if ($LASTEXITCODE -ne 0) {
             Write-Host "There might be something wrong with your deployment." -ForegroundColor Red
             Write-Host $whatIfResult -ForegroundColor Red
+            failureBanner
             exit 1            
         }
         # Proceed with the actual deployment
         Write-Host "Proceeding with Deployment..." -ForegroundColor Yellow
         $deploymentResult = az deployment sub create --template-file .\main.bicep --location $location --name $deploymentName --parameters modeldatacenter=$modelLocation
-
+        # Check if deploymentResult is valid        
+        ValidateVariableIsNullOrEmpty -variableValue $deploymentResult -variableName "Deployment Result"  
         if ($LASTEXITCODE -ne 0) {
             Write-Host "Deployment failed. Stopping execution." -ForegroundColor Red
             Write-Host $deploymentResult -ForegroundColor Red
+            failureBanner
             exit 1
         }
 
@@ -197,6 +200,7 @@ function DeployAzureResources([string]$location, [string]$modelLocation) {
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.InvocationInfo.PositionMessage -ForegroundColor Red
         Write-Host $_.ScriptStackTrace -ForegroundColor Red
+        failureBanner
         exit 1
     }
 }
@@ -410,6 +414,7 @@ function Check-Docker {
 # Check if Docker is running before proceeding
 if (-not (Check-Docker)) {
     Write-Host "Docker is not running. Please start Docker and try again." -ForegroundColor Red
+    failureBanner
     exit 1
 }
 
@@ -439,6 +444,9 @@ try {
     # Step 2 : Get Secrets from Azure resources
     Show-Banner -Title "Step 2 : Get Secrets from Azure resources"
     ###############################################################
+    # Validate if the Storage Account Name is empty or null    
+    ValidateVariableIsNullOrEmpty -variableValue $deploymentResult.StorageAccountName -variableName "Storage Account Name"
+
     # Get the storage account key
     $storageAccountKey = az storage account keys list --account-name $deploymentResult.StorageAccountName --resource-group $deploymentResult.ResourceGroupName --query "[0].value" -o tsv
 
@@ -596,6 +604,7 @@ try {
 
     if ($retryCount -eq $maxRetries) {
         Write-Host "Max retries reached. Failed to update the AKS cluster." -ForegroundColor Red
+        failureBanner
         exit 1
     }
 
@@ -615,6 +624,7 @@ try {
         Write-Host "Error details:" -ForegroundColor Red
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.Exception.StackTrace -ForegroundColor Red
+        failureBanner
         exit 1
     }
 
@@ -630,6 +640,7 @@ try {
         Write-Host "Error details:" -ForegroundColor Red
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.Exception.StackTrace -ForegroundColor Red
+        failureBanner
         exit 1
     }
 
@@ -650,6 +661,7 @@ try {
         Write-Host "Error details:" -ForegroundColor Red
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.Exception.StackTrace -ForegroundColor Red
+        failureBanner
         exit 1
     }
 
@@ -716,6 +728,9 @@ try {
     # Validate if System Assigned Identity is null or empty
     ValidateVariableIsNullOrEmpty -variableValue $systemAssignedIdentity -variableName "System-assigned managed identity"    
 
+     # Validate if ResourceGroupId is null or empty
+    ValidateVariableIsNullOrEmpty -variableValue $deploymentResult.ResourceGroupId -variableName "ResourceGroupId"    
+ 
     # Assign the role for aks system assigned managed identity to App Configuration Data Reader role with the scope of Resourcegroup
     az role assignment create --assignee $systemAssignedIdentity --role "App Configuration Data Reader" --scope $deploymentResult.ResourceGroupId
 
@@ -743,6 +758,7 @@ try {
         Write-Host "Error details:" -ForegroundColor Red
         Write-Host $_.Exception.Message -ForegroundColor Red
         Write-Host $_.Exception.StackTrace -ForegroundColor Red
+        failureBanner
         exit 1
     }
 
@@ -772,12 +788,21 @@ try {
 
 
     # 5.3 Update deploy.deployment.yaml.template file and save as deploy.deployment.yaml
+    # Validate AzContainerRegistryName IsNull Or Empty.
+    ValidateVariableIsNullOrEmpty -variableValue $deploymentResult.AzContainerRegistryName -variableName "Azure Container Registry Name"
+
     ## Define Image Tags
     $acrNamespace = "kmgs"
     $acrAIServiceTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/aiservice"
     $acrKernelMemoryTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/kernelmemory"
     $acrFrontAppTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/frontapp"
-
+    
+    # Validate AI Service Tag IsNull Or Empty.    
+    ValidateVariableIsNullOrEmpty -variableValue $acrAIServiceTag -variableName "AI Service Tag"
+    # Validate Kernel Memory Tag IsNull Or Empty.   
+    ValidateVariableIsNullOrEmpty -variableValue $acrKernelMemoryTag -variableName "Kernel Memory Tag"
+    # Validate Front App Tag IsNull Or Empty.   
+    ValidateVariableIsNullOrEmpty -variableValue $acrFrontAppTag -variableName "Front App Tag"
 
     $deploymentTemplatePlaceholders = @{
         '{{ aiservice-imagepath }}' = $acrAIServiceTag
@@ -821,8 +846,9 @@ try {
 
 
 #======================================================================================================================================================================
+    # Validate AzAppConfigEndpoint IsNull Or Empty.
+    ValidateVariableIsNullOrEmpty -variableValue $deploymentResult.AzAppConfigEndpoint -variableName "Azure App Configuration Endpoint"
     # App Deployment after finishing the AKS infrastructure setup
-    
     $appConfigServicePlaceholders = @{
         '{{ appconfig-url }}' = $deploymentResult.AzAppConfigEndpoint
     }