Skip to content

Commit

Permalink
[TA] Renames based on archboard feedbacks (Azure#35211)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mssfang
mssfang authored Jun 1, 2023
1 parent 35f6c07 commit 09d756f
Show file tree
Hide file tree
Showing 62 changed files with 1,629 additions and 1,592 deletions.
29 changes: 29 additions & 0 deletions sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,35 @@

### Breaking Changes
- Removed `Dynamic Classification` feature, which was introduced in the previous beta release.
- Renamed class:
`SummaryContext` to `AbstractiveSummaryContext`,
`SummarySentence` to `ExtractiveSummarySentence`,
`SummarySentencesOrder` to `ExtractiveSummarySentencesOrder`,
`ExtractSummaryOptions` to `ExtractiveSummaryOptions`,
`ExtractSummaryAction` to `ExtractiveSummaryAction`,
`ExtractSummaryActionResult` to `ExtractiveSummaryActionResult`,
`ExtractSummaryResult` to `ExtractiveSummaryResult`,
`ExtractSummaryResultCollection` to `ExtractiveSummaryResultCollection`,
`ExtractSummaryOperationDetail` to `ExtractiveSummaryOperationDetail`,
`ExtractSummaryPagedFlux` to `ExtractiveSummaryPagedFlux`,
`ExtractSummaryPagedIterable` to `ExtractiveSummaryPagedIterable`,
`AbstractSummaryOptions` to `AbstractiveSummaryOptions`,
`AbstractSummaryAction` to `AbstractiveSummaryAction`,
`AbstractSummaryActionResult` to `AbtractiveSummaryActionResult`,
`AbstractSummaryResultCollection` to `AbstractiveSummaryResultCollection`
`AbstractSummaryResult` to `AbstractiveSummaryResult`,
`AbstractSummaryOperationDetail` to `AbstractiveSummaryOperationDetail`,
`AbstractSummaryPagedFlux` to `AbstractiveSummaryPagedFlux`,
`AbstractSummaryPagedIterable` to `AbstractiveSummaryPagedIterable`,
- Renamed methods:
`getExtractSummaryActions()` to `getExtractiveSummaryActions()`,
`getAbstractSummaryActions()` to `getAbstractiveSummaryActions()`,
`setAbstractSummaryActions(AbstractSummaryAction... abstractSummaryActions)` to
`setAbstractiveSummaryActions(AbstractiveSummaryAction... abstractiveSummaryActions)`,
`setExtractSummaryActions(ExtractSummaryAction... extractSummaryActions)` to
`setExtractiveSummaryActions(ExtractiveSummaryAction... extractiveSummaryActions)`,
`getAbstractSummaryResults` to `getAbstractiveSummaryResults`,
`getExtractSummaryResults` to `getExtractiveSummaryResults`

### Bugs Fixed

Expand Down
150 changes: 75 additions & 75 deletions ...tanalytics/AbstractSummaryUtilClient.java → ...alytics/AbstractiveSummaryUtilClient.java
View file

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions ...e-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeActionsUtilClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.AbstractSummaryActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AbstractiveSummaryActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AnalyzeActionsOperationDetailPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AnalyzeActionsResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AnalyzeHealthcareEntitiesActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AnalyzeSentimentActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.AnalyzeTextsImpl;
import com.azure.ai.textanalytics.implementation.ExtractKeyPhrasesActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.ExtractSummaryActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.ExtractiveSummaryActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.MultiLabelClassifyActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.RecognizeCustomEntitiesActionResultPropertiesHelper;
import com.azure.ai.textanalytics.implementation.RecognizeEntitiesActionResultPropertiesHelper;
Expand Down Expand Up @@ -97,8 +97,8 @@
import com.azure.ai.textanalytics.implementation.models.TasksStateTasksKeyPhraseExtractionTasksItem;
import com.azure.ai.textanalytics.implementation.models.TasksStateTasksOld;
import com.azure.ai.textanalytics.implementation.models.TasksStateTasksSentimentAnalysisTasksItem;
import com.azure.ai.textanalytics.models.AbstractSummaryAction;
import com.azure.ai.textanalytics.models.AbstractSummaryActionResult;
import com.azure.ai.textanalytics.models.AbstractiveSummaryAction;
import com.azure.ai.textanalytics.models.AbstractiveSummaryActionResult;
import com.azure.ai.textanalytics.models.AnalyzeActionsOperationDetail;
import com.azure.ai.textanalytics.models.AnalyzeActionsOptions;
import com.azure.ai.textanalytics.models.AnalyzeActionsResult;
Expand All @@ -108,8 +108,8 @@
import com.azure.ai.textanalytics.models.AnalyzeSentimentActionResult;
import com.azure.ai.textanalytics.models.ExtractKeyPhrasesAction;
import com.azure.ai.textanalytics.models.ExtractKeyPhrasesActionResult;
import com.azure.ai.textanalytics.models.ExtractSummaryAction;
import com.azure.ai.textanalytics.models.ExtractSummaryActionResult;
import com.azure.ai.textanalytics.models.ExtractiveSummaryAction;
import com.azure.ai.textanalytics.models.ExtractiveSummaryActionResult;
import com.azure.ai.textanalytics.models.MultiLabelClassifyAction;
import com.azure.ai.textanalytics.models.MultiLabelClassifyActionResult;
import com.azure.ai.textanalytics.models.RecognizeCustomEntitiesAction;
Expand All @@ -122,7 +122,7 @@
import com.azure.ai.textanalytics.models.RecognizePiiEntitiesActionResult;
import com.azure.ai.textanalytics.models.SingleLabelClassifyAction;
import com.azure.ai.textanalytics.models.SingleLabelClassifyActionResult;
import com.azure.ai.textanalytics.models.SummarySentencesOrder;
import com.azure.ai.textanalytics.models.ExtractiveSummarySentencesOrder;
import com.azure.ai.textanalytics.models.TextAnalyticsActionResult;
import com.azure.ai.textanalytics.models.TextAnalyticsActions;
import com.azure.ai.textanalytics.models.TextAnalyticsError;
Expand Down Expand Up @@ -172,7 +172,7 @@
import static com.azure.ai.textanalytics.implementation.Utility.toAnalyzeSentimentResultCollection;
import static com.azure.ai.textanalytics.implementation.Utility.toCategoriesFilter;
import static com.azure.ai.textanalytics.implementation.Utility.toExtractKeyPhrasesResultCollection;
import static com.azure.ai.textanalytics.implementation.Utility.toExtractSummaryResultCollection;
import static com.azure.ai.textanalytics.implementation.Utility.toExtractiveSummaryResultCollection;
import static com.azure.ai.textanalytics.implementation.Utility.toLabelClassificationResultCollection;
import static com.azure.ai.textanalytics.implementation.Utility.toMultiLanguageInput;
import static com.azure.ai.textanalytics.implementation.Utility.toRecognizeCustomEntitiesResultCollection;
Expand Down Expand Up @@ -399,9 +399,9 @@ private List<AnalyzeTextLROTask> getAnalyzeTextLROTasks(TextAnalyticsActions act
actions.getSingleLabelClassifyActions();
final Iterable<MultiLabelClassifyAction> multiCategoryClassifyActions =
actions.getMultiLabelClassifyActions();
final Iterable<AbstractSummaryAction> abstractSummaryActions =
actions.getAbstractSummaryActions();
final Iterable<ExtractSummaryAction> extractSummaryActions = actions.getExtractSummaryActions();
final Iterable<AbstractiveSummaryAction> abstractiveSummaryActions =
actions.getAbstractiveSummaryActions();
final Iterable<ExtractiveSummaryAction> extractiveSummaryActions = actions.getExtractiveSummaryActions();

if (recognizeEntitiesActions != null) {
recognizeEntitiesActions.forEach(action -> tasks.add(toEntitiesLROTask(action)));
Expand Down Expand Up @@ -440,12 +440,12 @@ private List<AnalyzeTextLROTask> getAnalyzeTextLROTasks(TextAnalyticsActions act
multiCategoryClassifyActions.forEach(action -> tasks.add(toCustomMultiLabelClassificationLROTask(action)));
}

if (abstractSummaryActions != null) {
abstractSummaryActions.forEach(action -> tasks.add(toAbstractiveSummarizationLROTask(action)));
if (abstractiveSummaryActions != null) {
abstractiveSummaryActions.forEach(action -> tasks.add(toAbstractiveSummarizationLROTask(action)));
}

if (extractSummaryActions != null) {
extractSummaryActions.forEach(action -> tasks.add(toExtractiveSummarizationLROTask(action)));
if (extractiveSummaryActions != null) {
extractiveSummaryActions.forEach(action -> tasks.add(toExtractiveSummarizationLROTask(action)));
}
return tasks;
}
Expand Down Expand Up @@ -734,7 +734,7 @@ private CustomMultiLabelClassificationLROTask toCustomMultiLabelClassificationLR
return task;
}

private ExtractiveSummarizationLROTask toExtractiveSummarizationLROTask(ExtractSummaryAction action) {
private ExtractiveSummarizationLROTask toExtractiveSummarizationLROTask(ExtractiveSummaryAction action) {
if (action == null) {
return null;
}
Expand Down Expand Up @@ -765,8 +765,8 @@ private CustomMultiLabelClassificationTaskParameters getCustomMultiLabelClassifi
}

private ExtractiveSummarizationTaskParameters getExtractiveSummarizationTaskParameters(
ExtractSummaryAction action) {
SummarySentencesOrder orderBy = action.getOrderBy();
ExtractiveSummaryAction action) {
ExtractiveSummarySentencesOrder orderBy = action.getOrderBy();
return new ExtractiveSummarizationTaskParameters()
.setLoggingOptOut(action.isServiceLogsDisabled())
.setModelVersion(action.getModelVersion())
Expand All @@ -775,7 +775,7 @@ private ExtractiveSummarizationTaskParameters getExtractiveSummarizationTaskPara
.setSortBy(orderBy == null ? null : ExtractiveSummarizationSortingCriteria.fromString(orderBy.toString()));
}

private AbstractiveSummarizationLROTask toAbstractiveSummarizationLROTask(AbstractSummaryAction action) {
private AbstractiveSummarizationLROTask toAbstractiveSummarizationLROTask(AbstractiveSummaryAction action) {
if (action == null) {
return null;
}
Expand All @@ -785,7 +785,7 @@ private AbstractiveSummarizationLROTask toAbstractiveSummarizationLROTask(Abstra
}

private AbstractiveSummarizationTaskParameters getAbstractiveSummarizationTaskParameters(
AbstractSummaryAction action) {
AbstractiveSummaryAction action) {
return new AbstractiveSummarizationTaskParameters()
.setStringIndexType(StringIndexType.UTF16CODE_UNIT)
.setSentenceCount(action.getSentenceCount())
Expand Down Expand Up @@ -1139,8 +1139,8 @@ private AnalyzeActionsResult toAnalyzeActionsResultLanguageApi(AnalyzeTextJobSta
final List<RecognizeCustomEntitiesActionResult> recognizeCustomEntitiesActionResults = new ArrayList<>();
final List<SingleLabelClassifyActionResult> singleLabelClassifyActionResults = new ArrayList<>();
final List<MultiLabelClassifyActionResult> multiLabelClassifyActionResults = new ArrayList<>();
final List<AbstractSummaryActionResult> abstractSummaryActionResults = new ArrayList<>();
final List<ExtractSummaryActionResult> extractSummaryActionResults = new ArrayList<>();
final List<AbstractiveSummaryActionResult> abstractiveSummaryActionResults = new ArrayList<>();
final List<ExtractiveSummaryActionResult> extractiveSummaryActionResults = new ArrayList<>();

if (!CoreUtils.isNullOrEmpty(tasksResults)) {
for (int i = 0; i < tasksResults.size(); i++) {
Expand Down Expand Up @@ -1275,31 +1275,31 @@ private AnalyzeActionsResult toAnalyzeActionsResultLanguageApi(AnalyzeTextJobSta
} else if (taskResult instanceof ExtractiveSummarizationLROResult) {
final ExtractiveSummarizationLROResult extractiveSummarizationLROResult =
(ExtractiveSummarizationLROResult) taskResult;
final ExtractSummaryActionResult actionResult = new ExtractSummaryActionResult();
final ExtractiveSummaryActionResult actionResult = new ExtractiveSummaryActionResult();
final ExtractiveSummarizationResult results = extractiveSummarizationLROResult.getResults();
if (results != null) {
ExtractSummaryActionResultPropertiesHelper.setDocumentsResults(actionResult,
toExtractSummaryResultCollection(results));
ExtractiveSummaryActionResultPropertiesHelper.setDocumentsResults(actionResult,
toExtractiveSummaryResultCollection(results));
}
TextAnalyticsActionResultPropertiesHelper.setActionName(actionResult,
extractiveSummarizationLROResult.getTaskName());
TextAnalyticsActionResultPropertiesHelper.setCompletedAt(actionResult,
extractiveSummarizationLROResult.getLastUpdateDateTime());
extractSummaryActionResults.add(actionResult);
extractiveSummaryActionResults.add(actionResult);
} else if (taskResult instanceof AbstractiveSummarizationLROResult) {
final AbstractiveSummarizationLROResult abstractiveSummarizationLROResult =
(AbstractiveSummarizationLROResult) taskResult;
final AbstractSummaryActionResult actionResult = new AbstractSummaryActionResult();
final AbstractiveSummaryActionResult actionResult = new AbstractiveSummaryActionResult();
final AbstractiveSummarizationResult results = abstractiveSummarizationLROResult.getResults();
if (results != null) {
AbstractSummaryActionResultPropertiesHelper.setDocumentsResults(actionResult,
AbstractiveSummaryActionResultPropertiesHelper.setDocumentsResults(actionResult,
toAbstractiveSummaryResultCollection(results));
}
TextAnalyticsActionResultPropertiesHelper.setActionName(actionResult,
abstractiveSummarizationLROResult.getTaskName());
TextAnalyticsActionResultPropertiesHelper.setCompletedAt(actionResult,
abstractiveSummarizationLROResult.getLastUpdateDateTime());
abstractSummaryActionResults.add(actionResult);
abstractiveSummaryActionResults.add(actionResult);
} else {
throw LOGGER.logExceptionAsError(new RuntimeException(
"Invalid Long running operation task result: " + taskResult.getClass()));
Expand Down Expand Up @@ -1336,9 +1336,9 @@ private AnalyzeActionsResult toAnalyzeActionsResultLanguageApi(AnalyzeTextJobSta
} else if (HEALTHCARE.equals(taskName)) {
actionResult = analyzeHealthcareEntitiesActionResults.get(taskIndex);
} else if (EXTRACTIVE_SUMMARIZATION.equals(taskName)) {
actionResult = extractSummaryActionResults.get(taskIndex);
actionResult = extractiveSummaryActionResults.get(taskIndex);
} else if (ABSTRACTIVE_SUMMARIZATION.equals(taskName)) {
actionResult = abstractSummaryActionResults.get(taskIndex);
actionResult = abstractiveSummaryActionResults.get(taskIndex);
} else {
throw LOGGER.logExceptionAsError(new RuntimeException(
"Invalid task name in target reference, " + taskName));
Expand Down Expand Up @@ -1374,9 +1374,9 @@ private AnalyzeActionsResult toAnalyzeActionsResultLanguageApi(AnalyzeTextJobSta
AnalyzeActionsResultPropertiesHelper.setClassifyMultiCategoryResults(analyzeActionsResult,
IterableStream.of(multiLabelClassifyActionResults));
AnalyzeActionsResultPropertiesHelper.setAbstractiveSummaryResults(analyzeActionsResult,
IterableStream.of(abstractSummaryActionResults));
AnalyzeActionsResultPropertiesHelper.setExtractSummaryResults(analyzeActionsResult,
IterableStream.of(extractSummaryActionResults));
IterableStream.of(abstractiveSummaryActionResults));
AnalyzeActionsResultPropertiesHelper.setExtractiveSummaryResults(analyzeActionsResult,
IterableStream.of(extractiveSummaryActionResults));
return analyzeActionsResult;
}

Expand Down
Loading

0 comments on commit 09d756f

Please sign in to comment.