Skip to content

Commit 5437a95

Browse files
maririosmaririos
authored
enable healthcare again and updating pii tests (Azure#21108)
1 parent b6ade84 commit 5437a95

File tree

42 files changed

+2565
-2716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2565
-2716
lines changed

‎sdk/textanalytics/Azure.AI.TextAnalytics/src/AnalyzeBatchActionsOperation.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ async Task<Page<AnalyzeBatchActionsResult>> NextPageFunc(string nextLink, int? p
296296
//diagnostics scope?
297297
try
298298
{
299-
Response<AnalyzeJobState> jobState = await _serviceClient.AnalyzeStatusNextPageAsync(RemoveExtraInformationFromNextLink(nextLink)).ConfigureAwait(false);
299+
Response<AnalyzeJobState> jobState = await _serviceClient.AnalyzeStatusNextPageAsync(nextLink).ConfigureAwait(false);
300300

301301
AnalyzeBatchActionsResult result = Transforms.ConvertToAnalyzeOperationResult(jobState.Value, _idToIndexMap);
302302
return Page.FromValues(new List<AnalyzeBatchActionsResult>() { result }, jobState.Value.NextLink, jobState.GetRawResponse());
@@ -325,7 +325,7 @@ Page<AnalyzeBatchActionsResult> NextPageFunc(string nextLink, int? pageSizeHint)
325325
//diagnostics scope?
326326
try
327327
{
328-
Response<AnalyzeJobState> jobState = _serviceClient.AnalyzeStatusNextPage(RemoveExtraInformationFromNextLink(nextLink));
328+
Response<AnalyzeJobState> jobState = _serviceClient.AnalyzeStatusNextPage(nextLink);
329329

330330
AnalyzeBatchActionsResult result = Transforms.ConvertToAnalyzeOperationResult(jobState.Value, _idToIndexMap);
331331
return Page.FromValues(new List<AnalyzeBatchActionsResult>() { result }, jobState.Value.NextLink, jobState.GetRawResponse());
@@ -344,8 +344,5 @@ private void ValidateOperationStatus()
344344
if (!HasCompleted)
345345
throw new InvalidOperationException("The operation has not completed yet.");
346346
}
347-
348-
// Service bug https://github.com/Azure/azure-sdk-for-net/issues/20991
349-
private static string RemoveExtraInformationFromNextLink(string nextlink) => nextlink.Split('/').Last();
350347
}
351348
}

‎sdk/textanalytics/Azure.AI.TextAnalytics/src/AnalyzeHealthcareEntitiesOperation.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ async Task<Page<AnalyzeHealthcareEntitiesResultCollection>> NextPageFunc(string
334334
//diagnostics scope?
335335
try
336336
{
337-
Response<HealthcareJobState> jobState = await _serviceClient.HealthStatusNextPageAsync(RemoveExtraInformationFromNextLink(nextLink)).ConfigureAwait(false);
337+
Response<HealthcareJobState> jobState = await _serviceClient.HealthStatusNextPageAsync(nextLink).ConfigureAwait(false);
338338

339339
AnalyzeHealthcareEntitiesResultCollection result = Transforms.ConvertToAnalyzeHealthcareEntitiesResultCollection(jobState.Value.Results, _idToIndexMap);
340340
return Page.FromValues(new List<AnalyzeHealthcareEntitiesResultCollection>() { result }, jobState.Value.NextLink, jobState.GetRawResponse());
@@ -363,7 +363,7 @@ Page<AnalyzeHealthcareEntitiesResultCollection> NextPageFunc(string nextLink, in
363363
//diagnostics scope?
364364
try
365365
{
366-
Response<HealthcareJobState> jobState = _serviceClient.HealthStatusNextPage(RemoveExtraInformationFromNextLink(nextLink));
366+
Response<HealthcareJobState> jobState = _serviceClient.HealthStatusNextPage(nextLink);
367367

368368
AnalyzeHealthcareEntitiesResultCollection result = Transforms.ConvertToAnalyzeHealthcareEntitiesResultCollection(jobState.Value.Results, _idToIndexMap);
369369
return Page.FromValues(new List<AnalyzeHealthcareEntitiesResultCollection>() { result }, jobState.Value.NextLink, jobState.GetRawResponse());
@@ -384,8 +384,5 @@ private void ValidateOperationStatus()
384384
if (!HasValue)
385385
throw _requestFailedException;
386386
}
387-
388-
// Service bug https://github.com/Azure/azure-sdk-for-net/issues/20991
389-
private static string RemoveExtraInformationFromNextLink(string nextlink) => nextlink.Split('/').Last();
390387
}
391388
}

‎sdk/textanalytics/Azure.AI.TextAnalytics/tests/RecognizeHealthcareEntitiesTests.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public RecognizeHealthcareEntitiesTests(bool isAsync) : base(isAsync) { }
5050
};
5151

5252
[RecordedTest]
53-
[Ignore("Healthcare not enabled yet")]
5453
public async Task RecognizeHealthcareEntitiesTest()
5554
{
5655
TextAnalyticsClient client = GetClient();
@@ -112,7 +111,6 @@ public async Task RecognizeHealthcareEntitiesTest()
112111
}
113112

114113
[RecordedTest]
115-
[Ignore("Healthcare not enabled yet")]
116114
public async Task RecognizeHealthcareEntitiesTestWithAssertions()
117115
{
118116
TextAnalyticsClient client = GetClient();
@@ -178,7 +176,6 @@ public async Task RecognizeHealthcareEntitiesTestWithAssertions()
178176
}
179177

180178
[RecordedTest]
181-
[Ignore("Healthcare not enabled yet")]
182179
public async Task RecognizeHealthcareEntitiesWithLanguageTest()
183180
{
184181
TextAnalyticsClient client = GetClient();
@@ -202,7 +199,6 @@ public async Task RecognizeHealthcareEntitiesWithLanguageTest()
202199
}
203200

204201
[RecordedTest]
205-
[Ignore("Healthcare not enabled yet")]
206202
public async Task RecognizeHealthcareEntitiesBatchWithErrorTest()
207203
{
208204
TextAnalyticsClient client = GetClient();
@@ -233,7 +229,6 @@ public async Task RecognizeHealthcareEntitiesBatchWithErrorTest()
233229
}
234230

235231
[RecordedTest]
236-
[Ignore("Healthcare not enabled yet")]
237232
public async Task RecognizeHealthcareEntitiesBatchConvenienceTest()
238233
{
239234
TextAnalyticsClient client = GetClient();
@@ -257,7 +252,6 @@ public async Task RecognizeHealthcareEntitiesBatchConvenienceTest()
257252
}
258253

259254
[RecordedTest]
260-
[Ignore("Healthcare not enabled yet")]
261255
public async Task RecognizeHealthcareEntitiesBatchConvenienceWithStatisticsTest()
262256
{
263257
TextAnalyticsClient client = GetClient();
@@ -286,7 +280,6 @@ public async Task RecognizeHealthcareEntitiesBatchConvenienceWithStatisticsTest(
286280
}
287281

288282
[RecordedTest]
289-
[Ignore("Healthcare not enabled yet")]
290283
public async Task RecognizeHealthcareEntitiesBatchTest()
291284
{
292285
TextAnalyticsClient client = GetClient();
@@ -310,7 +303,6 @@ public async Task RecognizeHealthcareEntitiesBatchTest()
310303
}
311304

312305
[RecordedTest]
313-
[Ignore("Healthcare not enabled yet")]
314306
public async Task RecognizeHealthcareEntitiesBatchWithStatisticsTest()
315307
{
316308
TextAnalyticsClient client = GetClient();
@@ -339,7 +331,6 @@ public async Task RecognizeHealthcareEntitiesBatchWithStatisticsTest()
339331
}
340332

341333
[RecordedTest]
342-
[Ignore("Healthcare not enabled yet")]
343334
public async Task RecognizeHealthcareEntitiesBatchWithCancellation()
344335
{
345336
TextAnalyticsClient client = GetClient();
@@ -375,7 +366,6 @@ public async Task RecognizeHealthcareEntitiesBatchWithCancellation()
375366
}
376367

377368
[RecordedTest]
378-
[Ignore("Healthcare not enabled yet")]
379369
public async Task AnalyzeHealthcareEntitiesPagination()
380370
{
381371
TextAnalyticsClient client = GetClient();

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public RecognizePiiEntitiesTests(bool isAsync) : base(isAsync) { }
3939
{
4040
"859-98-0987",
4141
"800-102-1100",
42-
"Microsoft"
42+
"Microsoft",
43+
"developer"
4344
};
4445

4546
private static readonly List<string> s_document2ExpectedOutput = new List<string>
@@ -97,9 +98,6 @@ public async Task RecognizePiiEntitiesWithCategoriesTest()
9798
entities = await client.RecognizePiiEntitiesAsync(EnglishDocument1, "en", new RecognizePiiEntitiesOptions() { CategoriesFilter = { PiiEntityCategory.PhoneNumber, PiiEntityCategory.Organization } });
9899
ValidateInDocumenResult(entities, new List<string>() { "800-102-1100", "Microsoft" });
99100

100-
entities = await client.RecognizePiiEntitiesAsync(EnglishDocument1, "en", new RecognizePiiEntitiesOptions() { CategoriesFilter = { PiiEntityCategory.PhoneNumber, PiiEntityCategory.Organization, PiiEntityCategory.USSocialSecurityNumber } });
101-
ValidateInDocumenResult(entities, s_document1ExpectedOutput);
102-
103101
entities = await client.RecognizePiiEntitiesAsync(EnglishDocument1, "en", new RecognizePiiEntitiesOptions() { CategoriesFilter = { PiiEntityCategory.ABARoutingNumber } });
104102
Assert.AreEqual(0, entities.Count);
105103
}
@@ -212,7 +210,7 @@ public async Task RecognizePiiEntitiesBatchWithDomainTest()
212210

213211
var expectedOutput = new Dictionary<string, List<string>>()
214212
{
215-
{ "1", s_document1ExpectedOutput },
213+
{ "1", new List<string>() { "800-102-1100", "800-102-1100", "Microsoft" } },
216214
{ "2", s_document2ExpectedOutput },
217215
};
218216

@@ -243,7 +241,6 @@ private void ValidateInDocumenResult(PiiEntityCollection entities, List<string>
243241
foreach (PiiEntity entity in entities)
244242
{
245243
Assert.That(entity.Text, Is.Not.Null.And.Not.Empty);
246-
Assert.IsTrue(minimumExpectedOutput.Contains(entity.Text, StringComparer.OrdinalIgnoreCase));
247244
Assert.IsNotNull(entity.Category);
248245
Assert.GreaterOrEqual(entity.ConfidenceScore, 0.0);
249246
Assert.GreaterOrEqual(entity.Offset, 0);
@@ -254,6 +251,10 @@ private void ValidateInDocumenResult(PiiEntityCollection entities, List<string>
254251
Assert.IsNotEmpty(entity.SubCategory);
255252
}
256253
}
254+
foreach (var text in minimumExpectedOutput)
255+
{
256+
Assert.IsTrue(entities.Any(e => e.Text == text));
257+
}
257258
}
258259

259260
private void ValidateBatchDocumentsResult(RecognizePiiEntitiesResultCollection results, Dictionary<string, List<string>> minimumExpectedOutput, bool includeStatistics = default)

0 commit comments

Comments
 (0)