new errors (Azure#18834)

Author: maririos

sdk/textanalytics/Azure.AI.TextAnalytics/src/Transforms.cs

@@ -478,49 +478,68 @@ internal static AnalyzeBatchActionsResult ConvertToAnalyzeBatchActionsResult(Ana
             return new AnalyzeBatchActionsResult(extractKeyPhrasesActionResult, recognizeEntitiesActionResults, recognizePiiEntitiesActionResults, jobState.Statistics);
         }
 
-        internal static IReadOnlyCollection<ExtractKeyPhrasesActionResult> ConvertToExtractKeyPhrasesActionResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> errors)
+        internal static IReadOnlyCollection<ExtractKeyPhrasesActionResult> ConvertToExtractKeyPhrasesActionResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> tasksErrors)
         {
             var collection = new List<ExtractKeyPhrasesActionResult>();
             int index = 0;
             foreach (KeyPhraseExtractionTasksItem task in jobState.Tasks.KeyPhraseExtractionTasks)
             {
-                TextAnalyticsErrorInternal error;
-                errors.TryGetValue(index, out error);
-
-                collection.Add(new ExtractKeyPhrasesActionResult(ConvertToExtractKeyPhrasesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, error));
+                tasksErrors.TryGetValue(index, out TextAnalyticsErrorInternal taskError);
 
+                if (taskError != null)
+                {
+                    collection.Add(new ExtractKeyPhrasesActionResult(null, task.LastUpdateDateTime, taskError));
+                }
+                else
+                {
+                    collection.Add(new ExtractKeyPhrasesActionResult(ConvertToExtractKeyPhrasesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, null));
+                }
                 index++;
             }
 
             return collection;
         }
 
-        internal static IReadOnlyCollection<RecognizePiiEntitiesActionResult> ConvertToRecognizePiiEntitiesActionsResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> errors)
+        internal static IReadOnlyCollection<RecognizePiiEntitiesActionResult> ConvertToRecognizePiiEntitiesActionsResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> tasksErrors)
         {
             var collection = new List<RecognizePiiEntitiesActionResult>();
             int index = 0;
             foreach (EntityRecognitionPiiTasksItem task in jobState.Tasks.EntityRecognitionPiiTasks)
             {
-                TextAnalyticsErrorInternal error;
-                errors.TryGetValue(index, out error);
+                tasksErrors.TryGetValue(index, out TextAnalyticsErrorInternal taskError);
 
-                collection.Add(new RecognizePiiEntitiesActionResult(ConvertToRecognizePiiEntitiesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, error));
+                if (taskError != null)
+                {
+                    collection.Add(new RecognizePiiEntitiesActionResult(null, task.LastUpdateDateTime, taskError));
+                }
+                else
+                {
+                    collection.Add(new RecognizePiiEntitiesActionResult(ConvertToRecognizePiiEntitiesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, taskError));
+                }
                 index++;
             }
 
             return collection;
         }
 
-        internal static IReadOnlyCollection<RecognizeEntitiesActionResult> ConvertToRecognizeEntitiesActionsResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> errors)
+        internal static IReadOnlyCollection<RecognizeEntitiesActionResult> ConvertToRecognizeEntitiesActionsResults(AnalyzeJobState jobState, IDictionary<string, int> idToIndexMap, IDictionary<int, TextAnalyticsErrorInternal> tasksErrors)
         {
             var collection = new List<RecognizeEntitiesActionResult>();
             int index = 0;
             foreach (EntityRecognitionTasksItem task in jobState.Tasks.EntityRecognitionTasks)
             {
-                TextAnalyticsErrorInternal error;
-                errors.TryGetValue(index, out error);
+                tasksErrors.TryGetValue(index, out TextAnalyticsErrorInternal taskError);
 
-                collection.Add(new RecognizeEntitiesActionResult(ConvertToRecognizeEntitiesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, error));
+                tasksErrors.TryGetValue(index, out taskError);
+
+                if (taskError != null)
+                {
+                    collection.Add(new RecognizeEntitiesActionResult(null, task.LastUpdateDateTime, taskError));
+                }
+                else
+                {
+                    collection.Add(new RecognizeEntitiesActionResult(ConvertToRecognizeEntitiesResultCollection(task.ResultsInternal, idToIndexMap), task.LastUpdateDateTime, taskError));
+                }
                 index++;
             }
 

sdk/textanalytics/Azure.AI.TextAnalytics/tests/AnalyzeOperationTests.cs

@@ -330,6 +330,22 @@ public async Task AnalyzeOperationBatchWithErrorTest()
                         ModelVersion = "InvalidVersion"
                     }
                 },
