Merge pull request #12 from microsoft/bug-fix-1026

Merging bug fixes 1026

Author: toherman-msft

App/backend-api/Microsoft.GS.DPS.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.GS.DPS", "Microso
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.GS.DPS.Host", "Microsoft.GS.DPS.Host\Microsoft.GS.DPS.Host.csproj", "{3BBCDD67-966B-442A-9A34-FE6D311B4824}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.GS.DPS.Playground", "Microsoft.GS.DPS.Playground\Microsoft.GS.DPS.Playground.csproj", "{D3A41803-45E6-4641-A27A-CB86A2337361}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,8 +21,6 @@ Global
 		{3BBCDD67-966B-442A-9A34-FE6D311B4824}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BBCDD67-966B-442A-9A34-FE6D311B4824}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BBCDD67-966B-442A-9A34-FE6D311B4824}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3A41803-45E6-4641-A27A-CB86A2337361}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{D3A41803-45E6-4641-A27A-CB86A2337361}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -1,4 +1,4 @@
-using Microsoft.GS.DPS.Model.ChatHost;
+using Microsoft.GS.DPS.Model.ChatHost;
 using Microsoft.GS.DPS.Storage.ChatSessions.Entities;
 using Microsoft.GS.DPS.Storage.ChatSessions;
 using Microsoft.KernelMemory;
@@ -159,6 +159,7 @@ public async Task<ChatResponse> Chat(ChatRequest chatRequest)
             //Get the answer from the Kernel Memory
             var answer = await _kernelMemory.Ask(chatRequest.Question + ChatHost.s_additionalPrompt, chatRequest.DocumentIds, context: context);
 
+            answer.Result = System.Text.Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(answer.Result));
             Console.WriteLine($"Question: {answer.Question}");
             Console.WriteLine($"Answer: {answer.Result}");
 
@@ -201,8 +202,13 @@ public async Task<ChatResponse> Chat(ChatRequest chatRequest)
 
             try
             {
-                answerObject = JsonSerializer.Deserialize<Answer>(returnedChatMessageContent.Content, options: JsonSerializationOptionsCache.JsonSerializationOptionsIgnoreCase);
-
+                //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
+                });
             }
             catch
             {
@@ -245,4 +251,4 @@ public async Task<ChatResponse> Chat(ChatRequest chatRequest)
             };
         }
     }
-}
+}