Merge branch 'main' of github.com:Azure/aihub

Azure · Feb 28, 2024 · 9cc8c14 · 9cc8c14
2 parents 97caf81 + 80430c7
commit 9cc8c14
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 107 deletions.
diff --git a/src/AIHub/Controllers/AudioTranscriptionController.cs b/src/AIHub/Controllers/AudioTranscriptionController.cs
@@ -42,7 +42,7 @@ public async Task<IActionResult> TranscribeAudio(string audio_url, IFormFile ima
         request.Content = content;
         var response = await httpClient.SendAsync(request);
         response.EnsureSuccessStatusCode();
-        var responsejson = JsonConvert.DeserializeObject<dynamic>(await response.Content.ReadAsStringAsync())!;
+        var responsejson = JsonSerializer.Deserialize<dynamic>(await response.Content.ReadAsStringAsync())!;
         Console.WriteLine(responsejson);
         var output_result = responsejson.self.ToString();
         Console.WriteLine("SELF: " + output_result);
@@ -56,13 +56,13 @@ public async Task<IActionResult> TranscribeAudio(string audio_url, IFormFile ima
         var response2 = await httpClient.SendAsync(request2);
         response2.EnsureSuccessStatusCode();
         //Console.WriteLine(await response2.Content.ReadAsStringAsync());
-        var responsejson2 = JsonConvert.DeserializeObject<dynamic>(await response.Content.ReadAsStringAsync())!;
+        var responsejson2 = JsonSerializer.Deserialize<dynamic>(await response.Content.ReadAsStringAsync())!;
         Console.WriteLine(responsejson2);
         while (responsejson2.status != "Succeeded")
         {
             Thread.Sleep(10000);
             response2 = await httpClient.GetAsync(output_result);
-            responsejson2 = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+            responsejson2 = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
             Console.WriteLine(responsejson2.status);
         }
 
@@ -74,7 +74,7 @@ public async Task<IActionResult> TranscribeAudio(string audio_url, IFormFile ima
         request3.Content = content3;
         var response3 = await httpClient.SendAsync(request3);
         response3.EnsureSuccessStatusCode();
-        var responsejson3 = JsonConvert.DeserializeObject<dynamic>(await response3.Content.ReadAsStringAsync())!;
+        var responsejson3 = JsonSerializer.Deserialize<dynamic>(await response3.Content.ReadAsStringAsync())!;
         Console.WriteLine(responsejson3);
         // Extract contentUrl field
         string output_result3 = (string)responsejson3["values"][0]["links"]["contentUrl"];
@@ -89,7 +89,7 @@ public async Task<IActionResult> TranscribeAudio(string audio_url, IFormFile ima
         var response4 = await httpClient.SendAsync(request4);
         response4.EnsureSuccessStatusCode();
         Console.WriteLine(await response4.Content.ReadAsStringAsync());
-        var jsonObject4 = JsonConvert.DeserializeObject<JObject>(await response4.Content.ReadAsStringAsync())!;
+        var jsonObject4 = JsonSerializer.Deserialize<JsonObject>(await response4.Content.ReadAsStringAsync())!;
         string output_result4 = (string)jsonObject4["combinedRecognizedPhrases"]![0]!["lexical"]!;
         Console.WriteLine(output_result4);
 
@@ -103,7 +103,7 @@ public async Task<IActionResult> TranscribeAudio(string audio_url, IFormFile ima
 
     public class SpeechToTextResponse
     {
-        [JsonProperty("text")]
+        [JsonPropertyName("text")]
         public string Text { get; set; } = string.Empty;
     }
 

diff --git a/src/AIHub/Controllers/BrandAnalyzerController.cs b/src/AIHub/Controllers/BrandAnalyzerController.cs
@@ -59,7 +59,7 @@ public async Task<IActionResult> AnalyzeCompany()
         // Parse the response as JSON
         try
         {
-            var responsejson = JsonConvert.DeserializeObject<dynamic>(await response.Content.ReadAsStringAsync())!;
+            var responsejson = JsonSerializer.Deserialize<dynamic>(await response.Content.ReadAsStringAsync())!;
 
             // Get the web pages from the response
             var news = responsejson.webPages.value;

diff --git a/src/AIHub/Controllers/DocumentComparisonController.cs b/src/AIHub/Controllers/DocumentComparisonController.cs
@@ -81,15 +81,15 @@ public async Task<IActionResult> DocumentComparison(string[] document_urls, stri
             HttpResponseMessage response2 = await httpClient.GetAsync(operation_location_url);  // Blocking call! Program will wait here until a response is received or a timeout occurs.
             Console.WriteLine(response2);
             response2.EnsureSuccessStatusCode();
-            dynamic responsejson = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+            dynamic responsejson = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
 
             while (responsejson.status != "succeeded")
             {
                 if (response2 != null)
                 {
                     Thread.Sleep(10000);
                     response2 = await httpClient.GetAsync(operation_location_url);
-                    responsejson = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+                    responsejson = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
                 }
             }
             output_result[i] = responsejson.analyzeResult.content.ToString();

diff --git a/src/AIHub/Controllers/FormAnalyzerController.cs b/src/AIHub/Controllers/FormAnalyzerController.cs
@@ -82,14 +82,14 @@ public async Task<IActionResult> AnalyzeForm(string image_url, string prompt)
         Console.WriteLine(response2);
         response2.EnsureSuccessStatusCode();
         var responseBody = await response2.Content.ReadAsStringAsync();
-        var responsejson = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+        var responsejson = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
 
         //var analyzeresult = responseBody.analyzeResult;            
         while (responsejson.status != "succeeded")
         {
             Thread.Sleep(10000);
             response2 = await httpClient.GetAsync(operation_location_url);
-            responsejson = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+            responsejson = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
         }
         output_result = responsejson.analyzeResult.content.ToString();
 

diff --git a/src/AIHub/Controllers/ImageAnalyzerController.cs b/src/AIHub/Controllers/ImageAnalyzerController.cs
@@ -73,7 +73,7 @@ public async Task<IActionResult> DenseCaptionImage(string image_url)
         // Parse the response as JSON
         try
         {
-            var responsejson = JsonConvert.DeserializeObject<dynamic>(await response.Content.ReadAsStringAsync())!;
+            var responsejson = JsonSerializer.Deserialize<dynamic>(await response.Content.ReadAsStringAsync())!;
             // Get the web pages from the response
             var dense_descriptions = responsejson.denseCaptionsResult.values;
             // Iterate over the news items and print them
@@ -116,7 +116,7 @@ public async Task<IActionResult> DenseCaptionImage(string image_url)
         // Parse the response as JSON
         try
         {
-            var responsejson2 = JsonConvert.DeserializeObject<dynamic>(await response2.Content.ReadAsStringAsync())!;
+            var responsejson2 = JsonSerializer.Deserialize<dynamic>(await response2.Content.ReadAsStringAsync())!;
             Console.WriteLine(responsejson2.ToString());
             // Get the web pages from the response
             var ocr = responsejson2.readResult.content;

diff --git a/src/AIHub/GlobalUsings.cs b/src/AIHub/GlobalUsings.cs
@@ -8,8 +8,7 @@
 global using Azure.Storage.Blobs.Models;
 global using Azure.AI.OpenAI;
 global using System.Net.Http.Headers;
-global using Newtonsoft.Json;
-global using Newtonsoft.Json.Linq;
 global using System.Text;
 global using System.Text.Json;
+global using System.Text.Json.Nodes;
 global using System.Text.Json.Serialization;