+                RecognizeEntitiesOptions = new List<RecognizeEntitiesOptions>()
+                {
+                    new RecognizeEntitiesOptions(),
+                    new RecognizeEntitiesOptions()
+                    {
+                        ModelVersion = "InvalidVersion"
+                    }
+                },
+                RecognizePiiEntitiesOptions = new List<RecognizePiiEntitiesOptions>()
+                {
+                    new RecognizePiiEntitiesOptions(),
+                    new RecognizePiiEntitiesOptions()
+                    {
+                        ModelVersion = "InvalidVersion"
+                    }
+                },
                 DisplayName = "AnalyzeOperationBatchWithErrorTest",
             };
 
@@ -340,15 +356,41 @@ public async Task AnalyzeOperationBatchWithErrorTest()
             //Take the first page
             AnalyzeBatchActionsResult resultCollection = operation.Value.ToEnumerableAsync().Result.FirstOrDefault();
 
-            ExtractKeyPhrasesActionResult resultWithActionError = resultCollection.ExtractKeyPhrasesActionsResults.ElementAtOrDefault(1);
+            //Key phrases
+            var keyPhrasesActions = resultCollection.ExtractKeyPhrasesActionsResults.ToList();
+
+            Assert.IsFalse(keyPhrasesActions[0].HasError);
+            Assert.AreEqual(3, keyPhrasesActions[0].Result.Count);
+            var kpEmptyDocument = keyPhrasesActions[0].Result.ElementAt(2);
+            Assert.IsTrue(kpEmptyDocument.HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidDocument, kpEmptyDocument.Error.ErrorCode.ToString());
+
+            Assert.IsTrue(keyPhrasesActions[1].HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidRequest, keyPhrasesActions[1].Error.ErrorCode.ToString());
+
+            // Entities
+            var entitiesActions = resultCollection.RecognizeEntitiesActionsResults.ToList();
+
+            Assert.IsFalse(entitiesActions[0].HasError);
+            Assert.AreEqual(3, entitiesActions[0].Result.Count);
+            var entitiesEmptyDocument = entitiesActions[0].Result.ElementAt(2);
+            Assert.IsTrue(entitiesEmptyDocument.HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidDocument, entitiesEmptyDocument.Error.ErrorCode.ToString());
+
+            Assert.IsTrue(entitiesActions[1].HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidRequest, entitiesActions[1].Error.ErrorCode.ToString());
 
-            ExtractKeyPhrasesResultCollection resultWithDocumentError = resultCollection.ExtractKeyPhrasesActionsResults.FirstOrDefault().Result;
+            // PII entities
+            var piiEntitiesActions = resultCollection.RecognizePiiEntitiesActionsResults.ToList();
 
-            Assert.IsTrue(resultWithActionError.HasError);
-            Assert.AreEqual(TextAnalyticsErrorCode.InvalidRequest, resultWithActionError.Error.ErrorCode.ToString());
+            Assert.IsFalse(piiEntitiesActions[0].HasError);
+            Assert.AreEqual(3, piiEntitiesActions[0].Result.Count);
+            var piiEntitiesEmptyDocument = piiEntitiesActions[0].Result.ElementAt(2);
+            Assert.IsTrue(piiEntitiesEmptyDocument.HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidDocument, piiEntitiesEmptyDocument.Error.ErrorCode.ToString());
 
-            Assert.IsTrue(resultWithDocumentError.ElementAt(2).HasError);
-            Assert.AreEqual(TextAnalyticsErrorCode.InvalidDocument, resultWithDocumentError.ElementAt(2).Error.ErrorCode.ToString());
+            Assert.IsTrue(piiEntitiesActions[1].HasError);
+            Assert.AreEqual(TextAnalyticsErrorCode.InvalidRequest, piiEntitiesActions[1].Error.ErrorCode.ToString());
         }
 
         [Test]

sdk/textanalytics/Azure.AI.TextAnalytics/tests/RecognizePiiEntitiesTests.cs

@@ -80,7 +80,7 @@ public async Task RecognizePiiEntitiesWithDomainTest()
 
             PiiEntityCollection entities = await client.RecognizePiiEntitiesAsync(document, "en", new RecognizePiiEntitiesOptions() { DomainFilter = PiiEntityDomainType.ProtectedHealthInformation } );
 
-            ValidateInDocumenResult(entities, new List<string>() { "atest@microsoft.com" });
+            ValidateInDocumenResult(entities, new List<string>() { "atest@microsoft.com", "Microsoft" });
         }
 
         [Test]