[SyncStack-TextAnlytics] Add SyncStack support in TA (#32867)

Azure · Jan 26, 2023 · 7b7b901 · 7b7b901
1 parent f270ea9
commit 7b7b901
Show file tree

Hide file tree

Showing 224 changed files with 2,977 additions and 756 deletions.
diff --git a/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md b/sdk/textanalytics/azure-ai-textanalytics/CHANGELOG.md
@@ -9,7 +9,9 @@
 ### Bugs Fixed
 
 ### Other Changes
-
+- Integrate synchronous workflow for sync clients so that they do not block on async client APIs. 
+  It simplifies stack traces and improves debugging experience.
+
 ## 5.3.0-beta.1 (2022-11-18)
 
 ### Features Added

diff --git a/...tanalytics/AnalyzeActionsAsyncClient.java → ...xtanalytics/AnalyzeActionsUtilClient.java b/...tanalytics/AnalyzeActionsAsyncClient.java → ...xtanalytics/AnalyzeActionsUtilClient.java
diff --git a/...s/AnalyzeHealthcareEntityAsyncClient.java → ...cs/AnalyzeHealthcareEntityUtilClient.java b/...s/AnalyzeHealthcareEntityAsyncClient.java → ...cs/AnalyzeHealthcareEntityUtilClient.java
diff --git a/...nalytics/AnalyzeSentimentAsyncClient.java → ...analytics/AnalyzeSentimentUtilClient.java b/...nalytics/AnalyzeSentimentAsyncClient.java → ...analytics/AnalyzeSentimentUtilClient.java
@@ -7,6 +7,7 @@
 import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
 import com.azure.ai.textanalytics.implementation.Utility;
 import com.azure.ai.textanalytics.implementation.models.AnalyzeTextSentimentAnalysisInput;
+import com.azure.ai.textanalytics.implementation.models.ErrorResponseException;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageAnalysisInput;
 import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
 import com.azure.ai.textanalytics.implementation.models.SentimentAnalysisTaskParameters;
@@ -15,6 +16,7 @@
 import com.azure.ai.textanalytics.models.AnalyzeSentimentOptions;
 import com.azure.ai.textanalytics.models.TextDocumentInput;
 import com.azure.ai.textanalytics.util.AnalyzeSentimentResultCollection;
+import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
@@ -24,11 +26,15 @@
 import java.util.Arrays;
 
 import static com.azure.ai.textanalytics.TextAnalyticsAsyncClient.COGNITIVE_TRACING_NAMESPACE_VALUE;
+import static com.azure.ai.textanalytics.implementation.Utility.enableSyncRestProxy;
 import static com.azure.ai.textanalytics.implementation.Utility.getDocumentCount;
 import static com.azure.ai.textanalytics.implementation.Utility.getNotNullContext;
 import static com.azure.ai.textanalytics.implementation.Utility.getUnsupportedServiceApiVersionMessage;
 import static com.azure.ai.textanalytics.implementation.Utility.inputDocumentsValidation;
+import static com.azure.ai.textanalytics.implementation.Utility.mapToHttpResponseExceptionIfExists;
 import static com.azure.ai.textanalytics.implementation.Utility.throwIfTargetServiceVersionFound;
+import static com.azure.ai.textanalytics.implementation.Utility.toAnalyzeSentimentResultCollectionResponseLanguageApi;
+import static com.azure.ai.textanalytics.implementation.Utility.toAnalyzeSentimentResultCollectionResponseLegacyApi;
 import static com.azure.ai.textanalytics.implementation.Utility.toMultiLanguageInput;
 import static com.azure.core.util.FluxUtil.monoError;
 import static com.azure.core.util.FluxUtil.withContext;
@@ -37,20 +43,20 @@
 /**
  * Helper class for managing sentiment analysis endpoint.
  */
-class AnalyzeSentimentAsyncClient {
-    private final ClientLogger logger = new ClientLogger(AnalyzeSentimentAsyncClient.class);
+class AnalyzeSentimentUtilClient {
+    private static final ClientLogger LOGGER = new ClientLogger(AnalyzeSentimentUtilClient.class);
     private final TextAnalyticsClientImpl legacyService;
     private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;
 
     private final TextAnalyticsServiceVersion serviceVersion;
 
-    AnalyzeSentimentAsyncClient(TextAnalyticsClientImpl legacyService, TextAnalyticsServiceVersion serviceVersion) {
+    AnalyzeSentimentUtilClient(TextAnalyticsClientImpl legacyService, TextAnalyticsServiceVersion serviceVersion) {
         this.legacyService = legacyService;
         this.service = null;
         this.serviceVersion = serviceVersion;
     }
 
-    AnalyzeSentimentAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service,
+    AnalyzeSentimentUtilClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service,
                                 TextAnalyticsServiceVersion serviceVersion) {
         this.legacyService = null;
         this.service = service;
@@ -75,27 +81,7 @@ public Mono<Response<AnalyzeSentimentResultCollection>> analyzeSentimentBatch(
         try {
             return withContext(context -> getAnalyzedSentimentResponse(documents, options, context));
         } catch (RuntimeException ex) {
-            return monoError(logger, ex);
-        }
-    }
-
-    /**
-     * Helper function for calling service with max overloaded parameters that returns a mono {@link Response}
-     * which contains {@link AnalyzeSentimentResultCollection}.
-     *
-     * @param documents The list of documents to analyze sentiments for.
-     * @param options The additional configurable {@link AnalyzeSentimentOptions options} that may be passed when
-     * analyzing sentiments.
-     * @param context Additional context that is passed through the Http pipeline during the service call.
-     *
-     * @return A mono {@link Response} contains {@link AnalyzeSentimentResultCollection}.
-     */
-    Mono<Response<AnalyzeSentimentResultCollection>> analyzeSentimentBatchWithContext(
-        Iterable<TextDocumentInput> documents, AnalyzeSentimentOptions options, Context context) {
-        try {
-            return getAnalyzedSentimentResponse(documents, options, context);
-        } catch (RuntimeException ex) {
-            return monoError(logger, ex);
+            return monoError(LOGGER, ex);
         }
     }
 
@@ -117,27 +103,25 @@ private Mono<Response<AnalyzeSentimentResultCollection>> getAnalyzedSentimentRes
         options = options == null ? new AnalyzeSentimentOptions() : options;
 
         if (service != null) {
-            return service
-                       .analyzeTextWithResponseAsync(
-                           new AnalyzeTextSentimentAnalysisInput()
-                               .setParameters(
-                                   new SentimentAnalysisTaskParameters()
-                                       .setStringIndexType(StringIndexType.UTF16CODE_UNIT)
-                                       .setOpinionMining(options.isIncludeOpinionMining())
-                                       .setModelVersion(options.getModelVersion())
-                                       .setLoggingOptOut(options.isServiceLogsDisabled()))
-                               .setAnalysisInput(
-                                   new MultiLanguageAnalysisInput().setDocuments(toMultiLanguageInput(documents))),
-                           options.isIncludeStatistics(),
-                           getNotNullContext(context)
-                               .addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
-                       .doOnSubscribe(ignoredValue -> logger.info("A batch of documents with count - {}",
-                           getDocumentCount(documents)))
-                       .doOnSuccess(response -> logger.info("Analyzed sentiment for a batch of documents - {}",
-                           response))
-                       .doOnError(error -> logger.warning("Failed to analyze sentiment - {}", error))
-                       .map(Utility::toAnalyzeSentimentResultCollectionResponseLanguageApi)
-                       .onErrorMap(Utility::mapToHttpResponseExceptionIfExists);
+            return service.analyzeTextWithResponseAsync(
+                new AnalyzeTextSentimentAnalysisInput()
+                    .setParameters(
+                        new SentimentAnalysisTaskParameters()
+                            .setStringIndexType(StringIndexType.UTF16CODE_UNIT)
+                            .setOpinionMining(options.isIncludeOpinionMining())
+                            .setModelVersion(options.getModelVersion())
+                            .setLoggingOptOut(options.isServiceLogsDisabled()))
+                    .setAnalysisInput(
+                        new MultiLanguageAnalysisInput().setDocuments(toMultiLanguageInput(documents))),
+                options.isIncludeStatistics(),
+                getNotNullContext(context).addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
+                .doOnSubscribe(ignoredValue -> LOGGER.info("A batch of documents with count - {}",
+                    getDocumentCount(documents)))
+                .doOnSuccess(response -> LOGGER.info("Analyzed sentiment for a batch of documents - {}",
+                    response))
+                .doOnError(error -> LOGGER.warning("Failed to analyze sentiment - {}", error))
+                .map(Utility::toAnalyzeSentimentResultCollectionResponseLanguageApi)
+                .onErrorMap(Utility::mapToHttpResponseExceptionIfExists);
         }
 
         return legacyService.sentimentWithResponseAsync(
@@ -148,14 +132,60 @@ private Mono<Response<AnalyzeSentimentResultCollection>> getAnalyzedSentimentRes
             options.isIncludeOpinionMining(),
             StringIndexType.UTF16CODE_UNIT,
             getNotNullContext(context).addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE))
-            .doOnSubscribe(ignoredValue -> logger.info("A batch of documents with count - {}",
+            .doOnSubscribe(ignoredValue -> LOGGER.info("A batch of documents with count - {}",
                 getDocumentCount(documents)))
-            .doOnSuccess(response -> logger.info("Analyzed sentiment for a batch of documents - {}", response))
-            .doOnError(error -> logger.warning("Failed to analyze sentiment - {}", error))
+            .doOnSuccess(response -> LOGGER.info("Analyzed sentiment for a batch of documents - {}", response))
+            .doOnError(error -> LOGGER.warning("Failed to analyze sentiment - {}", error))
             .map(Utility::toAnalyzeSentimentResultCollectionResponseLegacyApi)
             .onErrorMap(Utility::mapToHttpResponseExceptionIfExists);
     }
 
+    /**
+     * Call the service with REST response, convert to a {@link Mono} of {@link Response} which contains
+     * {@link AnalyzeSentimentResultCollection} from a {@link SimpleResponse} of {@link SentimentResponse}.
+     *
+     * @param documents A list of documents to be analyzed.
+     * @param options The additional configurable {@link AnalyzeSentimentOptions options} that may be passed when
+     * analyzing sentiments.
+     * @param context Additional context that is passed through the Http pipeline during the service call.
+     *
+     * @return A {@link Response} contains {@link AnalyzeSentimentResultCollection}.
+     */
+    Response<AnalyzeSentimentResultCollection> getAnalyzedSentimentResponseSync(
+        Iterable<TextDocumentInput> documents, AnalyzeSentimentOptions options, Context context) {
+        throwIfCallingNotAvailableFeatureInOptions(options);
+        inputDocumentsValidation(documents);
+        options = options == null ? new AnalyzeSentimentOptions() : options;
+        context = enableSyncRestProxy(getNotNullContext(context))
+            .addData(AZ_TRACING_NAMESPACE_KEY, COGNITIVE_TRACING_NAMESPACE_VALUE);
+
+        try {
+            return (service != null)
+                ? toAnalyzeSentimentResultCollectionResponseLanguageApi(service.analyzeTextWithResponse(
+                    new AnalyzeTextSentimentAnalysisInput()
+                        .setParameters(
+                            new SentimentAnalysisTaskParameters()
+                                .setStringIndexType(StringIndexType.UTF16CODE_UNIT)
+                                .setOpinionMining(options.isIncludeOpinionMining())
+                                .setModelVersion(options.getModelVersion())
+                                .setLoggingOptOut(options.isServiceLogsDisabled()))
+                        .setAnalysisInput(
+                            new MultiLanguageAnalysisInput().setDocuments(toMultiLanguageInput(documents))),
+                    options.isIncludeStatistics(),
+                    context))
+                : toAnalyzeSentimentResultCollectionResponseLegacyApi(legacyService.sentimentWithResponseSync(
+                    new MultiLanguageBatchInput().setDocuments(toMultiLanguageInput(documents)),
+                    options.getModelVersion(),
+                    options.isIncludeStatistics(),
+                    options.isServiceLogsDisabled(),
+                    options.isIncludeOpinionMining(),
+                    StringIndexType.UTF16CODE_UNIT,
+                    context));
+        } catch (ErrorResponseException ex) {
+            throw LOGGER.logExceptionAsError((HttpResponseException) mapToHttpResponseExceptionIfExists(ex));
+        }
+    }
+
     private void throwIfCallingNotAvailableFeatureInOptions(AnalyzeSentimentOptions options) {
         if (options == null) {
             return;