Add new changes to DocumentAI

Geeksltd · Jan 29, 2025 · c0cf0f5 · c0cf0f5
1 parent 4cd5622
commit c0cf0f5
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 3 deletions.
diff --git a/Olive.Azure.DocumentAnalyzer/DocumentAnalyze.cs b/Olive.Azure.DocumentAnalyzer/DocumentAnalyze.cs
@@ -128,7 +128,53 @@ public async Task<DocumentAnalyzeModelResponse> ListDocumentAnalyzeModelsAsync(b
 
     }
 
-    public async Task<DocumentAnalyzeResult> AnalyzeDocumentAsync(byte[] fileData, string modelId, bool useFormRecognizer = false)
+    public async Task<string> AnalyzeDocumentAsync(byte[] fileData, string modelId, bool useFormRecognizer = false)
+    {
+        var requestUrl = $"{endpoint}/{(useFormRecognizer ? "formrecognizer" : "documentintelligence")}/documentModels/{modelId}:analyze?api-version={apiVersion}";
+        var request = new HttpRequestMessage(HttpMethod.Post, requestUrl);
+        httpClient.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", apiKey);
+
+        // Convert the file to a Base64 string
+        string base64String = Convert.ToBase64String(fileData);
+
+        // Create the JSON payload
+        var payload = new
+        {
+            base64Source = base64String
+        };
+
+        request.Content = new StringContent(JsonConvert.SerializeObject(payload));
+        request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+        try
+        {
+            var response = await httpClient.SendAsync(request);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var resultUrl = response.Headers.GetValues("Operation-Location").FirstOrDefault();
+                if (resultUrl is not null)
+                {
+                    return resultUrl;
+                }
+                else
+                {
+                    throw new Exception("No operation location header found in response.");
+                }
+            }
+            else
+            {
+                var message = await response.Content.ReadAsStringAsync();
+                throw new Exception($"Failed to analyze document. Error Message: {message}");
+            }
+        }
+        catch (Exception ex)
+        {
+            throw ex;
+        }
+    }
+
+    public async Task<DocumentAnalyzeResult> AnalyzeDocumentAsyncWithPoll(byte[] fileData, string modelId, bool useFormRecognizer = false)
     {
         var requestUrl = $"{endpoint}/{(useFormRecognizer ? "formrecognizer" : "documentintelligence")}/documentModels/{modelId}:analyze?api-version={apiVersion}";
         var request = new HttpRequestMessage(HttpMethod.Post, requestUrl);
@@ -175,7 +221,7 @@ public async Task<DocumentAnalyzeResult> AnalyzeDocumentAsync(byte[] fileData, s
 
     }
 
-    async Task<DocumentAnalyzeResult> PollForResults(string resultUrl)
+    private async Task<DocumentAnalyzeResult> PollForResults(string resultUrl)
     {
         httpClient.DefaultRequestHeaders.Clear();
         httpClient.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", apiKey);
@@ -208,6 +254,24 @@ async Task<DocumentAnalyzeResult> PollForResults(string resultUrl)
         }
     }
 
+    public async Task<DocumentAnalyzeResult> GetPollResults(string resultUrl)
+    {
+        httpClient.DefaultRequestHeaders.Clear();
+        httpClient.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", apiKey);
+
+        HttpResponseMessage response = await httpClient.GetAsync(resultUrl);
+        string jsonResponse = await response.Content.ReadAsStringAsync();
+
+        if (response.IsSuccessStatusCode)
+        {
+            return JsonConvert.DeserializeObject<DocumentAnalyzeResult>(jsonResponse);
+        }
+        else
+        {
+            throw new Exception("Failed to poll for results.");
+        }
+    }
+
     async Task<BuildDocumentAnalyzerResponse> GetOperationStatusAsync(string operationUrl)
     {
         httpClient.DefaultRequestHeaders.Clear();

diff --git a/Olive.Azure.DocumentAnalyzer/Olive.Azure.DocumentAnalyzer.csproj b/Olive.Azure.DocumentAnalyzer/Olive.Azure.DocumentAnalyzer.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	  <Version>1.0.5</Version>
+	  <Version>1.0.6</Version>
   </PropertyGroup>
 
   <ItemGroup>