From f55d72618f09e7645dd28a6f62345daa61a32561 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 22 Apr 2025 14:30:27 +0000 Subject: [PATCH] CodeGen from PR 33767 in Azure/azure-rest-api-specs Merge f374328bd8e125076bb0eb1a5ac75a6649c78a88 into b713df239eb640a56fb4b4db9648ad4bf1388e3b --- ...alyzeTextSubmitJobRequest.Serialization.cs | 23 +- .../Generated/AnalyzeTextSubmitJobRequest.cs | 6 +- .../src/Generated/CharacterMaskPolicyType.cs | 4 +- .../src/Generated/Docs/TextAnalysisClient.xml | 4 +- .../Generated/EntitySynonym.Serialization.cs | 153 ++++++++ .../src/Generated/EntitySynonym.cs | 79 +++++ .../Generated/EntitySynonyms.Serialization.cs | 160 +++++++++ .../src/Generated/EntitySynonyms.cs | 82 +++++ .../PiiActionContent.Serialization.cs | 32 ++ .../src/Generated/PiiActionContent.cs | 10 +- .../src/Generated/PiiCategoriesExclude.cs | 29 +- .../src/Generated/PiiCategory.cs | 29 +- .../src/Generated/TextAnalysisClient.cs | 30 +- .../Generated/TextAnalysisClientOptions.cs | 5 +- .../src/Generated/TextAnalysisModelFactory.cs | 9 + .../ValueExclusionPolicy.Serialization.cs | 160 +++++++++ .../src/Generated/ValueExclusionPolicy.cs | 82 +++++ .../Azure.AI.Language.Text/tsp-location.yaml | 6 +- ...extAnalysisAnalyzeTextCancelJobHeaders.cs} | 8 +- ...extAnalysisAnalyzeTextSubmitJobHeaders.cs} | 8 +- ...veLanguageServiceTextAnalysisRestClient.cs | 149 +++++--- ...iveSummarizationLROResult.Serialization.cs | 52 +-- .../AbstractiveSummarizationLROResult.cs | 24 +- ...ctiveSummarizationLROTask.Serialization.cs | 49 +-- .../Models/AbstractiveSummarizationLROTask.cs | 17 +- ...activeSummarizationResult.Serialization.cs | 46 +-- .../Models/AbstractiveSummarizationResult.cs | 26 +- ...veSummarizationResultBase.Serialization.cs | 68 ---- .../AbstractiveSummarizationResultBase.cs | 37 -- ...mmarizationTaskParameters.Serialization.cs | 68 +--- .../AbstractiveSummarizationTaskParameters.cs | 28 +- ...izationTaskParametersBase.Serialization.cs | 79 ----- ...tractiveSummarizationTaskParametersBase.cs | 32 -- ...tiveSummaryDocumentResult.Serialization.cs | 64 +--- .../AbstractiveSummaryDocumentResult.cs | 21 +- ...bstractiveSummaryInternal.Serialization.cs | 31 +- .../Models/AbstractiveSummaryInternal.cs | 8 +- .../Models/AnalyzeTextEntityLinkingInput.cs | 12 +- .../AnalyzeTextEntityRecognitionInput.cs | 12 +- .../AnalyzeTextJobState.Serialization.cs | 38 +- .../Generated/Models/AnalyzeTextJobState.cs | 72 ++-- .../AnalyzeTextJobStatistics.Serialization.cs | 44 --- .../Models/AnalyzeTextJobStatistics.cs | 28 -- .../Generated/Models/AnalyzeTextJobsInput.cs | 18 +- .../AnalyzeTextKeyPhraseExtractionInput.cs | 12 +- .../AnalyzeTextLROResult.Serialization.cs | 30 +- .../Generated/Models/AnalyzeTextLROResult.cs | 36 +- .../Models/AnalyzeTextLROResultsKind.cs | 28 +- .../AnalyzeTextLROTask.Serialization.cs | 40 +-- .../Generated/Models/AnalyzeTextLROTask.cs | 15 +- .../Models/AnalyzeTextLROTaskKind.cs | 28 +- .../AnalyzeTextLanguageDetectionInput.cs | 12 +- .../AnalyzeTextPiiEntitiesRecognitionInput.cs | 12 +- .../AnalyzeTextSentimentAnalysisInput.cs | 12 +- .../src/Generated/Models/AnalyzeTextTask.cs | 6 +- .../Generated/Models/AnalyzeTextTaskKind.cs | 14 +- .../Generated/Models/AnalyzeTextTaskResult.cs | 6 +- .../Models/AnalyzeTextTaskResultsKind.cs | 14 +- ...ssificationDocumentResult.Serialization.cs | 64 +--- .../Models/ClassificationDocumentResult.cs | 27 +- .../ClassificationResult.Serialization.cs | 21 +- .../Generated/Models/ClassificationResult.cs | 8 +- .../CustomEntitiesLROTask.Serialization.cs | 46 +-- .../Generated/Models/CustomEntitiesLROTask.cs | 10 +- .../CustomEntitiesResult.Serialization.cs | 66 +--- .../Generated/Models/CustomEntitiesResult.cs | 31 +- ...titiesResultDocumentsItem.Serialization.cs | 109 ------ .../CustomEntitiesResultDocumentsItem.cs | 37 -- ...tomEntitiesTaskParameters.Serialization.cs | 66 +--- .../Models/CustomEntitiesTaskParameters.cs | 24 +- ...ntityRecognitionLROResult.Serialization.cs | 52 +-- .../CustomEntityRecognitionLROResult.cs | 26 +- ...LabelClassificationResult.Serialization.cs | 66 +--- .../Models/CustomLabelClassificationResult.cs | 25 +- ...cationResultDocumentsItem.Serialization.cs | 109 ------ ...mLabelClassificationResultDocumentsItem.cs | 37 -- ...elClassificationLROResult.Serialization.cs | 52 +-- ...CustomMultiLabelClassificationLROResult.cs | 26 +- ...abelClassificationLROTask.Serialization.cs | 46 +-- .../CustomMultiLabelClassificationLROTask.cs | 8 +- ...ssificationTaskParameters.Serialization.cs | 52 +-- ...mMultiLabelClassificationTaskParameters.cs | 21 +- .../Models/CustomResult.Serialization.cs | 99 ------ .../src/Generated/Models/CustomResult.cs | 55 --- ...elClassificationLROResult.Serialization.cs | 52 +-- ...ustomSingleLabelClassificationLROResult.cs | 26 +- ...abelClassificationLROTask.Serialization.cs | 46 +-- .../CustomSingleLabelClassificationLROTask.cs | 8 +- ...ssificationTaskParameters.Serialization.cs | 52 +-- ...SingleLabelClassificationTaskParameters.cs | 21 +- .../CustomTaskParameters.Serialization.cs | 80 ----- .../Generated/Models/CustomTaskParameters.cs | 43 --- .../DetectedLanguageInternal.Serialization.cs | 37 +- .../Models/DetectedLanguageInternal.cs | 4 +- .../Models/DocumentError.Serialization.cs | 21 +- .../src/Generated/Models/DocumentError.cs | 6 +- .../Models/DocumentResult.Serialization.cs | 91 ----- .../src/Generated/Models/DocumentResult.cs | 48 --- .../Models/DocumentWarning.Serialization.cs | 26 +- .../src/Generated/Models/DocumentWarning.cs | 16 +- .../EntitiesDocumentResult.Serialization.cs | 64 +--- .../Models/EntitiesDocumentResult.cs | 21 +- .../Models/EntitiesLROTask.Serialization.cs | 46 +-- .../src/Generated/Models/EntitiesLROTask.cs | 8 +- .../Models/EntitiesResult.Serialization.cs | 64 +--- .../src/Generated/Models/EntitiesResult.cs | 21 +- ...titiesResultDocumentsItem.Serialization.cs | 109 ------ .../Models/EntitiesResultDocumentsItem.cs | 37 -- .../EntitiesTaskParameters.Serialization.cs | 60 +--- .../Models/EntitiesTaskParameters.cs | 18 +- .../Generated/Models/EntitiesTaskResult.cs | 10 +- .../Generated/Models/Entity.Serialization.cs | 32 +- .../src/Generated/Models/Entity.cs | 16 +- .../Models/EntityDataSource.Serialization.cs | 21 +- .../src/Generated/Models/EntityDataSource.cs | 2 +- .../EntityLinkingLROResult.Serialization.cs | 52 +-- .../Models/EntityLinkingLROResult.cs | 26 +- .../EntityLinkingLROTask.Serialization.cs | 46 +-- .../Generated/Models/EntityLinkingLROTask.cs | 10 +- .../EntityLinkingResult.Serialization.cs | 64 +--- .../Generated/Models/EntityLinkingResult.cs | 21 +- ...inkingResultDocumentsItem.Serialization.cs | 109 ------ .../EntityLinkingResultDocumentsItem.cs | 37 -- ...tityLinkingTaskParameters.Serialization.cs | 60 +--- .../Models/EntityLinkingTaskParameters.cs | 18 +- .../Models/EntityLinkingTaskResult.cs | 10 +- ...ntityRecognitionLROResult.Serialization.cs | 52 +-- .../Models/EntityRecognitionLROResult.cs | 26 +- .../Generated/Models/Error.Serialization.cs | 60 +--- .../src/Generated/Models/Error.cs | 21 +- .../src/Generated/Models/ErrorCode.cs | 36 +- ...ctedSummaryDocumentResult.Serialization.cs | 64 +--- .../Models/ExtractedSummaryDocumentResult.cs | 27 +- .../ExtractedSummarySentence.Serialization.cs | 25 +- .../Models/ExtractedSummarySentence.cs | 12 +- ...iveSummarizationLROResult.Serialization.cs | 52 +-- .../ExtractiveSummarizationLROResult.cs | 26 +- ...ctiveSummarizationLROTask.Serialization.cs | 46 +-- .../Models/ExtractiveSummarizationLROTask.cs | 8 +- ...activeSummarizationResult.Serialization.cs | 64 +--- .../Models/ExtractiveSummarizationResult.cs | 21 +- ...mmarizationTaskParameters.Serialization.cs | 88 +---- .../ExtractiveSummarizationTaskParameters.cs | 28 +- .../Models/ExtractiveSummarySentencesOrder.cs | 2 +- ...areEntitiesDocumentResult.Serialization.cs | 93 ++--- .../HealthcareEntitiesDocumentResult.cs | 23 +- ...HealthcareEntityAssertion.Serialization.cs | 32 +- .../Models/HealthcareEntityAssertion.cs | 2 +- .../Models/HealthcareEntityCategory.cs | 70 ++-- .../HealthcareEntityInternal.Serialization.cs | 54 +-- .../Models/HealthcareEntityInternal.cs | 28 +- .../Models/HealthcareEntityRelationType.cs | 120 +++---- .../HealthcareLROResult.Serialization.cs | 52 +-- .../Generated/Models/HealthcareLROResult.cs | 26 +- .../Models/HealthcareLROTask.Serialization.cs | 46 +-- .../src/Generated/Models/HealthcareLROTask.cs | 10 +- .../HealthcareRelationEntity.Serialization.cs | 21 +- .../Models/HealthcareRelationEntity.cs | 8 +- ...ealthcareRelationInternal.Serialization.cs | 53 +-- .../Models/HealthcareRelationInternal.cs | 16 +- .../Models/HealthcareResult.Serialization.cs | 64 +--- .../src/Generated/Models/HealthcareResult.cs | 27 +- ...thcareResultDocumentsItem.Serialization.cs | 127 ------- .../Models/HealthcareResultDocumentsItem.cs | 40 --- .../HealthcareTaskParameters.Serialization.cs | 60 +--- .../Models/HealthcareTaskParameters.cs | 18 +- .../src/Generated/Models/InnerErrorCode.cs | 28 +- .../Models/InnerErrorModel.Serialization.cs | 44 +-- .../src/Generated/Models/InnerErrorModel.cs | 14 +- .../src/Generated/Models/JobErrors.cs | 31 -- .../Models/JobState.Serialization.cs | 105 ------ .../src/Generated/Models/JobState.cs | 71 ---- ...PhraseExtractionLROResult.Serialization.cs | 52 +-- .../Models/KeyPhraseExtractionLROResult.cs | 26 +- .../Models/KeyPhraseLROTask.Serialization.cs | 46 +-- .../src/Generated/Models/KeyPhraseLROTask.cs | 8 +- .../Models/KeyPhraseResult.Serialization.cs | 64 +--- .../src/Generated/Models/KeyPhraseResult.cs | 21 +- ...PhraseResultDocumentsItem.Serialization.cs | 109 ------ .../Models/KeyPhraseResultDocumentsItem.cs | 37 -- .../KeyPhraseTaskParameters.Serialization.cs | 46 +-- .../Models/KeyPhraseTaskParameters.cs | 15 +- .../Generated/Models/KeyPhraseTaskResult.cs | 10 +- .../KeyPhrasesDocumentResult.Serialization.cs | 64 +--- .../Models/KeyPhrasesDocumentResult.cs | 21 +- .../Models/LanguageDetectionAnalysisInput.cs | 6 +- ...geDetectionDocumentResult.Serialization.cs | 49 +-- .../Models/LanguageDetectionDocumentResult.cs | 22 +- .../LanguageDetectionResult.Serialization.cs | 64 +--- .../Models/LanguageDetectionResult.cs | 27 +- ...geDetectionTaskParameters.Serialization.cs | 46 +-- .../Models/LanguageDetectionTaskParameters.cs | 15 +- .../Models/LanguageDetectionTaskResult.cs | 10 +- .../src/Generated/Models/LanguageInput.cs | 18 +- ...kedEntitiesDocumentResult.Serialization.cs | 64 +--- .../Models/LinkedEntitiesDocumentResult.cs | 21 +- .../Models/LinkedEntity.Serialization.cs | 42 +-- .../src/Generated/Models/LinkedEntity.cs | 2 +- .../Models/LinkedEntityMatch.Serialization.cs | 25 +- .../src/Generated/Models/LinkedEntityMatch.cs | 2 +- .../Models/MultiLanguageAnalysisInput.cs | 6 +- .../Generated/Models/MultiLanguageInput.cs | 4 +- .../src/Generated/Models/Pagination.cs | 28 -- .../src/Generated/Models/PiiDomain.cs | 2 +- ...PiiEntitiesDocumentResult.Serialization.cs | 78 ++-- .../Models/PiiEntitiesDocumentResult.cs | 23 +- .../Models/PiiEntitiesResult.Serialization.cs | 64 +--- .../src/Generated/Models/PiiEntitiesResult.cs | 21 +- .../src/Generated/Models/PiiEntityCategory.cs | 334 +++++++++--------- ...ntityRecognitionLROResult.Serialization.cs | 52 +-- .../Models/PiiEntityRecognitionLROResult.cs | 26 +- .../Models/PiiLROTask.Serialization.cs | 46 +-- .../src/Generated/Models/PiiLROTask.cs | 10 +- .../PiiResultDocumentsItem.Serialization.cs | 117 ------ .../Models/PiiResultDocumentsItem.cs | 40 --- .../Models/PiiTaskParameters.Serialization.cs | 94 +---- .../src/Generated/Models/PiiTaskParameters.cs | 24 +- .../src/Generated/Models/PiiTaskResult.cs | 10 +- .../Models/PreBuiltResult.Serialization.cs | 91 ----- .../src/Generated/Models/PreBuiltResult.cs | 48 --- .../PreBuiltTaskParameters.Serialization.cs | 75 ---- .../Models/PreBuiltTaskParameters.cs | 29 -- .../SentenceAssessment.Serialization.cs | 29 +- .../Generated/Models/SentenceAssessment.cs | 32 +- ...SentenceSentimentInternal.Serialization.cs | 47 +-- .../Models/SentenceSentimentInternal.cs | 12 +- .../Models/SentenceTarget.Serialization.cs | 36 +- .../src/Generated/Models/SentenceTarget.cs | 26 +- .../SentimentAnalysisLROTask.Serialization.cs | 46 +-- .../Models/SentimentAnalysisLROTask.cs | 8 +- ...entAnalysisTaskParameters.Serialization.cs | 78 +--- .../Models/SentimentAnalysisTaskParameters.cs | 22 +- ...SentimentConfidenceScores.Serialization.cs | 25 +- .../Models/SentimentConfidenceScores.cs | 21 +- .../SentimentDocumentResult.Serialization.cs | 92 ++--- .../Models/SentimentDocumentResult.cs | 37 +- .../SentimentLROResult.Serialization.cs | 52 +-- .../Generated/Models/SentimentLROResult.cs | 26 +- .../Models/SentimentResponse.Serialization.cs | 64 +--- .../src/Generated/Models/SentimentResponse.cs | 27 +- ...mentResponseDocumentsItem.Serialization.cs | 131 ------- .../Models/SentimentResponseDocumentsItem.cs | 42 --- .../Generated/Models/SentimentTaskResult.cs | 10 +- .../src/Generated/Models/StringIndexType.cs | 2 +- .../SummaryContextInternal.Serialization.cs | 21 +- .../Models/SummaryContextInternal.cs | 6 +- ...argetConfidenceScoreLabel.Serialization.cs | 21 +- .../Models/TargetConfidenceScoreLabel.cs | 6 +- .../Models/TargetRelation.Serialization.cs | 33 +- .../src/Generated/Models/TargetRelation.cs | 14 +- .../Models/TaskIdentifier.Serialization.cs | 60 ---- .../src/Generated/Models/TaskIdentifier.cs | 28 -- .../Models/TaskParameters.Serialization.cs | 64 ---- .../src/Generated/Models/TaskParameters.cs | 28 -- .../Models/TaskState.Serialization.cs | 66 ---- .../src/Generated/Models/TaskState.cs | 29 -- ...erialization.cs => Tasks.Serialization.cs} | 10 +- .../Models/{AnalyzeTasks.cs => Tasks.cs} | 39 +- .../Models/TasksState.Serialization.cs | 40 --- .../src/Generated/Models/TasksState.cs | 28 -- .../Models/TextAnalyticsOperationStatus.cs | 20 +- ...xtDocumentBatchStatistics.Serialization.cs | 25 +- .../TextDocumentStatistics.Serialization.cs | 21 +- ...knownAnalyzeTextLROResult.Serialization.cs | 50 +-- .../Models/UnknownAnalyzeTextLROResult.cs | 10 +- ...UnknownAnalyzeTextLROTask.Serialization.cs | 68 ---- .../Models/UnknownAnalyzeTextLROTask.cs | 21 -- .../Models/UnknownAnalyzeTextTaskResult.cs | 2 +- .../Generated/TextAnalyticsModelFactory.cs | 3 + .../Azure.AI.TextAnalytics/src/autorest.md | 2 +- 270 files changed, 3072 insertions(+), 7552 deletions(-) create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonym.Serialization.cs create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonym.cs create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.Serialization.cs create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.cs create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.Serialization.cs create mode 100644 sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.cs rename sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/{MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders.cs => MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders.cs} (59%) rename sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/{MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders.cs => MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders.cs} (59%) delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobErrors.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Pagination.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.cs rename sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/{AnalyzeTasks.Serialization.cs => Tasks.Serialization.cs} (85%) rename sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/{AnalyzeTasks.cs => Tasks.cs} (64%) delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.Serialization.cs delete mode 100644 sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.cs diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.Serialization.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.Serialization.cs index 8bc12cec8fb7..c6b9e67a7208 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.Serialization.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.Serialization.cs @@ -53,6 +53,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("defaultLanguage"u8); writer.WriteStringValue(DefaultLanguage); } + if (Optional.IsDefined(CancelAfter)) + { + writer.WritePropertyName("cancelAfter"u8); + writer.WriteNumberValue(CancelAfter.Value); + } if (options.Format != "W" && _serializedAdditionalRawData != null) { foreach (var item in _serializedAdditionalRawData) @@ -94,6 +99,7 @@ internal static AnalyzeTextSubmitJobRequest DeserializeAnalyzeTextSubmitJobReque MultiLanguageTextInput analysisInput = default; IReadOnlyList tasks = default; string defaultLanguage = default; + float? cancelAfter = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -123,13 +129,28 @@ internal static AnalyzeTextSubmitJobRequest DeserializeAnalyzeTextSubmitJobReque defaultLanguage = property.Value.GetString(); continue; } + if (property.NameEquals("cancelAfter"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + cancelAfter = property.Value.GetSingle(); + continue; + } if (options.Format != "W") { rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } serializedAdditionalRawData = rawDataDictionary; - return new AnalyzeTextSubmitJobRequest(displayName, analysisInput, tasks, defaultLanguage, serializedAdditionalRawData); + return new AnalyzeTextSubmitJobRequest( + displayName, + analysisInput, + tasks, + defaultLanguage, + cancelAfter, + serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.cs index 3bfb637bfc63..aad0502a187d 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/AnalyzeTextSubmitJobRequest.cs @@ -72,13 +72,15 @@ internal AnalyzeTextSubmitJobRequest(MultiLanguageTextInput textInput, IEnumerab /// The available derived classes include , , , , , , , , , and . /// /// Default language to use for records requesting automatic language detection. + /// Optional duration in seconds after which the job will be canceled if not completed. /// Keeps track of any properties unknown to the library. - internal AnalyzeTextSubmitJobRequest(string displayName, MultiLanguageTextInput textInput, IReadOnlyList actions, string defaultLanguage, IDictionary serializedAdditionalRawData) + internal AnalyzeTextSubmitJobRequest(string displayName, MultiLanguageTextInput textInput, IReadOnlyList actions, string defaultLanguage, float? cancelAfter, IDictionary serializedAdditionalRawData) { DisplayName = displayName; TextInput = textInput; Actions = actions; DefaultLanguage = defaultLanguage; + CancelAfter = cancelAfter; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -99,5 +101,7 @@ internal AnalyzeTextSubmitJobRequest() public IReadOnlyList Actions { get; } /// Default language to use for records requesting automatic language detection. public string DefaultLanguage { get; } + /// Optional duration in seconds after which the job will be canceled if not completed. + public float? CancelAfter { get; } } } diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/CharacterMaskPolicyType.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/CharacterMaskPolicyType.cs index 1b078201bf57..9bb4fe403a88 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/CharacterMaskPolicyType.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/CharacterMaskPolicyType.cs @@ -22,13 +22,13 @@ public CharacterMaskPolicyType() /// Initializes a new instance of . /// The entity RedactionPolicy object kind. /// Keeps track of any properties unknown to the library. - /// Optional parameter to use a Custom Character to be used for redaction in PII responses. Default character will be * as before. We allow specific ascii characters for redaction. + /// Optional parameter to use a Custom Character to be used for redaction in PII responses. Default character will bce * as before. We allow specific ascii characters for redaction. internal CharacterMaskPolicyType(RedactionPolicyKind policyKind, IDictionary serializedAdditionalRawData, RedactionCharacter? redactionCharacter) : base(policyKind, serializedAdditionalRawData) { RedactionCharacter = redactionCharacter; } - /// Optional parameter to use a Custom Character to be used for redaction in PII responses. Default character will be * as before. We allow specific ascii characters for redaction. + /// Optional parameter to use a Custom Character to be used for redaction in PII responses. Default character will bce * as before. We allow specific ascii characters for redaction. public RedactionCharacter? RedactionCharacter { get; set; } } } diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/Docs/TextAnalysisClient.xml b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/Docs/TextAnalysisClient.xml index 9f9295f90d52..d79c5c7cb4e4 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/Docs/TextAnalysisClient.xml +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/Docs/TextAnalysisClient.xml @@ -2041,7 +2041,7 @@ Console.WriteLine(result.GetProperty("tasks").GetProperty("inProgress").ToString Console.WriteLine(result.GetProperty("tasks").GetProperty("total").ToString()); ]]> - + This sample shows how to call AnalyzeTextSubmitOperationAsync. - + This sample shows how to call AnalyzeTextSubmitOperation. + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.Language.Text +{ + public partial class EntitySynonym : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(EntitySynonym)} does not support writing '{format}' format."); + } + + writer.WritePropertyName("synonym"u8); + writer.WriteStringValue(Synonym); + if (Optional.IsDefined(Language)) + { + writer.WritePropertyName("language"u8); + writer.WriteStringValue(Language); + } + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + EntitySynonym IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(EntitySynonym)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeEntitySynonym(document.RootElement, options); + } + + internal static EntitySynonym DeserializeEntitySynonym(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string synonym = default; + string language = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("synonym"u8)) + { + synonym = property.Value.GetString(); + continue; + } + if (property.NameEquals("language"u8)) + { + language = property.Value.GetString(); + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new EntitySynonym(synonym, language, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(EntitySynonym)} does not support writing '{options.Format}' format."); + } + } + + EntitySynonym IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeEntitySynonym(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(EntitySynonym)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static EntitySynonym FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeEntitySynonym(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonym.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonym.cs new file mode 100644 index 000000000000..ff80973fec8a --- /dev/null +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonym.cs @@ -0,0 +1,79 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.AI.Language.Text +{ + /// The entity synonyms used to enhance pii entity detection. + public partial class EntitySynonym + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// The synonym to be used for context. + /// is null. + public EntitySynonym(string synonym) + { + Argument.AssertNotNull(synonym, nameof(synonym)); + + Synonym = synonym; + } + + /// Initializes a new instance of . + /// The synonym to be used for context. + /// The 2 letter ISO 639-1 language the synonym. + /// Keeps track of any properties unknown to the library. + internal EntitySynonym(string synonym, string language, IDictionary serializedAdditionalRawData) + { + Synonym = synonym; + Language = language; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal EntitySynonym() + { + } + + /// The synonym to be used for context. + public string Synonym { get; } + /// The 2 letter ISO 639-1 language the synonym. + public string Language { get; set; } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.Serialization.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.Serialization.cs new file mode 100644 index 000000000000..5876f0f0171b --- /dev/null +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.Serialization.cs @@ -0,0 +1,160 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.Language.Text +{ + public partial class EntitySynonyms : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(EntitySynonyms)} does not support writing '{format}' format."); + } + + writer.WritePropertyName("entityType"u8); + writer.WriteStringValue(EntityType.ToString()); + writer.WritePropertyName("synonyms"u8); + writer.WriteStartArray(); + foreach (var item in Synonyms) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + EntitySynonyms IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(EntitySynonyms)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeEntitySynonyms(document.RootElement, options); + } + + internal static EntitySynonyms DeserializeEntitySynonyms(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + EntityCategory entityType = default; + IList synonyms = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("entityType"u8)) + { + entityType = new EntityCategory(property.Value.GetString()); + continue; + } + if (property.NameEquals("synonyms"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(EntitySynonym.DeserializeEntitySynonym(item, options)); + } + synonyms = array; + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new EntitySynonyms(entityType, synonyms, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(EntitySynonyms)} does not support writing '{options.Format}' format."); + } + } + + EntitySynonyms IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeEntitySynonyms(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(EntitySynonyms)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static EntitySynonyms FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeEntitySynonyms(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.cs new file mode 100644 index 000000000000..ff6366dd8dde --- /dev/null +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/EntitySynonyms.cs @@ -0,0 +1,82 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Azure.AI.Language.Text +{ + /// Object that allows the user to provide synonyms for context words that to enhance pii entity detection. + public partial class EntitySynonyms + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// The entity name. + /// The entity synonyms. + /// is null. + public EntitySynonyms(EntityCategory entityType, IEnumerable synonyms) + { + Argument.AssertNotNull(synonyms, nameof(synonyms)); + + EntityType = entityType; + Synonyms = synonyms.ToList(); + } + + /// Initializes a new instance of . + /// The entity name. + /// The entity synonyms. + /// Keeps track of any properties unknown to the library. + internal EntitySynonyms(EntityCategory entityType, IList synonyms, IDictionary serializedAdditionalRawData) + { + EntityType = entityType; + Synonyms = synonyms; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal EntitySynonyms() + { + } + + /// The entity name. + public EntityCategory EntityType { get; } + /// The entity synonyms. + public IList Synonyms { get; } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.Serialization.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.Serialization.cs index 39c2da994612..a30bdcb9e65a 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.Serialization.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.Serialization.cs @@ -79,6 +79,16 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("redactionPolicy"u8); writer.WriteObjectValue(RedactionPolicy, options); } + if (Optional.IsDefined(ValueExclusionPolicy)) + { + writer.WritePropertyName("valueExclusionPolicy"u8); + writer.WriteObjectValue(ValueExclusionPolicy, options); + } + if (Optional.IsDefined(EntitySynonyms)) + { + writer.WritePropertyName("entitySynonyms"u8); + writer.WriteObjectValue(EntitySynonyms, options); + } if (options.Format != "W" && _serializedAdditionalRawData != null) { foreach (var item in _serializedAdditionalRawData) @@ -123,6 +133,8 @@ internal static PiiActionContent DeserializePiiActionContent(JsonElement element StringIndexType? stringIndexType = default; IList excludePiiCategories = default; BaseRedactionPolicy redactionPolicy = default; + ValueExclusionPolicy valueExclusionPolicy = default; + EntitySynonyms entitySynonyms = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -196,6 +208,24 @@ internal static PiiActionContent DeserializePiiActionContent(JsonElement element redactionPolicy = BaseRedactionPolicy.DeserializeBaseRedactionPolicy(property.Value, options); continue; } + if (property.NameEquals("valueExclusionPolicy"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + valueExclusionPolicy = ValueExclusionPolicy.DeserializeValueExclusionPolicy(property.Value, options); + continue; + } + if (property.NameEquals("entitySynonyms"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + entitySynonyms = EntitySynonyms.DeserializeEntitySynonyms(property.Value, options); + continue; + } if (options.Format != "W") { rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); @@ -210,6 +240,8 @@ internal static PiiActionContent DeserializePiiActionContent(JsonElement element stringIndexType, excludePiiCategories ?? new ChangeTrackingList(), redactionPolicy, + valueExclusionPolicy, + entitySynonyms, serializedAdditionalRawData); } diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.cs index f87442aa7201..623eb093f939 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiActionContent.cs @@ -64,8 +64,10 @@ public PiiActionContent() /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , and . /// + /// Policy for specific words and terms that should be excluded from detection by the PII detection service. + /// (Optional) request parameter that allows the user to provide synonyms for context words that to enhance pii entity detection. /// Keeps track of any properties unknown to the library. - internal PiiActionContent(bool? loggingOptOut, string modelVersion, PiiDomain? domain, IList piiCategories, StringIndexType? stringIndexType, IList excludePiiCategories, BaseRedactionPolicy redactionPolicy, IDictionary serializedAdditionalRawData) + internal PiiActionContent(bool? loggingOptOut, string modelVersion, PiiDomain? domain, IList piiCategories, StringIndexType? stringIndexType, IList excludePiiCategories, BaseRedactionPolicy redactionPolicy, ValueExclusionPolicy valueExclusionPolicy, EntitySynonyms entitySynonyms, IDictionary serializedAdditionalRawData) { LoggingOptOut = loggingOptOut; ModelVersion = modelVersion; @@ -74,6 +76,8 @@ internal PiiActionContent(bool? loggingOptOut, string modelVersion, PiiDomain? d StringIndexType = stringIndexType; ExcludePiiCategories = excludePiiCategories; RedactionPolicy = redactionPolicy; + ValueExclusionPolicy = valueExclusionPolicy; + EntitySynonyms = entitySynonyms; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -95,5 +99,9 @@ internal PiiActionContent(bool? loggingOptOut, string modelVersion, PiiDomain? d /// The available derived classes include , and . /// public BaseRedactionPolicy RedactionPolicy { get; set; } + /// Policy for specific words and terms that should be excluded from detection by the PII detection service. + public ValueExclusionPolicy ValueExclusionPolicy { get; set; } + /// (Optional) request parameter that allows the user to provide synonyms for context words that to enhance pii entity detection. + public EntitySynonyms EntitySynonyms { get; set; } } } diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategoriesExclude.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategoriesExclude.cs index 935dc337e81a..c05ec5f3bf4d 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategoriesExclude.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategoriesExclude.cs @@ -193,12 +193,21 @@ public PiiCategoriesExclude(string value) private const string DateValue = "Date"; private const string PersonValue = "Person"; private const string AddressValue = "Address"; + private const string DateOfBirthValue = "DateOfBirth"; + private const string BankAccountNumberValue = "BankAccountNumber"; + private const string PassportNumberValue = "PassportNumber"; + private const string DriversLicenseNumberValue = "DriversLicenseNumber"; + private const string NeighborhoodValue = "Neighborhood"; + private const string SortCodeValue = "SortCode"; + private const string PINValue = "PIN"; + private const string VINValue = "VIN"; + private const string LicensePlateValue = "LicensePlate"; /// ABA Routing number. public static PiiCategoriesExclude AbaRoutingNumber { get; } = new PiiCategoriesExclude(AbaRoutingNumberValue); /// AR National Identity Number. public static PiiCategoriesExclude ArNationalIdentityNumber { get; } = new PiiCategoriesExclude(ArNationalIdentityNumberValue); - /// AT Identity Card. + /// AT Bank Account Number. public static PiiCategoriesExclude AuBankAccountNumber { get; } = new PiiCategoriesExclude(AuBankAccountNumberValue); /// AU Driver's License Number. public static PiiCategoriesExclude AuDriversLicenseNumber { get; } = new PiiCategoriesExclude(AuDriversLicenseNumberValue); @@ -536,6 +545,24 @@ public PiiCategoriesExclude(string value) public static PiiCategoriesExclude Person { get; } = new PiiCategoriesExclude(PersonValue); /// Address. public static PiiCategoriesExclude Address { get; } = new PiiCategoriesExclude(AddressValue); + /// Date Of Birth. + public static PiiCategoriesExclude DateOfBirth { get; } = new PiiCategoriesExclude(DateOfBirthValue); + /// Bank Account Number. + public static PiiCategoriesExclude BankAccountNumber { get; } = new PiiCategoriesExclude(BankAccountNumberValue); + /// Passport Number. + public static PiiCategoriesExclude PassportNumber { get; } = new PiiCategoriesExclude(PassportNumberValue); + /// Drivers License Number. + public static PiiCategoriesExclude DriversLicenseNumber { get; } = new PiiCategoriesExclude(DriversLicenseNumberValue); + /// Neighborhood. + public static PiiCategoriesExclude Neighborhood { get; } = new PiiCategoriesExclude(NeighborhoodValue); + /// Sort Code. 6-digit number used in the UK to identify a specific bank and branch where a bank account is held. + public static PiiCategoriesExclude SortCode { get; } = new PiiCategoriesExclude(SortCodeValue); + /// PIN. + public static PiiCategoriesExclude PIN { get; } = new PiiCategoriesExclude(PINValue); + /// VIN. + public static PiiCategoriesExclude VIN { get; } = new PiiCategoriesExclude(VINValue); + /// License Plate. + public static PiiCategoriesExclude LicensePlate { get; } = new PiiCategoriesExclude(LicensePlateValue); /// Determines if two values are the same. public static bool operator ==(PiiCategoriesExclude left, PiiCategoriesExclude right) => left.Equals(right); /// Determines if two values are not the same. diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategory.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategory.cs index fd0d8306060f..ee657d22ba22 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategory.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/PiiCategory.cs @@ -193,6 +193,15 @@ public PiiCategory(string value) private const string DateValue = "Date"; private const string PersonValue = "Person"; private const string AddressValue = "Address"; + private const string DateOfBirthValue = "DateOfBirth"; + private const string BankAccountNumberValue = "BankAccountNumber"; + private const string PassportNumberValue = "PassportNumber"; + private const string DriversLicenseNumberValue = "DriversLicenseNumber"; + private const string NeighborhoodValue = "Neighborhood"; + private const string SortCodeValue = "SortCode"; + private const string PINValue = "PIN"; + private const string VINValue = "VIN"; + private const string LicensePlateValue = "LicensePlate"; private const string AllValue = "All"; private const string DefaultValue = "Default"; @@ -200,7 +209,7 @@ public PiiCategory(string value) public static PiiCategory AbaRoutingNumber { get; } = new PiiCategory(AbaRoutingNumberValue); /// AR National Identity Number. public static PiiCategory ArNationalIdentityNumber { get; } = new PiiCategory(ArNationalIdentityNumberValue); - /// AT Identity Card. + /// AT Bank Account Number. public static PiiCategory AuBankAccountNumber { get; } = new PiiCategory(AuBankAccountNumberValue); /// AU Driver's License Number. public static PiiCategory AuDriversLicenseNumber { get; } = new PiiCategory(AuDriversLicenseNumberValue); @@ -538,6 +547,24 @@ public PiiCategory(string value) public static PiiCategory Person { get; } = new PiiCategory(PersonValue); /// Address. public static PiiCategory Address { get; } = new PiiCategory(AddressValue); + /// Date Of Birth. + public static PiiCategory DateOfBirth { get; } = new PiiCategory(DateOfBirthValue); + /// Bank Account Number. + public static PiiCategory BankAccountNumber { get; } = new PiiCategory(BankAccountNumberValue); + /// Passport Number. + public static PiiCategory PassportNumber { get; } = new PiiCategory(PassportNumberValue); + /// Drivers License Number. + public static PiiCategory DriversLicenseNumber { get; } = new PiiCategory(DriversLicenseNumberValue); + /// Neighborhood. + public static PiiCategory Neighborhood { get; } = new PiiCategory(NeighborhoodValue); + /// Sort Code. 6-digit number used in the UK to identify a specific bank and branch where a bank account is held. + public static PiiCategory SortCode { get; } = new PiiCategory(SortCodeValue); + /// PIN. + public static PiiCategory PIN { get; } = new PiiCategory(PINValue); + /// VIN. + public static PiiCategory VIN { get; } = new PiiCategory(VINValue); + /// License Plate. + public static PiiCategory LicensePlate { get; } = new PiiCategory(LicensePlateValue); /// All PII categories. public static PiiCategory All { get; } = new PiiCategory(AllValue); /// Default PII categories for the language. diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClient.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClient.cs index aea5acc66092..afc0f59f40d1 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClient.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClient.cs @@ -298,15 +298,22 @@ public virtual Response AnalyzeTextOperationStatus(Guid jobId, bool? showStats, /// List of tasks to be performed as part of the LRO. /// Name for the task. /// Default language to use for records requesting automatic language detection. + /// Optional duration in seconds after which the job will be canceled if not completed. /// The cancellation token to use. /// or is null. - /// - public virtual async Task AnalyzeTextSubmitOperationAsync(WaitUntil waitUntil, MultiLanguageTextInput textInput, IEnumerable actions, string displayName = null, string defaultLanguage = null, CancellationToken cancellationToken = default) + /// + public virtual async Task AnalyzeTextSubmitOperationAsync(WaitUntil waitUntil, MultiLanguageTextInput textInput, IEnumerable actions, string displayName = null, string defaultLanguage = null, float? cancelAfter = null, CancellationToken cancellationToken = default) { Argument.AssertNotNull(textInput, nameof(textInput)); Argument.AssertNotNull(actions, nameof(actions)); - AnalyzeTextSubmitJobRequest analyzeTextSubmitJobRequest = new AnalyzeTextSubmitJobRequest(displayName, textInput, actions.ToList(), defaultLanguage, null); + AnalyzeTextSubmitJobRequest analyzeTextSubmitJobRequest = new AnalyzeTextSubmitJobRequest( + displayName, + textInput, + actions.ToList(), + defaultLanguage, + cancelAfter, + null); RequestContext context = FromCancellationToken(cancellationToken); return await AnalyzeTextSubmitOperationAsync(waitUntil, analyzeTextSubmitJobRequest.ToRequestContent(), context).ConfigureAwait(false); } @@ -317,15 +324,22 @@ public virtual async Task AnalyzeTextSubmitOperationAsync(WaitUntil w /// List of tasks to be performed as part of the LRO. /// Name for the task. /// Default language to use for records requesting automatic language detection. + /// Optional duration in seconds after which the job will be canceled if not completed. /// The cancellation token to use. /// or is null. - /// - public virtual Operation AnalyzeTextSubmitOperation(WaitUntil waitUntil, MultiLanguageTextInput textInput, IEnumerable actions, string displayName = null, string defaultLanguage = null, CancellationToken cancellationToken = default) + /// + public virtual Operation AnalyzeTextSubmitOperation(WaitUntil waitUntil, MultiLanguageTextInput textInput, IEnumerable actions, string displayName = null, string defaultLanguage = null, float? cancelAfter = null, CancellationToken cancellationToken = default) { Argument.AssertNotNull(textInput, nameof(textInput)); Argument.AssertNotNull(actions, nameof(actions)); - AnalyzeTextSubmitJobRequest analyzeTextSubmitJobRequest = new AnalyzeTextSubmitJobRequest(displayName, textInput, actions.ToList(), defaultLanguage, null); + AnalyzeTextSubmitJobRequest analyzeTextSubmitJobRequest = new AnalyzeTextSubmitJobRequest( + displayName, + textInput, + actions.ToList(), + defaultLanguage, + cancelAfter, + null); RequestContext context = FromCancellationToken(cancellationToken); return AnalyzeTextSubmitOperation(waitUntil, analyzeTextSubmitJobRequest.ToRequestContent(), context); } @@ -340,7 +354,7 @@ public virtual Operation AnalyzeTextSubmitOperation(WaitUntil waitUntil, MultiLa /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -380,7 +394,7 @@ public virtual async Task AnalyzeTextSubmitOperationAsync(WaitUntil w /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClientOptions.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClientOptions.cs index 501497ceaa75..15df13be2b42 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClientOptions.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisClientOptions.cs @@ -13,7 +13,7 @@ namespace Azure.AI.Language.Text /// Client options for TextAnalysisClient. public partial class TextAnalysisClientOptions : ClientOptions { - private const ServiceVersion LatestVersion = ServiceVersion.V2024_11_15_Preview; + private const ServiceVersion LatestVersion = ServiceVersion.V2025_05_15_Preview; /// The version of the service to use. public enum ServiceVersion @@ -26,6 +26,8 @@ public enum ServiceVersion V2024_11_01 = 3, /// Service version "2024-11-15-preview". V2024_11_15_Preview = 4, + /// Service version "2025-05-15-preview". + V2025_05_15_Preview = 5, } internal string Version { get; } @@ -39,6 +41,7 @@ public TextAnalysisClientOptions(ServiceVersion version = LatestVersion) ServiceVersion.V2023_04_01 => "2023-04-01", ServiceVersion.V2024_11_01 => "2024-11-01", ServiceVersion.V2024_11_15_Preview => "2024-11-15-preview", + ServiceVersion.V2025_05_15_Preview => "2025-05-15-preview", _ => throw new NotSupportedException() }; } diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisModelFactory.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisModelFactory.cs index faf6d35b8c80..138fc4f17c5b 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisModelFactory.cs +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/TextAnalysisModelFactory.cs @@ -34,6 +34,15 @@ public static LanguageInput LanguageInput(string id = null, string text = null, return new LanguageInput(id, text, countryHint, serializedAdditionalRawData: null); } + /// Initializes a new instance of . + /// The synonym to be used for context. + /// The 2 letter ISO 639-1 language the synonym. + /// A new instance for mocking. + public static EntitySynonym EntitySynonym(string synonym = null, string language = null) + { + return new EntitySynonym(synonym, language, serializedAdditionalRawData: null); + } + /// Initializes a new instance of . /// Entity linking result. /// A new instance for mocking. diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.Serialization.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.Serialization.cs new file mode 100644 index 000000000000..a0194b6165bd --- /dev/null +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.Serialization.cs @@ -0,0 +1,160 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.Language.Text +{ + public partial class ValueExclusionPolicy : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + writer.WriteStartObject(); + JsonModelWriteCore(writer, options); + writer.WriteEndObject(); + } + + /// The JSON writer. + /// The client options for reading and writing models. + protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(ValueExclusionPolicy)} does not support writing '{format}' format."); + } + + writer.WritePropertyName("caseSensitive"u8); + writer.WriteBooleanValue(CaseSensitive); + writer.WritePropertyName("excludedValues"u8); + writer.WriteStartArray(); + foreach (var item in ExcludedValues) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + } + + ValueExclusionPolicy IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(ValueExclusionPolicy)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeValueExclusionPolicy(document.RootElement, options); + } + + internal static ValueExclusionPolicy DeserializeValueExclusionPolicy(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + bool caseSensitive = default; + IList excludedValues = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("caseSensitive"u8)) + { + caseSensitive = property.Value.GetBoolean(); + continue; + } + if (property.NameEquals("excludedValues"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(item.GetString()); + } + excludedValues = array; + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new ValueExclusionPolicy(caseSensitive, excludedValues, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(ValueExclusionPolicy)} does not support writing '{options.Format}' format."); + } + } + + ValueExclusionPolicy IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeValueExclusionPolicy(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(ValueExclusionPolicy)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static ValueExclusionPolicy FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); + return DeserializeValueExclusionPolicy(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.cs b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.cs new file mode 100644 index 000000000000..3cae20b4d26d --- /dev/null +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/src/Generated/ValueExclusionPolicy.cs @@ -0,0 +1,82 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Azure.AI.Language.Text +{ + /// Policy for specific words and terms that should be excluded from detection by the PII detection service. + public partial class ValueExclusionPolicy + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// Option to make the values excluded values case sensitive. + /// List of words and terms that should be excluded from detection by the PII detection service. + /// is null. + public ValueExclusionPolicy(bool caseSensitive, IEnumerable excludedValues) + { + Argument.AssertNotNull(excludedValues, nameof(excludedValues)); + + CaseSensitive = caseSensitive; + ExcludedValues = excludedValues.ToList(); + } + + /// Initializes a new instance of . + /// Option to make the values excluded values case sensitive. + /// List of words and terms that should be excluded from detection by the PII detection service. + /// Keeps track of any properties unknown to the library. + internal ValueExclusionPolicy(bool caseSensitive, IList excludedValues, IDictionary serializedAdditionalRawData) + { + CaseSensitive = caseSensitive; + ExcludedValues = excludedValues; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal ValueExclusionPolicy() + { + } + + /// Option to make the values excluded values case sensitive. + public bool CaseSensitive { get; } + /// List of words and terms that should be excluded from detection by the PII detection service. + public IList ExcludedValues { get; } + } +} diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Text/tsp-location.yaml b/sdk/cognitivelanguage/Azure.AI.Language.Text/tsp-location.yaml index 1faae3bb7069..f4c6941d93f3 100644 --- a/sdk/cognitivelanguage/Azure.AI.Language.Text/tsp-location.yaml +++ b/sdk/cognitivelanguage/Azure.AI.Language.Text/tsp-location.yaml @@ -1,4 +1,4 @@ -repo: azure/azure-rest-api-specs -commit: 462574dbd02088c209bb1da3eef0d93f699e8de2 directory: specification/cognitiveservices/Language.AnalyzeText - +commit: 20f7cf8268ee45be7fb0d580bae78b95200f1b41 +repo: Azure/azure-rest-api-specs +additionalDirectories: diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders.cs similarity index 59% rename from sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders.cs rename to sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders.cs index b490f7fc74ef..71d5605944a4 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders.cs @@ -5,17 +5,19 @@ #nullable disable +using System; using Azure.Core; namespace Azure.AI.TextAnalytics { - internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders + internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders { private readonly Response _response; - public MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders(Response response) + public MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders(Response response) { _response = response; } - public string OperationLocation => _response.Headers.TryGetValue("Operation-Location", out string value) ? value : null; + /// The location for monitoring the operation state. + public Uri OperationLocation => _response.Headers.TryGetValue("Operation-Location", out Uri value) ? value : null; } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders.cs similarity index 59% rename from sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders.cs rename to sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders.cs index 30df8841a84d..5678bc06ad5a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders.cs @@ -5,17 +5,19 @@ #nullable disable +using System; using Azure.Core; namespace Azure.AI.TextAnalytics { - internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders + internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders { private readonly Response _response; - public MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders(Response response) + public MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders(Response response) { _response = response; } - public string OperationLocation => _response.Headers.TryGetValue("Operation-Location", out string value) ? value : null; + /// The location for monitoring the operation state. + public Uri OperationLocation => _response.Headers.TryGetValue("Operation-Location", out Uri value) ? value : null; } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisRestClient.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisRestClient.cs index 16d7d3153470..38bbc99a4b7c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisRestClient.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/MicrosoftCognitiveLanguageServiceTextAnalysisRestClient.cs @@ -18,7 +18,6 @@ namespace Azure.AI.TextAnalytics internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisRestClient { private readonly HttpPipeline _pipeline; - private readonly string _endpoint; private readonly string _apiVersion; /// The ClientDiagnostics is used to provide tracing support for the client library. @@ -27,24 +26,22 @@ internal partial class MicrosoftCognitiveLanguageServiceTextAnalysisRestClient /// Initializes a new instance of MicrosoftCognitiveLanguageServiceTextAnalysisRestClient. /// The handler for diagnostic messaging in the client. /// The HTTP pipeline for sending and receiving REST requests and responses. - /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). /// Api Version. - /// , , or is null. - public MicrosoftCognitiveLanguageServiceTextAnalysisRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string endpoint, string apiVersion = "2023-04-01") + /// , or is null. + public MicrosoftCognitiveLanguageServiceTextAnalysisRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string apiVersion = "2023-04-01") { ClientDiagnostics = clientDiagnostics ?? throw new ArgumentNullException(nameof(clientDiagnostics)); _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); - _endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint)); _apiVersion = apiVersion ?? throw new ArgumentNullException(nameof(apiVersion)); } - internal HttpMessage CreateAnalyzeRequest(AnalyzeTextTask body, bool? showStats) + internal HttpMessage CreateAnalyzeRequest(string endpoint, AnalyzeTextTask body, bool? showStats) { var message = _pipeline.CreateMessage(); var request = message.Request; request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); - uri.AppendRaw(_endpoint, false); + uri.AppendRaw(endpoint, true); uri.AppendRaw("/language", false); uri.AppendPath("/:analyze-text", false); uri.AppendQuery("api-version", _apiVersion, true); @@ -62,19 +59,23 @@ internal HttpMessage CreateAnalyzeRequest(AnalyzeTextTask body, bool? showStats) } /// Request text analysis over a collection of documents. - /// Collection of documents to analyze and a single task to execute. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The input documents to analyze. /// (Optional) if set to true, response will contain request and document level statistics. /// The cancellation token to use. - /// is null. - /// Submit a collection of text documents for analysis. Specify a single unique task to be executed immediately. - public async Task> AnalyzeAsync(AnalyzeTextTask body, bool? showStats = null, CancellationToken cancellationToken = default) + /// or is null. + public async Task> AnalyzeAsync(string endpoint, AnalyzeTextTask body, bool? showStats = null, CancellationToken cancellationToken = default) { + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } if (body == null) { throw new ArgumentNullException(nameof(body)); } - using var message = CreateAnalyzeRequest(body, showStats); + using var message = CreateAnalyzeRequest(endpoint, body, showStats); await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); switch (message.Response.Status) { @@ -91,19 +92,23 @@ public async Task> AnalyzeAsync(AnalyzeTextTask } /// Request text analysis over a collection of documents. - /// Collection of documents to analyze and a single task to execute. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The input documents to analyze. /// (Optional) if set to true, response will contain request and document level statistics. /// The cancellation token to use. - /// is null. - /// Submit a collection of text documents for analysis. Specify a single unique task to be executed immediately. - public Response Analyze(AnalyzeTextTask body, bool? showStats = null, CancellationToken cancellationToken = default) + /// or is null. + public Response Analyze(string endpoint, AnalyzeTextTask body, bool? showStats = null, CancellationToken cancellationToken = default) { + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } if (body == null) { throw new ArgumentNullException(nameof(body)); } - using var message = CreateAnalyzeRequest(body, showStats); + using var message = CreateAnalyzeRequest(endpoint, body, showStats); _pipeline.Send(message, cancellationToken); switch (message.Response.Status) { @@ -119,13 +124,13 @@ public Response Analyze(AnalyzeTextTask body, bool? showS } } - internal HttpMessage CreateAnalyzeBatchSubmitJobRequest(AnalyzeTextJobsInput body) + internal HttpMessage CreateAnalyzeTextSubmitJobRequest(string endpoint, AnalyzeTextJobsInput body) { var message = _pipeline.CreateMessage(); var request = message.Request; request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); - uri.AppendRaw(_endpoint, false); + uri.AppendRaw(endpoint, true); uri.AppendRaw("/language", false); uri.AppendPath("/analyze-text/jobs", false); uri.AppendQuery("api-version", _apiVersion, true); @@ -138,21 +143,25 @@ internal HttpMessage CreateAnalyzeBatchSubmitJobRequest(AnalyzeTextJobsInput bod return message; } - /// Submit text analysis job. - /// Collection of documents to analyze and one or more tasks to execute. + /// Submit a collection of text documents for analysis. Specify one or more unique tasks to be executed as a long-running operation. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The to use. /// The cancellation token to use. - /// is null. - /// Submit a collection of text documents for analysis. Specify one or more unique tasks to be executed as a long-running operation. - public async Task> AnalyzeBatchSubmitJobAsync(AnalyzeTextJobsInput body, CancellationToken cancellationToken = default) + /// or is null. + public async Task> AnalyzeTextSubmitJobAsync(string endpoint, AnalyzeTextJobsInput body, CancellationToken cancellationToken = default) { + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } if (body == null) { throw new ArgumentNullException(nameof(body)); } - using var message = CreateAnalyzeBatchSubmitJobRequest(body); + using var message = CreateAnalyzeTextSubmitJobRequest(endpoint, body); await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders(message.Response); + var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders(message.Response); switch (message.Response.Status) { case 202: @@ -162,21 +171,25 @@ public async Task Submit text analysis job. - /// Collection of documents to analyze and one or more tasks to execute. + /// Submit a collection of text documents for analysis. Specify one or more unique tasks to be executed as a long-running operation. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The to use. /// The cancellation token to use. - /// is null. - /// Submit a collection of text documents for analysis. Specify one or more unique tasks to be executed as a long-running operation. - public ResponseWithHeaders AnalyzeBatchSubmitJob(AnalyzeTextJobsInput body, CancellationToken cancellationToken = default) + /// or is null. + public ResponseWithHeaders AnalyzeTextSubmitJob(string endpoint, AnalyzeTextJobsInput body, CancellationToken cancellationToken = default) { + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } if (body == null) { throw new ArgumentNullException(nameof(body)); } - using var message = CreateAnalyzeBatchSubmitJobRequest(body); + using var message = CreateAnalyzeTextSubmitJobRequest(endpoint, body); _pipeline.Send(message, cancellationToken); - var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchSubmitJobHeaders(message.Response); + var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextSubmitJobHeaders(message.Response); switch (message.Response.Status) { case 202: @@ -186,13 +199,13 @@ public ResponseWithHeaders Get analysis status and results. - /// Job ID. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// job ID. /// (Optional) if set to true, response will contain request and document level statistics. /// The maximum number of resources to return from the collection. /// An offset into the collection of the first resource to be returned. /// The cancellation token to use. - /// Get the status of an analysis job. A job may consist of one or more tasks. Once all tasks are succeeded, the job will transition to the succeeded state and results will be available for each task. - public async Task> AnalyzeBatchJobStatusAsync(Guid jobId, bool? showStats = null, int? top = null, int? skip = null, CancellationToken cancellationToken = default) + /// is null. + /// Get the status of an analysis job. A job can consist of one or more tasks. After all tasks succeed, the job transitions to the succeeded state and results are available for each task. + public async Task> AnalyzeTextJobStatusAsync(string endpoint, Guid jobId, bool? showStats = null, int? top = null, int? skip = null, CancellationToken cancellationToken = default) { - using var message = CreateAnalyzeBatchJobStatusRequest(jobId, showStats, top, skip); + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } + + using var message = CreateAnalyzeTextJobStatusRequest(endpoint, jobId, showStats, top, skip); await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); switch (message.Response.Status) { @@ -240,15 +260,22 @@ public async Task> AnalyzeBatchJobStatusAsync(Guid } /// Get analysis status and results. - /// Job ID. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// job ID. /// (Optional) if set to true, response will contain request and document level statistics. /// The maximum number of resources to return from the collection. /// An offset into the collection of the first resource to be returned. /// The cancellation token to use. - /// Get the status of an analysis job. A job may consist of one or more tasks. Once all tasks are succeeded, the job will transition to the succeeded state and results will be available for each task. - public Response AnalyzeBatchJobStatus(Guid jobId, bool? showStats = null, int? top = null, int? skip = null, CancellationToken cancellationToken = default) + /// is null. + /// Get the status of an analysis job. A job can consist of one or more tasks. After all tasks succeed, the job transitions to the succeeded state and results are available for each task. + public Response AnalyzeTextJobStatus(string endpoint, Guid jobId, bool? showStats = null, int? top = null, int? skip = null, CancellationToken cancellationToken = default) { - using var message = CreateAnalyzeBatchJobStatusRequest(jobId, showStats, top, skip); + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } + + using var message = CreateAnalyzeTextJobStatusRequest(endpoint, jobId, showStats, top, skip); _pipeline.Send(message, cancellationToken); switch (message.Response.Status) { @@ -264,13 +291,13 @@ public Response AnalyzeBatchJobStatus(Guid jobId, bool? sho } } - internal HttpMessage CreateAnalyzeBatchCancelJobRequest(Guid jobId) + internal HttpMessage CreateAnalyzeTextCancelJobRequest(string endpoint, Guid jobId) { var message = _pipeline.CreateMessage(); var request = message.Request; request.Method = RequestMethod.Post; var uri = new RawRequestUriBuilder(); - uri.AppendRaw(_endpoint, false); + uri.AppendRaw(endpoint, true); uri.AppendRaw("/language", false); uri.AppendPath("/analyze-text/jobs/", false); uri.AppendPath(jobId, true); @@ -282,14 +309,20 @@ internal HttpMessage CreateAnalyzeBatchCancelJobRequest(Guid jobId) } /// Cancel a long-running Text Analysis job. - /// Job ID. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The job ID to cancel. /// The cancellation token to use. - /// Cancel a long-running Text Analysis job. - public async Task> AnalyzeBatchCancelJobAsync(Guid jobId, CancellationToken cancellationToken = default) + /// is null. + public async Task> AnalyzeTextCancelJobAsync(string endpoint, Guid jobId, CancellationToken cancellationToken = default) { - using var message = CreateAnalyzeBatchCancelJobRequest(jobId); + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } + + using var message = CreateAnalyzeTextCancelJobRequest(endpoint, jobId); await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false); - var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders(message.Response); + var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders(message.Response); switch (message.Response.Status) { case 202: @@ -300,14 +333,20 @@ public async Task Cancel a long-running Text Analysis job. - /// Job ID. + /// Supported Cognitive Services endpoint (e.g., https://<resource-name>.api.cognitiveservices.azure.com). + /// The job ID to cancel. /// The cancellation token to use. - /// Cancel a long-running Text Analysis job. - public ResponseWithHeaders AnalyzeBatchCancelJob(Guid jobId, CancellationToken cancellationToken = default) + /// is null. + public ResponseWithHeaders AnalyzeTextCancelJob(string endpoint, Guid jobId, CancellationToken cancellationToken = default) { - using var message = CreateAnalyzeBatchCancelJobRequest(jobId); + if (endpoint == null) + { + throw new ArgumentNullException(nameof(endpoint)); + } + + using var message = CreateAnalyzeTextCancelJobRequest(endpoint, jobId); _pipeline.Send(message, cancellationToken); - var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeBatchCancelJobHeaders(message.Response); + var headers = new MicrosoftCognitiveLanguageServiceTextAnalysisAnalyzeTextCancelJobHeaders(message.Response); switch (message.Response.Status) { case 202: diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.Serialization.cs index afe8a955e8ba..5204e3c0a51d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class AbstractiveSummarizationLROResult : IUtf8JsonSerializable + internal partial class AbstractiveSummarizationLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static AbstractiveSummarizationLROResult DeserializeAbstractiveSummarizationLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static AbstractiveSummarizationLROResult DeserializeAbstractiveSummariz return null; } AbstractiveSummarizationResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static AbstractiveSummarizationLROResult DeserializeAbstractiveSummariz results = AbstractiveSummarizationResult.DeserializeAbstractiveSummarizationResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new AbstractiveSummarizationLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new AbstractiveSummarizationLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static AbstractiveSummarizationLROResult DeserializeAbstractiveSummariz using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAbstractiveSummarizationLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.cs index fe204112cebe..6852635e6fb5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROResult.cs @@ -13,11 +13,11 @@ namespace Azure.AI.TextAnalytics.Models internal partial class AbstractiveSummarizationLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// An object representing the pre-build summarization results of each document. + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// Results of the task. /// is null. - public AbstractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AbstractiveSummarizationResult results) : base(lastUpdateDateTime, status) + internal AbstractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AbstractiveSummarizationResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public AbstractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, Text } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// An object representing the pre-build summarization results of each document. - internal AbstractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, AbstractiveSummarizationResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// Results of the task. + internal AbstractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, AbstractiveSummarizationResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// An object representing the pre-build summarization results of each document. - public AbstractiveSummarizationResult Results { get; set; } + /// Results of the task. + public AbstractiveSummarizationResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.Serialization.cs index d17d9199a4ce..79998aae4ad3 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.Serialization.cs @@ -15,56 +15,21 @@ internal partial class AbstractiveSummarizationLROTask : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("parameters"u8); - writer.WriteObjectValue(Parameters); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); + if (Optional.IsDefined(Parameters)) + { + writer.WritePropertyName("parameters"u8); + writer.WriteObjectValue(Parameters); + } if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static AbstractiveSummarizationLROTask DeserializeAbstractiveSummarizationLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - AbstractiveSummarizationTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - parameters = AbstractiveSummarizationTaskParameters.DeserializeAbstractiveSummarizationTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new AbstractiveSummarizationLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new AbstractiveSummarizationLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAbstractiveSummarizationLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.cs index 4ea8a0c30b62..0ec32670637a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationLROTask.cs @@ -5,35 +5,28 @@ #nullable disable -using System; - namespace Azure.AI.TextAnalytics.Models { /// An object representing the task definition for an Abstractive Summarization task. internal partial class AbstractiveSummarizationLROTask : AnalyzeTextLROTask { /// Initializes a new instance of . - /// Supported parameters for the pre-build Abstractive Summarization task. - /// is null. - public AbstractiveSummarizationLROTask(AbstractiveSummarizationTaskParameters parameters) + public AbstractiveSummarizationLROTask() { - Argument.AssertNotNull(parameters, nameof(parameters)); - - Parameters = parameters; Kind = AnalyzeTextLROTaskKind.AbstractiveSummarization; } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for the pre-build Abstractive Summarization task. + /// task name. + /// The kind of task to perform. + /// Parameters for the Abstractive Summarization task. internal AbstractiveSummarizationLROTask(string taskName, AnalyzeTextLROTaskKind kind, AbstractiveSummarizationTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for the pre-build Abstractive Summarization task. + /// Parameters for the Abstractive Summarization task. public AbstractiveSummarizationTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.Serialization.cs index 2e20c406e4f1..be0c78719dbf 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.Serialization.cs @@ -7,49 +7,21 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class AbstractiveSummarizationResult : IUtf8JsonSerializable + internal partial class AbstractiveSummarizationResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WriteEndObject(); - } - internal static AbstractiveSummarizationResult DeserializeAbstractiveSummarizationResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; - IList documents = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("errors"u8)) @@ -87,23 +59,15 @@ internal static AbstractiveSummarizationResult DeserializeAbstractiveSummarizati continue; } } - return new AbstractiveSummarizationResult(documents, errors, statistics, modelVersion); + return new AbstractiveSummarizationResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new AbstractiveSummarizationResult FromResponse(Response response) + internal static AbstractiveSummarizationResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAbstractiveSummarizationResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.cs index 152956060e0f..5194858a8a2f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResult.cs @@ -11,41 +11,45 @@ namespace Azure.AI.TextAnalytics.Models { - /// An object representing the pre-build summarization results of each document. - internal partial class AbstractiveSummarizationResult : AbstractiveSummarizationResultBase + /// An object representing the pre-built Abstractive Summarization results of each document. + internal partial class AbstractiveSummarizationResult { /// Initializes a new instance of . - /// Response by document. /// Errors by document id. /// This field indicates which model is used for scoring. - /// , or is null. - public AbstractiveSummarizationResult(IEnumerable documents, IEnumerable errors, string modelVersion) : base(documents) + /// Response by document. + /// , or is null. + internal AbstractiveSummarizationResult(IEnumerable errors, string modelVersion, IEnumerable documents) { - Argument.AssertNotNull(documents, nameof(documents)); Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); + Argument.AssertNotNull(documents, nameof(documents)); Errors = errors.ToList(); ModelVersion = modelVersion; + Documents = documents.ToList(); } /// Initializes a new instance of . - /// Response by document. /// Errors by document id. /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. - internal AbstractiveSummarizationResult(IList documents, IList errors, TextDocumentBatchStatistics statistics, string modelVersion) : base(documents) + /// Response by document. + internal AbstractiveSummarizationResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { Errors = errors; Statistics = statistics; ModelVersion = modelVersion; + Documents = documents; } /// Errors by document id. - public IList Errors { get; } + public IReadOnlyList Errors { get; } /// if showStats=true was specified in the request this field will contain information about the request payload. - public TextDocumentBatchStatistics Statistics { get; set; } + public TextDocumentBatchStatistics Statistics { get; } /// This field indicates which model is used for scoring. - public string ModelVersion { get; set; } + public string ModelVersion { get; } + /// Response by document. + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.Serialization.cs deleted file mode 100644 index 8c7c9af272e1..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.Serialization.cs +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class AbstractiveSummarizationResultBase : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WriteEndObject(); - } - - internal static AbstractiveSummarizationResultBase DeserializeAbstractiveSummarizationResultBase(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList documents = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(AbstractiveSummaryDocumentResult.DeserializeAbstractiveSummaryDocumentResult(item)); - } - documents = array; - continue; - } - } - return new AbstractiveSummarizationResultBase(documents); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static AbstractiveSummarizationResultBase FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAbstractiveSummarizationResultBase(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.cs deleted file mode 100644 index fff56fe88fb9..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationResultBase.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Azure.AI.TextAnalytics.Models -{ - /// An object representing the summarization results of each document. - internal partial class AbstractiveSummarizationResultBase - { - /// Initializes a new instance of . - /// Response by document. - /// is null. - public AbstractiveSummarizationResultBase(IEnumerable documents) - { - Argument.AssertNotNull(documents, nameof(documents)); - - Documents = documents.ToList(); - } - - /// Initializes a new instance of . - /// Response by document. - internal AbstractiveSummarizationResultBase(IList documents) - { - Documents = documents; - } - - /// Response by document. - public IList Documents { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.Serialization.cs index 48b5ac15b734..98063aea1cd0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.Serialization.cs @@ -15,16 +15,16 @@ internal partial class AbstractiveSummarizationTaskParameters : IUtf8JsonSeriali void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } if (Optional.IsDefined(LoggingOptOut)) { writer.WritePropertyName("loggingOptOut"u8); writer.WriteBooleanValue(LoggingOptOut.Value); } + if (Optional.IsDefined(ModelVersion)) + { + writer.WritePropertyName("modelVersion"u8); + writer.WriteStringValue(ModelVersion); + } if (Optional.IsDefined(SentenceCount)) { writer.WritePropertyName("sentenceCount"u8); @@ -38,64 +38,8 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static AbstractiveSummarizationTaskParameters DeserializeAbstractiveSummarizationTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string modelVersion = default; - bool? loggingOptOut = default; - int? sentenceCount = default; - StringIndexType? stringIndexType = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - if (property.NameEquals("sentenceCount"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - sentenceCount = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - } - return new AbstractiveSummarizationTaskParameters(sentenceCount, stringIndexType, modelVersion, loggingOptOut); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new AbstractiveSummarizationTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAbstractiveSummarizationTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.cs index bb6cb9c5ac19..f885117c5a3a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParameters.cs @@ -7,8 +7,8 @@ namespace Azure.AI.TextAnalytics.Models { - /// Supported parameters for the pre-build Abstractive Summarization task. - internal partial class AbstractiveSummarizationTaskParameters : AbstractiveSummarizationTaskParametersBase + /// Supported parameters for the pre-built Abstractive Summarization task. + internal partial class AbstractiveSummarizationTaskParameters { /// Initializes a new instance of . public AbstractiveSummarizationTaskParameters() @@ -16,19 +16,25 @@ public AbstractiveSummarizationTaskParameters() } /// Initializes a new instance of . - /// It controls the approximate number of sentences in the output summaries. - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - /// - /// - internal AbstractiveSummarizationTaskParameters(int? sentenceCount, StringIndexType? stringIndexType, string modelVersion, bool? loggingOptOut) : base(sentenceCount, stringIndexType) + /// logging opt out. + /// model version. + /// Controls the approximate number of sentences in the output summaries. + /// String index type. + internal AbstractiveSummarizationTaskParameters(bool? loggingOptOut, string modelVersion, int? sentenceCount, StringIndexType? stringIndexType) { - ModelVersion = modelVersion; LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; + SentenceCount = sentenceCount; + StringIndexType = stringIndexType; } - /// Gets or sets the model version. - public string ModelVersion { get; set; } - /// Gets or sets the logging opt out. + /// logging opt out. public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Controls the approximate number of sentences in the output summaries. + public int? SentenceCount { get; set; } + /// String index type. + public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.Serialization.cs deleted file mode 100644 index d1a73a9acc59..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.Serialization.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class AbstractiveSummarizationTaskParametersBase : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Optional.IsDefined(SentenceCount)) - { - writer.WritePropertyName("sentenceCount"u8); - writer.WriteNumberValue(SentenceCount.Value); - } - if (Optional.IsDefined(StringIndexType)) - { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); - } - writer.WriteEndObject(); - } - - internal static AbstractiveSummarizationTaskParametersBase DeserializeAbstractiveSummarizationTaskParametersBase(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - int? sentenceCount = default; - StringIndexType? stringIndexType = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("sentenceCount"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - sentenceCount = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - } - return new AbstractiveSummarizationTaskParametersBase(sentenceCount, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static AbstractiveSummarizationTaskParametersBase FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAbstractiveSummarizationTaskParametersBase(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.cs deleted file mode 100644 index 76ce20ec0146..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummarizationTaskParametersBase.cs +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// Supported parameters for an Abstractive Summarization task. - internal partial class AbstractiveSummarizationTaskParametersBase - { - /// Initializes a new instance of . - public AbstractiveSummarizationTaskParametersBase() - { - } - - /// Initializes a new instance of . - /// It controls the approximate number of sentences in the output summaries. - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal AbstractiveSummarizationTaskParametersBase(int? sentenceCount, StringIndexType? stringIndexType) - { - SentenceCount = sentenceCount; - StringIndexType = stringIndexType; - } - - /// It controls the approximate number of sentences in the output summaries. - public int? SentenceCount { get; set; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - public StringIndexType? StringIndexType { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.Serialization.cs index ee8c6ac7f713..56e9eb0c1df2 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class AbstractiveSummaryDocumentResult : IUtf8JsonSerializable + internal partial class AbstractiveSummaryDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("summaries"u8); - writer.WriteStartArray(); - foreach (var item in Summaries) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static AbstractiveSummaryDocumentResult DeserializeAbstractiveSummaryDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList summaries = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList summaries = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("summaries"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(AbstractiveSummaryInternal.DeserializeAbstractiveSummaryInternal(item)); - } - summaries = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static AbstractiveSummaryDocumentResult DeserializeAbstractiveSummaryDo statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("summaries"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(AbstractiveSummaryInternal.DeserializeAbstractiveSummaryInternal(item)); + } + summaries = array; + continue; + } } return new AbstractiveSummaryDocumentResult(id, warnings, statistics, summaries); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new AbstractiveSummaryDocumentResult FromResponse(Response response) + internal static AbstractiveSummaryDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAbstractiveSummaryDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.cs index e376c81074ed..14bf467d7916 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// An object representing the summarization result of a single document. - internal partial class AbstractiveSummaryDocumentResult : DocumentResult + /// An object representing the pre-built Abstractive Summarization results of each document. + internal partial class AbstractiveSummaryDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// A list of abstractive summaries. /// , or is null. - public AbstractiveSummaryDocumentResult(string id, IEnumerable warnings, IEnumerable summaries) : base(id, warnings) + internal AbstractiveSummaryDocumentResult(string id, IEnumerable warnings, IEnumerable summaries) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(summaries, nameof(summaries)); + Id = id; + Warnings = warnings.ToList(); Summaries = summaries.ToList(); } @@ -33,12 +35,21 @@ public AbstractiveSummaryDocumentResult(string id, IEnumerable /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// A list of abstractive summaries. - internal AbstractiveSummaryDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList summaries) : base(id, warnings, statistics) + internal AbstractiveSummaryDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList summaries) { + Id = id; + Warnings = warnings; + Statistics = statistics; Summaries = summaries; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// A list of abstractive summaries. - public IList Summaries { get; } + public IReadOnlyList Summaries { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.Serialization.cs index 0caddf1c657b..dc8e3471f133 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.Serialization.cs @@ -7,30 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class AbstractiveSummaryInternal : IUtf8JsonSerializable + internal partial class AbstractiveSummaryInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (Optional.IsCollectionDefined(Contexts)) - { - writer.WritePropertyName("contexts"u8); - writer.WriteStartArray(); - foreach (var item in Contexts) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - } - writer.WriteEndObject(); - } - internal static AbstractiveSummaryInternal DeserializeAbstractiveSummaryInternal(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -38,7 +19,7 @@ internal static AbstractiveSummaryInternal DeserializeAbstractiveSummaryInternal return null; } string text = default; - IList contexts = default; + IReadOnlyList contexts = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("text"u8)) @@ -71,13 +52,5 @@ internal static AbstractiveSummaryInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAbstractiveSummaryInternal(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.cs index 453d86b5cfa7..8f99b1d672a0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AbstractiveSummaryInternal.cs @@ -16,7 +16,7 @@ internal partial class AbstractiveSummaryInternal /// Initializes a new instance of . /// The text of the summary. /// is null. - public AbstractiveSummaryInternal(string text) + internal AbstractiveSummaryInternal(string text) { Argument.AssertNotNull(text, nameof(text)); @@ -27,15 +27,15 @@ public AbstractiveSummaryInternal(string text) /// Initializes a new instance of . /// The text of the summary. /// The context list of the summary. - internal AbstractiveSummaryInternal(string text, IList contexts) + internal AbstractiveSummaryInternal(string text, IReadOnlyList contexts) { Text = text; Contexts = contexts; } /// The text of the summary. - public string Text { get; set; } + public string Text { get; } /// The context list of the summary. - public IList Contexts { get; } + public IReadOnlyList Contexts { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityLinkingInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityLinkingInput.cs index 7d2fe702a155..fb2b23316f24 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityLinkingInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityLinkingInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextEntityLinkingInput. + /// Contains the analyze text Entity linking input. internal partial class AnalyzeTextEntityLinkingInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextEntityLinkingInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for an Entity Linking task. + /// The kind of task to perform. + /// Contains the analysis input to be handled by the service. + /// Task parameters. internal AnalyzeTextEntityLinkingInput(AnalyzeTextTaskKind kind, MultiLanguageAnalysisInput analysisInput, EntityLinkingTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextEntityLinkingInput(AnalyzeTextTaskKind kind, MultiLanguageAn Kind = kind; } - /// Gets or sets the analysis input. + /// Contains the analysis input to be handled by the service. public MultiLanguageAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for an Entity Linking task. + /// Task parameters. public EntityLinkingTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityRecognitionInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityRecognitionInput.cs index c69b13f61221..86baa4564984 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityRecognitionInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextEntityRecognitionInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextEntityRecognitionInput. + /// The entity recognition analyze text input task request. internal partial class AnalyzeTextEntityRecognitionInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextEntityRecognitionInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for an Entity Recognition task. + /// The kind of task to perform. + /// The input to be analyzed. + /// Task parameters. internal AnalyzeTextEntityRecognitionInput(AnalyzeTextTaskKind kind, MultiLanguageAnalysisInput analysisInput, EntitiesTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextEntityRecognitionInput(AnalyzeTextTaskKind kind, MultiLangua Kind = kind; } - /// Gets or sets the analysis input. + /// The input to be analyzed. public MultiLanguageAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for an Entity Recognition task. + /// Task parameters. public EntitiesTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.Serialization.cs index 1c4d2c2c2c2e..b51035b5938d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.Serialization.cs @@ -19,32 +19,18 @@ internal static AnalyzeTextJobState DeserializeAnalyzeTextJobState(JsonElement e { return null; } - AnalyzeTasks tasks = default; - TextDocumentBatchStatistics statistics = default; string displayName = default; DateTimeOffset createdDateTime = default; DateTimeOffset? expirationDateTime = default; - string jobId = default; + Guid jobId = default; DateTimeOffset lastUpdatedDateTime = default; TextAnalyticsOperationStatus status = default; IReadOnlyList errors = default; string nextLink = default; + Tasks tasks = default; + TextDocumentBatchStatistics statistics = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("tasks"u8)) - { - tasks = AnalyzeTasks.DeserializeAnalyzeTasks(property.Value); - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentBatchStatistics.DeserializeTextDocumentBatchStatistics(property.Value); - continue; - } if (property.NameEquals("displayName"u8)) { displayName = property.Value.GetString(); @@ -66,7 +52,7 @@ internal static AnalyzeTextJobState DeserializeAnalyzeTextJobState(JsonElement e } if (property.NameEquals("jobId"u8)) { - jobId = property.Value.GetString(); + jobId = property.Value.GetGuid(); continue; } if (property.NameEquals("lastUpdatedDateTime"u8)) @@ -98,6 +84,20 @@ internal static AnalyzeTextJobState DeserializeAnalyzeTextJobState(JsonElement e nextLink = property.Value.GetString(); continue; } + if (property.NameEquals("tasks"u8)) + { + tasks = Tasks.DeserializeTasks(property.Value); + continue; + } + if (property.NameEquals("statistics"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + statistics = TextDocumentBatchStatistics.DeserializeTextDocumentBatchStatistics(property.Value); + continue; + } } return new AnalyzeTextJobState( displayName, @@ -114,7 +114,7 @@ internal static AnalyzeTextJobState DeserializeAnalyzeTextJobState(JsonElement e /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new AnalyzeTextJobState FromResponse(Response response) + internal static AnalyzeTextJobState FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAnalyzeTextJobState(document.RootElement); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.cs index 428ef5874f5a..79adb45d42af 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobState.cs @@ -10,43 +10,71 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextJobState. - internal partial class AnalyzeTextJobState : JobState + /// The object containing the analyze job LRO job state. + internal partial class AnalyzeTextJobState { /// Initializes a new instance of . - /// - /// - /// - /// - /// - /// or is null. - internal AnalyzeTextJobState(DateTimeOffset createdDateTime, string jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status, AnalyzeTasks tasks) : base(createdDateTime, jobId, lastUpdatedDateTime, status) + /// Date and time job created. + /// job ID. + /// last updated date and time. + /// status. + /// List of tasks. + /// is null. + internal AnalyzeTextJobState(DateTimeOffset createdDateTime, Guid jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status, Tasks tasks) { - Argument.AssertNotNull(jobId, nameof(jobId)); Argument.AssertNotNull(tasks, nameof(tasks)); + CreatedDateTime = createdDateTime; + JobId = jobId; + LastUpdatedDateTime = lastUpdatedDateTime; + Status = status; + Errors = new ChangeTrackingList(); Tasks = tasks; } /// Initializes a new instance of . - /// - /// - /// - /// - /// - /// - /// - /// - /// + /// display name. + /// Date and time job created. + /// Date and time job expires. + /// job ID. + /// last updated date and time. + /// status. + /// errors. + /// next link. + /// List of tasks. /// if showStats=true was specified in the request this field will contain information about the request payload. - internal AnalyzeTextJobState(string displayName, DateTimeOffset createdDateTime, DateTimeOffset? expirationDateTime, string jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status, IReadOnlyList errors, string nextLink, AnalyzeTasks tasks, TextDocumentBatchStatistics statistics) : base(displayName, createdDateTime, expirationDateTime, jobId, lastUpdatedDateTime, status, errors, nextLink) + internal AnalyzeTextJobState(string displayName, DateTimeOffset createdDateTime, DateTimeOffset? expirationDateTime, Guid jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status, IReadOnlyList errors, string nextLink, Tasks tasks, TextDocumentBatchStatistics statistics) { + DisplayName = displayName; + CreatedDateTime = createdDateTime; + ExpirationDateTime = expirationDateTime; + JobId = jobId; + LastUpdatedDateTime = lastUpdatedDateTime; + Status = status; + Errors = errors; + NextLink = nextLink; Tasks = tasks; Statistics = statistics; } - /// Gets the tasks. - public AnalyzeTasks Tasks { get; } + /// display name. + public string DisplayName { get; } + /// Date and time job created. + public DateTimeOffset CreatedDateTime { get; } + /// Date and time job expires. + public DateTimeOffset? ExpirationDateTime { get; } + /// job ID. + public Guid JobId { get; } + /// last updated date and time. + public DateTimeOffset LastUpdatedDateTime { get; } + /// status. + public TextAnalyticsOperationStatus Status { get; } + /// errors. + public IReadOnlyList Errors { get; } + /// next link. + public string NextLink { get; } + /// List of tasks. + public Tasks Tasks { get; } /// if showStats=true was specified in the request this field will contain information about the request payload. public TextDocumentBatchStatistics Statistics { get; } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.Serialization.cs deleted file mode 100644 index 45de12a5512c..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.Serialization.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class AnalyzeTextJobStatistics - { - internal static AnalyzeTextJobStatistics DeserializeAnalyzeTextJobStatistics(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - TextDocumentBatchStatistics statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentBatchStatistics.DeserializeTextDocumentBatchStatistics(property.Value); - continue; - } - } - return new AnalyzeTextJobStatistics(statistics); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static AnalyzeTextJobStatistics FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAnalyzeTextJobStatistics(document.RootElement); - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.cs deleted file mode 100644 index 572e6b49d676..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobStatistics.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// The AnalyzeTextJobStatistics. - internal partial class AnalyzeTextJobStatistics - { - /// Initializes a new instance of . - internal AnalyzeTextJobStatistics() - { - } - - /// Initializes a new instance of . - /// if showStats=true was specified in the request this field will contain information about the request payload. - internal AnalyzeTextJobStatistics(TextDocumentBatchStatistics statistics) - { - Statistics = statistics; - } - - /// if showStats=true was specified in the request this field will contain information about the request payload. - public TextDocumentBatchStatistics Statistics { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobsInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobsInput.cs index 3ac64583a030..00d1d42c9a7e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobsInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextJobsInput.cs @@ -11,13 +11,13 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextJobsInput. + /// The input object for the analyze text LRO. internal partial class AnalyzeTextJobsInput { /// Initializes a new instance of . - /// + /// Contains the input to be analyzed. /// - /// The set of tasks to execute on the input documents. + /// List of tasks to be performed as part of the LRO. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// @@ -32,10 +32,10 @@ public AnalyzeTextJobsInput(MultiLanguageAnalysisInput analysisInput, IEnumerabl } /// Initializes a new instance of . - /// Optional display name for the analysis job. - /// + /// Name for the task. + /// Contains the input to be analyzed. /// - /// The set of tasks to execute on the input documents. + /// List of tasks to be performed as part of the LRO. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// @@ -46,12 +46,12 @@ internal AnalyzeTextJobsInput(string displayName, MultiLanguageAnalysisInput ana Tasks = tasks; } - /// Optional display name for the analysis job. + /// Name for the task. public string DisplayName { get; set; } - /// Gets the analysis input. + /// Contains the input to be analyzed. public MultiLanguageAnalysisInput AnalysisInput { get; } /// - /// The set of tasks to execute on the input documents. + /// List of tasks to be performed as part of the LRO. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextKeyPhraseExtractionInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextKeyPhraseExtractionInput.cs index 2d20f0e88bff..bd0f1be828f5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextKeyPhraseExtractionInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextKeyPhraseExtractionInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextKeyPhraseExtractionInput. + /// Contains the analyze text KeyPhraseExtraction task input. internal partial class AnalyzeTextKeyPhraseExtractionInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextKeyPhraseExtractionInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for a Key Phrase Extraction task. + /// The kind of task to perform. + /// Contains the input documents. + /// Key phrase extraction task parameters. internal AnalyzeTextKeyPhraseExtractionInput(AnalyzeTextTaskKind kind, MultiLanguageAnalysisInput analysisInput, KeyPhraseTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextKeyPhraseExtractionInput(AnalyzeTextTaskKind kind, MultiLang Kind = kind; } - /// Gets or sets the analysis input. + /// Contains the input documents. public MultiLanguageAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for a Key Phrase Extraction task. + /// Key phrase extraction task parameters. public KeyPhraseTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.Serialization.cs index a382f63279e8..dd5c4478021b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.Serialization.cs @@ -6,29 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class AnalyzeTextLROResult : IUtf8JsonSerializable + internal partial class AnalyzeTextLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static AnalyzeTextLROResult DeserializeAnalyzeTextLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -57,18 +39,10 @@ internal static AnalyzeTextLROResult DeserializeAnalyzeTextLROResult(JsonElement /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new AnalyzeTextLROResult FromResponse(Response response) + internal static AnalyzeTextLROResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeAnalyzeTextLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.cs index 9b13dfe853c8..af6765a5c0b8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResult.cs @@ -10,33 +10,41 @@ namespace Azure.AI.TextAnalytics.Models { /// - /// The AnalyzeTextLROResult. + /// Contains the AnalyzeText long running operation result object. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// - internal abstract partial class AnalyzeTextLROResult : TaskState + internal abstract partial class AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - protected AnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status) : base(lastUpdateDateTime, status) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + protected AnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status) { + LastUpdateDateTime = lastUpdateDateTime; + Status = status; } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - internal AnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName) : base(lastUpdateDateTime, status) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + internal AnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind) { - Kind = kind; + LastUpdateDateTime = lastUpdateDateTime; + Status = status; TaskName = taskName; + Kind = kind; } - /// Enumeration of supported Text Analysis long-running operation task results. + /// The last updated time in UTC for the task. + public DateTimeOffset LastUpdateDateTime { get; } + /// The status of the task at the mentioned last update time. + public TextAnalyticsOperationStatus Status { get; } + /// task name. + public string TaskName { get; } + /// Kind of the task. internal AnalyzeTextLROResultsKind Kind { get; set; } - /// Gets or sets the task name. - public string TaskName { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResultsKind.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResultsKind.cs index 2e377d47db46..bb4fe4fed170 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResultsKind.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROResultsKind.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Enumeration of supported Text Analysis long-running operation task results. + /// The kind of the response object returned by the analyze-text long running task. internal readonly partial struct AnalyzeTextLROResultsKind : IEquatable { private readonly string _value; @@ -28,33 +28,33 @@ public AnalyzeTextLROResultsKind(string value) private const string KeyPhraseExtractionLROResultsValue = "KeyPhraseExtractionLROResults"; private const string EntityLinkingLROResultsValue = "EntityLinkingLROResults"; private const string HealthcareLROResultsValue = "HealthcareLROResults"; - private const string ExtractiveSummarizationLROResultsValue = "ExtractiveSummarizationLROResults"; private const string CustomEntityRecognitionLROResultsValue = "CustomEntityRecognitionLROResults"; private const string CustomSingleLabelClassificationLROResultsValue = "CustomSingleLabelClassificationLROResults"; private const string CustomMultiLabelClassificationLROResultsValue = "CustomMultiLabelClassificationLROResults"; + private const string ExtractiveSummarizationLROResultsValue = "ExtractiveSummarizationLROResults"; private const string AbstractiveSummarizationLROResultsValue = "AbstractiveSummarizationLROResults"; - /// SentimentAnalysisLROResults. + /// Sentiment analysis LRO results. public static AnalyzeTextLROResultsKind SentimentAnalysisLROResults { get; } = new AnalyzeTextLROResultsKind(SentimentAnalysisLROResultsValue); - /// EntityRecognitionLROResults. + /// Entity recognition LRO results. public static AnalyzeTextLROResultsKind EntityRecognitionLROResults { get; } = new AnalyzeTextLROResultsKind(EntityRecognitionLROResultsValue); - /// PiiEntityRecognitionLROResults. + /// PII entity recognition LRO results. public static AnalyzeTextLROResultsKind PiiEntityRecognitionLROResults { get; } = new AnalyzeTextLROResultsKind(PiiEntityRecognitionLROResultsValue); - /// KeyPhraseExtractionLROResults. + /// Key phrase extraction LRO results. public static AnalyzeTextLROResultsKind KeyPhraseExtractionLROResults { get; } = new AnalyzeTextLROResultsKind(KeyPhraseExtractionLROResultsValue); - /// EntityLinkingLROResults. + /// Entity linking LRO results. public static AnalyzeTextLROResultsKind EntityLinkingLROResults { get; } = new AnalyzeTextLROResultsKind(EntityLinkingLROResultsValue); - /// HealthcareLROResults. + /// Healthcare LRO results. public static AnalyzeTextLROResultsKind HealthcareLROResults { get; } = new AnalyzeTextLROResultsKind(HealthcareLROResultsValue); - /// ExtractiveSummarizationLROResults. - public static AnalyzeTextLROResultsKind ExtractiveSummarizationLROResults { get; } = new AnalyzeTextLROResultsKind(ExtractiveSummarizationLROResultsValue); - /// CustomEntityRecognitionLROResults. + /// Custom entity recognition LRO results. public static AnalyzeTextLROResultsKind CustomEntityRecognitionLROResults { get; } = new AnalyzeTextLROResultsKind(CustomEntityRecognitionLROResultsValue); - /// CustomSingleLabelClassificationLROResults. + /// Custom single label classification LRO results. public static AnalyzeTextLROResultsKind CustomSingleLabelClassificationLROResults { get; } = new AnalyzeTextLROResultsKind(CustomSingleLabelClassificationLROResultsValue); - /// CustomMultiLabelClassificationLROResults. + /// Custom multi label classification LRO results. public static AnalyzeTextLROResultsKind CustomMultiLabelClassificationLROResults { get; } = new AnalyzeTextLROResultsKind(CustomMultiLabelClassificationLROResultsValue); - /// AbstractiveSummarizationLROResults. + /// Extractive summarization LRO results. + public static AnalyzeTextLROResultsKind ExtractiveSummarizationLROResults { get; } = new AnalyzeTextLROResultsKind(ExtractiveSummarizationLROResultsValue); + /// Abstractive summarization LRO results. public static AnalyzeTextLROResultsKind AbstractiveSummarizationLROResults { get; } = new AnalyzeTextLROResultsKind(AbstractiveSummarizationLROResultsValue); /// Determines if two values are the same. public static bool operator ==(AnalyzeTextLROResultsKind left, AnalyzeTextLROResultsKind right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.Serialization.cs index 35f4c45f87e1..240f09b20935 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.Serialization.cs @@ -15,52 +15,18 @@ internal partial class AnalyzeTextLROTask : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static AnalyzeTextLROTask DeserializeAnalyzeTextLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - if (element.TryGetProperty("kind", out JsonElement discriminator)) - { - switch (discriminator.GetString()) - { - case "AbstractiveSummarization": return AbstractiveSummarizationLROTask.DeserializeAbstractiveSummarizationLROTask(element); - case "CustomEntityRecognition": return CustomEntitiesLROTask.DeserializeCustomEntitiesLROTask(element); - case "CustomMultiLabelClassification": return CustomMultiLabelClassificationLROTask.DeserializeCustomMultiLabelClassificationLROTask(element); - case "CustomSingleLabelClassification": return CustomSingleLabelClassificationLROTask.DeserializeCustomSingleLabelClassificationLROTask(element); - case "EntityLinking": return EntityLinkingLROTask.DeserializeEntityLinkingLROTask(element); - case "EntityRecognition": return EntitiesLROTask.DeserializeEntitiesLROTask(element); - case "ExtractiveSummarization": return ExtractiveSummarizationLROTask.DeserializeExtractiveSummarizationLROTask(element); - case "Healthcare": return HealthcareLROTask.DeserializeHealthcareLROTask(element); - case "KeyPhraseExtraction": return KeyPhraseLROTask.DeserializeKeyPhraseLROTask(element); - case "PiiEntityRecognition": return PiiLROTask.DeserializePiiLROTask(element); - case "SentimentAnalysis": return SentimentAnalysisLROTask.DeserializeSentimentAnalysisLROTask(element); - } - } - return UnknownAnalyzeTextLROTask.DeserializeUnknownAnalyzeTextLROTask(element); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new AnalyzeTextLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAnalyzeTextLROTask(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.cs index f4cf6ac92b0c..b0b4872d36ba 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTask.cs @@ -8,11 +8,11 @@ namespace Azure.AI.TextAnalytics.Models { /// - /// The AnalyzeTextLROTask. + /// The long running task to be performed by the service on the input documents. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// - internal abstract partial class AnalyzeTextLROTask : TaskIdentifier + internal abstract partial class AnalyzeTextLROTask { /// Initializes a new instance of . protected AnalyzeTextLROTask() @@ -20,14 +20,17 @@ protected AnalyzeTextLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - internal AnalyzeTextLROTask(string taskName, AnalyzeTextLROTaskKind kind) : base(taskName) + /// task name. + /// The kind of task to perform. + internal AnalyzeTextLROTask(string taskName, AnalyzeTextLROTaskKind kind) { + TaskName = taskName; Kind = kind; } - /// Enumeration of supported long-running Text Analysis tasks. + /// task name. + public string TaskName { get; set; } + /// The kind of task to perform. internal AnalyzeTextLROTaskKind Kind { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTaskKind.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTaskKind.cs index 1c982ec66517..88d427b59293 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTaskKind.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLROTaskKind.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Enumeration of supported long-running Text Analysis tasks. + /// The kind of the long running analyze text tasks supported. internal readonly partial struct AnalyzeTextLROTaskKind : IEquatable { private readonly string _value; @@ -28,33 +28,33 @@ public AnalyzeTextLROTaskKind(string value) private const string KeyPhraseExtractionValue = "KeyPhraseExtraction"; private const string EntityLinkingValue = "EntityLinking"; private const string HealthcareValue = "Healthcare"; - private const string ExtractiveSummarizationValue = "ExtractiveSummarization"; private const string CustomEntityRecognitionValue = "CustomEntityRecognition"; private const string CustomSingleLabelClassificationValue = "CustomSingleLabelClassification"; private const string CustomMultiLabelClassificationValue = "CustomMultiLabelClassification"; + private const string ExtractiveSummarizationValue = "ExtractiveSummarization"; private const string AbstractiveSummarizationValue = "AbstractiveSummarization"; - /// SentimentAnalysis. + /// Sentiment analysis task. public static AnalyzeTextLROTaskKind SentimentAnalysis { get; } = new AnalyzeTextLROTaskKind(SentimentAnalysisValue); - /// EntityRecognition. + /// Entity recognition task. public static AnalyzeTextLROTaskKind EntityRecognition { get; } = new AnalyzeTextLROTaskKind(EntityRecognitionValue); - /// PiiEntityRecognition. + /// PII entity recognition task. public static AnalyzeTextLROTaskKind PiiEntityRecognition { get; } = new AnalyzeTextLROTaskKind(PiiEntityRecognitionValue); - /// KeyPhraseExtraction. + /// Key phrase extraction task. public static AnalyzeTextLROTaskKind KeyPhraseExtraction { get; } = new AnalyzeTextLROTaskKind(KeyPhraseExtractionValue); - /// EntityLinking. + /// Entity linking task. public static AnalyzeTextLROTaskKind EntityLinking { get; } = new AnalyzeTextLROTaskKind(EntityLinkingValue); - /// Healthcare. + /// Healthcare task. public static AnalyzeTextLROTaskKind Healthcare { get; } = new AnalyzeTextLROTaskKind(HealthcareValue); - /// ExtractiveSummarization. - public static AnalyzeTextLROTaskKind ExtractiveSummarization { get; } = new AnalyzeTextLROTaskKind(ExtractiveSummarizationValue); - /// CustomEntityRecognition. + /// Custom entity recognition task. public static AnalyzeTextLROTaskKind CustomEntityRecognition { get; } = new AnalyzeTextLROTaskKind(CustomEntityRecognitionValue); - /// CustomSingleLabelClassification. + /// Custom single label classification task. public static AnalyzeTextLROTaskKind CustomSingleLabelClassification { get; } = new AnalyzeTextLROTaskKind(CustomSingleLabelClassificationValue); - /// CustomMultiLabelClassification. + /// Custom multi label classification task. public static AnalyzeTextLROTaskKind CustomMultiLabelClassification { get; } = new AnalyzeTextLROTaskKind(CustomMultiLabelClassificationValue); - /// AbstractiveSummarization. + /// Extractive summarization task. + public static AnalyzeTextLROTaskKind ExtractiveSummarization { get; } = new AnalyzeTextLROTaskKind(ExtractiveSummarizationValue); + /// Abstractive summarization task. public static AnalyzeTextLROTaskKind AbstractiveSummarization { get; } = new AnalyzeTextLROTaskKind(AbstractiveSummarizationValue); /// Determines if two values are the same. public static bool operator ==(AnalyzeTextLROTaskKind left, AnalyzeTextLROTaskKind right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLanguageDetectionInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLanguageDetectionInput.cs index f465872cfd6b..c7c94e6c21bc 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLanguageDetectionInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextLanguageDetectionInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextLanguageDetectionInput. + /// Contains the language detection document analysis task input. internal partial class AnalyzeTextLanguageDetectionInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextLanguageDetectionInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for a Language Detection task. + /// The kind of task to perform. + /// Documents to be analyzed. + /// task parameters. internal AnalyzeTextLanguageDetectionInput(AnalyzeTextTaskKind kind, LanguageDetectionAnalysisInput analysisInput, LanguageDetectionTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextLanguageDetectionInput(AnalyzeTextTaskKind kind, LanguageDet Kind = kind; } - /// Gets or sets the analysis input. + /// Documents to be analyzed. public LanguageDetectionAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for a Language Detection task. + /// task parameters. public LanguageDetectionTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextPiiEntitiesRecognitionInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextPiiEntitiesRecognitionInput.cs index 9ca27601cd3d..8ab523ead415 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextPiiEntitiesRecognitionInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextPiiEntitiesRecognitionInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextPiiEntitiesRecognitionInput. + /// Contains the analyze text PIIEntityRecognition task input. internal partial class AnalyzeTextPiiEntitiesRecognitionInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextPiiEntitiesRecognitionInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for a PII Entities Recognition task. + /// The kind of task to perform. + /// Contains the input documents. + /// Pii task parameters. internal AnalyzeTextPiiEntitiesRecognitionInput(AnalyzeTextTaskKind kind, MultiLanguageAnalysisInput analysisInput, PiiTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextPiiEntitiesRecognitionInput(AnalyzeTextTaskKind kind, MultiL Kind = kind; } - /// Gets or sets the analysis input. + /// Contains the input documents. public MultiLanguageAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for a PII Entities Recognition task. + /// Pii task parameters. public PiiTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextSentimentAnalysisInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextSentimentAnalysisInput.cs index 7e6748a86667..ff57e2ba2077 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextSentimentAnalysisInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextSentimentAnalysisInput.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The AnalyzeTextSentimentAnalysisInput. + /// Contains the analyze text SentimentAnalysis task input. internal partial class AnalyzeTextSentimentAnalysisInput : AnalyzeTextTask { /// Initializes a new instance of . @@ -17,9 +17,9 @@ public AnalyzeTextSentimentAnalysisInput() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. - /// - /// Supported parameters for a Sentiment Analysis task. + /// The kind of task to perform. + /// Contains the input documents. + /// Sentiment Analysis task parameters. internal AnalyzeTextSentimentAnalysisInput(AnalyzeTextTaskKind kind, MultiLanguageAnalysisInput analysisInput, SentimentAnalysisTaskParameters parameters) : base(kind) { AnalysisInput = analysisInput; @@ -27,9 +27,9 @@ internal AnalyzeTextSentimentAnalysisInput(AnalyzeTextTaskKind kind, MultiLangua Kind = kind; } - /// Gets or sets the analysis input. + /// Contains the input documents. public MultiLanguageAnalysisInput AnalysisInput { get; set; } - /// Supported parameters for a Sentiment Analysis task. + /// Sentiment Analysis task parameters. public SentimentAnalysisTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTask.cs index 8e42d2693178..f1c814675e96 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTask.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// - /// The AnalyzeTextTask. + /// Collection of documents to analyze and a single task to execute. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , and . /// @@ -20,13 +20,13 @@ public AnalyzeTextTask() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis tasks. + /// The kind of task to perform. internal AnalyzeTextTask(AnalyzeTextTaskKind kind) { Kind = kind; } - /// Enumeration of supported Text Analysis tasks. + /// The kind of task to perform. internal AnalyzeTextTaskKind Kind { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskKind.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskKind.cs index 43db54d0b992..ca1c5d6392fb 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskKind.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskKind.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Enumeration of supported Text Analysis tasks. + /// The kind of the analyze-text tasks supported. internal readonly partial struct AnalyzeTextTaskKind : IEquatable { private readonly string _value; @@ -29,17 +29,17 @@ public AnalyzeTextTaskKind(string value) private const string LanguageDetectionValue = "LanguageDetection"; private const string EntityLinkingValue = "EntityLinking"; - /// SentimentAnalysis. + /// Sentiment analysis task. public static AnalyzeTextTaskKind SentimentAnalysis { get; } = new AnalyzeTextTaskKind(SentimentAnalysisValue); - /// EntityRecognition. + /// Entity recognition task. public static AnalyzeTextTaskKind EntityRecognition { get; } = new AnalyzeTextTaskKind(EntityRecognitionValue); - /// PiiEntityRecognition. + /// PII entity recognition task. public static AnalyzeTextTaskKind PiiEntityRecognition { get; } = new AnalyzeTextTaskKind(PiiEntityRecognitionValue); - /// KeyPhraseExtraction. + /// Key phrase extraction task. public static AnalyzeTextTaskKind KeyPhraseExtraction { get; } = new AnalyzeTextTaskKind(KeyPhraseExtractionValue); - /// LanguageDetection. + /// Language detection task. public static AnalyzeTextTaskKind LanguageDetection { get; } = new AnalyzeTextTaskKind(LanguageDetectionValue); - /// EntityLinking. + /// Entity linking task. public static AnalyzeTextTaskKind EntityLinking { get; } = new AnalyzeTextTaskKind(EntityLinkingValue); /// Determines if two values are the same. public static bool operator ==(AnalyzeTextTaskKind left, AnalyzeTextTaskKind right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResult.cs index 57e6017ac79f..95e4c82205c0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResult.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// - /// The AnalyzeTextTaskResult. + /// The result object for the analyze task. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , and . /// @@ -20,13 +20,13 @@ internal AnalyzeTextTaskResult() } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. + /// The kind of task result. internal AnalyzeTextTaskResult(AnalyzeTextTaskResultsKind kind) { Kind = kind; } - /// Enumeration of supported Text Analysis task results. + /// The kind of task result. internal AnalyzeTextTaskResultsKind Kind { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResultsKind.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResultsKind.cs index 5ce829a83773..1bf6a0b45253 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResultsKind.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTextTaskResultsKind.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Enumeration of supported Text Analysis task results. + /// The kind of the response object returned by the analyze-text task. internal readonly partial struct AnalyzeTextTaskResultsKind : IEquatable { private readonly string _value; @@ -29,17 +29,17 @@ public AnalyzeTextTaskResultsKind(string value) private const string LanguageDetectionResultsValue = "LanguageDetectionResults"; private const string EntityLinkingResultsValue = "EntityLinkingResults"; - /// SentimentAnalysisResults. + /// Sentiment analysis results. public static AnalyzeTextTaskResultsKind SentimentAnalysisResults { get; } = new AnalyzeTextTaskResultsKind(SentimentAnalysisResultsValue); - /// EntityRecognitionResults. + /// Entity recognition results. public static AnalyzeTextTaskResultsKind EntityRecognitionResults { get; } = new AnalyzeTextTaskResultsKind(EntityRecognitionResultsValue); - /// PiiEntityRecognitionResults. + /// PII entity recognition results. public static AnalyzeTextTaskResultsKind PiiEntityRecognitionResults { get; } = new AnalyzeTextTaskResultsKind(PiiEntityRecognitionResultsValue); - /// KeyPhraseExtractionResults. + /// Key phrase extraction results. public static AnalyzeTextTaskResultsKind KeyPhraseExtractionResults { get; } = new AnalyzeTextTaskResultsKind(KeyPhraseExtractionResultsValue); - /// LanguageDetectionResults. + /// Language detection results. public static AnalyzeTextTaskResultsKind LanguageDetectionResults { get; } = new AnalyzeTextTaskResultsKind(LanguageDetectionResultsValue); - /// EntityLinkingResults. + /// Entity linking results. public static AnalyzeTextTaskResultsKind EntityLinkingResults { get; } = new AnalyzeTextTaskResultsKind(EntityLinkingResultsValue); /// Determines if two values are the same. public static bool operator ==(AnalyzeTextTaskResultsKind left, AnalyzeTextTaskResultsKind right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.Serialization.cs index b1b4c523c92c..640ca3326903 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ClassificationDocumentResult : IUtf8JsonSerializable + internal partial class ClassificationDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("class"u8); - writer.WriteStartArray(); - foreach (var item in Class) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static ClassificationDocumentResult DeserializeClassificationDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList @class = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList @class = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("class"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(ClassificationResult.DeserializeClassificationResult(item)); - } - @class = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static ClassificationDocumentResult DeserializeClassificationDocumentRe statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("class"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(ClassificationResult.DeserializeClassificationResult(item)); + } + @class = array; + continue; + } } return new ClassificationDocumentResult(id, warnings, statistics, @class); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new ClassificationDocumentResult FromResponse(Response response) + internal static ClassificationDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeClassificationDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.cs index 1678bd2cfc09..d97a10e8541a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ClassificationDocumentResult. - internal partial class ClassificationDocumentResult : DocumentResult + /// Contains the classification doc result for the task. + internal partial class ClassificationDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. - /// + /// Contains the classification doc results for all docs. /// , or is null. - public ClassificationDocumentResult(string id, IEnumerable warnings, IEnumerable @class) : base(id, warnings) + internal ClassificationDocumentResult(string id, IEnumerable warnings, IEnumerable @class) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(@class, nameof(@class)); + Id = id; + Warnings = warnings.ToList(); Class = @class.ToList(); } @@ -32,13 +34,22 @@ public ClassificationDocumentResult(string id, IEnumerable warn /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. - /// - internal ClassificationDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList @class) : base(id, warnings, statistics) + /// Contains the classification doc results for all docs. + internal ClassificationDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList @class) { + Id = id; + Warnings = warnings; + Statistics = statistics; Class = @class; } - /// Gets the class. - public IList Class { get; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } + /// Contains the classification doc results for all docs. + public IReadOnlyList Class { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.Serialization.cs index ec024daa173a..ae3ea25b6722 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ClassificationResult : IUtf8JsonSerializable + internal partial class ClassificationResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("category"u8); - writer.WriteStringValue(Category); - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore); - writer.WriteEndObject(); - } - internal static ClassificationResult DeserializeClassificationResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static ClassificationResult FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeClassificationResult(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.cs index b5a2e06b412d..4146061ccfb0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ClassificationResult.cs @@ -9,14 +9,14 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ClassificationResult. + /// Contains the classification result. internal partial class ClassificationResult { /// Initializes a new instance of . /// Classification type. /// Confidence score between 0 and 1 of the recognized class. /// is null. - public ClassificationResult(string category, double confidenceScore) + internal ClassificationResult(string category, double confidenceScore) { Argument.AssertNotNull(category, nameof(category)); @@ -25,8 +25,8 @@ public ClassificationResult(string category, double confidenceScore) } /// Classification type. - public string Category { get; set; } + public string Category { get; } /// Confidence score between 0 and 1 of the recognized class. - public double ConfidenceScore { get; set; } + public double ConfidenceScore { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.Serialization.cs index f9bf1afa8995..03b12b16e234 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static CustomEntitiesLROTask DeserializeCustomEntitiesLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - CustomEntitiesTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = CustomEntitiesTaskParameters.DeserializeCustomEntitiesTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new CustomEntitiesLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomEntitiesLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomEntitiesLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.cs index d73f078a2417..1810f3396d58 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesLROTask.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Use custom models to ease the process of information extraction from unstructured documents like contracts or financial documents. + /// Contains the custom text LRO task. internal partial class CustomEntitiesLROTask : AnalyzeTextLROTask { /// Initializes a new instance of . @@ -17,16 +17,16 @@ public CustomEntitiesLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Custom Entities task. + /// task name. + /// The kind of task to perform. + /// task parameters. internal CustomEntitiesLROTask(string taskName, AnalyzeTextLROTaskKind kind, CustomEntitiesTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Custom Entities task. + /// task parameters. public CustomEntitiesTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.Serialization.cs index e9b9cb6906d9..5a3db86df0d9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.Serialization.cs @@ -7,64 +7,24 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class CustomEntitiesResult : IUtf8JsonSerializable + internal partial class CustomEntitiesResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); - writer.WriteEndObject(); - } - internal static CustomEntitiesResult DeserializeCustomEntitiesResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string projectName = default; string deploymentName = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(CustomEntitiesResultDocumentsItem.DeserializeCustomEntitiesResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -94,24 +54,26 @@ internal static CustomEntitiesResult DeserializeCustomEntitiesResult(JsonElement deploymentName = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(EntitiesDocumentResult.DeserializeEntitiesDocumentResult(item)); + } + documents = array; + continue; + } } return new CustomEntitiesResult(errors, statistics, projectName, deploymentName, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new CustomEntitiesResult FromResponse(Response response) + internal static CustomEntitiesResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeCustomEntitiesResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.cs index 15ab3b54fa0a..bb78519c545f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResult.cs @@ -11,22 +11,25 @@ namespace Azure.AI.TextAnalytics.Models { - /// The CustomEntitiesResult. - internal partial class CustomEntitiesResult : CustomResult + /// Contains the list of detected custom entities result for the documents. + internal partial class CustomEntitiesResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. - /// Response by document. + /// Enumeration of the document results. /// , , or is null. - public CustomEntitiesResult(IEnumerable errors, string projectName, string deploymentName, IEnumerable documents) : base(errors, projectName, deploymentName) + internal CustomEntitiesResult(IEnumerable errors, string projectName, string deploymentName, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(projectName, nameof(projectName)); Argument.AssertNotNull(deploymentName, nameof(deploymentName)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ProjectName = projectName; + DeploymentName = deploymentName; Documents = documents.ToList(); } @@ -35,13 +38,25 @@ public CustomEntitiesResult(IEnumerable errors, string projectNam /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. - /// Response by document. - internal CustomEntitiesResult(IList errors, TextDocumentBatchStatistics statistics, string projectName, string deploymentName, IList documents) : base(errors, statistics, projectName, deploymentName) + /// Enumeration of the document results. + internal CustomEntitiesResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string projectName, string deploymentName, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ProjectName = projectName; + DeploymentName = deploymentName; Documents = documents; } - /// Response by document. - public IList Documents { get; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates the project name for the model. + public string ProjectName { get; } + /// This field indicates the deployment name for the model. + public string DeploymentName { get; } + /// Enumeration of the document results. + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.Serialization.cs deleted file mode 100644 index 3186deef7ae4..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class CustomEntitiesResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static CustomEntitiesResultDocumentsItem DeserializeCustomEntitiesResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList entities = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Entity.DeserializeEntity(item)); - } - entities = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new CustomEntitiesResultDocumentsItem(id, warnings, statistics, entities); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomEntitiesResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomEntitiesResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.cs deleted file mode 100644 index 1f7ee1e77323..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesResultDocumentsItem.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The CustomEntitiesResultDocumentsItem. - internal partial class CustomEntitiesResultDocumentsItem : EntitiesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Recognized entities in the document. - /// , or is null. - public CustomEntitiesResultDocumentsItem(string id, IEnumerable warnings, IEnumerable entities) : base(id, warnings, entities) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(entities, nameof(entities)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Recognized entities in the document. - internal CustomEntitiesResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList entities) : base(id, warnings, statistics, entities) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.Serialization.cs index d17a8e7f3ee4..60458c2c9dda 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.Serialization.cs @@ -15,77 +15,25 @@ internal partial class CustomEntitiesTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(StringIndexType)) + if (Optional.IsDefined(LoggingOptOut)) { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); } writer.WritePropertyName("projectName"u8); writer.WriteStringValue(ProjectName); writer.WritePropertyName("deploymentName"u8); writer.WriteStringValue(DeploymentName); - if (Optional.IsDefined(LoggingOptOut)) + if (Optional.IsDefined(StringIndexType)) { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); + writer.WritePropertyName("stringIndexType"u8); + writer.WriteStringValue(StringIndexType.Value.ToString()); } writer.WriteEndObject(); } - internal static CustomEntitiesTaskParameters DeserializeCustomEntitiesTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - StringIndexType? stringIndexType = default; - string projectName = default; - string deploymentName = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("projectName"u8)) - { - projectName = property.Value.GetString(); - continue; - } - if (property.NameEquals("deploymentName"u8)) - { - deploymentName = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new CustomEntitiesTaskParameters(loggingOptOut, projectName, deploymentName, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomEntitiesTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomEntitiesTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.cs index 3a0ec5b6f939..d62acc282801 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntitiesTaskParameters.cs @@ -10,29 +10,41 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Custom Entities task. - internal partial class CustomEntitiesTaskParameters : CustomTaskParameters + internal partial class CustomEntitiesTaskParameters { /// Initializes a new instance of . /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. /// or is null. - public CustomEntitiesTaskParameters(string projectName, string deploymentName) : base(projectName, deploymentName) + public CustomEntitiesTaskParameters(string projectName, string deploymentName) { Argument.AssertNotNull(projectName, nameof(projectName)); Argument.AssertNotNull(deploymentName, nameof(deploymentName)); + + ProjectName = projectName; + DeploymentName = deploymentName; } /// Initializes a new instance of . - /// + /// logging opt out. /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal CustomEntitiesTaskParameters(bool? loggingOptOut, string projectName, string deploymentName, StringIndexType? stringIndexType) : base(loggingOptOut, projectName, deploymentName) + /// Optional parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). + internal CustomEntitiesTaskParameters(bool? loggingOptOut, string projectName, string deploymentName, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ProjectName = projectName; + DeploymentName = deploymentName; StringIndexType = stringIndexType; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// This field indicates the project name for the model. + public string ProjectName { get; } + /// This field indicates the deployment name for the model. + public string DeploymentName { get; } + /// Optional parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.Serialization.cs index 3eda90a9429a..cfd3a982e0d7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class CustomEntityRecognitionLROResult : IUtf8JsonSerializable + internal partial class CustomEntityRecognitionLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static CustomEntityRecognitionLROResult DeserializeCustomEntityRecognitionLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static CustomEntityRecognitionLROResult DeserializeCustomEntityRecognit return null; } CustomEntitiesResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static CustomEntityRecognitionLROResult DeserializeCustomEntityRecognit results = CustomEntitiesResult.DeserializeCustomEntitiesResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new CustomEntityRecognitionLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new CustomEntityRecognitionLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static CustomEntityRecognitionLROResult DeserializeCustomEntityRecognit using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeCustomEntityRecognitionLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.cs index 20e2905df3c9..141052d365b4 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomEntityRecognitionLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The CustomEntityRecognitionLROResult. + /// Contains the custom entity recognition job result. internal partial class CustomEntityRecognitionLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// List of results. /// is null. - public CustomEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomEntitiesResult results) : base(lastUpdateDateTime, status) + internal CustomEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomEntitiesResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public CustomEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextA } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal CustomEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, CustomEntitiesResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// List of results. + internal CustomEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, CustomEntitiesResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public CustomEntitiesResult Results { get; set; } + /// List of results. + public CustomEntitiesResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.Serialization.cs index b940366d8f4d..fe206fbc6923 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.Serialization.cs @@ -7,64 +7,24 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class CustomLabelClassificationResult : IUtf8JsonSerializable + internal partial class CustomLabelClassificationResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); - writer.WriteEndObject(); - } - internal static CustomLabelClassificationResult DeserializeCustomLabelClassificationResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string projectName = default; string deploymentName = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(CustomLabelClassificationResultDocumentsItem.DeserializeCustomLabelClassificationResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -94,24 +54,26 @@ internal static CustomLabelClassificationResult DeserializeCustomLabelClassifica deploymentName = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(ClassificationDocumentResult.DeserializeClassificationDocumentResult(item)); + } + documents = array; + continue; + } } return new CustomLabelClassificationResult(errors, statistics, projectName, deploymentName, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new CustomLabelClassificationResult FromResponse(Response response) + internal static CustomLabelClassificationResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeCustomLabelClassificationResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.cs index bfdacca2e077..2c49360ac640 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResult.cs @@ -11,8 +11,8 @@ namespace Azure.AI.TextAnalytics.Models { - /// The CustomLabelClassificationResult. - internal partial class CustomLabelClassificationResult : CustomResult + /// Contains the custom label classification results. + internal partial class CustomLabelClassificationResult { /// Initializes a new instance of . /// Errors by document id. @@ -20,13 +20,16 @@ internal partial class CustomLabelClassificationResult : CustomResult /// This field indicates the deployment name for the model. /// Response by document. /// , , or is null. - public CustomLabelClassificationResult(IEnumerable errors, string projectName, string deploymentName, IEnumerable documents) : base(errors, projectName, deploymentName) + internal CustomLabelClassificationResult(IEnumerable errors, string projectName, string deploymentName, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(projectName, nameof(projectName)); Argument.AssertNotNull(deploymentName, nameof(deploymentName)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ProjectName = projectName; + DeploymentName = deploymentName; Documents = documents.ToList(); } @@ -36,12 +39,24 @@ public CustomLabelClassificationResult(IEnumerable errors, string /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. /// Response by document. - internal CustomLabelClassificationResult(IList errors, TextDocumentBatchStatistics statistics, string projectName, string deploymentName, IList documents) : base(errors, statistics, projectName, deploymentName) + internal CustomLabelClassificationResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string projectName, string deploymentName, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ProjectName = projectName; + DeploymentName = deploymentName; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates the project name for the model. + public string ProjectName { get; } + /// This field indicates the deployment name for the model. + public string DeploymentName { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.Serialization.cs deleted file mode 100644 index 34a74c3d0070..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class CustomLabelClassificationResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("class"u8); - writer.WriteStartArray(); - foreach (var item in Class) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static CustomLabelClassificationResultDocumentsItem DeserializeCustomLabelClassificationResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList @class = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("class"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(ClassificationResult.DeserializeClassificationResult(item)); - } - @class = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new CustomLabelClassificationResultDocumentsItem(id, warnings, statistics, @class); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomLabelClassificationResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomLabelClassificationResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.cs deleted file mode 100644 index d6e4dba54305..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomLabelClassificationResultDocumentsItem.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The CustomLabelClassificationResultDocumentsItem. - internal partial class CustomLabelClassificationResultDocumentsItem : ClassificationDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// - /// , or is null. - public CustomLabelClassificationResultDocumentsItem(string id, IEnumerable warnings, IEnumerable @class) : base(id, warnings, @class) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(@class, nameof(@class)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// - internal CustomLabelClassificationResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList @class) : base(id, warnings, statistics, @class) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.Serialization.cs index fd6f14ba1c27..433d7757c9d6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class CustomMultiLabelClassificationLROResult : IUtf8JsonSerializable + internal partial class CustomMultiLabelClassificationLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static CustomMultiLabelClassificationLROResult DeserializeCustomMultiLabelClassificationLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static CustomMultiLabelClassificationLROResult DeserializeCustomMultiLa return null; } CustomLabelClassificationResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static CustomMultiLabelClassificationLROResult DeserializeCustomMultiLa results = CustomLabelClassificationResult.DeserializeCustomLabelClassificationResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new CustomMultiLabelClassificationLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new CustomMultiLabelClassificationLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static CustomMultiLabelClassificationLROResult DeserializeCustomMultiLa using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeCustomMultiLabelClassificationLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.cs index 82bb78d8afb7..1ed6d8e6739f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The CustomMultiLabelClassificationLROResult. + /// Contains the custom multi label classification job result. internal partial class CustomMultiLabelClassificationLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// List of results. /// is null. - public CustomMultiLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status) + internal CustomMultiLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public CustomMultiLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal CustomMultiLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// List of results. + internal CustomMultiLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public CustomLabelClassificationResult Results { get; set; } + /// List of results. + public CustomLabelClassificationResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.Serialization.cs index dcb05cf83e06..5f2483051590 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static CustomMultiLabelClassificationLROTask DeserializeCustomMultiLabelClassificationLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - CustomMultiLabelClassificationTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = CustomMultiLabelClassificationTaskParameters.DeserializeCustomMultiLabelClassificationTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new CustomMultiLabelClassificationLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomMultiLabelClassificationLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomMultiLabelClassificationLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.cs index 2e7299ab1eb1..13bfe4043af5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationLROTask.cs @@ -17,16 +17,16 @@ public CustomMultiLabelClassificationLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Custom Multi Classification task. + /// task name. + /// The kind of task to perform. + /// Task parameters. internal CustomMultiLabelClassificationLROTask(string taskName, AnalyzeTextLROTaskKind kind, CustomMultiLabelClassificationTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Custom Multi Classification task. + /// Task parameters. public CustomMultiLabelClassificationTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.Serialization.cs index 9b7e66654909..21f4aff09933 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.Serialization.cs @@ -15,62 +15,20 @@ internal partial class CustomMultiLabelClassificationTaskParameters : IUtf8JsonS void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); if (Optional.IsDefined(LoggingOptOut)) { writer.WritePropertyName("loggingOptOut"u8); writer.WriteBooleanValue(LoggingOptOut.Value); } + writer.WritePropertyName("projectName"u8); + writer.WriteStringValue(ProjectName); + writer.WritePropertyName("deploymentName"u8); + writer.WriteStringValue(DeploymentName); writer.WriteEndObject(); } - internal static CustomMultiLabelClassificationTaskParameters DeserializeCustomMultiLabelClassificationTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string projectName = default; - string deploymentName = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("projectName"u8)) - { - projectName = property.Value.GetString(); - continue; - } - if (property.NameEquals("deploymentName"u8)) - { - deploymentName = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new CustomMultiLabelClassificationTaskParameters(loggingOptOut, projectName, deploymentName); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomMultiLabelClassificationTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomMultiLabelClassificationTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.cs index 8448c6711b87..aa140b75ddb0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomMultiLabelClassificationTaskParameters.cs @@ -10,24 +10,37 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Custom Multi Classification task. - internal partial class CustomMultiLabelClassificationTaskParameters : CustomTaskParameters + internal partial class CustomMultiLabelClassificationTaskParameters { /// Initializes a new instance of . /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. /// or is null. - public CustomMultiLabelClassificationTaskParameters(string projectName, string deploymentName) : base(projectName, deploymentName) + public CustomMultiLabelClassificationTaskParameters(string projectName, string deploymentName) { Argument.AssertNotNull(projectName, nameof(projectName)); Argument.AssertNotNull(deploymentName, nameof(deploymentName)); + + ProjectName = projectName; + DeploymentName = deploymentName; } /// Initializes a new instance of . - /// + /// logging opt out. /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. - internal CustomMultiLabelClassificationTaskParameters(bool? loggingOptOut, string projectName, string deploymentName) : base(loggingOptOut, projectName, deploymentName) + internal CustomMultiLabelClassificationTaskParameters(bool? loggingOptOut, string projectName, string deploymentName) { + LoggingOptOut = loggingOptOut; + ProjectName = projectName; + DeploymentName = deploymentName; } + + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// This field indicates the project name for the model. + public string ProjectName { get; } + /// This field indicates the deployment name for the model. + public string DeploymentName { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.Serialization.cs deleted file mode 100644 index c9e55162079a..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.Serialization.cs +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class CustomResult : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); - writer.WriteEndObject(); - } - - internal static CustomResult DeserializeCustomResult(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList errors = default; - TextDocumentBatchStatistics statistics = default; - string projectName = default; - string deploymentName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("errors"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentError.DeserializeDocumentError(item)); - } - errors = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentBatchStatistics.DeserializeTextDocumentBatchStatistics(property.Value); - continue; - } - if (property.NameEquals("projectName"u8)) - { - projectName = property.Value.GetString(); - continue; - } - if (property.NameEquals("deploymentName"u8)) - { - deploymentName = property.Value.GetString(); - continue; - } - } - return new CustomResult(errors, statistics, projectName, deploymentName); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static CustomResult FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomResult(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.cs deleted file mode 100644 index bcdc468a4039..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomResult.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The CustomResult. - internal partial class CustomResult - { - /// Initializes a new instance of . - /// Errors by document id. - /// This field indicates the project name for the model. - /// This field indicates the deployment name for the model. - /// , or is null. - public CustomResult(IEnumerable errors, string projectName, string deploymentName) - { - Argument.AssertNotNull(errors, nameof(errors)); - Argument.AssertNotNull(projectName, nameof(projectName)); - Argument.AssertNotNull(deploymentName, nameof(deploymentName)); - - Errors = errors.ToList(); - ProjectName = projectName; - DeploymentName = deploymentName; - } - - /// Initializes a new instance of . - /// Errors by document id. - /// if showStats=true was specified in the request this field will contain information about the request payload. - /// This field indicates the project name for the model. - /// This field indicates the deployment name for the model. - internal CustomResult(IList errors, TextDocumentBatchStatistics statistics, string projectName, string deploymentName) - { - Errors = errors; - Statistics = statistics; - ProjectName = projectName; - DeploymentName = deploymentName; - } - - /// Errors by document id. - public IList Errors { get; } - /// if showStats=true was specified in the request this field will contain information about the request payload. - public TextDocumentBatchStatistics Statistics { get; set; } - /// This field indicates the project name for the model. - public string ProjectName { get; set; } - /// This field indicates the deployment name for the model. - public string DeploymentName { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.Serialization.cs index 98c066847f26..03f10b184635 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class CustomSingleLabelClassificationLROResult : IUtf8JsonSerializable + internal partial class CustomSingleLabelClassificationLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static CustomSingleLabelClassificationLROResult DeserializeCustomSingleLabelClassificationLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static CustomSingleLabelClassificationLROResult DeserializeCustomSingle return null; } CustomLabelClassificationResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static CustomSingleLabelClassificationLROResult DeserializeCustomSingle results = CustomLabelClassificationResult.DeserializeCustomLabelClassificationResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new CustomSingleLabelClassificationLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new CustomSingleLabelClassificationLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static CustomSingleLabelClassificationLROResult DeserializeCustomSingle using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeCustomSingleLabelClassificationLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.cs index cda6ff4c5749..ed3c064d05e1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The CustomSingleLabelClassificationLROResult. + /// Contains the custom single label classification job result. internal partial class CustomSingleLabelClassificationLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// List of results. /// is null. - public CustomSingleLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status) + internal CustomSingleLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public CustomSingleLabelClassificationLROResult(DateTimeOffset lastUpdateDateTim } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal CustomSingleLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// List of results. + internal CustomSingleLabelClassificationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, CustomLabelClassificationResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public CustomLabelClassificationResult Results { get; set; } + /// List of results. + public CustomLabelClassificationResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.Serialization.cs index d6cb5c8b8fa6..ae6a9f9494f6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static CustomSingleLabelClassificationLROTask DeserializeCustomSingleLabelClassificationLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - CustomSingleLabelClassificationTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = CustomSingleLabelClassificationTaskParameters.DeserializeCustomSingleLabelClassificationTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new CustomSingleLabelClassificationLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomSingleLabelClassificationLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomSingleLabelClassificationLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.cs index 0a833c789cfd..ffbe5846ef39 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationLROTask.cs @@ -17,16 +17,16 @@ public CustomSingleLabelClassificationLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Custom Single Classification task. + /// task name. + /// The kind of task to perform. + /// Task parameters. internal CustomSingleLabelClassificationLROTask(string taskName, AnalyzeTextLROTaskKind kind, CustomSingleLabelClassificationTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Custom Single Classification task. + /// Task parameters. public CustomSingleLabelClassificationTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.Serialization.cs index 7eba3bcbb8f8..fe5cce2737f5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.Serialization.cs @@ -15,62 +15,20 @@ internal partial class CustomSingleLabelClassificationTaskParameters : IUtf8Json void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); if (Optional.IsDefined(LoggingOptOut)) { writer.WritePropertyName("loggingOptOut"u8); writer.WriteBooleanValue(LoggingOptOut.Value); } + writer.WritePropertyName("projectName"u8); + writer.WriteStringValue(ProjectName); + writer.WritePropertyName("deploymentName"u8); + writer.WriteStringValue(DeploymentName); writer.WriteEndObject(); } - internal static CustomSingleLabelClassificationTaskParameters DeserializeCustomSingleLabelClassificationTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string projectName = default; - string deploymentName = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("projectName"u8)) - { - projectName = property.Value.GetString(); - continue; - } - if (property.NameEquals("deploymentName"u8)) - { - deploymentName = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new CustomSingleLabelClassificationTaskParameters(loggingOptOut, projectName, deploymentName); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomSingleLabelClassificationTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomSingleLabelClassificationTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.cs index 5ad3caa9b5e1..60a1b50c5008 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomSingleLabelClassificationTaskParameters.cs @@ -10,24 +10,37 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Custom Single Classification task. - internal partial class CustomSingleLabelClassificationTaskParameters : CustomTaskParameters + internal partial class CustomSingleLabelClassificationTaskParameters { /// Initializes a new instance of . /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. /// or is null. - public CustomSingleLabelClassificationTaskParameters(string projectName, string deploymentName) : base(projectName, deploymentName) + public CustomSingleLabelClassificationTaskParameters(string projectName, string deploymentName) { Argument.AssertNotNull(projectName, nameof(projectName)); Argument.AssertNotNull(deploymentName, nameof(deploymentName)); + + ProjectName = projectName; + DeploymentName = deploymentName; } /// Initializes a new instance of . - /// + /// logging opt out. /// This field indicates the project name for the model. /// This field indicates the deployment name for the model. - internal CustomSingleLabelClassificationTaskParameters(bool? loggingOptOut, string projectName, string deploymentName) : base(loggingOptOut, projectName, deploymentName) + internal CustomSingleLabelClassificationTaskParameters(bool? loggingOptOut, string projectName, string deploymentName) { + LoggingOptOut = loggingOptOut; + ProjectName = projectName; + DeploymentName = deploymentName; } + + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// This field indicates the project name for the model. + public string ProjectName { get; } + /// This field indicates the deployment name for the model. + public string DeploymentName { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.Serialization.cs deleted file mode 100644 index 8f00f91b0ebc..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.Serialization.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class CustomTaskParameters : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("projectName"u8); - writer.WriteStringValue(ProjectName); - writer.WritePropertyName("deploymentName"u8); - writer.WriteStringValue(DeploymentName); - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } - writer.WriteEndObject(); - } - - internal static CustomTaskParameters DeserializeCustomTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string projectName = default; - string deploymentName = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("projectName"u8)) - { - projectName = property.Value.GetString(); - continue; - } - if (property.NameEquals("deploymentName"u8)) - { - deploymentName = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new CustomTaskParameters(loggingOptOut, projectName, deploymentName); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new CustomTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeCustomTaskParameters(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.cs deleted file mode 100644 index bc9c41960071..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/CustomTaskParameters.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; - -namespace Azure.AI.TextAnalytics.Models -{ - /// Parameters object for a text analysis task using custom models. - internal partial class CustomTaskParameters : TaskParameters - { - /// Initializes a new instance of . - /// This field indicates the project name for the model. - /// This field indicates the deployment name for the model. - /// or is null. - public CustomTaskParameters(string projectName, string deploymentName) - { - Argument.AssertNotNull(projectName, nameof(projectName)); - Argument.AssertNotNull(deploymentName, nameof(deploymentName)); - - ProjectName = projectName; - DeploymentName = deploymentName; - } - - /// Initializes a new instance of . - /// - /// This field indicates the project name for the model. - /// This field indicates the deployment name for the model. - internal CustomTaskParameters(bool? loggingOptOut, string projectName, string deploymentName) : base(loggingOptOut) - { - ProjectName = projectName; - DeploymentName = deploymentName; - } - - /// This field indicates the project name for the model. - public string ProjectName { get; set; } - /// This field indicates the deployment name for the model. - public string DeploymentName { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.Serialization.cs index 8f386584a358..22ab83720142 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.Serialization.cs @@ -6,38 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial struct DetectedLanguageInternal : IUtf8JsonSerializable + internal partial struct DetectedLanguageInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Name != null) - { - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - } - else - { - writer.WriteNull("name"); - } - if (Iso6391Name != null) - { - writer.WritePropertyName("iso6391Name"u8); - writer.WriteStringValue(Iso6391Name); - } - else - { - writer.WriteNull("iso6391Name"); - } - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore); - writer.WriteEndObject(); - } - internal static DetectedLanguageInternal DeserializeDetectedLanguageInternal(JsonElement element) { string name = default; @@ -81,13 +54,5 @@ internal static DetectedLanguageInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeDetectedLanguageInternal(document.RootElement); } - - /// Convert into a . - internal RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.cs index 7881fab4631f..bd39e70ea226 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DetectedLanguageInternal.cs @@ -7,14 +7,14 @@ namespace Azure.AI.TextAnalytics.Models { - /// The DetectedLanguage. + /// Contains the details of the detected language for the text. internal readonly partial struct DetectedLanguageInternal { /// Initializes a new instance of . /// Long name of a detected language (e.g. English, French). /// A two letter representation of the detected language according to the ISO 639-1 standard (e.g. en, fr). /// A confidence score between 0 and 1. Scores close to 1 indicate 100% certainty that the identified language is true. - public DetectedLanguageInternal(string name, string iso6391Name, double confidenceScore) + internal DetectedLanguageInternal(string name, string iso6391Name, double confidenceScore) { Name = name; Iso6391Name = iso6391Name; diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.Serialization.cs index 9790492c3bcd..dfa51f06174c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class DocumentError : IUtf8JsonSerializable + internal partial class DocumentError { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("error"u8); - writer.WriteObjectValue(Error); - writer.WriteEndObject(); - } - internal static DocumentError DeserializeDocumentError(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static DocumentError FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeDocumentError(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.cs index d08c02aca622..ae27fc1421b0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentError.cs @@ -16,7 +16,7 @@ internal partial class DocumentError /// The ID of the input document. /// Error encountered. /// or is null. - public DocumentError(string id, Error error) + internal DocumentError(string id, Error error) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(error, nameof(error)); @@ -26,8 +26,8 @@ public DocumentError(string id, Error error) } /// The ID of the input document. - public string Id { get; set; } + public string Id { get; } /// Error encountered. - public Error Error { get; set; } + public Error Error { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.Serialization.cs deleted file mode 100644 index 2a8fa68552a9..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.Serialization.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class DocumentResult : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static DocumentResult DeserializeDocumentResult(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new DocumentResult(id, warnings, statistics); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static DocumentResult FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeDocumentResult(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.cs deleted file mode 100644 index f71905d52301..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentResult.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The DocumentResult. - internal partial class DocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// or is null. - public DocumentResult(string id, IEnumerable warnings) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - - Id = id; - Warnings = warnings.ToList(); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - internal DocumentResult(string id, IList warnings, TextDocumentStatistics? statistics) - { - Id = id; - Warnings = warnings; - Statistics = statistics; - } - - /// Unique, non-empty document identifier. - public string Id { get; set; } - /// Warnings encountered while processing document. - public IList Warnings { get; } - /// if showStats=true was specified in the request this field will contain information about the document payload. - public TextDocumentStatistics? Statistics { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.Serialization.cs index 81460f406a72..a88c341a024f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.Serialization.cs @@ -6,27 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class DocumentWarning : IUtf8JsonSerializable + internal partial class DocumentWarning { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToSerialString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (Optional.IsDefined(TargetRef)) - { - writer.WritePropertyName("targetRef"u8); - writer.WriteStringValue(TargetRef); - } - writer.WriteEndObject(); - } - internal static DocumentWarning DeserializeDocumentWarning(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -64,13 +48,5 @@ internal static DocumentWarning FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeDocumentWarning(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.cs index 08ed64bfb069..46a47e245769 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/DocumentWarning.cs @@ -9,14 +9,14 @@ namespace Azure.AI.TextAnalytics.Models { - /// The DocumentWarning. + /// Contains the warnings object with warnings encountered for the processed document. internal partial class DocumentWarning { /// Initializes a new instance of . - /// Error code. + /// Warning code. /// Warning message. /// is null. - public DocumentWarning(WarningCodeValue code, string message) + internal DocumentWarning(WarningCodeValue code, string message) { Argument.AssertNotNull(message, nameof(message)); @@ -25,7 +25,7 @@ public DocumentWarning(WarningCodeValue code, string message) } /// Initializes a new instance of . - /// Error code. + /// Warning code. /// Warning message. /// A JSON pointer reference indicating the target object. internal DocumentWarning(WarningCodeValue code, string message, string targetRef) @@ -35,11 +35,11 @@ internal DocumentWarning(WarningCodeValue code, string message, string targetRef TargetRef = targetRef; } - /// Error code. - public WarningCodeValue Code { get; set; } + /// Warning code. + public WarningCodeValue Code { get; } /// Warning message. - public string Message { get; set; } + public string Message { get; } /// A JSON pointer reference indicating the target object. - public string TargetRef { get; set; } + public string TargetRef { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.Serialization.cs index 28fe258871e1..06bc14fb72aa 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class EntitiesDocumentResult : IUtf8JsonSerializable + internal partial class EntitiesDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static EntitiesDocumentResult DeserializeEntitiesDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList entities = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList entities = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Entity.DeserializeEntity(item)); - } - entities = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static EntitiesDocumentResult DeserializeEntitiesDocumentResult(JsonEle statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("entities"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(Entity.DeserializeEntity(item)); + } + entities = array; + continue; + } } return new EntitiesDocumentResult(id, warnings, statistics, entities); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new EntitiesDocumentResult FromResponse(Response response) + internal static EntitiesDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntitiesDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.cs index f22a185b0dcc..fda0d735c6f9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntitiesDocumentResult. - internal partial class EntitiesDocumentResult : DocumentResult + /// Contains the entity recognition task result for the document. + internal partial class EntitiesDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// Recognized entities in the document. /// , or is null. - public EntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities) : base(id, warnings) + internal EntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(entities, nameof(entities)); + Id = id; + Warnings = warnings.ToList(); Entities = entities.ToList(); } @@ -33,12 +35,21 @@ public EntitiesDocumentResult(string id, IEnumerable warnings, /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// Recognized entities in the document. - internal EntitiesDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList entities) : base(id, warnings, statistics) + internal EntitiesDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList entities) { + Id = id; + Warnings = warnings; + Statistics = statistics; Entities = entities; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Recognized entities in the document. - public IList Entities { get; } + public IReadOnlyList Entities { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.Serialization.cs index 68923088b6ec..d9c5f18d07a6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static EntitiesLROTask DeserializeEntitiesLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - EntitiesTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = EntitiesTaskParameters.DeserializeEntitiesTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new EntitiesLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntitiesLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntitiesLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.cs index d76d674c8b45..e3586da5e418 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesLROTask.cs @@ -17,16 +17,16 @@ public EntitiesLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for an Entity Recognition task. + /// task name. + /// The kind of task to perform. + /// Task parameters. internal EntitiesLROTask(string taskName, AnalyzeTextLROTaskKind kind, EntitiesTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for an Entity Recognition task. + /// Task parameters. public EntitiesTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.Serialization.cs index 59cf87f0ceff..ee79b7e90013 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class EntitiesResult : IUtf8JsonSerializable + internal partial class EntitiesResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static EntitiesResult DeserializeEntitiesResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(EntitiesResultDocumentsItem.DeserializeEntitiesResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static EntitiesResult DeserializeEntitiesResult(JsonElement element) modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(EntitiesDocumentResult.DeserializeEntitiesDocumentResult(item)); + } + documents = array; + continue; + } } return new EntitiesResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new EntitiesResult FromResponse(Response response) + internal static EntitiesResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntitiesResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.cs index 04e60c035971..79f802f2225e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntitiesResult. - internal partial class EntitiesResult : PreBuiltResult + /// Contains the entity recognition task result. + internal partial class EntitiesResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. /// Response by document. /// , or is null. - public EntitiesResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal EntitiesResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -33,12 +35,21 @@ public EntitiesResult(IEnumerable errors, string modelVersion, IE /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. /// Response by document. - internal EntitiesResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + internal EntitiesResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.Serialization.cs deleted file mode 100644 index 64694207506b..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class EntitiesResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static EntitiesResultDocumentsItem DeserializeEntitiesResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList entities = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Entity.DeserializeEntity(item)); - } - entities = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new EntitiesResultDocumentsItem(id, warnings, statistics, entities); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntitiesResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntitiesResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.cs deleted file mode 100644 index b279a33ced9e..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesResultDocumentsItem.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The EntitiesResultDocumentsItem. - internal partial class EntitiesResultDocumentsItem : EntitiesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Recognized entities in the document. - /// , or is null. - public EntitiesResultDocumentsItem(string id, IEnumerable warnings, IEnumerable entities) : base(id, warnings, entities) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(entities, nameof(entities)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Recognized entities in the document. - internal EntitiesResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList entities) : base(id, warnings, statistics, entities) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.Serialization.cs index 29a278a7b1a3..6ce2677b229e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.Serialization.cs @@ -15,72 +15,26 @@ internal partial class EntitiesTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(StringIndexType)) + if (Optional.IsDefined(LoggingOptOut)) { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); } if (Optional.IsDefined(ModelVersion)) { writer.WritePropertyName("modelVersion"u8); writer.WriteStringValue(ModelVersion); } - if (Optional.IsDefined(LoggingOptOut)) + if (Optional.IsDefined(StringIndexType)) { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); + writer.WritePropertyName("stringIndexType"u8); + writer.WriteStringValue(StringIndexType.Value.ToString()); } writer.WriteEndObject(); } - internal static EntitiesTaskParameters DeserializeEntitiesTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new EntitiesTaskParameters(loggingOptOut, modelVersion, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntitiesTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntitiesTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.cs index 2a40db9313b7..bfbf737cfaf4 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for an Entity Recognition task. - internal partial class EntitiesTaskParameters : PreBuiltTaskParameters + internal partial class EntitiesTaskParameters { /// Initializes a new instance of . public EntitiesTaskParameters() @@ -16,15 +16,21 @@ public EntitiesTaskParameters() } /// Initializes a new instance of . - /// - /// - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal EntitiesTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// (Optional) parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). + internal EntitiesTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; StringIndexType = stringIndexType; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// (Optional) parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskResult.cs index 7b3990233069..f331420d8fd1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntitiesTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntitiesTaskResult. + /// Contains the entity task. internal partial class EntitiesTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// Results for entity recognition. /// is null. internal EntitiesTaskResult(EntitiesResult results) { @@ -24,15 +24,15 @@ internal EntitiesTaskResult(EntitiesResult results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// Results for entity recognition. internal EntitiesTaskResult(AnalyzeTextTaskResultsKind kind, EntitiesResult results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// Results for entity recognition. public EntitiesResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.Serialization.cs index a08ae00a3672..65c5990c4e4a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.Serialization.cs @@ -6,33 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class Entity : IUtf8JsonSerializable + internal partial class Entity { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("category"u8); - writer.WriteStringValue(Category); - if (Optional.IsDefined(Subcategory)) - { - writer.WritePropertyName("subcategory"u8); - writer.WriteStringValue(Subcategory); - } - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore); - writer.WriteEndObject(); - } - internal static Entity DeserializeEntity(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -94,13 +72,5 @@ internal static Entity FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntity(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.cs index 57b530540792..efab17afcaa4 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Entity.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The Entity. + /// Defines the detected entity object containing the entity category and entity text detected, etc. internal partial class Entity { /// Initializes a new instance of . @@ -19,7 +19,7 @@ internal partial class Entity /// Length for the entity text. Use of different 'stringIndexType' values can affect the length returned. /// Confidence score between 0 and 1 of the extracted entity. /// or is null. - public Entity(string text, string category, int offset, int length, double confidenceScore) + internal Entity(string text, string category, int offset, int length, double confidenceScore) { Argument.AssertNotNull(text, nameof(text)); Argument.AssertNotNull(category, nameof(category)); @@ -49,16 +49,16 @@ internal Entity(string text, string category, string subcategory, int offset, in } /// Entity text as appears in the request. - public string Text { get; set; } + public string Text { get; } /// Entity type. - public string Category { get; set; } + public string Category { get; } /// (Optional) Entity sub type. - public string Subcategory { get; set; } + public string Subcategory { get; } /// Start position for the entity text. Use of different 'stringIndexType' values can affect the offset returned. - public int Offset { get; set; } + public int Offset { get; } /// Length for the entity text. Use of different 'stringIndexType' values can affect the length returned. - public int Length { get; set; } + public int Length { get; } /// Confidence score between 0 and 1 of the extracted entity. - public double ConfidenceScore { get; set; } + public double ConfidenceScore { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.Serialization.cs index 7f183ef36a2f..91edff7f820f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial class EntityDataSource : IUtf8JsonSerializable + public partial class EntityDataSource { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("dataSource"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(EntityId); - writer.WriteEndObject(); - } - internal static EntityDataSource DeserializeEntityDataSource(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static EntityDataSource FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntityDataSource(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.cs index 01ea47935077..03fed56c0d35 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityDataSource.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics { - /// The HealthcareEntityLink. + /// Reference to an entity in known data sources. public partial class EntityDataSource { } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.Serialization.cs index 846c9da8c185..68231b778850 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class EntityLinkingLROResult : IUtf8JsonSerializable + internal partial class EntityLinkingLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static EntityLinkingLROResult DeserializeEntityLinkingLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static EntityLinkingLROResult DeserializeEntityLinkingLROResult(JsonEle return null; } EntityLinkingResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static EntityLinkingLROResult DeserializeEntityLinkingLROResult(JsonEle results = EntityLinkingResult.DeserializeEntityLinkingResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new EntityLinkingLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new EntityLinkingLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static EntityLinkingLROResult DeserializeEntityLinkingLROResult(JsonEle using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntityLinkingLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.cs index fe0291a36ae2..917500169bb5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntityLinkingLROResult. + /// Contains the analyze text Entity linking task LRO result. internal partial class EntityLinkingLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// Entity linking result. /// is null. - public EntityLinkingLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, EntityLinkingResult results) : base(lastUpdateDateTime, status) + internal EntityLinkingLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, EntityLinkingResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public EntityLinkingLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOp } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal EntityLinkingLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, EntityLinkingResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// Entity linking result. + internal EntityLinkingLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, EntityLinkingResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public EntityLinkingResult Results { get; set; } + /// Entity linking result. + public EntityLinkingResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.Serialization.cs index 466322ce14bf..2ee758a4997b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static EntityLinkingLROTask DeserializeEntityLinkingLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - EntityLinkingTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = EntityLinkingTaskParameters.DeserializeEntityLinkingTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new EntityLinkingLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntityLinkingLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntityLinkingLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.cs index 434d46ac8275..a9808e6b57b8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingLROTask.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// An object representing the task definition for an Entity Linking task. + /// Contains the analyze text Entity linking LRO task. internal partial class EntityLinkingLROTask : AnalyzeTextLROTask { /// Initializes a new instance of . @@ -17,16 +17,16 @@ public EntityLinkingLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for an Entity Linking task. + /// task name. + /// The kind of task to perform. + /// Task parameters. internal EntityLinkingLROTask(string taskName, AnalyzeTextLROTaskKind kind, EntityLinkingTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for an Entity Linking task. + /// Task parameters. public EntityLinkingTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.Serialization.cs index 756f85a8caff..7382c64904d9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class EntityLinkingResult : IUtf8JsonSerializable + internal partial class EntityLinkingResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static EntityLinkingResult DeserializeEntityLinkingResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(EntityLinkingResultDocumentsItem.DeserializeEntityLinkingResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static EntityLinkingResult DeserializeEntityLinkingResult(JsonElement e modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(LinkedEntitiesDocumentResult.DeserializeLinkedEntitiesDocumentResult(item)); + } + documents = array; + continue; + } } return new EntityLinkingResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new EntityLinkingResult FromResponse(Response response) + internal static EntityLinkingResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntityLinkingResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.cs index a48c7a1d0590..112231249fd9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntityLinkingResult. - internal partial class EntityLinkingResult : PreBuiltResult + /// Entity linking result. + internal partial class EntityLinkingResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. /// Response by document. /// , or is null. - public EntityLinkingResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal EntityLinkingResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -33,12 +35,21 @@ public EntityLinkingResult(IEnumerable errors, string modelVersio /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. /// Response by document. - internal EntityLinkingResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + internal EntityLinkingResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.Serialization.cs deleted file mode 100644 index 0cbcc7b51999..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class EntityLinkingResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static EntityLinkingResultDocumentsItem DeserializeEntityLinkingResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList entities = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(LinkedEntity.DeserializeLinkedEntity(item)); - } - entities = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new EntityLinkingResultDocumentsItem(id, warnings, statistics, entities); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntityLinkingResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntityLinkingResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.cs deleted file mode 100644 index f3967c70e2b9..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingResultDocumentsItem.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The EntityLinkingResultDocumentsItem. - internal partial class EntityLinkingResultDocumentsItem : LinkedEntitiesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Recognized well known entities in the document. - /// , or is null. - public EntityLinkingResultDocumentsItem(string id, IEnumerable warnings, IEnumerable entities) : base(id, warnings, entities) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(entities, nameof(entities)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Recognized well known entities in the document. - internal EntityLinkingResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList entities) : base(id, warnings, statistics, entities) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.Serialization.cs index ee9407620d54..815aa508b5d1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.Serialization.cs @@ -15,72 +15,26 @@ internal partial class EntityLinkingTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(StringIndexType)) + if (Optional.IsDefined(LoggingOptOut)) { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); } if (Optional.IsDefined(ModelVersion)) { writer.WritePropertyName("modelVersion"u8); writer.WriteStringValue(ModelVersion); } - if (Optional.IsDefined(LoggingOptOut)) + if (Optional.IsDefined(StringIndexType)) { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); + writer.WritePropertyName("stringIndexType"u8); + writer.WriteStringValue(StringIndexType.Value.ToString()); } writer.WriteEndObject(); } - internal static EntityLinkingTaskParameters DeserializeEntityLinkingTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new EntityLinkingTaskParameters(loggingOptOut, modelVersion, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new EntityLinkingTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeEntityLinkingTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.cs index 630a89b0245a..f2ace0f3f80c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for an Entity Linking task. - internal partial class EntityLinkingTaskParameters : PreBuiltTaskParameters + internal partial class EntityLinkingTaskParameters { /// Initializes a new instance of . public EntityLinkingTaskParameters() @@ -16,15 +16,21 @@ public EntityLinkingTaskParameters() } /// Initializes a new instance of . - /// - /// - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal EntityLinkingTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// Optional parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). + internal EntityLinkingTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; StringIndexType = stringIndexType; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Optional parameter to provide the string index type used to interpret string offsets. Defaults to TextElements (Graphemes). public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskResult.cs index 7989552ea9f5..d3fb8f6a7659 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityLinkingTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntityLinkingTaskResult. + /// Contains the analyze text Entity linking task result. internal partial class EntityLinkingTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// Entity linking result. /// is null. internal EntityLinkingTaskResult(EntityLinkingResult results) { @@ -24,15 +24,15 @@ internal EntityLinkingTaskResult(EntityLinkingResult results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// Entity linking result. internal EntityLinkingTaskResult(AnalyzeTextTaskResultsKind kind, EntityLinkingResult results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// Entity linking result. public EntityLinkingResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.Serialization.cs index cc9c0a78dd47..a8ea1e8762e7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class EntityRecognitionLROResult : IUtf8JsonSerializable + internal partial class EntityRecognitionLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static EntityRecognitionLROResult DeserializeEntityRecognitionLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static EntityRecognitionLROResult DeserializeEntityRecognitionLROResult return null; } EntitiesResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static EntityRecognitionLROResult DeserializeEntityRecognitionLROResult results = EntitiesResult.DeserializeEntitiesResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new EntityRecognitionLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new EntityRecognitionLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static EntityRecognitionLROResult DeserializeEntityRecognitionLROResult using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeEntityRecognitionLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.cs index 7e58f252e4e9..458888844a25 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/EntityRecognitionLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The EntityRecognitionLROResult. + /// Contains the entity recognition job task result. internal partial class EntityRecognitionLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// Results for the task. /// is null. - public EntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, EntitiesResult results) : base(lastUpdateDateTime, status) + internal EntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, EntitiesResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public EntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyti } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal EntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, EntitiesResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// Results for the task. + internal EntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, EntitiesResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public EntitiesResult Results { get; set; } + /// Results for the task. + public EntitiesResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.Serialization.cs index f472c6948c80..8cf5dfc8955a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.Serialization.cs @@ -7,47 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class Error : IUtf8JsonSerializable + internal partial class Error { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (Optional.IsDefined(Target)) - { - writer.WritePropertyName("target"u8); - writer.WriteStringValue(Target); - } - if (Optional.IsCollectionDefined(Details)) - { - writer.WritePropertyName("details"u8); - writer.WriteStartArray(); - foreach (var item in Details) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - } - if (Optional.IsDefined(Innererror)) - { - writer.WritePropertyName("innererror"u8); - writer.WriteObjectValue(Innererror); - } - foreach (var item in AdditionalProperties) - { - writer.WritePropertyName(item.Key); - writer.WriteObjectValue(item.Value); - } - writer.WriteEndObject(); - } - internal static Error DeserializeError(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -57,10 +21,8 @@ internal static Error DeserializeError(JsonElement element) ErrorCode code = default; string message = default; string target = default; - IList details = default; + IReadOnlyList details = default; InnerErrorModel innererror = default; - IDictionary additionalProperties = default; - Dictionary additionalPropertiesDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { if (property.NameEquals("code"u8)) @@ -101,16 +63,8 @@ internal static Error DeserializeError(JsonElement element) innererror = InnerErrorModel.DeserializeInnerErrorModel(property.Value); continue; } - additionalPropertiesDictionary.Add(property.Name, property.Value.GetObject()); } - additionalProperties = additionalPropertiesDictionary; - return new Error( - code, - message, - target, - details ?? new ChangeTrackingList(), - innererror, - additionalProperties); + return new Error(code, message, target, details ?? new ChangeTrackingList(), innererror); } /// Deserializes the model from a raw response. @@ -120,13 +74,5 @@ internal static Error FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeError(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.cs index 8171965e6d24..5c7e29245e14 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Error.cs @@ -10,21 +10,20 @@ namespace Azure.AI.TextAnalytics.Models { - /// The error object. + /// The error response object returned when the service encounters some errors during processing the request. internal partial class Error { /// Initializes a new instance of . /// One of a server-defined set of error codes. /// A human-readable representation of the error. /// is null. - public Error(ErrorCode code, string message) + internal Error(ErrorCode code, string message) { Argument.AssertNotNull(message, nameof(message)); Code = code; Message = message; Details = new ChangeTrackingList(); - AdditionalProperties = new ChangeTrackingDictionary(); } /// Initializes a new instance of . @@ -33,28 +32,24 @@ public Error(ErrorCode code, string message) /// The target of the error. /// An array of details about specific errors that led to this reported error. /// An object containing more specific information than the current object about the error. - /// Additional Properties. - internal Error(ErrorCode code, string message, string target, IList details, InnerErrorModel innererror, IDictionary additionalProperties) + internal Error(ErrorCode code, string message, string target, IReadOnlyList details, InnerErrorModel innererror) { Code = code; Message = message; Target = target; Details = details; Innererror = innererror; - AdditionalProperties = additionalProperties; } /// One of a server-defined set of error codes. - public ErrorCode Code { get; set; } + public ErrorCode Code { get; } /// A human-readable representation of the error. - public string Message { get; set; } + public string Message { get; } /// The target of the error. - public string Target { get; set; } + public string Target { get; } /// An array of details about specific errors that led to this reported error. - public IList Details { get; } + public IReadOnlyList Details { get; } /// An object containing more specific information than the current object about the error. - public InnerErrorModel Innererror { get; set; } - /// Additional Properties. - public IDictionary AdditionalProperties { get; } + public InnerErrorModel Innererror { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ErrorCode.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ErrorCode.cs index 8f638583f5d1..e827ada6884e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ErrorCode.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ErrorCode.cs @@ -41,41 +41,41 @@ public ErrorCode(string value) private const string ConflictValue = "Conflict"; private const string WarningValue = "Warning"; - /// InvalidRequest. + /// Invalid request error. public static ErrorCode InvalidRequest { get; } = new ErrorCode(InvalidRequestValue); - /// InvalidArgument. + /// Invalid argument error. public static ErrorCode InvalidArgument { get; } = new ErrorCode(InvalidArgumentValue); - /// Unauthorized. + /// Unauthorized access error. public static ErrorCode Unauthorized { get; } = new ErrorCode(UnauthorizedValue); - /// Forbidden. + /// Forbidden access error. public static ErrorCode Forbidden { get; } = new ErrorCode(ForbiddenValue); - /// NotFound. + /// Not found error. public static ErrorCode NotFound { get; } = new ErrorCode(NotFoundValue); - /// ProjectNotFound. + /// Project not found error. public static ErrorCode ProjectNotFound { get; } = new ErrorCode(ProjectNotFoundValue); - /// OperationNotFound. + /// Operation not found error. public static ErrorCode OperationNotFound { get; } = new ErrorCode(OperationNotFoundValue); - /// AzureCognitiveSearchNotFound. + /// Azure Cognitive Search not found error. public static ErrorCode AzureCognitiveSearchNotFound { get; } = new ErrorCode(AzureCognitiveSearchNotFoundValue); - /// AzureCognitiveSearchIndexNotFound. + /// Azure Cognitive Search index not found error. public static ErrorCode AzureCognitiveSearchIndexNotFound { get; } = new ErrorCode(AzureCognitiveSearchIndexNotFoundValue); - /// TooManyRequests. + /// Too many requests error. public static ErrorCode TooManyRequests { get; } = new ErrorCode(TooManyRequestsValue); - /// AzureCognitiveSearchThrottling. + /// Azure Cognitive Search throttling error. public static ErrorCode AzureCognitiveSearchThrottling { get; } = new ErrorCode(AzureCognitiveSearchThrottlingValue); - /// AzureCognitiveSearchIndexLimitReached. + /// Azure Cognitive Search index limit reached error. public static ErrorCode AzureCognitiveSearchIndexLimitReached { get; } = new ErrorCode(AzureCognitiveSearchIndexLimitReachedValue); - /// InternalServerError. + /// Internal server error. public static ErrorCode InternalServerError { get; } = new ErrorCode(InternalServerErrorValue); - /// ServiceUnavailable. + /// Service unavailable error. public static ErrorCode ServiceUnavailable { get; } = new ErrorCode(ServiceUnavailableValue); - /// Timeout. + /// Timeout error. public static ErrorCode Timeout { get; } = new ErrorCode(TimeoutValue); - /// QuotaExceeded. + /// Quota exceeded error. public static ErrorCode QuotaExceeded { get; } = new ErrorCode(QuotaExceededValue); - /// Conflict. + /// Conflict error. public static ErrorCode Conflict { get; } = new ErrorCode(ConflictValue); - /// Warning. + /// Warning error. public static ErrorCode Warning { get; } = new ErrorCode(WarningValue); /// Determines if two values are the same. public static bool operator ==(ErrorCode left, ErrorCode right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.Serialization.cs index 28796546f722..815575699933 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ExtractedSummaryDocumentResult : IUtf8JsonSerializable + internal partial class ExtractedSummaryDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("sentences"u8); - writer.WriteStartArray(); - foreach (var item in Sentences) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static ExtractedSummaryDocumentResult DeserializeExtractedSummaryDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList sentences = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList sentences = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("sentences"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(ExtractedSummarySentence.DeserializeExtractedSummarySentence(item)); - } - sentences = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static ExtractedSummaryDocumentResult DeserializeExtractedSummaryDocume statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("sentences"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(ExtractedSummarySentence.DeserializeExtractedSummarySentence(item)); + } + sentences = array; + continue; + } } return new ExtractedSummaryDocumentResult(id, warnings, statistics, sentences); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new ExtractedSummaryDocumentResult FromResponse(Response response) + internal static ExtractedSummaryDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeExtractedSummaryDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.cs index 462066aa88ba..a7355df0ce3d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummaryDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ExtractedSummaryDocumentResult. - internal partial class ExtractedSummaryDocumentResult : DocumentResult + /// A ranked list of sentences representing the extracted summary. + internal partial class ExtractedSummaryDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. - /// A ranked list of sentences representing the extracted summary. + /// Specifies the the extracted sentences from the input document. /// , or is null. - public ExtractedSummaryDocumentResult(string id, IEnumerable warnings, IEnumerable sentences) : base(id, warnings) + internal ExtractedSummaryDocumentResult(string id, IEnumerable warnings, IEnumerable sentences) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(sentences, nameof(sentences)); + Id = id; + Warnings = warnings.ToList(); Sentences = sentences.ToList(); } @@ -32,13 +34,22 @@ public ExtractedSummaryDocumentResult(string id, IEnumerable wa /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. - /// A ranked list of sentences representing the extracted summary. - internal ExtractedSummaryDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList sentences) : base(id, warnings, statistics) + /// Specifies the the extracted sentences from the input document. + internal ExtractedSummaryDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList sentences) { + Id = id; + Warnings = warnings; + Statistics = statistics; Sentences = sentences; } - /// A ranked list of sentences representing the extracted summary. - public IList Sentences { get; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } + /// Specifies the the extracted sentences from the input document. + public IReadOnlyList Sentences { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.Serialization.cs index 357eb8617bac..339941fd4e14 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.Serialization.cs @@ -6,26 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ExtractedSummarySentence : IUtf8JsonSerializable + internal partial class ExtractedSummarySentence { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("rankScore"u8); - writer.WriteNumberValue(RankScore); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WriteEndObject(); - } - internal static ExtractedSummarySentence DeserializeExtractedSummarySentence(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -69,13 +54,5 @@ internal static ExtractedSummarySentence FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeExtractedSummarySentence(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.cs index c1fab1c9ee90..03b41e5deb09 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractedSummarySentence.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ExtractedSummarySentence. + /// Represents an extracted sentences from the input document. internal partial class ExtractedSummarySentence { /// Initializes a new instance of . @@ -18,7 +18,7 @@ internal partial class ExtractedSummarySentence /// The sentence offset from the start of the document, based on the value of the parameter StringIndexType. /// The length of the sentence. /// is null. - public ExtractedSummarySentence(string text, double rankScore, int offset, int length) + internal ExtractedSummarySentence(string text, double rankScore, int offset, int length) { Argument.AssertNotNull(text, nameof(text)); @@ -29,12 +29,12 @@ public ExtractedSummarySentence(string text, double rankScore, int offset, int l } /// The extracted sentence text. - public string Text { get; set; } + public string Text { get; } /// A double value representing the relevance of the sentence within the summary. Higher values indicate higher importance. - public double RankScore { get; set; } + public double RankScore { get; } /// The sentence offset from the start of the document, based on the value of the parameter StringIndexType. - public int Offset { get; set; } + public int Offset { get; } /// The length of the sentence. - public int Length { get; set; } + public int Length { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.Serialization.cs index 2bac16e4a51c..5ee347144f24 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ExtractiveSummarizationLROResult : IUtf8JsonSerializable + internal partial class ExtractiveSummarizationLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static ExtractiveSummarizationLROResult DeserializeExtractiveSummarizationLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static ExtractiveSummarizationLROResult DeserializeExtractiveSummarizat return null; } ExtractiveSummarizationResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static ExtractiveSummarizationLROResult DeserializeExtractiveSummarizat results = ExtractiveSummarizationResult.DeserializeExtractiveSummarizationResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new ExtractiveSummarizationLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new ExtractiveSummarizationLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static ExtractiveSummarizationLROResult DeserializeExtractiveSummarizat using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeExtractiveSummarizationLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.cs index b590b1022d19..a9bfccdc2f50 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ExtractiveSummarizationLROResult. + /// An object representing the results for an Extractive Summarization task. internal partial class ExtractiveSummarizationLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// Results of the task. /// is null. - public ExtractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, ExtractiveSummarizationResult results) : base(lastUpdateDateTime, status) + internal ExtractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, ExtractiveSummarizationResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public ExtractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextA } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal ExtractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, ExtractiveSummarizationResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// Results of the task. + internal ExtractiveSummarizationLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, ExtractiveSummarizationResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public ExtractiveSummarizationResult Results { get; set; } + /// Results of the task. + public ExtractiveSummarizationResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.Serialization.cs index 8ce0d54e256f..ecb29aa756c9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static ExtractiveSummarizationLROTask DeserializeExtractiveSummarizationLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - ExtractiveSummarizationTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = ExtractiveSummarizationTaskParameters.DeserializeExtractiveSummarizationTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new ExtractiveSummarizationLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new ExtractiveSummarizationLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeExtractiveSummarizationLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.cs index fd4d7569d227..b9f9323a902d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationLROTask.cs @@ -17,16 +17,16 @@ public ExtractiveSummarizationLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for an Extractive Summarization task. + /// task name. + /// The kind of task to perform. + /// Parameters for the Extractive Summarization task. internal ExtractiveSummarizationLROTask(string taskName, AnalyzeTextLROTaskKind kind, ExtractiveSummarizationTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for an Extractive Summarization task. + /// Parameters for the Extractive Summarization task. public ExtractiveSummarizationTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.Serialization.cs index 69c401dc6660..d0f51c6c21f7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class ExtractiveSummarizationResult : IUtf8JsonSerializable + internal partial class ExtractiveSummarizationResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static ExtractiveSummarizationResult DeserializeExtractiveSummarizationResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(ExtractedSummaryDocumentResult.DeserializeExtractedSummaryDocumentResult(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static ExtractiveSummarizationResult DeserializeExtractiveSummarization modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(ExtractedSummaryDocumentResult.DeserializeExtractedSummaryDocumentResult(item)); + } + documents = array; + continue; + } } return new ExtractiveSummarizationResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new ExtractiveSummarizationResult FromResponse(Response response) + internal static ExtractiveSummarizationResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeExtractiveSummarizationResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.cs index 41f1f77561e1..3d69cce9e3c9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The ExtractiveSummarizationResult. - internal partial class ExtractiveSummarizationResult : PreBuiltResult + /// An object representing the pre-built Extractive Summarization results of each document. + internal partial class ExtractiveSummarizationResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. /// Response by document. /// , or is null. - public ExtractiveSummarizationResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal ExtractiveSummarizationResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -33,12 +35,21 @@ public ExtractiveSummarizationResult(IEnumerable errors, string m /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. /// Response by document. - internal ExtractiveSummarizationResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + internal ExtractiveSummarizationResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.Serialization.cs index c5d755833000..bcffeaa1f59e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.Serialization.cs @@ -15,6 +15,16 @@ internal partial class ExtractiveSummarizationTaskParameters : IUtf8JsonSerializ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); + if (Optional.IsDefined(LoggingOptOut)) + { + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); + } + if (Optional.IsDefined(ModelVersion)) + { + writer.WritePropertyName("modelVersion"u8); + writer.WriteStringValue(ModelVersion); + } if (Optional.IsDefined(SentenceCount)) { writer.WritePropertyName("sentenceCount"u8); @@ -30,87 +40,11 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("stringIndexType"u8); writer.WriteStringValue(StringIndexType.Value.ToString()); } - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } writer.WriteEndObject(); } - internal static ExtractiveSummarizationTaskParameters DeserializeExtractiveSummarizationTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - int? sentenceCount = default; - ExtractiveSummarySentencesOrder? sortBy = default; - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("sentenceCount"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - sentenceCount = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("sortBy"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - sortBy = new ExtractiveSummarySentencesOrder(property.Value.GetString()); - continue; - } - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new ExtractiveSummarizationTaskParameters(loggingOptOut, modelVersion, sentenceCount, sortBy, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new ExtractiveSummarizationTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeExtractiveSummarizationTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.cs index b1ab48b6d40c..19aa5e3bc317 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarizationTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for an Extractive Summarization task. - internal partial class ExtractiveSummarizationTaskParameters : PreBuiltTaskParameters + internal partial class ExtractiveSummarizationTaskParameters { /// Initializes a new instance of . public ExtractiveSummarizationTaskParameters() @@ -16,23 +16,29 @@ public ExtractiveSummarizationTaskParameters() } /// Initializes a new instance of . - /// - /// - /// - /// The sorting criteria to use for the results of Extractive Summarization. - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal ExtractiveSummarizationTaskParameters(bool? loggingOptOut, string modelVersion, int? sentenceCount, ExtractiveSummarySentencesOrder? sortBy, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// Specifies the number of sentences in the extracted summary. + /// Specifies how to sort the extracted summaries. + /// Specifies the method used to interpret string offsets. + internal ExtractiveSummarizationTaskParameters(bool? loggingOptOut, string modelVersion, long? sentenceCount, ExtractiveSummarySentencesOrder? sortBy, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; SentenceCount = sentenceCount; SortBy = sortBy; StringIndexType = stringIndexType; } - /// Gets or sets the sentence count. - public int? SentenceCount { get; set; } - /// The sorting criteria to use for the results of Extractive Summarization. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Specifies the number of sentences in the extracted summary. + public long? SentenceCount { get; set; } + /// Specifies how to sort the extracted summaries. public ExtractiveSummarySentencesOrder? SortBy { get; set; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// Specifies the method used to interpret string offsets. public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarySentencesOrder.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarySentencesOrder.cs index bb5c43b66ef8..b9d3903ea916 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarySentencesOrder.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/ExtractiveSummarySentencesOrder.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics { - /// The sorting criteria to use for the results of Extractive Summarization. + /// Specifies how to sort the extracted summaries. public readonly partial struct ExtractiveSummarySentencesOrder : IEquatable { private readonly string _value; diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.Serialization.cs index a708477d1a8d..f636924ab88c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.Serialization.cs @@ -7,79 +7,24 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareEntitiesDocumentResult : IUtf8JsonSerializable + internal partial class HealthcareEntitiesDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("relations"u8); - writer.WriteStartArray(); - foreach (var item in Relations) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static HealthcareEntitiesDocumentResult DeserializeHealthcareEntitiesDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList entities = default; - IList relations = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList entities = default; + IReadOnlyList relations = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(HealthcareEntityInternal.DeserializeHealthcareEntityInternal(item)); - } - entities = array; - continue; - } - if (property.NameEquals("relations"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(HealthcareRelationInternal.DeserializeHealthcareRelationInternal(item)); - } - relations = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -104,24 +49,36 @@ internal static HealthcareEntitiesDocumentResult DeserializeHealthcareEntitiesDo statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("entities"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(HealthcareEntityInternal.DeserializeHealthcareEntityInternal(item)); + } + entities = array; + continue; + } + if (property.NameEquals("relations"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(HealthcareRelationInternal.DeserializeHealthcareRelationInternal(item)); + } + relations = array; + continue; + } } return new HealthcareEntitiesDocumentResult(id, warnings, statistics, entities, relations); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new HealthcareEntitiesDocumentResult FromResponse(Response response) + internal static HealthcareEntitiesDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareEntitiesDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.cs index 67a7876d127b..4f0945e0d0ab 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntitiesDocumentResult.cs @@ -11,8 +11,8 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareEntitiesDocumentResult. - internal partial class HealthcareEntitiesDocumentResult : DocumentResult + /// Result object for the processed Healthcare document. + internal partial class HealthcareEntitiesDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. @@ -20,13 +20,15 @@ internal partial class HealthcareEntitiesDocumentResult : DocumentResult /// Healthcare entities. /// Healthcare entity relations. /// , , or is null. - public HealthcareEntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities, IEnumerable relations) : base(id, warnings) + internal HealthcareEntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities, IEnumerable relations) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(entities, nameof(entities)); Argument.AssertNotNull(relations, nameof(relations)); + Id = id; + Warnings = warnings.ToList(); Entities = entities.ToList(); Relations = relations.ToList(); } @@ -37,15 +39,24 @@ public HealthcareEntitiesDocumentResult(string id, IEnumerable /// if showStats=true was specified in the request this field will contain information about the document payload. /// Healthcare entities. /// Healthcare entity relations. - internal HealthcareEntitiesDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList entities, IList relations) : base(id, warnings, statistics) + internal HealthcareEntitiesDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList entities, IReadOnlyList relations) { + Id = id; + Warnings = warnings; + Statistics = statistics; Entities = entities; Relations = relations; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Healthcare entities. - public IList Entities { get; } + public IReadOnlyList Entities { get; } /// Healthcare entity relations. - public IList Relations { get; } + public IReadOnlyList Relations { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.Serialization.cs index 4df223dbda87..4d823e7585ff 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.Serialization.cs @@ -6,33 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial class HealthcareEntityAssertion : IUtf8JsonSerializable + public partial class HealthcareEntityAssertion { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Optional.IsDefined(Conditionality)) - { - writer.WritePropertyName("conditionality"u8); - writer.WriteStringValue(Conditionality.Value.ToSerialString()); - } - if (Optional.IsDefined(Certainty)) - { - writer.WritePropertyName("certainty"u8); - writer.WriteStringValue(Certainty.Value.ToSerialString()); - } - if (Optional.IsDefined(Association)) - { - writer.WritePropertyName("association"u8); - writer.WriteStringValue(Association.Value.ToSerialString()); - } - writer.WriteEndObject(); - } - internal static HealthcareEntityAssertion DeserializeHealthcareEntityAssertion(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -82,13 +60,5 @@ internal static HealthcareEntityAssertion FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareEntityAssertion(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.cs index 2c618651c931..91993a8c487c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityAssertion.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics { - /// The HealthcareAssertion. + /// Assertion of the entity. public partial class HealthcareEntityAssertion { /// Initializes a new instance of . diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityCategory.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityCategory.cs index 8347c35c3481..45888d99f373 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityCategory.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityCategory.cs @@ -25,7 +25,6 @@ public HealthcareEntityCategory(string value) private const string BodyStructureValue = "BodyStructure"; private const string AgeValue = "Age"; private const string GenderValue = "Gender"; - private const string EthnicityValue = "Ethnicity"; private const string ExaminationNameValue = "ExaminationName"; private const string DateValue = "Date"; private const string DirectionValue = "Direction"; @@ -34,18 +33,14 @@ public HealthcareEntityCategory(string value) private const string MeasurementUnitValue = "MeasurementUnit"; private const string RelationalOperatorValue = "RelationalOperator"; private const string TimeValue = "Time"; - private const string CourseValue = "Course"; private const string GeneOrProteinValue = "GeneOrProtein"; private const string VariantValue = "Variant"; - private const string ExpressionValue = "Expression"; - private const string MutationTypeValue = "MutationType"; private const string AdministrativeEventValue = "AdministrativeEvent"; private const string CareEnvironmentValue = "CareEnvironment"; private const string HealthcareProfessionValue = "HealthcareProfession"; private const string DiagnosisValue = "Diagnosis"; private const string SymptomOrSignValue = "SymptomOrSign"; private const string ConditionQualifierValue = "ConditionQualifier"; - private const string ConditionScaleValue = "ConditionScale"; private const string MedicationClassValue = "MedicationClass"; private const string MedicationNameValue = "MedicationName"; private const string DosageValue = "Dosage"; @@ -53,21 +48,24 @@ public HealthcareEntityCategory(string value) private const string MedicationRouteValue = "MedicationRoute"; private const string FamilyRelationValue = "FamilyRelation"; private const string TreatmentNameValue = "TreatmentName"; + private const string EthnicityValue = "Ethnicity"; + private const string CourseValue = "Course"; + private const string ExpressionValue = "Expression"; + private const string MutationTypeValue = "MutationType"; + private const string ConditionScaleValue = "ConditionScale"; private const string AllergenValue = "Allergen"; private const string EmploymentValue = "Employment"; private const string LivingStatusValue = "LivingStatus"; private const string SubstanceUseValue = "SubstanceUse"; private const string SubstanceUseAmountValue = "SubstanceUseAmount"; - /// BodyStructure. + /// Body structure. public static HealthcareEntityCategory BodyStructure { get; } = new HealthcareEntityCategory(BodyStructureValue); /// Age. public static HealthcareEntityCategory Age { get; } = new HealthcareEntityCategory(AgeValue); /// Gender. public static HealthcareEntityCategory Gender { get; } = new HealthcareEntityCategory(GenderValue); - /// Ethnicity. - public static HealthcareEntityCategory Ethnicity { get; } = new HealthcareEntityCategory(EthnicityValue); - /// ExaminationName. + /// Examination name. public static HealthcareEntityCategory ExaminationName { get; } = new HealthcareEntityCategory(ExaminationNameValue); /// Date. public static HealthcareEntityCategory Date { get; } = new HealthcareEntityCategory(DateValue); @@ -75,61 +73,63 @@ public HealthcareEntityCategory(string value) public static HealthcareEntityCategory Direction { get; } = new HealthcareEntityCategory(DirectionValue); /// Frequency. public static HealthcareEntityCategory Frequency { get; } = new HealthcareEntityCategory(FrequencyValue); - /// MeasurementValue. + /// Measurement value. public static HealthcareEntityCategory MeasurementValue { get; } = new HealthcareEntityCategory(MeasurementValueValue); - /// MeasurementUnit. + /// Measurement unit. public static HealthcareEntityCategory MeasurementUnit { get; } = new HealthcareEntityCategory(MeasurementUnitValue); - /// RelationalOperator. + /// Relational operator. public static HealthcareEntityCategory RelationalOperator { get; } = new HealthcareEntityCategory(RelationalOperatorValue); /// Time. public static HealthcareEntityCategory Time { get; } = new HealthcareEntityCategory(TimeValue); - /// Course. - public static HealthcareEntityCategory Course { get; } = new HealthcareEntityCategory(CourseValue); - /// GeneOrProtein. + /// Gene or protein. public static HealthcareEntityCategory GeneOrProtein { get; } = new HealthcareEntityCategory(GeneOrProteinValue); /// Variant. public static HealthcareEntityCategory Variant { get; } = new HealthcareEntityCategory(VariantValue); - /// Expression. - public static HealthcareEntityCategory Expression { get; } = new HealthcareEntityCategory(ExpressionValue); - /// MutationType. - public static HealthcareEntityCategory MutationType { get; } = new HealthcareEntityCategory(MutationTypeValue); - /// AdministrativeEvent. + /// Administrative event. public static HealthcareEntityCategory AdministrativeEvent { get; } = new HealthcareEntityCategory(AdministrativeEventValue); - /// CareEnvironment. + /// Care environment. public static HealthcareEntityCategory CareEnvironment { get; } = new HealthcareEntityCategory(CareEnvironmentValue); - /// HealthcareProfession. + /// Healthcare profession. public static HealthcareEntityCategory HealthcareProfession { get; } = new HealthcareEntityCategory(HealthcareProfessionValue); /// Diagnosis. public static HealthcareEntityCategory Diagnosis { get; } = new HealthcareEntityCategory(DiagnosisValue); - /// SymptomOrSign. + /// Symptom or sign. public static HealthcareEntityCategory SymptomOrSign { get; } = new HealthcareEntityCategory(SymptomOrSignValue); - /// ConditionQualifier. + /// Condition qualifier. public static HealthcareEntityCategory ConditionQualifier { get; } = new HealthcareEntityCategory(ConditionQualifierValue); - /// ConditionScale. - public static HealthcareEntityCategory ConditionScale { get; } = new HealthcareEntityCategory(ConditionScaleValue); - /// MedicationClass. + /// Medication class. public static HealthcareEntityCategory MedicationClass { get; } = new HealthcareEntityCategory(MedicationClassValue); - /// MedicationName. + /// Medication name. public static HealthcareEntityCategory MedicationName { get; } = new HealthcareEntityCategory(MedicationNameValue); /// Dosage. public static HealthcareEntityCategory Dosage { get; } = new HealthcareEntityCategory(DosageValue); - /// MedicationForm. + /// Medication form. public static HealthcareEntityCategory MedicationForm { get; } = new HealthcareEntityCategory(MedicationFormValue); - /// MedicationRoute. + /// Medication route. public static HealthcareEntityCategory MedicationRoute { get; } = new HealthcareEntityCategory(MedicationRouteValue); - /// FamilyRelation. + /// Family relation. public static HealthcareEntityCategory FamilyRelation { get; } = new HealthcareEntityCategory(FamilyRelationValue); - /// TreatmentName. + /// Treatment name. public static HealthcareEntityCategory TreatmentName { get; } = new HealthcareEntityCategory(TreatmentNameValue); + /// Ethnicity. + public static HealthcareEntityCategory Ethnicity { get; } = new HealthcareEntityCategory(EthnicityValue); + /// Course. + public static HealthcareEntityCategory Course { get; } = new HealthcareEntityCategory(CourseValue); + /// Expression. + public static HealthcareEntityCategory Expression { get; } = new HealthcareEntityCategory(ExpressionValue); + /// Mutation type. + public static HealthcareEntityCategory MutationType { get; } = new HealthcareEntityCategory(MutationTypeValue); + /// Condition scale. + public static HealthcareEntityCategory ConditionScale { get; } = new HealthcareEntityCategory(ConditionScaleValue); /// Allergen. public static HealthcareEntityCategory Allergen { get; } = new HealthcareEntityCategory(AllergenValue); /// Employment. public static HealthcareEntityCategory Employment { get; } = new HealthcareEntityCategory(EmploymentValue); - /// LivingStatus. + /// Living status. public static HealthcareEntityCategory LivingStatus { get; } = new HealthcareEntityCategory(LivingStatusValue); - /// SubstanceUse. + /// Substance use. public static HealthcareEntityCategory SubstanceUse { get; } = new HealthcareEntityCategory(SubstanceUseValue); - /// SubstanceUseAmount. + /// Substance use amount. public static HealthcareEntityCategory SubstanceUseAmount { get; } = new HealthcareEntityCategory(SubstanceUseAmountValue); /// Determines if two values are the same. public static bool operator ==(HealthcareEntityCategory left, HealthcareEntityCategory right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.Serialization.cs index 3212ab87d0c5..d9e667be3ac1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.Serialization.cs @@ -7,53 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareEntityInternal : IUtf8JsonSerializable + internal partial class HealthcareEntityInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("category"u8); - writer.WriteStringValue(Category.ToString()); - if (Optional.IsDefined(Subcategory)) - { - writer.WritePropertyName("subcategory"u8); - writer.WriteStringValue(Subcategory); - } - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore); - if (Optional.IsDefined(Assertion)) - { - writer.WritePropertyName("assertion"u8); - writer.WriteObjectValue(Assertion); - } - if (Optional.IsDefined(Name)) - { - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - } - if (Optional.IsCollectionDefined(Links)) - { - writer.WritePropertyName("links"u8); - writer.WriteStartArray(); - foreach (var item in Links) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - } - writer.WriteEndObject(); - } - internal static HealthcareEntityInternal DeserializeHealthcareEntityInternal(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -68,7 +26,7 @@ internal static HealthcareEntityInternal DeserializeHealthcareEntityInternal(Jso double confidenceScore = default; HealthcareEntityAssertion assertion = default; string name = default; - IList links = default; + IReadOnlyList links = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("text"u8)) @@ -149,13 +107,5 @@ internal static HealthcareEntityInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareEntityInternal(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.cs index b06f3bcada85..d384a4bd2ce5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityInternal.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareEntity. + /// Healthcare entity extracted from the document. internal partial class HealthcareEntityInternal { /// Initializes a new instance of . @@ -20,7 +20,7 @@ internal partial class HealthcareEntityInternal /// Length for the entity text. Use of different 'stringIndexType' values can affect the length returned. /// Confidence score between 0 and 1 of the extracted entity. /// is null. - public HealthcareEntityInternal(string text, HealthcareEntityCategory category, int offset, int length, double confidenceScore) + internal HealthcareEntityInternal(string text, HealthcareEntityCategory category, int offset, int length, double confidenceScore) { Argument.AssertNotNull(text, nameof(text)); @@ -39,10 +39,10 @@ public HealthcareEntityInternal(string text, HealthcareEntityCategory category, /// Start position for the entity text. Use of different 'stringIndexType' values can affect the offset returned. /// Length for the entity text. Use of different 'stringIndexType' values can affect the length returned. /// Confidence score between 0 and 1 of the extracted entity. - /// + /// Assertion of the entity. /// Preferred name for the entity. Example: 'histologically' would have a 'name' of 'histologic'. /// Entity references in known data sources. - internal HealthcareEntityInternal(string text, HealthcareEntityCategory category, string subcategory, int offset, int length, double confidenceScore, HealthcareEntityAssertion assertion, string name, IList links) + internal HealthcareEntityInternal(string text, HealthcareEntityCategory category, string subcategory, int offset, int length, double confidenceScore, HealthcareEntityAssertion assertion, string name, IReadOnlyList links) { Text = text; Category = category; @@ -56,22 +56,22 @@ internal HealthcareEntityInternal(string text, HealthcareEntityCategory category } /// Entity text as appears in the request. - public string Text { get; set; } + public string Text { get; } /// Healthcare Entity Category. - public HealthcareEntityCategory Category { get; set; } + public HealthcareEntityCategory Category { get; } /// (Optional) Entity sub type. - public string Subcategory { get; set; } + public string Subcategory { get; } /// Start position for the entity text. Use of different 'stringIndexType' values can affect the offset returned. - public int Offset { get; set; } + public int Offset { get; } /// Length for the entity text. Use of different 'stringIndexType' values can affect the length returned. - public int Length { get; set; } + public int Length { get; } /// Confidence score between 0 and 1 of the extracted entity. - public double ConfidenceScore { get; set; } - /// Gets or sets the assertion. - public HealthcareEntityAssertion Assertion { get; set; } + public double ConfidenceScore { get; } + /// Assertion of the entity. + public HealthcareEntityAssertion Assertion { get; } /// Preferred name for the entity. Example: 'histologically' would have a 'name' of 'histologic'. - public string Name { get; set; } + public string Name { get; } /// Entity references in known data sources. - public IList Links { get; } + public IReadOnlyList Links { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityRelationType.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityRelationType.cs index ac290ff6ed35..ca76f9b385b5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityRelationType.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareEntityRelationType.cs @@ -23,30 +23,17 @@ public HealthcareEntityRelationType(string value) } private const string AbbreviationValue = "Abbreviation"; - private const string BodySiteOfConditionValue = "BodySiteOfCondition"; - private const string BodySiteOfTreatmentValue = "BodySiteOfTreatment"; - private const string CourseOfConditionValue = "CourseOfCondition"; - private const string CourseOfExaminationValue = "CourseOfExamination"; - private const string CourseOfMedicationValue = "CourseOfMedication"; - private const string CourseOfTreatmentValue = "CourseOfTreatment"; private const string DirectionOfBodyStructureValue = "DirectionOfBodyStructure"; private const string DirectionOfConditionValue = "DirectionOfCondition"; private const string DirectionOfExaminationValue = "DirectionOfExamination"; private const string DirectionOfTreatmentValue = "DirectionOfTreatment"; private const string DosageOfMedicationValue = "DosageOfMedication"; - private const string ExaminationFindsConditionValue = "ExaminationFindsCondition"; - private const string ExpressionOfGeneValue = "ExpressionOfGene"; - private const string ExpressionOfVariantValue = "ExpressionOfVariant"; private const string FormOfMedicationValue = "FormOfMedication"; - private const string FrequencyOfConditionValue = "FrequencyOfCondition"; private const string FrequencyOfMedicationValue = "FrequencyOfMedication"; private const string FrequencyOfTreatmentValue = "FrequencyOfTreatment"; - private const string MutationTypeOfGeneValue = "MutationTypeOfGene"; - private const string MutationTypeOfVariantValue = "MutationTypeOfVariant"; private const string QualifierOfConditionValue = "QualifierOfCondition"; private const string RelationOfExaminationValue = "RelationOfExamination"; private const string RouteOfMedicationValue = "RouteOfMedication"; - private const string ScaleOfConditionValue = "ScaleOfCondition"; private const string TimeOfConditionValue = "TimeOfCondition"; private const string TimeOfEventValue = "TimeOfEvent"; private const string TimeOfExaminationValue = "TimeOfExamination"; @@ -56,77 +43,90 @@ public HealthcareEntityRelationType(string value) private const string UnitOfExaminationValue = "UnitOfExamination"; private const string ValueOfConditionValue = "ValueOfCondition"; private const string ValueOfExaminationValue = "ValueOfExamination"; + private const string BodySiteOfConditionValue = "BodySiteOfCondition"; + private const string BodySiteOfTreatmentValue = "BodySiteOfTreatment"; + private const string CourseOfConditionValue = "CourseOfCondition"; + private const string CourseOfExaminationValue = "CourseOfExamination"; + private const string CourseOfMedicationValue = "CourseOfMedication"; + private const string CourseOfTreatmentValue = "CourseOfTreatment"; + private const string ExaminationFindsConditionValue = "ExaminationFindsCondition"; + private const string ExpressionOfGeneValue = "ExpressionOfGene"; + private const string ExpressionOfVariantValue = "ExpressionOfVariant"; + private const string FrequencyOfConditionValue = "FrequencyOfCondition"; + private const string MutationTypeOfGeneValue = "MutationTypeOfGene"; + private const string MutationTypeOfVariantValue = "MutationTypeOfVariant"; + private const string ScaleOfConditionValue = "ScaleOfCondition"; private const string VariantOfGeneValue = "VariantOfGene"; /// Abbreviation. public static HealthcareEntityRelationType Abbreviation { get; } = new HealthcareEntityRelationType(AbbreviationValue); - /// BodySiteOfCondition. - public static HealthcareEntityRelationType BodySiteOfCondition { get; } = new HealthcareEntityRelationType(BodySiteOfConditionValue); - /// BodySiteOfTreatment. - public static HealthcareEntityRelationType BodySiteOfTreatment { get; } = new HealthcareEntityRelationType(BodySiteOfTreatmentValue); - /// CourseOfCondition. - public static HealthcareEntityRelationType CourseOfCondition { get; } = new HealthcareEntityRelationType(CourseOfConditionValue); - /// CourseOfExamination. - public static HealthcareEntityRelationType CourseOfExamination { get; } = new HealthcareEntityRelationType(CourseOfExaminationValue); - /// CourseOfMedication. - public static HealthcareEntityRelationType CourseOfMedication { get; } = new HealthcareEntityRelationType(CourseOfMedicationValue); - /// CourseOfTreatment. - public static HealthcareEntityRelationType CourseOfTreatment { get; } = new HealthcareEntityRelationType(CourseOfTreatmentValue); - /// DirectionOfBodyStructure. + /// Direction of body structure. public static HealthcareEntityRelationType DirectionOfBodyStructure { get; } = new HealthcareEntityRelationType(DirectionOfBodyStructureValue); - /// DirectionOfCondition. + /// Direction of condition. public static HealthcareEntityRelationType DirectionOfCondition { get; } = new HealthcareEntityRelationType(DirectionOfConditionValue); - /// DirectionOfExamination. + /// Direction of examination. public static HealthcareEntityRelationType DirectionOfExamination { get; } = new HealthcareEntityRelationType(DirectionOfExaminationValue); - /// DirectionOfTreatment. + /// Direction of treatment. public static HealthcareEntityRelationType DirectionOfTreatment { get; } = new HealthcareEntityRelationType(DirectionOfTreatmentValue); - /// DosageOfMedication. + /// Dosage of medication. public static HealthcareEntityRelationType DosageOfMedication { get; } = new HealthcareEntityRelationType(DosageOfMedicationValue); - /// ExaminationFindsCondition. - public static HealthcareEntityRelationType ExaminationFindsCondition { get; } = new HealthcareEntityRelationType(ExaminationFindsConditionValue); - /// ExpressionOfGene. - public static HealthcareEntityRelationType ExpressionOfGene { get; } = new HealthcareEntityRelationType(ExpressionOfGeneValue); - /// ExpressionOfVariant. - public static HealthcareEntityRelationType ExpressionOfVariant { get; } = new HealthcareEntityRelationType(ExpressionOfVariantValue); - /// FormOfMedication. + /// Form of medication. public static HealthcareEntityRelationType FormOfMedication { get; } = new HealthcareEntityRelationType(FormOfMedicationValue); - /// FrequencyOfCondition. - public static HealthcareEntityRelationType FrequencyOfCondition { get; } = new HealthcareEntityRelationType(FrequencyOfConditionValue); - /// FrequencyOfMedication. + /// Frequency of medication. public static HealthcareEntityRelationType FrequencyOfMedication { get; } = new HealthcareEntityRelationType(FrequencyOfMedicationValue); - /// FrequencyOfTreatment. + /// Frequency of treatment. public static HealthcareEntityRelationType FrequencyOfTreatment { get; } = new HealthcareEntityRelationType(FrequencyOfTreatmentValue); - /// MutationTypeOfGene. - public static HealthcareEntityRelationType MutationTypeOfGene { get; } = new HealthcareEntityRelationType(MutationTypeOfGeneValue); - /// MutationTypeOfVariant. - public static HealthcareEntityRelationType MutationTypeOfVariant { get; } = new HealthcareEntityRelationType(MutationTypeOfVariantValue); - /// QualifierOfCondition. + /// Qualifier of condition. public static HealthcareEntityRelationType QualifierOfCondition { get; } = new HealthcareEntityRelationType(QualifierOfConditionValue); - /// RelationOfExamination. + /// Relation of examination. public static HealthcareEntityRelationType RelationOfExamination { get; } = new HealthcareEntityRelationType(RelationOfExaminationValue); - /// RouteOfMedication. + /// Route of medication. public static HealthcareEntityRelationType RouteOfMedication { get; } = new HealthcareEntityRelationType(RouteOfMedicationValue); - /// ScaleOfCondition. - public static HealthcareEntityRelationType ScaleOfCondition { get; } = new HealthcareEntityRelationType(ScaleOfConditionValue); - /// TimeOfCondition. + /// Time of condition. public static HealthcareEntityRelationType TimeOfCondition { get; } = new HealthcareEntityRelationType(TimeOfConditionValue); - /// TimeOfEvent. + /// Time of event. public static HealthcareEntityRelationType TimeOfEvent { get; } = new HealthcareEntityRelationType(TimeOfEventValue); - /// TimeOfExamination. + /// Time of examination. public static HealthcareEntityRelationType TimeOfExamination { get; } = new HealthcareEntityRelationType(TimeOfExaminationValue); - /// TimeOfMedication. + /// Time of medication. public static HealthcareEntityRelationType TimeOfMedication { get; } = new HealthcareEntityRelationType(TimeOfMedicationValue); - /// TimeOfTreatment. + /// Time of treatment. public static HealthcareEntityRelationType TimeOfTreatment { get; } = new HealthcareEntityRelationType(TimeOfTreatmentValue); - /// UnitOfCondition. + /// Unit of condition. public static HealthcareEntityRelationType UnitOfCondition { get; } = new HealthcareEntityRelationType(UnitOfConditionValue); - /// UnitOfExamination. + /// Unit of examination. public static HealthcareEntityRelationType UnitOfExamination { get; } = new HealthcareEntityRelationType(UnitOfExaminationValue); - /// ValueOfCondition. + /// Value of condition. public static HealthcareEntityRelationType ValueOfCondition { get; } = new HealthcareEntityRelationType(ValueOfConditionValue); - /// ValueOfExamination. + /// Value of examination. public static HealthcareEntityRelationType ValueOfExamination { get; } = new HealthcareEntityRelationType(ValueOfExaminationValue); - /// VariantOfGene. + /// Body site of condition. + public static HealthcareEntityRelationType BodySiteOfCondition { get; } = new HealthcareEntityRelationType(BodySiteOfConditionValue); + /// Body site of treatment. + public static HealthcareEntityRelationType BodySiteOfTreatment { get; } = new HealthcareEntityRelationType(BodySiteOfTreatmentValue); + /// Course of condition. + public static HealthcareEntityRelationType CourseOfCondition { get; } = new HealthcareEntityRelationType(CourseOfConditionValue); + /// Course of examination. + public static HealthcareEntityRelationType CourseOfExamination { get; } = new HealthcareEntityRelationType(CourseOfExaminationValue); + /// Course of medication. + public static HealthcareEntityRelationType CourseOfMedication { get; } = new HealthcareEntityRelationType(CourseOfMedicationValue); + /// Course of treatment. + public static HealthcareEntityRelationType CourseOfTreatment { get; } = new HealthcareEntityRelationType(CourseOfTreatmentValue); + /// Examination finds condition. + public static HealthcareEntityRelationType ExaminationFindsCondition { get; } = new HealthcareEntityRelationType(ExaminationFindsConditionValue); + /// Expression of gene. + public static HealthcareEntityRelationType ExpressionOfGene { get; } = new HealthcareEntityRelationType(ExpressionOfGeneValue); + /// Expression of variant. + public static HealthcareEntityRelationType ExpressionOfVariant { get; } = new HealthcareEntityRelationType(ExpressionOfVariantValue); + /// Frequency of condition. + public static HealthcareEntityRelationType FrequencyOfCondition { get; } = new HealthcareEntityRelationType(FrequencyOfConditionValue); + /// Mutation type of gene. + public static HealthcareEntityRelationType MutationTypeOfGene { get; } = new HealthcareEntityRelationType(MutationTypeOfGeneValue); + /// Mutation type of variant. + public static HealthcareEntityRelationType MutationTypeOfVariant { get; } = new HealthcareEntityRelationType(MutationTypeOfVariantValue); + /// Scale of condition. + public static HealthcareEntityRelationType ScaleOfCondition { get; } = new HealthcareEntityRelationType(ScaleOfConditionValue); + /// Variant of gene. public static HealthcareEntityRelationType VariantOfGene { get; } = new HealthcareEntityRelationType(VariantOfGeneValue); /// Determines if two values are the same. public static bool operator ==(HealthcareEntityRelationType left, HealthcareEntityRelationType right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.Serialization.cs index be42228692df..1538c91fe7ed 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareLROResult : IUtf8JsonSerializable + internal partial class HealthcareLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static HealthcareLROResult DeserializeHealthcareLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static HealthcareLROResult DeserializeHealthcareLROResult(JsonElement e return null; } HealthcareResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static HealthcareLROResult DeserializeHealthcareLROResult(JsonElement e results = HealthcareResult.DeserializeHealthcareResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new HealthcareLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new HealthcareLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static HealthcareLROResult DeserializeHealthcareLROResult(JsonElement e using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.cs index 4b591f383115..411c15d52d18 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareLROResult. + /// Healthcare Analyze Text long tunning operation result object. internal partial class HealthcareLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// Results of the task. /// is null. - public HealthcareLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, HealthcareResult results) : base(lastUpdateDateTime, status) + internal HealthcareLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, HealthcareResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public HealthcareLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOpera } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal HealthcareLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, HealthcareResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// Results of the task. + internal HealthcareLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, HealthcareResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public HealthcareResult Results { get; set; } + /// Results of the task. + public HealthcareResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.Serialization.cs index e084375030ba..dd37b1493331 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static HealthcareLROTask DeserializeHealthcareLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - HealthcareTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = HealthcareTaskParameters.DeserializeHealthcareTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new HealthcareLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new HealthcareLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeHealthcareLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.cs index 601a6f154f06..ea78fe9dd538 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareLROTask.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareLROTask. + /// The long running task to be performed by the service on the Healthcare input documents. internal partial class HealthcareLROTask : AnalyzeTextLROTask { /// Initializes a new instance of . @@ -17,16 +17,16 @@ public HealthcareLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Healthcare task. + /// task name. + /// The kind of task to perform. + /// Parameters for the Healthcare task. internal HealthcareLROTask(string taskName, AnalyzeTextLROTaskKind kind, HealthcareTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Healthcare task. + /// Parameters for the Healthcare task. public HealthcareTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.Serialization.cs index 6efd2275259b..535a69818f60 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareRelationEntity : IUtf8JsonSerializable + internal partial class HealthcareRelationEntity { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("ref"u8); - writer.WriteStringValue(Ref); - writer.WritePropertyName("role"u8); - writer.WriteStringValue(Role); - writer.WriteEndObject(); - } - internal static HealthcareRelationEntity DeserializeHealthcareRelationEntity(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static HealthcareRelationEntity FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareRelationEntity(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.cs index 341a6c26f37e..3a9ef9973cd8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationEntity.cs @@ -9,14 +9,14 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareRelationEntity. + /// Entity in the relation. internal partial class HealthcareRelationEntity { /// Initializes a new instance of . /// Reference link object, using a JSON pointer RFC 6901 (URI Fragment Identifier Representation), pointing to the entity . /// Role of entity in the relationship. For example: 'CD20-positive diffuse large B-cell lymphoma' has the following entities with their roles in parenthesis: CD20 (GeneOrProtein), Positive (Expression), diffuse large B-cell lymphoma (Diagnosis). /// or is null. - public HealthcareRelationEntity(string @ref, string role) + internal HealthcareRelationEntity(string @ref, string role) { Argument.AssertNotNull(@ref, nameof(@ref)); Argument.AssertNotNull(role, nameof(role)); @@ -26,8 +26,8 @@ public HealthcareRelationEntity(string @ref, string role) } /// Reference link object, using a JSON pointer RFC 6901 (URI Fragment Identifier Representation), pointing to the entity . - public string Ref { get; set; } + public string Ref { get; } /// Role of entity in the relationship. For example: 'CD20-positive diffuse large B-cell lymphoma' has the following entities with their roles in parenthesis: CD20 (GeneOrProtein), Positive (Expression), diffuse large B-cell lymphoma (Diagnosis). - public string Role { get; set; } + public string Role { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.Serialization.cs index 185acba854dc..74c988600a0e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.Serialization.cs @@ -7,32 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareRelationInternal : IUtf8JsonSerializable + internal partial class HealthcareRelationInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("relationType"u8); - writer.WriteStringValue(RelationType.ToString()); - if (Optional.IsDefined(ConfidenceScore)) - { - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore.Value); - } - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WriteEndObject(); - } - internal static HealthcareRelationInternal DeserializeHealthcareRelationInternal(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -40,8 +19,8 @@ internal static HealthcareRelationInternal DeserializeHealthcareRelationInternal return null; } HealthcareEntityRelationType relationType = default; + IReadOnlyList entities = default; double? confidenceScore = default; - IList entities = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("relationType"u8)) @@ -49,15 +28,6 @@ internal static HealthcareRelationInternal DeserializeHealthcareRelationInternal relationType = new HealthcareEntityRelationType(property.Value.GetString()); continue; } - if (property.NameEquals("confidenceScore"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - confidenceScore = property.Value.GetDouble(); - continue; - } if (property.NameEquals("entities"u8)) { List array = new List(); @@ -68,8 +38,17 @@ internal static HealthcareRelationInternal DeserializeHealthcareRelationInternal entities = array; continue; } + if (property.NameEquals("confidenceScore"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + confidenceScore = property.Value.GetDouble(); + continue; + } } - return new HealthcareRelationInternal(relationType, confidenceScore, entities); + return new HealthcareRelationInternal(relationType, entities, confidenceScore); } /// Deserializes the model from a raw response. @@ -79,13 +58,5 @@ internal static HealthcareRelationInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareRelationInternal(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.cs index 66ea6478a09e..38dc0aacf3e5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareRelationInternal.cs @@ -18,7 +18,7 @@ internal partial class HealthcareRelationInternal /// Type of relation. Examples include: `DosageOfMedication` or 'FrequencyOfMedication', etc. /// The entities in the relation. /// is null. - public HealthcareRelationInternal(HealthcareEntityRelationType relationType, IEnumerable entities) + internal HealthcareRelationInternal(HealthcareEntityRelationType relationType, IEnumerable entities) { Argument.AssertNotNull(entities, nameof(entities)); @@ -28,20 +28,20 @@ public HealthcareRelationInternal(HealthcareEntityRelationType relationType, IEn /// Initializes a new instance of . /// Type of relation. Examples include: `DosageOfMedication` or 'FrequencyOfMedication', etc. - /// Confidence score between 0 and 1 of the extracted relation. /// The entities in the relation. - internal HealthcareRelationInternal(HealthcareEntityRelationType relationType, double? confidenceScore, IList entities) + /// Confidence score between 0 and 1 of the extracted relation. + internal HealthcareRelationInternal(HealthcareEntityRelationType relationType, IReadOnlyList entities, double? confidenceScore) { RelationType = relationType; - ConfidenceScore = confidenceScore; Entities = entities; + ConfidenceScore = confidenceScore; } /// Type of relation. Examples include: `DosageOfMedication` or 'FrequencyOfMedication', etc. - public HealthcareEntityRelationType RelationType { get; set; } - /// Confidence score between 0 and 1 of the extracted relation. - public double? ConfidenceScore { get; set; } + public HealthcareEntityRelationType RelationType { get; } /// The entities in the relation. - public IList Entities { get; } + public IReadOnlyList Entities { get; } + /// Confidence score between 0 and 1 of the extracted relation. + public double? ConfidenceScore { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.Serialization.cs index 91592ec93371..5b87e82a675b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class HealthcareResult : IUtf8JsonSerializable + internal partial class HealthcareResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static HealthcareResult DeserializeHealthcareResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(HealthcareResultDocumentsItem.DeserializeHealthcareResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static HealthcareResult DeserializeHealthcareResult(JsonElement element modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(HealthcareEntitiesDocumentResult.DeserializeHealthcareEntitiesDocumentResult(item)); + } + documents = array; + continue; + } } return new HealthcareResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new HealthcareResult FromResponse(Response response) + internal static HealthcareResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeHealthcareResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.cs index 3bfb87c96073..4936c352b180 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The HealthcareResult. - internal partial class HealthcareResult : PreBuiltResult + /// Result object for the processed Healthcare task. + internal partial class HealthcareResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. - /// + /// List of result objects for the processed Healthcare documents. /// , or is null. - public HealthcareResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal HealthcareResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -32,13 +34,22 @@ public HealthcareResult(IEnumerable errors, string modelVersion, /// Errors by document id. /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. - /// - internal HealthcareResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + /// List of result objects for the processed Healthcare documents. + internal HealthcareResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } - /// Gets the documents. - public IList Documents { get; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } + /// List of result objects for the processed Healthcare documents. + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.Serialization.cs deleted file mode 100644 index 3a006adbb355..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class HealthcareResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("relations"u8); - writer.WriteStartArray(); - foreach (var item in Relations) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static HealthcareResultDocumentsItem DeserializeHealthcareResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList entities = default; - IList relations = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(HealthcareEntityInternal.DeserializeHealthcareEntityInternal(item)); - } - entities = array; - continue; - } - if (property.NameEquals("relations"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(HealthcareRelationInternal.DeserializeHealthcareRelationInternal(item)); - } - relations = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new HealthcareResultDocumentsItem(id, warnings, statistics, entities, relations); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new HealthcareResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeHealthcareResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.cs deleted file mode 100644 index 720c0df1f6d7..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareResultDocumentsItem.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The HealthcareResultDocumentsItem. - internal partial class HealthcareResultDocumentsItem : HealthcareEntitiesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Healthcare entities. - /// Healthcare entity relations. - /// , , or is null. - public HealthcareResultDocumentsItem(string id, IEnumerable warnings, IEnumerable entities, IEnumerable relations) : base(id, warnings, entities, relations) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(entities, nameof(entities)); - Argument.AssertNotNull(relations, nameof(relations)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Healthcare entities. - /// Healthcare entity relations. - internal HealthcareResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList entities, IList relations) : base(id, warnings, statistics, entities, relations) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.Serialization.cs index 1211ae427f8e..95fafdbfc0c9 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.Serialization.cs @@ -15,72 +15,26 @@ internal partial class HealthcareTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(StringIndexType)) + if (Optional.IsDefined(LoggingOptOut)) { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); } if (Optional.IsDefined(ModelVersion)) { writer.WritePropertyName("modelVersion"u8); writer.WriteStringValue(ModelVersion); } - if (Optional.IsDefined(LoggingOptOut)) + if (Optional.IsDefined(StringIndexType)) { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); + writer.WritePropertyName("stringIndexType"u8); + writer.WriteStringValue(StringIndexType.Value.ToString()); } writer.WriteEndObject(); } - internal static HealthcareTaskParameters DeserializeHealthcareTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new HealthcareTaskParameters(loggingOptOut, modelVersion, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new HealthcareTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeHealthcareTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.cs index fa8923ccbc35..f4c0084851b8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/HealthcareTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Healthcare task. - internal partial class HealthcareTaskParameters : PreBuiltTaskParameters + internal partial class HealthcareTaskParameters { /// Initializes a new instance of . public HealthcareTaskParameters() @@ -16,15 +16,21 @@ public HealthcareTaskParameters() } /// Initializes a new instance of . - /// - /// - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal HealthcareTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// Specifies the method used to interpret string offsets. + internal HealthcareTaskParameters(bool? loggingOptOut, string modelVersion, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; StringIndexType = stringIndexType; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Specifies the method used to interpret string offsets. public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorCode.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorCode.cs index 75a48383178c..e4a1e126c629 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorCode.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorCode.cs @@ -37,33 +37,33 @@ public InnerErrorCode(string value) private const string UnsupportedLanguageCodeValue = "UnsupportedLanguageCode"; private const string InvalidCountryHintValue = "InvalidCountryHint"; - /// InvalidRequest. + /// Invalid request error. public static InnerErrorCode InvalidRequest { get; } = new InnerErrorCode(InvalidRequestValue); - /// InvalidParameterValue. + /// Invalid parameter value error. public static InnerErrorCode InvalidParameterValue { get; } = new InnerErrorCode(InvalidParameterValueValue); - /// KnowledgeBaseNotFound. + /// Knowledge base not found error. public static InnerErrorCode KnowledgeBaseNotFound { get; } = new InnerErrorCode(KnowledgeBaseNotFoundValue); - /// AzureCognitiveSearchNotFound. + /// Azure Cognitive Search not found error. public static InnerErrorCode AzureCognitiveSearchNotFound { get; } = new InnerErrorCode(AzureCognitiveSearchNotFoundValue); - /// AzureCognitiveSearchThrottling. + /// Azure Cognitive Search throttling error. public static InnerErrorCode AzureCognitiveSearchThrottling { get; } = new InnerErrorCode(AzureCognitiveSearchThrottlingValue); - /// ExtractionFailure. + /// Extraction failure error. public static InnerErrorCode ExtractionFailure { get; } = new InnerErrorCode(ExtractionFailureValue); - /// InvalidRequestBodyFormat. + /// Invalid request body format error. public static InnerErrorCode InvalidRequestBodyFormat { get; } = new InnerErrorCode(InvalidRequestBodyFormatValue); - /// EmptyRequest. + /// Empty request error. public static InnerErrorCode EmptyRequest { get; } = new InnerErrorCode(EmptyRequestValue); - /// MissingInputDocuments. + /// Missing input documents error. public static InnerErrorCode MissingInputDocuments { get; } = new InnerErrorCode(MissingInputDocumentsValue); - /// InvalidDocument. + /// Invalid document error. public static InnerErrorCode InvalidDocument { get; } = new InnerErrorCode(InvalidDocumentValue); - /// ModelVersionIncorrect. + /// Model version incorrect error. public static InnerErrorCode ModelVersionIncorrect { get; } = new InnerErrorCode(ModelVersionIncorrectValue); - /// InvalidDocumentBatch. + /// Invalid document batch error. public static InnerErrorCode InvalidDocumentBatch { get; } = new InnerErrorCode(InvalidDocumentBatchValue); - /// UnsupportedLanguageCode. + /// Unsupported language code error. public static InnerErrorCode UnsupportedLanguageCode { get; } = new InnerErrorCode(UnsupportedLanguageCodeValue); - /// InvalidCountryHint. + /// Invalid country hint error. public static InnerErrorCode InvalidCountryHint { get; } = new InnerErrorCode(InvalidCountryHintValue); /// Determines if two values are the same. public static bool operator ==(InnerErrorCode left, InnerErrorCode right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.Serialization.cs index dfc33370bd56..702c518a422b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.Serialization.cs @@ -7,43 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class InnerErrorModel : IUtf8JsonSerializable + internal partial class InnerErrorModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (Optional.IsCollectionDefined(Details)) - { - writer.WritePropertyName("details"u8); - writer.WriteStartObject(); - foreach (var item in Details) - { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); - } - writer.WriteEndObject(); - } - if (Optional.IsDefined(Target)) - { - writer.WritePropertyName("target"u8); - writer.WriteStringValue(Target); - } - if (Optional.IsDefined(Innererror)) - { - writer.WritePropertyName("innererror"u8); - writer.WriteObjectValue(Innererror); - } - writer.WriteEndObject(); - } - internal static InnerErrorModel DeserializeInnerErrorModel(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -52,7 +20,7 @@ internal static InnerErrorModel DeserializeInnerErrorModel(JsonElement element) } InnerErrorCode code = default; string message = default; - IDictionary details = default; + IReadOnlyDictionary details = default; string target = default; InnerErrorModel innererror = default; foreach (var property in element.EnumerateObject()) @@ -106,13 +74,5 @@ internal static InnerErrorModel FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeInnerErrorModel(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.cs index 14db7cffe467..c58ce7c62375 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/InnerErrorModel.cs @@ -17,7 +17,7 @@ internal partial class InnerErrorModel /// One of a server-defined set of error codes. /// Error message. /// is null. - public InnerErrorModel(InnerErrorCode code, string message) + internal InnerErrorModel(InnerErrorCode code, string message) { Argument.AssertNotNull(message, nameof(message)); @@ -32,7 +32,7 @@ public InnerErrorModel(InnerErrorCode code, string message) /// Error details. /// Error target. /// An object containing more specific information than the current object about the error. - internal InnerErrorModel(InnerErrorCode code, string message, IDictionary details, string target, InnerErrorModel innererror) + internal InnerErrorModel(InnerErrorCode code, string message, IReadOnlyDictionary details, string target, InnerErrorModel innererror) { Code = code; Message = message; @@ -42,14 +42,14 @@ internal InnerErrorModel(InnerErrorCode code, string message, IDictionary One of a server-defined set of error codes. - public InnerErrorCode Code { get; set; } + public InnerErrorCode Code { get; } /// Error message. - public string Message { get; set; } + public string Message { get; } /// Error details. - public IDictionary Details { get; } + public IReadOnlyDictionary Details { get; } /// Error target. - public string Target { get; set; } + public string Target { get; } /// An object containing more specific information than the current object about the error. - public InnerErrorModel Innererror { get; set; } + public InnerErrorModel Innererror { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobErrors.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobErrors.cs deleted file mode 100644 index d000ff1df73c..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobErrors.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The JobErrors. - internal partial class JobErrors - { - /// Initializes a new instance of . - internal JobErrors() - { - Errors = new ChangeTrackingList(); - } - - /// Initializes a new instance of . - /// - internal JobErrors(IReadOnlyList errors) - { - Errors = errors; - } - - /// Gets the errors. - public IReadOnlyList Errors { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.Serialization.cs deleted file mode 100644 index fbba47ff8ce7..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.Serialization.cs +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Text.Json; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class JobState - { - internal static JobState DeserializeJobState(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string displayName = default; - DateTimeOffset createdDateTime = default; - DateTimeOffset? expirationDateTime = default; - string jobId = default; - DateTimeOffset lastUpdatedDateTime = default; - TextAnalyticsOperationStatus status = default; - IReadOnlyList errors = default; - string nextLink = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("displayName"u8)) - { - displayName = property.Value.GetString(); - continue; - } - if (property.NameEquals("createdDateTime"u8)) - { - createdDateTime = property.Value.GetDateTimeOffset("O"); - continue; - } - if (property.NameEquals("expirationDateTime"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - expirationDateTime = property.Value.GetDateTimeOffset("O"); - continue; - } - if (property.NameEquals("jobId"u8)) - { - jobId = property.Value.GetString(); - continue; - } - if (property.NameEquals("lastUpdatedDateTime"u8)) - { - lastUpdatedDateTime = property.Value.GetDateTimeOffset("O"); - continue; - } - if (property.NameEquals("status"u8)) - { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); - continue; - } - if (property.NameEquals("errors"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Error.DeserializeError(item)); - } - errors = array; - continue; - } - if (property.NameEquals("nextLink"u8)) - { - nextLink = property.Value.GetString(); - continue; - } - } - return new JobState( - displayName, - createdDateTime, - expirationDateTime, - jobId, - lastUpdatedDateTime, - status, - errors ?? new ChangeTrackingList(), - nextLink); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static JobState FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeJobState(document.RootElement); - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.cs deleted file mode 100644 index 3c49287162cb..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/JobState.cs +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The JobState. - internal partial class JobState - { - /// Initializes a new instance of . - /// - /// - /// - /// - /// is null. - internal JobState(DateTimeOffset createdDateTime, string jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status) - { - Argument.AssertNotNull(jobId, nameof(jobId)); - - CreatedDateTime = createdDateTime; - JobId = jobId; - LastUpdatedDateTime = lastUpdatedDateTime; - Status = status; - Errors = new ChangeTrackingList(); - } - - /// Initializes a new instance of . - /// - /// - /// - /// - /// - /// - /// - /// - internal JobState(string displayName, DateTimeOffset createdDateTime, DateTimeOffset? expirationDateTime, string jobId, DateTimeOffset lastUpdatedDateTime, TextAnalyticsOperationStatus status, IReadOnlyList errors, string nextLink) - { - DisplayName = displayName; - CreatedDateTime = createdDateTime; - ExpirationDateTime = expirationDateTime; - JobId = jobId; - LastUpdatedDateTime = lastUpdatedDateTime; - Status = status; - Errors = errors; - NextLink = nextLink; - } - - /// Gets the display name. - public string DisplayName { get; } - /// Gets the created date time. - public DateTimeOffset CreatedDateTime { get; } - /// Gets the expiration date time. - public DateTimeOffset? ExpirationDateTime { get; } - /// Gets the job id. - public string JobId { get; } - /// Gets the last updated date time. - public DateTimeOffset LastUpdatedDateTime { get; } - /// Gets the status. - public TextAnalyticsOperationStatus Status { get; } - /// Gets the errors. - public IReadOnlyList Errors { get; } - /// Gets the next link. - public string NextLink { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.Serialization.cs index 86755a3e5bdd..595f09a2575f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class KeyPhraseExtractionLROResult : IUtf8JsonSerializable + internal partial class KeyPhraseExtractionLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static KeyPhraseExtractionLROResult DeserializeKeyPhraseExtractionLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static KeyPhraseExtractionLROResult DeserializeKeyPhraseExtractionLRORe return null; } KeyPhraseResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static KeyPhraseExtractionLROResult DeserializeKeyPhraseExtractionLRORe results = KeyPhraseResult.DeserializeKeyPhraseResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new KeyPhraseExtractionLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new KeyPhraseExtractionLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static KeyPhraseExtractionLROResult DeserializeKeyPhraseExtractionLRORe using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeKeyPhraseExtractionLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.cs index 0495e8e0d39c..e5dd728041ef 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseExtractionLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The KeyPhraseExtractionLROResult. + /// Contains the analyze text KeyPhraseExtraction LRO task. internal partial class KeyPhraseExtractionLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// The list of Key phrase extraction results. /// is null. - public KeyPhraseExtractionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, KeyPhraseResult results) : base(lastUpdateDateTime, status) + internal KeyPhraseExtractionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, KeyPhraseResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public KeyPhraseExtractionLROResult(DateTimeOffset lastUpdateDateTime, TextAnaly } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal KeyPhraseExtractionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, KeyPhraseResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// The list of Key phrase extraction results. + internal KeyPhraseExtractionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, KeyPhraseResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public KeyPhraseResult Results { get; set; } + /// The list of Key phrase extraction results. + public KeyPhraseResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.Serialization.cs index 577b7d81b1f3..7c3df0a2da3f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static KeyPhraseLROTask DeserializeKeyPhraseLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - KeyPhraseTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = KeyPhraseTaskParameters.DeserializeKeyPhraseTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new KeyPhraseLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new KeyPhraseLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeKeyPhraseLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.cs index 3eefccf80f41..902348de6166 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseLROTask.cs @@ -17,16 +17,16 @@ public KeyPhraseLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Key Phrase Extraction task. + /// task name. + /// The kind of task to perform. + /// Key phrase extraction task parameters. internal KeyPhraseLROTask(string taskName, AnalyzeTextLROTaskKind kind, KeyPhraseTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Key Phrase Extraction task. + /// Key phrase extraction task parameters. public KeyPhraseTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.Serialization.cs index 3e52d985d315..5eb9a5e14c22 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class KeyPhraseResult : IUtf8JsonSerializable + internal partial class KeyPhraseResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static KeyPhraseResult DeserializeKeyPhraseResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(KeyPhraseResultDocumentsItem.DeserializeKeyPhraseResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static KeyPhraseResult DeserializeKeyPhraseResult(JsonElement element) modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(KeyPhrasesDocumentResult.DeserializeKeyPhrasesDocumentResult(item)); + } + documents = array; + continue; + } } return new KeyPhraseResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new KeyPhraseResult FromResponse(Response response) + internal static KeyPhraseResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeKeyPhraseResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.cs index be4b64fa6a23..e44cbe2ea1c0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The KeyPhraseResult. - internal partial class KeyPhraseResult : PreBuiltResult + /// Contains the KeyPhraseResult. + internal partial class KeyPhraseResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. /// Response by document. /// , or is null. - public KeyPhraseResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal KeyPhraseResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -33,12 +35,21 @@ public KeyPhraseResult(IEnumerable errors, string modelVersion, I /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. /// Response by document. - internal KeyPhraseResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + internal KeyPhraseResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.Serialization.cs deleted file mode 100644 index c5aac455e8dd..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class KeyPhraseResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("keyPhrases"u8); - writer.WriteStartArray(); - foreach (var item in KeyPhrases) - { - writer.WriteStringValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static KeyPhraseResultDocumentsItem DeserializeKeyPhraseResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList keyPhrases = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("keyPhrases"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(item.GetString()); - } - keyPhrases = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new KeyPhraseResultDocumentsItem(id, warnings, statistics, keyPhrases); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new KeyPhraseResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeKeyPhraseResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.cs deleted file mode 100644 index 8fd9f64c8038..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseResultDocumentsItem.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The KeyPhraseResultDocumentsItem. - internal partial class KeyPhraseResultDocumentsItem : KeyPhrasesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// A list of representative words or phrases. The number of key phrases returned is proportional to the number of words in the input document. - /// , or is null. - public KeyPhraseResultDocumentsItem(string id, IEnumerable warnings, IEnumerable keyPhrases) : base(id, warnings, keyPhrases) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(keyPhrases, nameof(keyPhrases)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// A list of representative words or phrases. The number of key phrases returned is proportional to the number of words in the input document. - internal KeyPhraseResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, IList keyPhrases) : base(id, warnings, statistics, keyPhrases) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.Serialization.cs index 12237d4ae608..8533f567e7c0 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.Serialization.cs @@ -15,57 +15,21 @@ internal partial class KeyPhraseTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } if (Optional.IsDefined(LoggingOptOut)) { writer.WritePropertyName("loggingOptOut"u8); writer.WriteBooleanValue(LoggingOptOut.Value); } - writer.WriteEndObject(); - } - - internal static KeyPhraseTaskParameters DeserializeKeyPhraseTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) + if (Optional.IsDefined(ModelVersion)) { - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } + writer.WritePropertyName("modelVersion"u8); + writer.WriteStringValue(ModelVersion); } - return new KeyPhraseTaskParameters(loggingOptOut, modelVersion); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new KeyPhraseTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeKeyPhraseTaskParameters(document.RootElement); + writer.WriteEndObject(); } /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.cs index 2f6e46625b59..9914ada47ea7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Key Phrase Extraction task. - internal partial class KeyPhraseTaskParameters : PreBuiltTaskParameters + internal partial class KeyPhraseTaskParameters { /// Initializes a new instance of . public KeyPhraseTaskParameters() @@ -16,10 +16,17 @@ public KeyPhraseTaskParameters() } /// Initializes a new instance of . - /// - /// - internal KeyPhraseTaskParameters(bool? loggingOptOut, string modelVersion) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + internal KeyPhraseTaskParameters(bool? loggingOptOut, string modelVersion) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; } + + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskResult.cs index ad15c30cbf9d..297f599ca320 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhraseTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The KeyPhraseTaskResult. + /// Contains the analyze text KeyPhraseExtraction task result. internal partial class KeyPhraseTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// The list of Key phrase extraction results. /// is null. internal KeyPhraseTaskResult(KeyPhraseResult results) { @@ -24,15 +24,15 @@ internal KeyPhraseTaskResult(KeyPhraseResult results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// The list of Key phrase extraction results. internal KeyPhraseTaskResult(AnalyzeTextTaskResultsKind kind, KeyPhraseResult results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// The list of Key phrase extraction results. public KeyPhraseResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.Serialization.cs index 1bcf7f928616..da3a426a8fa8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class KeyPhrasesDocumentResult : IUtf8JsonSerializable + internal partial class KeyPhrasesDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("keyPhrases"u8); - writer.WriteStartArray(); - foreach (var item in KeyPhrases) - { - writer.WriteStringValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static KeyPhrasesDocumentResult DeserializeKeyPhrasesDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList keyPhrases = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList keyPhrases = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("keyPhrases"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(item.GetString()); - } - keyPhrases = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static KeyPhrasesDocumentResult DeserializeKeyPhrasesDocumentResult(Jso statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("keyPhrases"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(item.GetString()); + } + keyPhrases = array; + continue; + } } return new KeyPhrasesDocumentResult(id, warnings, statistics, keyPhrases); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new KeyPhrasesDocumentResult FromResponse(Response response) + internal static KeyPhrasesDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeKeyPhrasesDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.cs index 27028fba1dc9..7016316f01b7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/KeyPhrasesDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The KeyPhrasesDocumentResult. - internal partial class KeyPhrasesDocumentResult : DocumentResult + /// Contains the Key phrase extraction results for a document. + internal partial class KeyPhrasesDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// A list of representative words or phrases. The number of key phrases returned is proportional to the number of words in the input document. /// , or is null. - public KeyPhrasesDocumentResult(string id, IEnumerable warnings, IEnumerable keyPhrases) : base(id, warnings) + internal KeyPhrasesDocumentResult(string id, IEnumerable warnings, IEnumerable keyPhrases) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(keyPhrases, nameof(keyPhrases)); + Id = id; + Warnings = warnings.ToList(); KeyPhrases = keyPhrases.ToList(); } @@ -33,12 +35,21 @@ public KeyPhrasesDocumentResult(string id, IEnumerable warnings /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// A list of representative words or phrases. The number of key phrases returned is proportional to the number of words in the input document. - internal KeyPhrasesDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList keyPhrases) : base(id, warnings, statistics) + internal KeyPhrasesDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList keyPhrases) { + Id = id; + Warnings = warnings; + Statistics = statistics; KeyPhrases = keyPhrases; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// A list of representative words or phrases. The number of key phrases returned is proportional to the number of words in the input document. - public IList KeyPhrases { get; } + public IReadOnlyList KeyPhrases { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionAnalysisInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionAnalysisInput.cs index 07c2d5d4862c..434edbe48383 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionAnalysisInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionAnalysisInput.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The LanguageDetectionAnalysisInput. + /// Contains the language detection document analysis input. internal partial class LanguageDetectionAnalysisInput { /// Initializes a new instance of . @@ -19,13 +19,13 @@ public LanguageDetectionAnalysisInput() } /// Initializes a new instance of . - /// + /// List of documents to be analyzed. internal LanguageDetectionAnalysisInput(IList documents) { Documents = documents; } - /// Gets the documents. + /// List of documents to be analyzed. public IList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.Serialization.cs index 90b4a2af4f5f..1d47cd76b851 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.Serialization.cs @@ -7,51 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class LanguageDetectionDocumentResult : IUtf8JsonSerializable + internal partial class LanguageDetectionDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("detectedLanguage"u8); - writer.WriteObjectValue(DetectedLanguage); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static LanguageDetectionDocumentResult DeserializeLanguageDetectionDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - DetectedLanguageInternal detectedLanguage = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + DetectedLanguageInternal detectedLanguage = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("detectedLanguage"u8)) - { - detectedLanguage = DetectedLanguageInternal.DeserializeDetectedLanguageInternal(property.Value); - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -76,24 +48,21 @@ internal static LanguageDetectionDocumentResult DeserializeLanguageDetectionDocu statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("detectedLanguage"u8)) + { + detectedLanguage = DetectedLanguageInternal.DeserializeDetectedLanguageInternal(property.Value); + continue; + } } return new LanguageDetectionDocumentResult(id, warnings, statistics, detectedLanguage); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new LanguageDetectionDocumentResult FromResponse(Response response) + internal static LanguageDetectionDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeLanguageDetectionDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.cs index 4634a8485eed..7931800b922d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionDocumentResult.cs @@ -7,22 +7,25 @@ using System; using System.Collections.Generic; +using System.Linq; namespace Azure.AI.TextAnalytics.Models { - /// The LanguageDetectionDocumentResult. - internal partial class LanguageDetectionDocumentResult : DocumentResult + /// Contains the language detection for a document. + internal partial class LanguageDetectionDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// Detected Language. /// or is null. - public LanguageDetectionDocumentResult(string id, IEnumerable warnings, DetectedLanguageInternal detectedLanguage) : base(id, warnings) + internal LanguageDetectionDocumentResult(string id, IEnumerable warnings, DetectedLanguageInternal detectedLanguage) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); + Id = id; + Warnings = warnings.ToList(); DetectedLanguage = detectedLanguage; } @@ -31,12 +34,21 @@ public LanguageDetectionDocumentResult(string id, IEnumerable w /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// Detected Language. - internal LanguageDetectionDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, DetectedLanguageInternal detectedLanguage) : base(id, warnings, statistics) + internal LanguageDetectionDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, DetectedLanguageInternal detectedLanguage) { + Id = id; + Warnings = warnings; + Statistics = statistics; DetectedLanguage = detectedLanguage; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Detected Language. - public DetectedLanguageInternal DetectedLanguage { get; set; } + public DetectedLanguageInternal DetectedLanguage { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.Serialization.cs index 57f8d19cb2d4..10a13d7a4564 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class LanguageDetectionResult : IUtf8JsonSerializable + internal partial class LanguageDetectionResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static LanguageDetectionResult DeserializeLanguageDetectionResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(LanguageDetectionDocumentResult.DeserializeLanguageDetectionDocumentResult(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static LanguageDetectionResult DeserializeLanguageDetectionResult(JsonE modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(LanguageDetectionDocumentResult.DeserializeLanguageDetectionDocumentResult(item)); + } + documents = array; + continue; + } } return new LanguageDetectionResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new LanguageDetectionResult FromResponse(Response response) + internal static LanguageDetectionResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeLanguageDetectionResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.cs index e4093356bfc1..9e22b7df2601 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The LanguageDetectionResult. - internal partial class LanguageDetectionResult : PreBuiltResult + /// Contains the language detection result for the request. + internal partial class LanguageDetectionResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. - /// Response by document. + /// Enumeration of language detection results for each input document. /// , or is null. - public LanguageDetectionResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal LanguageDetectionResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -32,13 +34,22 @@ public LanguageDetectionResult(IEnumerable errors, string modelVe /// Errors by document id. /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. - /// Response by document. - internal LanguageDetectionResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + /// Enumeration of language detection results for each input document. + internal LanguageDetectionResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } - /// Response by document. - public IList Documents { get; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } + /// Enumeration of language detection results for each input document. + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.Serialization.cs index c8137ed0cb4b..06a8a295ed49 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.Serialization.cs @@ -15,57 +15,21 @@ internal partial class LanguageDetectionTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } if (Optional.IsDefined(LoggingOptOut)) { writer.WritePropertyName("loggingOptOut"u8); writer.WriteBooleanValue(LoggingOptOut.Value); } - writer.WriteEndObject(); - } - - internal static LanguageDetectionTaskParameters DeserializeLanguageDetectionTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) + if (Optional.IsDefined(ModelVersion)) { - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } + writer.WritePropertyName("modelVersion"u8); + writer.WriteStringValue(ModelVersion); } - return new LanguageDetectionTaskParameters(loggingOptOut, modelVersion); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new LanguageDetectionTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeLanguageDetectionTaskParameters(document.RootElement); + writer.WriteEndObject(); } /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.cs index 59805e47ffac..704b7e30d4d6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Language Detection task. - internal partial class LanguageDetectionTaskParameters : PreBuiltTaskParameters + internal partial class LanguageDetectionTaskParameters { /// Initializes a new instance of . public LanguageDetectionTaskParameters() @@ -16,10 +16,17 @@ public LanguageDetectionTaskParameters() } /// Initializes a new instance of . - /// - /// - internal LanguageDetectionTaskParameters(bool? loggingOptOut, string modelVersion) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + internal LanguageDetectionTaskParameters(bool? loggingOptOut, string modelVersion) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; } + + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskResult.cs index 6818652cc988..deb049dca54f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageDetectionTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The LanguageDetectionTaskResult. + /// Contains the language detection task result for the request. internal partial class LanguageDetectionTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// Contains the language detection results. /// is null. internal LanguageDetectionTaskResult(LanguageDetectionResult results) { @@ -24,15 +24,15 @@ internal LanguageDetectionTaskResult(LanguageDetectionResult results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// Contains the language detection results. internal LanguageDetectionTaskResult(AnalyzeTextTaskResultsKind kind, LanguageDetectionResult results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// Contains the language detection results. public LanguageDetectionResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageInput.cs index fb2c67168827..96888c6691fc 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LanguageInput.cs @@ -7,12 +7,12 @@ namespace Azure.AI.TextAnalytics.Models { - /// The LanguageInput. + /// Contains the language detection input. internal partial class LanguageInput { /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// + /// A unique, non-empty document identifier. + /// The input text to process. public LanguageInput(string id, string text) { Id = id; @@ -20,9 +20,9 @@ public LanguageInput(string id, string text) } /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// - /// + /// A unique, non-empty document identifier. + /// The input text to process. + /// The country hint to help with language detection of the text. internal LanguageInput(string id, string text, string countryHint) { Id = id; @@ -30,11 +30,11 @@ internal LanguageInput(string id, string text, string countryHint) CountryHint = countryHint; } - /// Unique, non-empty document identifier. + /// A unique, non-empty document identifier. public string Id { get; } - /// Gets the text. + /// The input text to process. public string Text { get; } - /// Gets or sets the country hint. + /// The country hint to help with language detection of the text. public string CountryHint { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.Serialization.cs index c99002f4b35f..d54f426a4200 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class LinkedEntitiesDocumentResult : IUtf8JsonSerializable + internal partial class LinkedEntitiesDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static LinkedEntitiesDocumentResult DeserializeLinkedEntitiesDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList entities = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + IReadOnlyList entities = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(LinkedEntity.DeserializeLinkedEntity(item)); - } - entities = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -86,24 +48,26 @@ internal static LinkedEntitiesDocumentResult DeserializeLinkedEntitiesDocumentRe statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("entities"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(LinkedEntity.DeserializeLinkedEntity(item)); + } + entities = array; + continue; + } } return new LinkedEntitiesDocumentResult(id, warnings, statistics, entities); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new LinkedEntitiesDocumentResult FromResponse(Response response) + internal static LinkedEntitiesDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeLinkedEntitiesDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.cs index 424d0a3f02bf..8fefd4d13cad 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntitiesDocumentResult.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The LinkedEntitiesDocumentResult. - internal partial class LinkedEntitiesDocumentResult : DocumentResult + /// Entity linking document result. + internal partial class LinkedEntitiesDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// Recognized well known entities in the document. /// , or is null. - public LinkedEntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities) : base(id, warnings) + internal LinkedEntitiesDocumentResult(string id, IEnumerable warnings, IEnumerable entities) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(entities, nameof(entities)); + Id = id; + Warnings = warnings.ToList(); Entities = entities.ToList(); } @@ -33,12 +35,21 @@ public LinkedEntitiesDocumentResult(string id, IEnumerable warn /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// Recognized well known entities in the document. - internal LinkedEntitiesDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, IList entities) : base(id, warnings, statistics) + internal LinkedEntitiesDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, IReadOnlyList entities) { + Id = id; + Warnings = warnings; + Statistics = statistics; Entities = entities; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Recognized well known entities in the document. - public IList Entities { get; } + public IReadOnlyList Entities { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.Serialization.cs index 16ef75b44499..d76f9bf9d960 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.Serialization.cs @@ -8,43 +8,11 @@ using System; using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial struct LinkedEntity : IUtf8JsonSerializable + public partial struct LinkedEntity { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("matches"u8); - writer.WriteStartArray(); - foreach (var item in Matches) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("language"u8); - writer.WriteStringValue(Language); - if (Optional.IsDefined(DataSourceEntityId)) - { - writer.WritePropertyName("id"u8); - writer.WriteStringValue(DataSourceEntityId); - } - writer.WritePropertyName("url"u8); - writer.WriteStringValue(Url.AbsoluteUri); - writer.WritePropertyName("dataSource"u8); - writer.WriteStringValue(DataSource); - if (Optional.IsDefined(BingEntitySearchApiId)) - { - writer.WritePropertyName("bingId"u8); - writer.WriteStringValue(BingEntitySearchApiId); - } - writer.WriteEndObject(); - } - internal static LinkedEntity DeserializeLinkedEntity(JsonElement element) { string name = default; @@ -114,13 +82,5 @@ internal static LinkedEntity FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeLinkedEntity(document.RootElement); } - - /// Convert into a . - internal RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.cs index 9778691e8590..a361b623b453 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntity.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics { - /// The LinkedEntity. + /// The LinkedEntity object containing the detected entity with the associated sources/links. public readonly partial struct LinkedEntity { } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.Serialization.cs index 471feab8780e..860f3158bccc 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.Serialization.cs @@ -6,26 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial struct LinkedEntityMatch : IUtf8JsonSerializable + public partial struct LinkedEntityMatch { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("confidenceScore"u8); - writer.WriteNumberValue(ConfidenceScore); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WriteEndObject(); - } - internal static LinkedEntityMatch DeserializeLinkedEntityMatch(JsonElement element) { double confidenceScore = default; @@ -65,13 +50,5 @@ internal static LinkedEntityMatch FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeLinkedEntityMatch(document.RootElement); } - - /// Convert into a . - internal RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.cs index bd4359681535..890cd4598bf3 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/LinkedEntityMatch.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics { - /// The Match. + /// The Match object containing the detected entity text with the offset and the length. public readonly partial struct LinkedEntityMatch { } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageAnalysisInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageAnalysisInput.cs index 66d3dbeb8d49..7faca36a6cb7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageAnalysisInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageAnalysisInput.cs @@ -9,7 +9,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The MultiLanguageAnalysisInput. + /// Collection of input documents to be analyzed by the service. internal partial class MultiLanguageAnalysisInput { /// Initializes a new instance of . @@ -19,13 +19,13 @@ public MultiLanguageAnalysisInput() } /// Initializes a new instance of . - /// + /// The input documents to be analyzed. internal MultiLanguageAnalysisInput(IList documents) { Documents = documents; } - /// Gets the documents. + /// The input documents to be analyzed. public IList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageInput.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageInput.cs index aec998c4fee6..e453f3e4477a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageInput.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/MultiLanguageInput.cs @@ -22,7 +22,7 @@ public MultiLanguageInput(string id, string text) /// Initializes a new instance of . /// A unique, non-empty document identifier. /// The input text to process. - /// (Optional) This is the 2 letter ISO 639-1 representation of a language. For example, use "en" for English; "es" for Spanish etc. If not set, use "en" for English as default. + /// (Optional) This is the 2 letter ISO 639-1 representation of a language. For example, use \"en\" for English; \"es\" for Spanish etc. If not set, use \"en\" for English as default. (Following only applies to 2023-04-15-preview and above) For Auto Language Detection, use \"auto\". If not set, use \"en\" for English as default. internal MultiLanguageInput(string id, string text, string language) { Id = id; @@ -34,7 +34,7 @@ internal MultiLanguageInput(string id, string text, string language) public string Id { get; } /// The input text to process. public string Text { get; } - /// (Optional) This is the 2 letter ISO 639-1 representation of a language. For example, use "en" for English; "es" for Spanish etc. If not set, use "en" for English as default. + /// (Optional) This is the 2 letter ISO 639-1 representation of a language. For example, use \"en\" for English; \"es\" for Spanish etc. If not set, use \"en\" for English as default. (Following only applies to 2023-04-15-preview and above) For Auto Language Detection, use \"auto\". If not set, use \"en\" for English as default. public string Language { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Pagination.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Pagination.cs deleted file mode 100644 index e6624237d38e..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Pagination.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// The Pagination. - internal partial class Pagination - { - /// Initializes a new instance of . - internal Pagination() - { - } - - /// Initializes a new instance of . - /// - internal Pagination(string nextLink) - { - NextLink = nextLink; - } - - /// Gets the next link. - public string NextLink { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiDomain.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiDomain.cs index 08b08b97cb36..29f886d4b538 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiDomain.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiDomain.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// The PII domain used for PII Entity Recognition. + /// Domain for PII task. internal readonly partial struct PiiDomain : IEquatable { private readonly string _value; diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.Serialization.cs index 18fcd0843637..4a7eb7e16fab 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.Serialization.cs @@ -7,69 +7,24 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class PiiEntitiesDocumentResult : IUtf8JsonSerializable + internal partial class PiiEntitiesDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("redactedText"u8); - writer.WriteStringValue(RedactedText); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static PiiEntitiesDocumentResult DeserializePiiEntitiesDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - string redactedText = default; - IList entities = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + string redactedText = default; + IReadOnlyList entities = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("redactedText"u8)) - { - redactedText = property.Value.GetString(); - continue; - } - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Entity.DeserializeEntity(item)); - } - entities = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -94,24 +49,31 @@ internal static PiiEntitiesDocumentResult DeserializePiiEntitiesDocumentResult(J statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("redactedText"u8)) + { + redactedText = property.Value.GetString(); + continue; + } + if (property.NameEquals("entities"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(Entity.DeserializeEntity(item)); + } + entities = array; + continue; + } } return new PiiEntitiesDocumentResult(id, warnings, statistics, redactedText, entities); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new PiiEntitiesDocumentResult FromResponse(Response response) + internal static PiiEntitiesDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializePiiEntitiesDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.cs index 60f03b9349c0..7afd45282fcf 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesDocumentResult.cs @@ -11,8 +11,8 @@ namespace Azure.AI.TextAnalytics.Models { - /// The PiiEntitiesDocumentResult. - internal partial class PiiEntitiesDocumentResult : DocumentResult + /// Contains the PII results. + internal partial class PiiEntitiesDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. @@ -20,13 +20,15 @@ internal partial class PiiEntitiesDocumentResult : DocumentResult /// Returns redacted text. /// Recognized entities in the document. /// , , or is null. - public PiiEntitiesDocumentResult(string id, IEnumerable warnings, string redactedText, IEnumerable entities) : base(id, warnings) + internal PiiEntitiesDocumentResult(string id, IEnumerable warnings, string redactedText, IEnumerable entities) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(redactedText, nameof(redactedText)); Argument.AssertNotNull(entities, nameof(entities)); + Id = id; + Warnings = warnings.ToList(); RedactedText = redactedText; Entities = entities.ToList(); } @@ -37,15 +39,24 @@ public PiiEntitiesDocumentResult(string id, IEnumerable warning /// if showStats=true was specified in the request this field will contain information about the document payload. /// Returns redacted text. /// Recognized entities in the document. - internal PiiEntitiesDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, string redactedText, IList entities) : base(id, warnings, statistics) + internal PiiEntitiesDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, string redactedText, IReadOnlyList entities) { + Id = id; + Warnings = warnings; + Statistics = statistics; RedactedText = redactedText; Entities = entities; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Returns redacted text. - public string RedactedText { get; set; } + public string RedactedText { get; } /// Recognized entities in the document. - public IList Entities { get; } + public IReadOnlyList Entities { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.Serialization.cs index 9f7e637d91e1..58fc5a74810b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.Serialization.cs @@ -8,61 +8,23 @@ using System.Collections.Generic; using System.Text.Json; using Azure.AI.TextAnalytics.Models; -using Azure.Core; namespace Azure.AI.TextAnalytics { - internal partial class PiiEntitiesResult : IUtf8JsonSerializable + internal partial class PiiEntitiesResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static PiiEntitiesResult DeserializePiiEntitiesResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(PiiResultDocumentsItem.DeserializePiiResultDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -87,24 +49,26 @@ internal static PiiEntitiesResult DeserializePiiEntitiesResult(JsonElement eleme modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(PiiEntitiesDocumentResult.DeserializePiiEntitiesDocumentResult(item)); + } + documents = array; + continue; + } } return new PiiEntitiesResult(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new PiiEntitiesResult FromResponse(Response response) + internal static PiiEntitiesResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializePiiEntitiesResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.cs index ca87d6353d0f..49a08ff413c6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntitiesResult.cs @@ -12,20 +12,22 @@ namespace Azure.AI.TextAnalytics { - /// The PiiResult. - internal partial class PiiEntitiesResult : PreBuiltResult + /// Contains the PiiResult. + internal partial class PiiEntitiesResult { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. /// Response by document. /// , or is null. - public PiiEntitiesResult(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal PiiEntitiesResult(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -34,12 +36,21 @@ public PiiEntitiesResult(IEnumerable errors, string modelVersion, /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. /// Response by document. - internal PiiEntitiesResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + internal PiiEntitiesResult(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } /// Response by document. - public IList Documents { get; } + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityCategory.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityCategory.cs index 4197341f674c..06c059501859 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityCategory.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityCategory.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics { - /// The PiiCategory. + /// (Optional) describes the PII categories to return. public readonly partial struct PiiEntityCategory : IEquatable { private readonly string _value; @@ -196,329 +196,329 @@ public PiiEntityCategory(string value) private const string AllValue = "All"; private const string DefaultValue = "Default"; - /// ABARoutingNumber. + /// ABA Routing number. public static PiiEntityCategory ABARoutingNumber { get; } = new PiiEntityCategory(ABARoutingNumberValue); - /// ARNationalIdentityNumber. + /// AR National Identity Number. public static PiiEntityCategory ARNationalIdentityNumber { get; } = new PiiEntityCategory(ARNationalIdentityNumberValue); - /// AUBankAccountNumber. + /// AT Bank Account Number. public static PiiEntityCategory AUBankAccountNumber { get; } = new PiiEntityCategory(AUBankAccountNumberValue); - /// AUDriversLicenseNumber. + /// AU Driver's License Number. public static PiiEntityCategory AUDriversLicenseNumber { get; } = new PiiEntityCategory(AUDriversLicenseNumberValue); - /// AUMedicalAccountNumber. + /// AU Medical Account Number. public static PiiEntityCategory AUMedicalAccountNumber { get; } = new PiiEntityCategory(AUMedicalAccountNumberValue); - /// AUPassportNumber. + /// AU Passport Number. public static PiiEntityCategory AUPassportNumber { get; } = new PiiEntityCategory(AUPassportNumberValue); - /// AUTaxFileNumber. + /// AU Tax File Number. public static PiiEntityCategory AUTaxFileNumber { get; } = new PiiEntityCategory(AUTaxFileNumberValue); - /// AUBusinessNumber. + /// AU Business Number. public static PiiEntityCategory AUBusinessNumber { get; } = new PiiEntityCategory(AUBusinessNumberValue); - /// AUCompanyNumber. + /// AU Company Number. public static PiiEntityCategory AUCompanyNumber { get; } = new PiiEntityCategory(AUCompanyNumberValue); - /// ATIdentityCard. + /// AT Identity Card. public static PiiEntityCategory ATIdentityCard { get; } = new PiiEntityCategory(ATIdentityCardValue); - /// ATTaxIdentificationNumber. + /// AT Tax Identification Number. public static PiiEntityCategory ATTaxIdentificationNumber { get; } = new PiiEntityCategory(ATTaxIdentificationNumberValue); - /// ATValueAddedTaxNumber. + /// AT Value Added Tax Number. public static PiiEntityCategory ATValueAddedTaxNumber { get; } = new PiiEntityCategory(ATValueAddedTaxNumberValue); - /// AzureDocumentDBAuthKey. + /// Azure Document DB Auth Key. public static PiiEntityCategory AzureDocumentDBAuthKey { get; } = new PiiEntityCategory(AzureDocumentDBAuthKeyValue); - /// AzureIAASDatabaseConnectionAndSQLString. + /// Azure IAAS Database Connection And SQL String. public static PiiEntityCategory AzureIaasDatabaseConnectionAndSQLString { get; } = new PiiEntityCategory(AzureIaasDatabaseConnectionAndSQLStringValue); - /// AzureIoTConnectionString. + /// Azure IoT Connection String. public static PiiEntityCategory AzureIoTConnectionString { get; } = new PiiEntityCategory(AzureIoTConnectionStringValue); - /// AzurePublishSettingPassword. + /// Azure Publish Setting Password. public static PiiEntityCategory AzurePublishSettingPassword { get; } = new PiiEntityCategory(AzurePublishSettingPasswordValue); - /// AzureRedisCacheString. + /// Azure Redis Cache String. public static PiiEntityCategory AzureRedisCacheString { get; } = new PiiEntityCategory(AzureRedisCacheStringValue); - /// AzureSAS. + /// Azure SAS. public static PiiEntityCategory AzureSAS { get; } = new PiiEntityCategory(AzureSASValue); - /// AzureServiceBusString. + /// Azure Service Bus String. public static PiiEntityCategory AzureServiceBusString { get; } = new PiiEntityCategory(AzureServiceBusStringValue); - /// AzureStorageAccountKey. + /// Azure Storage Account Key. public static PiiEntityCategory AzureStorageAccountKey { get; } = new PiiEntityCategory(AzureStorageAccountKeyValue); - /// AzureStorageAccountGeneric. + /// Azure Storage Account Generic. public static PiiEntityCategory AzureStorageAccountGeneric { get; } = new PiiEntityCategory(AzureStorageAccountGenericValue); - /// BENationalNumber. + /// BE National Number. public static PiiEntityCategory BENationalNumber { get; } = new PiiEntityCategory(BENationalNumberValue); - /// BENationalNumberV2. + /// BE National Number V2. public static PiiEntityCategory BENationalNumberV2 { get; } = new PiiEntityCategory(BENationalNumberV2Value); - /// BEValueAddedTaxNumber. + /// BE Value Added Tax Number. public static PiiEntityCategory BEValueAddedTaxNumber { get; } = new PiiEntityCategory(BEValueAddedTaxNumberValue); - /// BRCPFNumber. + /// BR CPF Number. public static PiiEntityCategory BrcpfNumber { get; } = new PiiEntityCategory(BrcpfNumberValue); - /// BRLegalEntityNumber. + /// BR Legal Entity Number. public static PiiEntityCategory BRLegalEntityNumber { get; } = new PiiEntityCategory(BRLegalEntityNumberValue); - /// BRNationalIDRG. + /// BR National ID RG. public static PiiEntityCategory BRNationalIdrg { get; } = new PiiEntityCategory(BRNationalIdrgValue); - /// BGUniformCivilNumber. + /// BG Uniform Civil Number. public static PiiEntityCategory BGUniformCivilNumber { get; } = new PiiEntityCategory(BGUniformCivilNumberValue); - /// CABankAccountNumber. + /// CA Bank Account Number. public static PiiEntityCategory CABankAccountNumber { get; } = new PiiEntityCategory(CABankAccountNumberValue); - /// CADriversLicenseNumber. + /// CA Driver's License Number. public static PiiEntityCategory CADriversLicenseNumber { get; } = new PiiEntityCategory(CADriversLicenseNumberValue); - /// CAHealthServiceNumber. + /// CA Health Service Number. public static PiiEntityCategory CAHealthServiceNumber { get; } = new PiiEntityCategory(CAHealthServiceNumberValue); - /// CAPassportNumber. + /// CA Passport Number. public static PiiEntityCategory CAPassportNumber { get; } = new PiiEntityCategory(CAPassportNumberValue); - /// CAPersonalHealthIdentification. + /// CA Personal Health Identification. public static PiiEntityCategory CAPersonalHealthIdentification { get; } = new PiiEntityCategory(CAPersonalHealthIdentificationValue); - /// CASocialInsuranceNumber. + /// CA Social Insurance Number. public static PiiEntityCategory CASocialInsuranceNumber { get; } = new PiiEntityCategory(CASocialInsuranceNumberValue); - /// CLIdentityCardNumber. + /// CL Identity Card Number. public static PiiEntityCategory CLIdentityCardNumber { get; } = new PiiEntityCategory(CLIdentityCardNumberValue); - /// CNResidentIdentityCardNumber. + /// CN Resident Identity Card Number. public static PiiEntityCategory CNResidentIdentityCardNumber { get; } = new PiiEntityCategory(CNResidentIdentityCardNumberValue); - /// CreditCardNumber. + /// Credit Card Number. public static PiiEntityCategory CreditCardNumber { get; } = new PiiEntityCategory(CreditCardNumberValue); - /// HRIdentityCardNumber. + /// HR Identity Card Number. public static PiiEntityCategory HRIdentityCardNumber { get; } = new PiiEntityCategory(HRIdentityCardNumberValue); - /// HRNationalIDNumber. + /// HR National ID Number. public static PiiEntityCategory HRNationalIDNumber { get; } = new PiiEntityCategory(HRNationalIDNumberValue); - /// HRPersonalIdentificationNumber. + /// HR Personal Identification Number. public static PiiEntityCategory HRPersonalIdentificationNumber { get; } = new PiiEntityCategory(HRPersonalIdentificationNumberValue); - /// HRPersonalIdentificationOIBNumberV2. + /// HR Personal Identification OIB Number V2. public static PiiEntityCategory HRPersonalIdentificationOIBNumberV2 { get; } = new PiiEntityCategory(HRPersonalIdentificationOIBNumberV2Value); - /// CYIdentityCard. + /// CY Identity Card. public static PiiEntityCategory CYIdentityCard { get; } = new PiiEntityCategory(CYIdentityCardValue); - /// CYTaxIdentificationNumber. + /// CY Tax Identification Number. public static PiiEntityCategory CYTaxIdentificationNumber { get; } = new PiiEntityCategory(CYTaxIdentificationNumberValue); - /// CZPersonalIdentityNumber. + /// CZ Personal Identity Number. public static PiiEntityCategory CZPersonalIdentityNumber { get; } = new PiiEntityCategory(CZPersonalIdentityNumberValue); - /// CZPersonalIdentityV2. + /// CZ Personal Identity V2. public static PiiEntityCategory CZPersonalIdentityV2 { get; } = new PiiEntityCategory(CZPersonalIdentityV2Value); - /// DKPersonalIdentificationNumber. + /// DK Personal Identification Number. public static PiiEntityCategory DKPersonalIdentificationNumber { get; } = new PiiEntityCategory(DKPersonalIdentificationNumberValue); - /// DKPersonalIdentificationV2. + /// DK Personal Identification V2. public static PiiEntityCategory DKPersonalIdentificationV2 { get; } = new PiiEntityCategory(DKPersonalIdentificationV2Value); - /// DrugEnforcementAgencyNumber. + /// Drug Enforcement Agency Number. public static PiiEntityCategory DrugEnforcementAgencyNumber { get; } = new PiiEntityCategory(DrugEnforcementAgencyNumberValue); - /// EEPersonalIdentificationCode. + /// EE Personal Identification Code. public static PiiEntityCategory EEPersonalIdentificationCode { get; } = new PiiEntityCategory(EEPersonalIdentificationCodeValue); - /// EUDebitCardNumber. + /// EU Debit Card Number. public static PiiEntityCategory EUDebitCardNumber { get; } = new PiiEntityCategory(EUDebitCardNumberValue); - /// EUDriversLicenseNumber. + /// EU Driver's License Number. public static PiiEntityCategory EUDriversLicenseNumber { get; } = new PiiEntityCategory(EUDriversLicenseNumberValue); - /// EUGPSCoordinates. + /// EU GPS Coordinates. public static PiiEntityCategory EugpsCoordinates { get; } = new PiiEntityCategory(EugpsCoordinatesValue); - /// EUNationalIdentificationNumber. + /// EU National Identification Number. public static PiiEntityCategory EUNationalIdentificationNumber { get; } = new PiiEntityCategory(EUNationalIdentificationNumberValue); - /// EUPassportNumber. + /// EU Passport Number. public static PiiEntityCategory EUPassportNumber { get; } = new PiiEntityCategory(EUPassportNumberValue); - /// EUSocialSecurityNumber. + /// EU Social Security Number. public static PiiEntityCategory EUSocialSecurityNumber { get; } = new PiiEntityCategory(EUSocialSecurityNumberValue); - /// EUTaxIdentificationNumber. + /// EU Tax Identification Number. public static PiiEntityCategory EUTaxIdentificationNumber { get; } = new PiiEntityCategory(EUTaxIdentificationNumberValue); - /// FIEuropeanHealthNumber. + /// FI European Health Number. public static PiiEntityCategory FIEuropeanHealthNumber { get; } = new PiiEntityCategory(FIEuropeanHealthNumberValue); - /// FINationalID. + /// FI National ID. public static PiiEntityCategory FINationalID { get; } = new PiiEntityCategory(FINationalIDValue); - /// FINationalIDV2. + /// FI National ID V2. public static PiiEntityCategory FINationalIDV2 { get; } = new PiiEntityCategory(FINationalIDV2Value); - /// FIPassportNumber. + /// FI Passport Number. public static PiiEntityCategory FIPassportNumber { get; } = new PiiEntityCategory(FIPassportNumberValue); - /// FRDriversLicenseNumber. + /// FR Driver's License Number. public static PiiEntityCategory FRDriversLicenseNumber { get; } = new PiiEntityCategory(FRDriversLicenseNumberValue); - /// FRHealthInsuranceNumber. + /// FR Health Insurance Number. public static PiiEntityCategory FRHealthInsuranceNumber { get; } = new PiiEntityCategory(FRHealthInsuranceNumberValue); - /// FRNationalID. + /// FR National ID. public static PiiEntityCategory FRNationalID { get; } = new PiiEntityCategory(FRNationalIDValue); - /// FRPassportNumber. + /// FR Passport Number. public static PiiEntityCategory FRPassportNumber { get; } = new PiiEntityCategory(FRPassportNumberValue); - /// FRSocialSecurityNumber. + /// FR Social Security Number. public static PiiEntityCategory FRSocialSecurityNumber { get; } = new PiiEntityCategory(FRSocialSecurityNumberValue); - /// FRTaxIdentificationNumber. + /// FR Tax Identification Number. public static PiiEntityCategory FRTaxIdentificationNumber { get; } = new PiiEntityCategory(FRTaxIdentificationNumberValue); - /// FRValueAddedTaxNumber. + /// FR Value Added Tax Number. public static PiiEntityCategory FRValueAddedTaxNumber { get; } = new PiiEntityCategory(FRValueAddedTaxNumberValue); - /// DEDriversLicenseNumber. + /// DE Driver's License Number. public static PiiEntityCategory DEDriversLicenseNumber { get; } = new PiiEntityCategory(DEDriversLicenseNumberValue); - /// DEPassportNumber. + /// DE Passport Number. public static PiiEntityCategory DEPassportNumber { get; } = new PiiEntityCategory(DEPassportNumberValue); - /// DEIdentityCardNumber. + /// DE Identity Card Number. public static PiiEntityCategory DEIdentityCardNumber { get; } = new PiiEntityCategory(DEIdentityCardNumberValue); - /// DETaxIdentificationNumber. + /// DE Tax Identification Number. public static PiiEntityCategory DETaxIdentificationNumber { get; } = new PiiEntityCategory(DETaxIdentificationNumberValue); - /// DEValueAddedNumber. + /// DE Value Added Number. public static PiiEntityCategory DEValueAddedNumber { get; } = new PiiEntityCategory(DEValueAddedNumberValue); - /// GRNationalIDCard. + /// GR National ID Card. public static PiiEntityCategory GRNationalIDCard { get; } = new PiiEntityCategory(GRNationalIDCardValue); - /// GRNationalIDV2. + /// GR National ID V2. public static PiiEntityCategory GRNationalIDV2 { get; } = new PiiEntityCategory(GRNationalIDV2Value); - /// GRTaxIdentificationNumber. + /// GR Tax Identification Number. public static PiiEntityCategory GRTaxIdentificationNumber { get; } = new PiiEntityCategory(GRTaxIdentificationNumberValue); - /// HKIdentityCardNumber. + /// HK Identity Card Number. public static PiiEntityCategory HKIdentityCardNumber { get; } = new PiiEntityCategory(HKIdentityCardNumberValue); - /// HUValueAddedNumber. + /// HU Value Added Number. public static PiiEntityCategory HUValueAddedNumber { get; } = new PiiEntityCategory(HUValueAddedNumberValue); - /// HUPersonalIdentificationNumber. + /// HU Personal Identification Number. public static PiiEntityCategory HUPersonalIdentificationNumber { get; } = new PiiEntityCategory(HUPersonalIdentificationNumberValue); - /// HUTaxIdentificationNumber. + /// HU Tax Identification Number. public static PiiEntityCategory HUTaxIdentificationNumber { get; } = new PiiEntityCategory(HUTaxIdentificationNumberValue); - /// INPermanentAccount. + /// IN Permanent Account. public static PiiEntityCategory INPermanentAccount { get; } = new PiiEntityCategory(INPermanentAccountValue); - /// INUniqueIdentificationNumber. + /// IN Unique Identification Number. public static PiiEntityCategory INUniqueIdentificationNumber { get; } = new PiiEntityCategory(INUniqueIdentificationNumberValue); - /// IDIdentityCardNumber. + /// ID Identity Card Number. public static PiiEntityCategory IDIdentityCardNumber { get; } = new PiiEntityCategory(IDIdentityCardNumberValue); - /// InternationalBankingAccountNumber. + /// International Banking Account Number. public static PiiEntityCategory InternationalBankingAccountNumber { get; } = new PiiEntityCategory(InternationalBankingAccountNumberValue); - /// IEPersonalPublicServiceNumber. + /// IE Personal Public Service Number. public static PiiEntityCategory IEPersonalPublicServiceNumber { get; } = new PiiEntityCategory(IEPersonalPublicServiceNumberValue); - /// IEPersonalPublicServiceNumberV2. + /// IE Personal Public Service Number V2. public static PiiEntityCategory IEPersonalPublicServiceNumberV2 { get; } = new PiiEntityCategory(IEPersonalPublicServiceNumberV2Value); - /// ILBankAccountNumber. + /// IL Bank Account Number. public static PiiEntityCategory ILBankAccountNumber { get; } = new PiiEntityCategory(ILBankAccountNumberValue); - /// ILNationalID. + /// IL National ID. public static PiiEntityCategory ILNationalID { get; } = new PiiEntityCategory(ILNationalIDValue); - /// ITDriversLicenseNumber. + /// IT Driver's License Number. public static PiiEntityCategory ITDriversLicenseNumber { get; } = new PiiEntityCategory(ITDriversLicenseNumberValue); - /// ITFiscalCode. + /// IT Fiscal Code. public static PiiEntityCategory ITFiscalCode { get; } = new PiiEntityCategory(ITFiscalCodeValue); - /// ITValueAddedTaxNumber. + /// IT Value Added Tax Number. public static PiiEntityCategory ITValueAddedTaxNumber { get; } = new PiiEntityCategory(ITValueAddedTaxNumberValue); - /// JPBankAccountNumber. + /// JP Bank Account Number. public static PiiEntityCategory JPBankAccountNumber { get; } = new PiiEntityCategory(JPBankAccountNumberValue); - /// JPDriversLicenseNumber. + /// JP Driver's License Number. public static PiiEntityCategory JPDriversLicenseNumber { get; } = new PiiEntityCategory(JPDriversLicenseNumberValue); - /// JPPassportNumber. + /// JP Passport Number. public static PiiEntityCategory JPPassportNumber { get; } = new PiiEntityCategory(JPPassportNumberValue); - /// JPResidentRegistrationNumber. + /// JP Resident Registration Number. public static PiiEntityCategory JPResidentRegistrationNumber { get; } = new PiiEntityCategory(JPResidentRegistrationNumberValue); - /// JPSocialInsuranceNumber. + /// JP Social Insurance Number. public static PiiEntityCategory JPSocialInsuranceNumber { get; } = new PiiEntityCategory(JPSocialInsuranceNumberValue); - /// JPMyNumberCorporate. + /// JP My Number Corporate. public static PiiEntityCategory JPMyNumberCorporate { get; } = new PiiEntityCategory(JPMyNumberCorporateValue); - /// JPMyNumberPersonal. + /// JP My Number Personal. public static PiiEntityCategory JPMyNumberPersonal { get; } = new PiiEntityCategory(JPMyNumberPersonalValue); - /// JPResidenceCardNumber. + /// JP Residence Card Number. public static PiiEntityCategory JPResidenceCardNumber { get; } = new PiiEntityCategory(JPResidenceCardNumberValue); - /// LVPersonalCode. + /// LV Personal Code. public static PiiEntityCategory LVPersonalCode { get; } = new PiiEntityCategory(LVPersonalCodeValue); - /// LTPersonalCode. + /// LT Personal Code. public static PiiEntityCategory LTPersonalCode { get; } = new PiiEntityCategory(LTPersonalCodeValue); - /// LUNationalIdentificationNumberNatural. + /// LU National Identification Number Natural. public static PiiEntityCategory LUNationalIdentificationNumberNatural { get; } = new PiiEntityCategory(LUNationalIdentificationNumberNaturalValue); - /// LUNationalIdentificationNumberNonNatural. + /// LU National Identification Number Non Natural. public static PiiEntityCategory LUNationalIdentificationNumberNonNatural { get; } = new PiiEntityCategory(LUNationalIdentificationNumberNonNaturalValue); - /// MYIdentityCardNumber. + /// MY Identity Card Number. public static PiiEntityCategory MYIdentityCardNumber { get; } = new PiiEntityCategory(MYIdentityCardNumberValue); - /// MTIdentityCardNumber. + /// MT Identity Card Number. public static PiiEntityCategory MTIdentityCardNumber { get; } = new PiiEntityCategory(MTIdentityCardNumberValue); - /// MTTaxIDNumber. + /// MT Tax ID Number. public static PiiEntityCategory MTTaxIDNumber { get; } = new PiiEntityCategory(MTTaxIDNumberValue); - /// NLCitizensServiceNumber. + /// NL Citizens Service Number. public static PiiEntityCategory NLCitizensServiceNumber { get; } = new PiiEntityCategory(NLCitizensServiceNumberValue); - /// NLCitizensServiceNumberV2. + /// NL Citizens Service Number V2. public static PiiEntityCategory NLCitizensServiceNumberV2 { get; } = new PiiEntityCategory(NLCitizensServiceNumberV2Value); - /// NLTaxIdentificationNumber. + /// NL Tax Identification Number. public static PiiEntityCategory NLTaxIdentificationNumber { get; } = new PiiEntityCategory(NLTaxIdentificationNumberValue); - /// NLValueAddedTaxNumber. + /// NL Value Added Tax Number. public static PiiEntityCategory NLValueAddedTaxNumber { get; } = new PiiEntityCategory(NLValueAddedTaxNumberValue); - /// NZBankAccountNumber. + /// NZ Bank Account Number. public static PiiEntityCategory NZBankAccountNumber { get; } = new PiiEntityCategory(NZBankAccountNumberValue); - /// NZDriversLicenseNumber. + /// NZ Driver's License Number. public static PiiEntityCategory NZDriversLicenseNumber { get; } = new PiiEntityCategory(NZDriversLicenseNumberValue); - /// NZInlandRevenueNumber. + /// NZ Inland Revenue Number. public static PiiEntityCategory NZInlandRevenueNumber { get; } = new PiiEntityCategory(NZInlandRevenueNumberValue); - /// NZMinistryOfHealthNumber. + /// NZ Ministry Of Health Number. public static PiiEntityCategory NZMinistryOfHealthNumber { get; } = new PiiEntityCategory(NZMinistryOfHealthNumberValue); - /// NZSocialWelfareNumber. + /// NZ Social Welfare Number. public static PiiEntityCategory NZSocialWelfareNumber { get; } = new PiiEntityCategory(NZSocialWelfareNumberValue); - /// NOIdentityNumber. + /// NO Identity Number. public static PiiEntityCategory NOIdentityNumber { get; } = new PiiEntityCategory(NOIdentityNumberValue); - /// PHUnifiedMultiPurposeIDNumber. + /// PH Unified Multi Purpose ID Number. public static PiiEntityCategory PHUnifiedMultiPurposeIDNumber { get; } = new PiiEntityCategory(PHUnifiedMultiPurposeIDNumberValue); - /// PLIdentityCard. + /// PL Identity Card. public static PiiEntityCategory PLIdentityCard { get; } = new PiiEntityCategory(PLIdentityCardValue); - /// PLNationalID. + /// PL National ID. public static PiiEntityCategory PLNationalID { get; } = new PiiEntityCategory(PLNationalIDValue); - /// PLNationalIDV2. + /// PL National ID V2. public static PiiEntityCategory PLNationalIDV2 { get; } = new PiiEntityCategory(PLNationalIDV2Value); - /// PLPassportNumber. + /// PL Passport Number. public static PiiEntityCategory PLPassportNumber { get; } = new PiiEntityCategory(PLPassportNumberValue); - /// PLTaxIdentificationNumber. + /// PL Tax Identification Number. public static PiiEntityCategory PLTaxIdentificationNumber { get; } = new PiiEntityCategory(PLTaxIdentificationNumberValue); - /// PLREGONNumber. + /// PL REGON Number. public static PiiEntityCategory PlregonNumber { get; } = new PiiEntityCategory(PlregonNumberValue); - /// PTCitizenCardNumber. + /// PT Citizen Card Number. public static PiiEntityCategory PTCitizenCardNumber { get; } = new PiiEntityCategory(PTCitizenCardNumberValue); - /// PTCitizenCardNumberV2. + /// PT Citizen Card Number V2. public static PiiEntityCategory PTCitizenCardNumberV2 { get; } = new PiiEntityCategory(PTCitizenCardNumberV2Value); - /// PTTaxIdentificationNumber. + /// PT Tax Identification Number. public static PiiEntityCategory PTTaxIdentificationNumber { get; } = new PiiEntityCategory(PTTaxIdentificationNumberValue); - /// ROPersonalNumericalCode. + /// RO Personal Numerical Code. public static PiiEntityCategory ROPersonalNumericalCode { get; } = new PiiEntityCategory(ROPersonalNumericalCodeValue); - /// RUPassportNumberDomestic. + /// RU Passport Number Domestic. public static PiiEntityCategory RUPassportNumberDomestic { get; } = new PiiEntityCategory(RUPassportNumberDomesticValue); - /// RUPassportNumberInternational. + /// RU Passport Number International. public static PiiEntityCategory RUPassportNumberInternational { get; } = new PiiEntityCategory(RUPassportNumberInternationalValue); - /// SANationalID. + /// SA National ID. public static PiiEntityCategory SANationalID { get; } = new PiiEntityCategory(SANationalIDValue); - /// SGNationalRegistrationIdentityCardNumber. + /// SG National Registration Identity Card Number. public static PiiEntityCategory SGNationalRegistrationIdentityCardNumber { get; } = new PiiEntityCategory(SGNationalRegistrationIdentityCardNumberValue); - /// SKPersonalNumber. + /// SK Personal Number. public static PiiEntityCategory SKPersonalNumber { get; } = new PiiEntityCategory(SKPersonalNumberValue); - /// SITaxIdentificationNumber. + /// SI Tax Identification Number. public static PiiEntityCategory SITaxIdentificationNumber { get; } = new PiiEntityCategory(SITaxIdentificationNumberValue); - /// SIUniqueMasterCitizenNumber. + /// SI Unique Master Citizen Number. public static PiiEntityCategory SIUniqueMasterCitizenNumber { get; } = new PiiEntityCategory(SIUniqueMasterCitizenNumberValue); - /// ZAIdentificationNumber. + /// ZA Identification Number. public static PiiEntityCategory ZAIdentificationNumber { get; } = new PiiEntityCategory(ZAIdentificationNumberValue); - /// KRResidentRegistrationNumber. + /// KR Resident Registration Number. public static PiiEntityCategory KRResidentRegistrationNumber { get; } = new PiiEntityCategory(KRResidentRegistrationNumberValue); - /// ESDNI. + /// ES DNI. public static PiiEntityCategory Esdni { get; } = new PiiEntityCategory(EsdniValue); - /// ESSocialSecurityNumber. + /// ES Social Security Number. public static PiiEntityCategory ESSocialSecurityNumber { get; } = new PiiEntityCategory(ESSocialSecurityNumberValue); - /// ESTaxIdentificationNumber. + /// ES Tax Identification Number. public static PiiEntityCategory ESTaxIdentificationNumber { get; } = new PiiEntityCategory(ESTaxIdentificationNumberValue); - /// SQLServerConnectionString. + /// SQL Server Connection String. public static PiiEntityCategory SQLServerConnectionString { get; } = new PiiEntityCategory(SQLServerConnectionStringValue); - /// SENationalID. + /// SE National ID. public static PiiEntityCategory SENationalID { get; } = new PiiEntityCategory(SENationalIDValue); - /// SENationalIDV2. + /// SE National ID V2. public static PiiEntityCategory SENationalIDV2 { get; } = new PiiEntityCategory(SENationalIDV2Value); - /// SEPassportNumber. + /// SE Passport Number. public static PiiEntityCategory SEPassportNumber { get; } = new PiiEntityCategory(SEPassportNumberValue); - /// SETaxIdentificationNumber. + /// SE Tax Identification Number. public static PiiEntityCategory SETaxIdentificationNumber { get; } = new PiiEntityCategory(SETaxIdentificationNumberValue); - /// SWIFTCode. + /// SWIFT Code. public static PiiEntityCategory SwiftCode { get; } = new PiiEntityCategory(SwiftCodeValue); - /// CHSocialSecurityNumber. + /// CH Social Security Number. public static PiiEntityCategory CHSocialSecurityNumber { get; } = new PiiEntityCategory(CHSocialSecurityNumberValue); - /// TWNationalID. + /// TW National ID. public static PiiEntityCategory TWNationalID { get; } = new PiiEntityCategory(TWNationalIDValue); - /// TWPassportNumber. + /// TW Passport Number. public static PiiEntityCategory TWPassportNumber { get; } = new PiiEntityCategory(TWPassportNumberValue); - /// TWResidentCertificate. + /// TW Resident Certificate. public static PiiEntityCategory TWResidentCertificate { get; } = new PiiEntityCategory(TWResidentCertificateValue); - /// THPopulationIdentificationCode. + /// TH Population Identification Code. public static PiiEntityCategory THPopulationIdentificationCode { get; } = new PiiEntityCategory(THPopulationIdentificationCodeValue); - /// TRNationalIdentificationNumber. + /// TR National Identification Number. public static PiiEntityCategory TRNationalIdentificationNumber { get; } = new PiiEntityCategory(TRNationalIdentificationNumberValue); - /// UKDriversLicenseNumber. + /// UK Driver's License Number. public static PiiEntityCategory UKDriversLicenseNumber { get; } = new PiiEntityCategory(UKDriversLicenseNumberValue); - /// UKElectoralRollNumber. + /// UK Electoral Roll Number. public static PiiEntityCategory UKElectoralRollNumber { get; } = new PiiEntityCategory(UKElectoralRollNumberValue); - /// UKNationalHealthNumber. + /// UK National Health Number. public static PiiEntityCategory UKNationalHealthNumber { get; } = new PiiEntityCategory(UKNationalHealthNumberValue); - /// UKNationalInsuranceNumber. + /// UK National Insurance Number. public static PiiEntityCategory UKNationalInsuranceNumber { get; } = new PiiEntityCategory(UKNationalInsuranceNumberValue); - /// UKUniqueTaxpayerNumber. + /// UK Unique Taxpayer Number. public static PiiEntityCategory UKUniqueTaxpayerNumber { get; } = new PiiEntityCategory(UKUniqueTaxpayerNumberValue); - /// USUKPassportNumber. + /// US UK Passport Number. public static PiiEntityCategory UsukPassportNumber { get; } = new PiiEntityCategory(UsukPassportNumberValue); - /// USBankAccountNumber. + /// US Bank Account Number. public static PiiEntityCategory USBankAccountNumber { get; } = new PiiEntityCategory(USBankAccountNumberValue); - /// USDriversLicenseNumber. + /// US Driver's License Number. public static PiiEntityCategory USDriversLicenseNumber { get; } = new PiiEntityCategory(USDriversLicenseNumberValue); - /// USIndividualTaxpayerIdentification. + /// US Individual Taxpayer Identification. public static PiiEntityCategory USIndividualTaxpayerIdentification { get; } = new PiiEntityCategory(USIndividualTaxpayerIdentificationValue); - /// USSocialSecurityNumber. + /// US Social Security Number. public static PiiEntityCategory USSocialSecurityNumber { get; } = new PiiEntityCategory(USSocialSecurityNumberValue); - /// UAPassportNumberDomestic. + /// UA Passport Number Domestic. public static PiiEntityCategory UAPassportNumberDomestic { get; } = new PiiEntityCategory(UAPassportNumberDomesticValue); - /// UAPassportNumberInternational. + /// UA Passport Number International. public static PiiEntityCategory UAPassportNumberInternational { get; } = new PiiEntityCategory(UAPassportNumberInternationalValue); /// Organization. public static PiiEntityCategory Organization { get; } = new PiiEntityCategory(OrganizationValue); @@ -528,9 +528,9 @@ public PiiEntityCategory(string value) public static PiiEntityCategory URL { get; } = new PiiEntityCategory(URLValue); /// Age. public static PiiEntityCategory Age { get; } = new PiiEntityCategory(AgeValue); - /// PhoneNumber. + /// Phone Number. public static PiiEntityCategory PhoneNumber { get; } = new PiiEntityCategory(PhoneNumberValue); - /// IPAddress. + /// IP Address. public static PiiEntityCategory IPAddress { get; } = new PiiEntityCategory(IPAddressValue); /// Date. public static PiiEntityCategory Date { get; } = new PiiEntityCategory(DateValue); @@ -538,9 +538,9 @@ public PiiEntityCategory(string value) public static PiiEntityCategory Person { get; } = new PiiEntityCategory(PersonValue); /// Address. public static PiiEntityCategory Address { get; } = new PiiEntityCategory(AddressValue); - /// All. + /// All PII categories. public static PiiEntityCategory All { get; } = new PiiEntityCategory(AllValue); - /// Default. + /// Default PII categories for the language. public static PiiEntityCategory Default { get; } = new PiiEntityCategory(DefaultValue); /// Determines if two values are the same. public static bool operator ==(PiiEntityCategory left, PiiEntityCategory right) => left.Equals(right); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.Serialization.cs index 5f153acc75a4..13e57bfe4481 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class PiiEntityRecognitionLROResult : IUtf8JsonSerializable + internal partial class PiiEntityRecognitionLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static PiiEntityRecognitionLROResult DeserializePiiEntityRecognitionLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static PiiEntityRecognitionLROResult DeserializePiiEntityRecognitionLRO return null; } PiiEntitiesResult results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static PiiEntityRecognitionLROResult DeserializePiiEntityRecognitionLRO results = PiiEntitiesResult.DeserializePiiEntitiesResult(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new PiiEntityRecognitionLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new PiiEntityRecognitionLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static PiiEntityRecognitionLROResult DeserializePiiEntityRecognitionLRO using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializePiiEntityRecognitionLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.cs index 4ac52d7a7574..eae8fecc5d4b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiEntityRecognitionLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The PiiEntityRecognitionLROResult. + /// Contains the PII LRO results. internal partial class PiiEntityRecognitionLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// The list of pii results. /// is null. - public PiiEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, PiiEntitiesResult results) : base(lastUpdateDateTime, status) + internal PiiEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, PiiEntitiesResult results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public PiiEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnal } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal PiiEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, PiiEntitiesResult results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// The list of pii results. + internal PiiEntityRecognitionLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, PiiEntitiesResult results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public PiiEntitiesResult Results { get; set; } + /// The list of pii results. + public PiiEntitiesResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.Serialization.cs index 93144dec1b09..5e3e2c61bdc6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static PiiLROTask DeserializePiiLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - PiiTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = PiiTaskParameters.DeserializePiiTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new PiiLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new PiiLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePiiLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.cs index 63641ab154b7..babe90ff642a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiLROTask.cs @@ -7,7 +7,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// An object representing the task definition for a PII Entities Recognition task. + /// Contains the analyze text PIIEntityRecognition LRO task. internal partial class PiiLROTask : AnalyzeTextLROTask { /// Initializes a new instance of . @@ -17,16 +17,16 @@ public PiiLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a PII Entities Recognition task. + /// task name. + /// The kind of task to perform. + /// Pii task parameters. internal PiiLROTask(string taskName, AnalyzeTextLROTaskKind kind, PiiTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a PII Entities Recognition task. + /// Pii task parameters. public PiiTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.Serialization.cs deleted file mode 100644 index 16d3ee64ae29..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.Serialization.cs +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class PiiResultDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("redactedText"u8); - writer.WriteStringValue(RedactedText); - writer.WritePropertyName("entities"u8); - writer.WriteStartArray(); - foreach (var item in Entities) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static PiiResultDocumentsItem DeserializePiiResultDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string redactedText = default; - IList entities = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("redactedText"u8)) - { - redactedText = property.Value.GetString(); - continue; - } - if (property.NameEquals("entities"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(Entity.DeserializeEntity(item)); - } - entities = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new PiiResultDocumentsItem(id, warnings, statistics, redactedText, entities); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new PiiResultDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePiiResultDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.cs deleted file mode 100644 index 8b2c631c22e5..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiResultDocumentsItem.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The PiiResultDocumentsItem. - internal partial class PiiResultDocumentsItem : PiiEntitiesDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Returns redacted text. - /// Recognized entities in the document. - /// , , or is null. - public PiiResultDocumentsItem(string id, IEnumerable warnings, string redactedText, IEnumerable entities) : base(id, warnings, redactedText, entities) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(redactedText, nameof(redactedText)); - Argument.AssertNotNull(entities, nameof(entities)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Returns redacted text. - /// Recognized entities in the document. - internal PiiResultDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, string redactedText, IList entities) : base(id, warnings, statistics, redactedText, entities) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.Serialization.cs index d88672b91ba1..8aee46becce1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.Serialization.cs @@ -5,7 +5,6 @@ #nullable disable -using System.Collections.Generic; using System.Text.Json; using Azure.Core; @@ -16,6 +15,16 @@ internal partial class PiiTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); + if (Optional.IsDefined(LoggingOptOut)) + { + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); + } + if (Optional.IsDefined(ModelVersion)) + { + writer.WritePropertyName("modelVersion"u8); + writer.WriteStringValue(ModelVersion); + } if (Optional.IsDefined(Domain)) { writer.WritePropertyName("domain"u8); @@ -36,92 +45,11 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("stringIndexType"u8); writer.WriteStringValue(StringIndexType.Value.ToString()); } - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } writer.WriteEndObject(); } - internal static PiiTaskParameters DeserializePiiTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - PiiDomain? domain = default; - IList piiCategories = default; - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("domain"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - domain = new PiiDomain(property.Value.GetString()); - continue; - } - if (property.NameEquals("piiCategories"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(new PiiEntityCategory(item.GetString())); - } - piiCategories = array; - continue; - } - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new PiiTaskParameters(loggingOptOut, modelVersion, domain, piiCategories ?? new ChangeTrackingList(), stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new PiiTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePiiTaskParameters(document.RootElement); - } - /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.cs index 325ba1d66c47..757d486ccc5e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskParameters.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a PII Entities Recognition task. - internal partial class PiiTaskParameters : PreBuiltTaskParameters + internal partial class PiiTaskParameters { /// Initializes a new instance of . public PiiTaskParameters() @@ -19,21 +19,27 @@ public PiiTaskParameters() } /// Initializes a new instance of . - /// - /// - /// The PII domain used for PII Entity Recognition. - /// (Optional) describes the PII categories to return. - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal PiiTaskParameters(bool? loggingOptOut, string modelVersion, PiiDomain? domain, IList piiCategories, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// Domain for PII task. + /// Enumeration of PII categories to be returned in the response. + /// StringIndexType to be used for analysis. + internal PiiTaskParameters(bool? loggingOptOut, string modelVersion, PiiDomain? domain, IList piiCategories, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; Domain = domain; PiiCategories = piiCategories; StringIndexType = stringIndexType; } - /// The PII domain used for PII Entity Recognition. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Domain for PII task. public PiiDomain? Domain { get; set; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// StringIndexType to be used for analysis. public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskResult.cs index 71c5c8988e98..aff5c9bb87d4 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PiiTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The PiiTaskResult. + /// Contains the analyze text PIIEntityRecognition LRO task. internal partial class PiiTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// The list of pii results. /// is null. internal PiiTaskResult(PiiEntitiesResult results) { @@ -24,15 +24,15 @@ internal PiiTaskResult(PiiEntitiesResult results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// The list of pii results. internal PiiTaskResult(AnalyzeTextTaskResultsKind kind, PiiEntitiesResult results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// The list of pii results. public PiiEntitiesResult Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.Serialization.cs deleted file mode 100644 index 4286b952de8a..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.Serialization.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class PreBuiltResult : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - - internal static PreBuiltResult DeserializePreBuiltResult(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - IList errors = default; - TextDocumentBatchStatistics statistics = default; - string modelVersion = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("errors"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentError.DeserializeDocumentError(item)); - } - errors = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentBatchStatistics.DeserializeTextDocumentBatchStatistics(property.Value); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - } - return new PreBuiltResult(errors, statistics, modelVersion); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static PreBuiltResult FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePreBuiltResult(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.cs deleted file mode 100644 index cfd4c1ba808f..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltResult.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The PreBuiltResult. - internal partial class PreBuiltResult - { - /// Initializes a new instance of . - /// Errors by document id. - /// This field indicates which model is used for scoring. - /// or is null. - public PreBuiltResult(IEnumerable errors, string modelVersion) - { - Argument.AssertNotNull(errors, nameof(errors)); - Argument.AssertNotNull(modelVersion, nameof(modelVersion)); - - Errors = errors.ToList(); - ModelVersion = modelVersion; - } - - /// Initializes a new instance of . - /// Errors by document id. - /// if showStats=true was specified in the request this field will contain information about the request payload. - /// This field indicates which model is used for scoring. - internal PreBuiltResult(IList errors, TextDocumentBatchStatistics statistics, string modelVersion) - { - Errors = errors; - Statistics = statistics; - ModelVersion = modelVersion; - } - - /// Errors by document id. - public IList Errors { get; } - /// if showStats=true was specified in the request this field will contain information about the request payload. - public TextDocumentBatchStatistics Statistics { get; set; } - /// This field indicates which model is used for scoring. - public string ModelVersion { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.Serialization.cs deleted file mode 100644 index 070efc7e65a5..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.Serialization.cs +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class PreBuiltTaskParameters : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Optional.IsDefined(ModelVersion)) - { - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - } - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } - writer.WriteEndObject(); - } - - internal static PreBuiltTaskParameters DeserializePreBuiltTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new PreBuiltTaskParameters(loggingOptOut, modelVersion); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new PreBuiltTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializePreBuiltTaskParameters(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.cs deleted file mode 100644 index e119c77bd0bf..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/PreBuiltTaskParameters.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// Parameters object for a text analysis task using pre-built models. - internal partial class PreBuiltTaskParameters : TaskParameters - { - /// Initializes a new instance of . - public PreBuiltTaskParameters() - { - } - - /// Initializes a new instance of . - /// - /// - internal PreBuiltTaskParameters(bool? loggingOptOut, string modelVersion) : base(loggingOptOut) - { - ModelVersion = modelVersion; - } - - /// Gets or sets the model version. - public string ModelVersion { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.Serialization.cs index 8614bcfba72a..962b4fb6eb89 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.Serialization.cs @@ -6,30 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SentenceAssessment : IUtf8JsonSerializable + internal partial class SentenceAssessment { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("sentiment"u8); - writer.WriteStringValue(Sentiment); - writer.WritePropertyName("confidenceScores"u8); - writer.WriteObjectValue(ConfidenceScores); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("isNegated"u8); - writer.WriteBooleanValue(IsNegated); - writer.WriteEndObject(); - } - internal static SentenceAssessment DeserializeSentenceAssessment(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -91,13 +72,5 @@ internal static SentenceAssessment FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentenceAssessment(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.cs index 25db6ebf0fe3..f206ce23a158 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceAssessment.cs @@ -9,18 +9,18 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentenceAssessment. + /// Represents a sentence assessment and the assessments or target objects related to it. internal partial class SentenceAssessment { /// Initializes a new instance of . - /// Assessment sentiment in the sentence. - /// Assessment sentiment confidence scores in the sentence. - /// The assessment offset from the start of the sentence. - /// The length of the assessment. - /// The assessment text detected. + /// The sentiment of the sentence. + /// Represents the confidence scores across all sentiment classes: positive and negative. + /// The target offset from the start of the sentence. + /// The length of the target. + /// The target text detected. /// The indicator representing if the assessment is negated. /// , or is null. - public SentenceAssessment(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, bool isNegated) + internal SentenceAssessment(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, bool isNegated) { Argument.AssertNotNull(sentiment, nameof(sentiment)); Argument.AssertNotNull(confidenceScores, nameof(confidenceScores)); @@ -33,15 +33,15 @@ public SentenceAssessment(string sentiment, TargetConfidenceScoreLabel confidenc Text = text; IsNegated = isNegated; } - /// Assessment sentiment confidence scores in the sentence. - public TargetConfidenceScoreLabel ConfidenceScores { get; set; } - /// The assessment offset from the start of the sentence. - public int Offset { get; set; } - /// The length of the assessment. - public int Length { get; set; } - /// The assessment text detected. - public string Text { get; set; } + /// Represents the confidence scores across all sentiment classes: positive and negative. + public TargetConfidenceScoreLabel ConfidenceScores { get; } + /// The target offset from the start of the sentence. + public int Offset { get; } + /// The length of the target. + public int Length { get; } + /// The target text detected. + public string Text { get; } /// The indicator representing if the assessment is negated. - public bool IsNegated { get; set; } + public bool IsNegated { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.Serialization.cs index 65ead5f84b8b..80b78251045a 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.Serialization.cs @@ -7,48 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial struct SentenceSentimentInternal : IUtf8JsonSerializable + internal partial struct SentenceSentimentInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("sentiment"u8); - writer.WriteStringValue(Sentiment); - writer.WritePropertyName("confidenceScores"u8); - writer.WriteObjectValue(ConfidenceScores); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - if (Optional.IsCollectionDefined(Targets)) - { - writer.WritePropertyName("targets"u8); - writer.WriteStartArray(); - foreach (var item in Targets) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - } - if (Optional.IsCollectionDefined(Assessments)) - { - writer.WritePropertyName("assessments"u8); - writer.WriteStartArray(); - foreach (var item in Assessments) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - } - writer.WriteEndObject(); - } - internal static SentenceSentimentInternal DeserializeSentenceSentimentInternal(JsonElement element) { string text = default; @@ -131,13 +94,5 @@ internal static SentenceSentimentInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentenceSentimentInternal(document.RootElement); } - - /// Convert into a . - internal RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.cs index 737eb6bdb740..2565ea04a8df 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceSentimentInternal.cs @@ -11,19 +11,19 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentenceSentiment. + /// A document's sentence sentiment. internal readonly partial struct SentenceSentimentInternal { /// Initializes a new instance of . /// The sentence text. /// The predicted Sentiment for the sentence. /// The sentiment confidence score between 0 and 1 for the sentence for all classes. - /// The sentence offset from the start of the document. - /// The length of the sentence. + /// The target offset from the start of the sentence. + /// The length of the target. /// The array of sentence targets for the sentence. /// The array of assessments for the sentence. /// , or is null. - public SentenceSentimentInternal(string text, string sentiment, SentimentConfidenceScores confidenceScores, int offset, int length, IEnumerable targets, IEnumerable assessments) + internal SentenceSentimentInternal(string text, string sentiment, SentimentConfidenceScores confidenceScores, int offset, int length, IEnumerable targets, IEnumerable assessments) { Argument.AssertNotNull(text, nameof(text)); Argument.AssertNotNull(sentiment, nameof(sentiment)); @@ -42,8 +42,8 @@ public SentenceSentimentInternal(string text, string sentiment, SentimentConfide /// The sentence text. /// The predicted Sentiment for the sentence. /// The sentiment confidence score between 0 and 1 for the sentence for all classes. - /// The sentence offset from the start of the document. - /// The length of the sentence. + /// The target offset from the start of the sentence. + /// The length of the target. /// The array of sentence targets for the sentence. /// The array of assessments for the sentence. internal SentenceSentimentInternal(string text, string sentiment, SentimentConfidenceScores confidenceScores, int offset, int length, IReadOnlyList targets, IReadOnlyList assessments) diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.Serialization.cs index a63244629cb6..f8d23bce9790 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.Serialization.cs @@ -7,35 +7,11 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SentenceTarget : IUtf8JsonSerializable + internal partial class SentenceTarget { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("sentiment"u8); - writer.WriteStringValue(Sentiment); - writer.WritePropertyName("confidenceScores"u8); - writer.WriteObjectValue(ConfidenceScores); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("relations"u8); - writer.WriteStartArray(); - foreach (var item in Relations) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WriteEndObject(); - } - internal static SentenceTarget DeserializeSentenceTarget(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -47,7 +23,7 @@ internal static SentenceTarget DeserializeSentenceTarget(JsonElement element) int offset = default; int length = default; string text = default; - IList relations = default; + IReadOnlyList relations = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("sentiment"u8)) @@ -102,13 +78,5 @@ internal static SentenceTarget FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentenceTarget(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.cs index 73252692663b..e5de45e4f122 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentenceTarget.cs @@ -11,18 +11,18 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentenceTarget. + /// Represents a sentence target and the assessments or target objects related to it. internal partial class SentenceTarget { /// Initializes a new instance of . - /// Targeted sentiment in the sentence. - /// Target sentiment confidence scores for the target in the sentence. + /// The sentiment of the sentence. + /// Represents the confidence scores across all sentiment classes: positive and negative. /// The target offset from the start of the sentence. /// The length of the target. /// The target text detected. /// The array of either assessment or target objects which is related to the target. /// , , or is null. - public SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, IEnumerable relations) + internal SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, IEnumerable relations) { Argument.AssertNotNull(sentiment, nameof(sentiment)); Argument.AssertNotNull(confidenceScores, nameof(confidenceScores)); @@ -38,13 +38,13 @@ public SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceSco } /// Initializes a new instance of . - /// Targeted sentiment in the sentence. - /// Target sentiment confidence scores for the target in the sentence. + /// The sentiment of the sentence. + /// Represents the confidence scores across all sentiment classes: positive and negative. /// The target offset from the start of the sentence. /// The length of the target. /// The target text detected. /// The array of either assessment or target objects which is related to the target. - internal SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, IList relations) + internal SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceScores, int offset, int length, string text, IReadOnlyList relations) { Sentiment = sentiment; ConfidenceScores = confidenceScores; @@ -53,15 +53,15 @@ internal SentenceTarget(string sentiment, TargetConfidenceScoreLabel confidenceS Text = text; Relations = relations; } - /// Target sentiment confidence scores for the target in the sentence. - public TargetConfidenceScoreLabel ConfidenceScores { get; set; } + /// Represents the confidence scores across all sentiment classes: positive and negative. + public TargetConfidenceScoreLabel ConfidenceScores { get; } /// The target offset from the start of the sentence. - public int Offset { get; set; } + public int Offset { get; } /// The length of the target. - public int Length { get; set; } + public int Length { get; } /// The target text detected. - public string Text { get; set; } + public string Text { get; } /// The array of either assessment or target objects which is related to the target. - public IList Relations { get; } + public IReadOnlyList Relations { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.Serialization.cs index bbfd01be932d..3c850cde59a2 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.Serialization.cs @@ -20,58 +20,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"u8); writer.WriteObjectValue(Parameters); } - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); if (Optional.IsDefined(TaskName)) { writer.WritePropertyName("taskName"u8); writer.WriteStringValue(TaskName); } + writer.WritePropertyName("kind"u8); + writer.WriteStringValue(Kind.ToString()); writer.WriteEndObject(); } - internal static SentimentAnalysisLROTask DeserializeSentimentAnalysisLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - SentimentAnalysisTaskParameters parameters = default; - AnalyzeTextLROTaskKind kind = default; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("parameters"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - parameters = SentimentAnalysisTaskParameters.DeserializeSentimentAnalysisTaskParameters(property.Value); - continue; - } - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new SentimentAnalysisLROTask(taskName, kind, parameters); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new SentimentAnalysisLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeSentimentAnalysisLROTask(document.RootElement); - } - /// Convert into a . internal override RequestContent ToRequestContent() { diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.cs index 355069753eab..ede5561b5f2d 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisLROTask.cs @@ -17,16 +17,16 @@ public SentimentAnalysisLROTask() } /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - /// Supported parameters for a Sentiment Analysis task. + /// task name. + /// The kind of task to perform. + /// Parameters for the Sentiment Analysis task. internal SentimentAnalysisLROTask(string taskName, AnalyzeTextLROTaskKind kind, SentimentAnalysisTaskParameters parameters) : base(taskName, kind) { Parameters = parameters; Kind = kind; } - /// Supported parameters for a Sentiment Analysis task. + /// Parameters for the Sentiment Analysis task. public SentimentAnalysisTaskParameters Parameters { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.Serialization.cs index f0299073ca1a..5d35165c5857 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.Serialization.cs @@ -15,87 +15,31 @@ internal partial class SentimentAnalysisTaskParameters : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Optional.IsDefined(OpinionMining)) - { - writer.WritePropertyName("opinionMining"u8); - writer.WriteBooleanValue(OpinionMining.Value); - } - if (Optional.IsDefined(StringIndexType)) + if (Optional.IsDefined(LoggingOptOut)) { - writer.WritePropertyName("stringIndexType"u8); - writer.WriteStringValue(StringIndexType.Value.ToString()); + writer.WritePropertyName("loggingOptOut"u8); + writer.WriteBooleanValue(LoggingOptOut.Value); } if (Optional.IsDefined(ModelVersion)) { writer.WritePropertyName("modelVersion"u8); writer.WriteStringValue(ModelVersion); } - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } - writer.WriteEndObject(); - } - - internal static SentimentAnalysisTaskParameters DeserializeSentimentAnalysisTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) + if (Optional.IsDefined(OpinionMining)) { - return null; + writer.WritePropertyName("opinionMining"u8); + writer.WriteBooleanValue(OpinionMining.Value); } - bool? opinionMining = default; - StringIndexType? stringIndexType = default; - string modelVersion = default; - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) + if (Optional.IsDefined(StringIndexType)) { - if (property.NameEquals("opinionMining"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - opinionMining = property.Value.GetBoolean(); - continue; - } - if (property.NameEquals("stringIndexType"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - stringIndexType = new StringIndexType(property.Value.GetString()); - continue; - } - if (property.NameEquals("modelVersion"u8)) - { - modelVersion = property.Value.GetString(); - continue; - } - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } + writer.WritePropertyName("stringIndexType"u8); + writer.WriteStringValue(StringIndexType.Value.ToString()); } - return new SentimentAnalysisTaskParameters(loggingOptOut, modelVersion, opinionMining, stringIndexType); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new SentimentAnalysisTaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeSentimentAnalysisTaskParameters(document.RootElement); + writer.WriteEndObject(); } /// Convert into a . - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.cs index 3396cd7fc1e6..ec67b9bc64bc 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentAnalysisTaskParameters.cs @@ -8,7 +8,7 @@ namespace Azure.AI.TextAnalytics.Models { /// Supported parameters for a Sentiment Analysis task. - internal partial class SentimentAnalysisTaskParameters : PreBuiltTaskParameters + internal partial class SentimentAnalysisTaskParameters { /// Initializes a new instance of . public SentimentAnalysisTaskParameters() @@ -16,19 +16,25 @@ public SentimentAnalysisTaskParameters() } /// Initializes a new instance of . - /// - /// - /// - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. - internal SentimentAnalysisTaskParameters(bool? loggingOptOut, string modelVersion, bool? opinionMining, StringIndexType? stringIndexType) : base(loggingOptOut, modelVersion) + /// logging opt out. + /// model version. + /// Whether to use opinion mining in the request or not. + /// Specifies the method used to interpret string offsets. + internal SentimentAnalysisTaskParameters(bool? loggingOptOut, string modelVersion, bool? opinionMining, StringIndexType? stringIndexType) { + LoggingOptOut = loggingOptOut; + ModelVersion = modelVersion; OpinionMining = opinionMining; StringIndexType = stringIndexType; } - /// Gets or sets the opinion mining. + /// logging opt out. + public bool? LoggingOptOut { get; set; } + /// model version. + public string ModelVersion { get; set; } + /// Whether to use opinion mining in the request or not. public bool? OpinionMining { get; set; } - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// Specifies the method used to interpret string offsets. public StringIndexType? StringIndexType { get; set; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.Serialization.cs index a745feca8cce..f065ebc822c8 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.Serialization.cs @@ -6,24 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; -namespace Azure.AI.TextAnalytics +namespace Azure.AI.TextAnalytics.Models { - public partial class SentimentConfidenceScores : IUtf8JsonSerializable + internal partial class SentimentConfidenceScores { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("positive"u8); - writer.WriteNumberValue(Positive); - writer.WritePropertyName("neutral"u8); - writer.WriteNumberValue(Neutral); - writer.WritePropertyName("negative"u8); - writer.WriteNumberValue(Negative); - writer.WriteEndObject(); - } - internal static SentimentConfidenceScores DeserializeSentimentConfidenceScores(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -61,13 +48,5 @@ internal static SentimentConfidenceScores FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentimentConfidenceScores(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.cs index 7a819363e8a2..cf551aa54183 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentConfidenceScores.cs @@ -5,10 +5,27 @@ #nullable disable -namespace Azure.AI.TextAnalytics +namespace Azure.AI.TextAnalytics.Models { /// Represents the confidence scores between 0 and 1 across all sentiment classes: positive, neutral, negative. - public partial class SentimentConfidenceScores + internal partial class SentimentConfidenceScores { + /// Initializes a new instance of . + /// Confidence score for positive sentiment. + /// Confidence score for neutral sentiment. + /// Confidence score for negative sentiment. + internal SentimentConfidenceScores(double positive, double neutral, double negative) + { + Positive = positive; + Neutral = neutral; + Negative = negative; + } + + /// Confidence score for positive sentiment. + public double Positive { get; } + /// Confidence score for neutral sentiment. + public double Neutral { get; } + /// Confidence score for negative sentiment. + public double Negative { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.Serialization.cs index 52700cf5068a..60027d65e84e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.Serialization.cs @@ -7,77 +7,25 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SentimentDocumentResult : IUtf8JsonSerializable + internal partial class SentimentDocumentResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("sentiment"u8); - writer.WriteStringValue(Sentiment.ToSerialString()); - writer.WritePropertyName("confidenceScores"u8); - writer.WriteObjectValue(ConfidenceScores); - writer.WritePropertyName("sentences"u8); - writer.WriteStartArray(); - foreach (var item in Sentences) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - internal static SentimentDocumentResult DeserializeSentimentDocumentResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - TextSentiment sentiment = default; - SentimentConfidenceScores confidenceScores = default; - IList sentences = default; string id = default; - IList warnings = default; + IReadOnlyList warnings = default; TextDocumentStatistics? statistics = default; + TextSentiment sentiment = default; + SentimentConfidenceScores confidenceScores = default; + IReadOnlyList sentences = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("sentiment"u8)) - { - sentiment = property.Value.GetString().ToTextSentiment(); - continue; - } - if (property.NameEquals("confidenceScores"u8)) - { - confidenceScores = SentimentConfidenceScores.DeserializeSentimentConfidenceScores(property.Value); - continue; - } - if (property.NameEquals("sentences"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(SentenceSentimentInternal.DeserializeSentenceSentimentInternal(item)); - } - sentences = array; - continue; - } if (property.NameEquals("id"u8)) { id = property.Value.GetString(); @@ -102,6 +50,26 @@ internal static SentimentDocumentResult DeserializeSentimentDocumentResult(JsonE statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); continue; } + if (property.NameEquals("sentiment"u8)) + { + sentiment = property.Value.GetString().ToTextSentiment(); + continue; + } + if (property.NameEquals("confidenceScores"u8)) + { + confidenceScores = SentimentConfidenceScores.DeserializeSentimentConfidenceScores(property.Value); + continue; + } + if (property.NameEquals("sentences"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(SentenceSentimentInternal.DeserializeSentenceSentimentInternal(item)); + } + sentences = array; + continue; + } } return new SentimentDocumentResult( id, @@ -114,18 +82,10 @@ internal static SentimentDocumentResult DeserializeSentimentDocumentResult(JsonE /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new SentimentDocumentResult FromResponse(Response response) + internal static SentimentDocumentResult FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentimentDocumentResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.cs index 5f023dbc6821..1e8d07f07281 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentDocumentResult.cs @@ -11,23 +11,25 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentimentDocumentResult. - internal partial class SentimentDocumentResult : DocumentResult + /// An object representing the pre-built Sentiment Analysis results of each document. + internal partial class SentimentDocumentResult { /// Initializes a new instance of . /// Unique, non-empty document identifier. /// Warnings encountered while processing document. /// Predicted sentiment for document (Negative, Neutral, Positive, or Mixed). - /// Document level sentiment confidence scores between 0 and 1 for each sentiment class. - /// Sentence level sentiment analysis. + /// The sentiment confidence score between 0 and 1 for the sentence for all classes. + /// The document's sentences sentiment. /// , , or is null. - public SentimentDocumentResult(string id, IEnumerable warnings, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IEnumerable sentences) : base(id, warnings) + internal SentimentDocumentResult(string id, IEnumerable warnings, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IEnumerable sentences) { Argument.AssertNotNull(id, nameof(id)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(confidenceScores, nameof(confidenceScores)); Argument.AssertNotNull(sentences, nameof(sentences)); + Id = id; + Warnings = warnings.ToList(); Sentiment = sentiment; ConfidenceScores = confidenceScores; Sentences = sentences.ToList(); @@ -38,20 +40,29 @@ public SentimentDocumentResult(string id, IEnumerable warnings, /// Warnings encountered while processing document. /// if showStats=true was specified in the request this field will contain information about the document payload. /// Predicted sentiment for document (Negative, Neutral, Positive, or Mixed). - /// Document level sentiment confidence scores between 0 and 1 for each sentiment class. - /// Sentence level sentiment analysis. - internal SentimentDocumentResult(string id, IList warnings, TextDocumentStatistics? statistics, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IList sentences) : base(id, warnings, statistics) + /// The sentiment confidence score between 0 and 1 for the sentence for all classes. + /// The document's sentences sentiment. + internal SentimentDocumentResult(string id, IReadOnlyList warnings, TextDocumentStatistics? statistics, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IReadOnlyList sentences) { + Id = id; + Warnings = warnings; + Statistics = statistics; Sentiment = sentiment; ConfidenceScores = confidenceScores; Sentences = sentences; } + /// Unique, non-empty document identifier. + public string Id { get; } + /// Warnings encountered while processing document. + public IReadOnlyList Warnings { get; } + /// if showStats=true was specified in the request this field will contain information about the document payload. + public TextDocumentStatistics? Statistics { get; } /// Predicted sentiment for document (Negative, Neutral, Positive, or Mixed). - public TextSentiment Sentiment { get; set; } - /// Document level sentiment confidence scores between 0 and 1 for each sentiment class. - public SentimentConfidenceScores ConfidenceScores { get; set; } - /// Sentence level sentiment analysis. - public IList Sentences { get; } + public TextSentiment Sentiment { get; } + /// The sentiment confidence score between 0 and 1 for the sentence for all classes. + public SentimentConfidenceScores ConfidenceScores { get; } + /// The document's sentences sentiment. + public IReadOnlyList Sentences { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.Serialization.cs index 782a7205f478..ac886a79b277 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.Serialization.cs @@ -7,31 +7,11 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SentimentLROResult : IUtf8JsonSerializable + internal partial class SentimentLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("results"u8); - writer.WriteObjectValue(Results); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static SentimentLROResult DeserializeSentimentLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -39,10 +19,10 @@ internal static SentimentLROResult DeserializeSentimentLROResult(JsonElement ele return null; } SentimentResponse results = default; - AnalyzeTextLROResultsKind kind = default; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("results"u8)) @@ -50,28 +30,28 @@ internal static SentimentLROResult DeserializeSentimentLROResult(JsonElement ele results = SentimentResponse.DeserializeSentimentResponse(property.Value); continue; } - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new SentimentLROResult(lastUpdateDateTime, status, kind, taskName, results); + return new SentimentLROResult(lastUpdateDateTime, status, taskName, kind, results); } /// Deserializes the model from a raw response. @@ -81,13 +61,5 @@ internal static SentimentLROResult DeserializeSentimentLROResult(JsonElement ele using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentimentLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.cs index 3074c6ef1bc1..cf8b295d17a5 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentLROResult.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentimentLROResult. + /// Contains the Sentiment Analysis LRO results. internal partial class SentimentLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// The sentiment analysis results. /// is null. - public SentimentLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, SentimentResponse results) : base(lastUpdateDateTime, status) + internal SentimentLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, SentimentResponse results) : base(lastUpdateDateTime, status) { Argument.AssertNotNull(results, nameof(results)); @@ -26,18 +26,18 @@ public SentimentLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperat } /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - /// - internal SentimentLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName, SentimentResponse results) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + /// The sentiment analysis results. + internal SentimentLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind, SentimentResponse results) : base(lastUpdateDateTime, status, taskName, kind) { Results = results; Kind = kind; } - /// Gets or sets the results. - public SentimentResponse Results { get; set; } + /// The sentiment analysis results. + public SentimentResponse Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.Serialization.cs index 707c2603bdbc..d2c6636e001b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.Serialization.cs @@ -7,61 +7,23 @@ using System.Collections.Generic; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SentimentResponse : IUtf8JsonSerializable + internal partial class SentimentResponse { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documents"u8); - writer.WriteStartArray(); - foreach (var item in Documents) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("errors"u8); - writer.WriteStartArray(); - foreach (var item in Errors) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WritePropertyName("modelVersion"u8); - writer.WriteStringValue(ModelVersion); - writer.WriteEndObject(); - } - internal static SentimentResponse DeserializeSentimentResponse(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - IList documents = default; - IList errors = default; + IReadOnlyList errors = default; TextDocumentBatchStatistics statistics = default; string modelVersion = default; + IReadOnlyList documents = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("documents"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(SentimentResponseDocumentsItem.DeserializeSentimentResponseDocumentsItem(item)); - } - documents = array; - continue; - } if (property.NameEquals("errors"u8)) { List array = new List(); @@ -86,24 +48,26 @@ internal static SentimentResponse DeserializeSentimentResponse(JsonElement eleme modelVersion = property.Value.GetString(); continue; } + if (property.NameEquals("documents"u8)) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(SentimentDocumentResult.DeserializeSentimentDocumentResult(item)); + } + documents = array; + continue; + } } return new SentimentResponse(errors, statistics, modelVersion, documents); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static new SentimentResponse FromResponse(Response response) + internal static SentimentResponse FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSentimentResponse(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.cs index f17f6a25145a..6ac55985f2ea 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponse.cs @@ -11,20 +11,22 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentimentResponse. - internal partial class SentimentResponse : PreBuiltResult + /// Sentiment analysis results for the input documents. + internal partial class SentimentResponse { /// Initializes a new instance of . /// Errors by document id. /// This field indicates which model is used for scoring. - /// Sentiment analysis per document. + /// The sentiment analysis results for each document in the input. /// , or is null. - public SentimentResponse(IEnumerable errors, string modelVersion, IEnumerable documents) : base(errors, modelVersion) + internal SentimentResponse(IEnumerable errors, string modelVersion, IEnumerable documents) { Argument.AssertNotNull(errors, nameof(errors)); Argument.AssertNotNull(modelVersion, nameof(modelVersion)); Argument.AssertNotNull(documents, nameof(documents)); + Errors = errors.ToList(); + ModelVersion = modelVersion; Documents = documents.ToList(); } @@ -32,13 +34,22 @@ public SentimentResponse(IEnumerable errors, string modelVersion, /// Errors by document id. /// if showStats=true was specified in the request this field will contain information about the request payload. /// This field indicates which model is used for scoring. - /// Sentiment analysis per document. - internal SentimentResponse(IList errors, TextDocumentBatchStatistics statistics, string modelVersion, IList documents) : base(errors, statistics, modelVersion) + /// The sentiment analysis results for each document in the input. + internal SentimentResponse(IReadOnlyList errors, TextDocumentBatchStatistics statistics, string modelVersion, IReadOnlyList documents) { + Errors = errors; + Statistics = statistics; + ModelVersion = modelVersion; Documents = documents; } - /// Sentiment analysis per document. - public IList Documents { get; } + /// Errors by document id. + public IReadOnlyList Errors { get; } + /// if showStats=true was specified in the request this field will contain information about the request payload. + public TextDocumentBatchStatistics Statistics { get; } + /// This field indicates which model is used for scoring. + public string ModelVersion { get; } + /// The sentiment analysis results for each document in the input. + public IReadOnlyList Documents { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.Serialization.cs deleted file mode 100644 index c23cd08dc381..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.Serialization.cs +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class SentimentResponseDocumentsItem : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("sentiment"u8); - writer.WriteStringValue(Sentiment.ToSerialString()); - writer.WritePropertyName("confidenceScores"u8); - writer.WriteObjectValue(ConfidenceScores); - writer.WritePropertyName("sentences"u8); - writer.WriteStartArray(); - foreach (var item in Sentences) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("warnings"u8); - writer.WriteStartArray(); - foreach (var item in Warnings) - { - writer.WriteObjectValue(item); - } - writer.WriteEndArray(); - if (Optional.IsDefined(Statistics)) - { - writer.WritePropertyName("statistics"u8); - writer.WriteObjectValue(Statistics); - } - writer.WriteEndObject(); - } - - internal static SentimentResponseDocumentsItem DeserializeSentimentResponseDocumentsItem(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - TextSentiment sentiment = default; - SentimentConfidenceScores confidenceScores = default; - IList sentences = default; - string id = default; - IList warnings = default; - TextDocumentStatistics? statistics = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("sentiment"u8)) - { - sentiment = property.Value.GetString().ToTextSentiment(); - continue; - } - if (property.NameEquals("confidenceScores"u8)) - { - confidenceScores = SentimentConfidenceScores.DeserializeSentimentConfidenceScores(property.Value); - continue; - } - if (property.NameEquals("sentences"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(SentenceSentimentInternal.DeserializeSentenceSentimentInternal(item)); - } - sentences = array; - continue; - } - if (property.NameEquals("id"u8)) - { - id = property.Value.GetString(); - continue; - } - if (property.NameEquals("warnings"u8)) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(DocumentWarning.DeserializeDocumentWarning(item)); - } - warnings = array; - continue; - } - if (property.NameEquals("statistics"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - statistics = TextDocumentStatistics.DeserializeTextDocumentStatistics(property.Value); - continue; - } - } - return new SentimentResponseDocumentsItem( - id, - warnings, - statistics, - sentiment, - confidenceScores, - sentences); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new SentimentResponseDocumentsItem FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeSentimentResponseDocumentsItem(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.cs deleted file mode 100644 index 77c87ba5f70a..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentResponseDocumentsItem.cs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The SentimentResponseDocumentsItem. - internal partial class SentimentResponseDocumentsItem : SentimentDocumentResult - { - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// Predicted sentiment for document (Negative, Neutral, Positive, or Mixed). - /// Document level sentiment confidence scores between 0 and 1 for each sentiment class. - /// Sentence level sentiment analysis. - /// , , or is null. - public SentimentResponseDocumentsItem(string id, IEnumerable warnings, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IEnumerable sentences) : base(id, warnings, sentiment, confidenceScores, sentences) - { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(warnings, nameof(warnings)); - Argument.AssertNotNull(confidenceScores, nameof(confidenceScores)); - Argument.AssertNotNull(sentences, nameof(sentences)); - } - - /// Initializes a new instance of . - /// Unique, non-empty document identifier. - /// Warnings encountered while processing document. - /// if showStats=true was specified in the request this field will contain information about the document payload. - /// Predicted sentiment for document (Negative, Neutral, Positive, or Mixed). - /// Document level sentiment confidence scores between 0 and 1 for each sentiment class. - /// Sentence level sentiment analysis. - internal SentimentResponseDocumentsItem(string id, IList warnings, TextDocumentStatistics? statistics, TextSentiment sentiment, SentimentConfidenceScores confidenceScores, IList sentences) : base(id, warnings, statistics, sentiment, confidenceScores, sentences) - { - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentTaskResult.cs index c79d8c04f9fe..b9f2fbba1032 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SentimentTaskResult.cs @@ -9,11 +9,11 @@ namespace Azure.AI.TextAnalytics.Models { - /// The SentimentTaskResult. + /// Contains the analyze text SentimentAnalysis LRO task result. internal partial class SentimentTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// + /// The sentiment analysis results. /// is null. internal SentimentTaskResult(SentimentResponse results) { @@ -24,15 +24,15 @@ internal SentimentTaskResult(SentimentResponse results) } /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. - /// + /// The kind of task result. + /// The sentiment analysis results. internal SentimentTaskResult(AnalyzeTextTaskResultsKind kind, SentimentResponse results) : base(kind) { Results = results; Kind = kind; } - /// Gets the results. + /// The sentiment analysis results. public SentimentResponse Results { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/StringIndexType.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/StringIndexType.cs index 568833869e7e..1188ae7fb2d1 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/StringIndexType.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/StringIndexType.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics.Models { - /// Specifies the method used to interpret string offsets. Defaults to Text Elements (Graphemes) according to Unicode v8.0.0. For additional information see https://aka.ms/text-analytics-offsets. + /// String index type. internal readonly partial struct StringIndexType : IEquatable { private readonly string _value; diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.Serialization.cs index 9be4fe6b8423..94c4104183b7 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class SummaryContextInternal : IUtf8JsonSerializable + internal partial class SummaryContextInternal { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("offset"u8); - writer.WriteNumberValue(Offset); - writer.WritePropertyName("length"u8); - writer.WriteNumberValue(Length); - writer.WriteEndObject(); - } - internal static SummaryContextInternal DeserializeSummaryContextInternal(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static SummaryContextInternal FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeSummaryContextInternal(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.cs index 488f7f8cdde5..e830a89b8e85 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/SummaryContextInternal.cs @@ -13,15 +13,15 @@ internal partial class SummaryContextInternal /// Initializes a new instance of . /// Start position for the context. Use of different 'stringIndexType' values can affect the offset returned. /// The length of the context. Use of different 'stringIndexType' values can affect the length returned. - public SummaryContextInternal(int offset, int length) + internal SummaryContextInternal(int offset, int length) { Offset = offset; Length = length; } /// Start position for the context. Use of different 'stringIndexType' values can affect the offset returned. - public int Offset { get; set; } + public int Offset { get; } /// The length of the context. Use of different 'stringIndexType' values can affect the length returned. - public int Length { get; set; } + public int Length { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.Serialization.cs index 295a3c36f354..2c47ba29daa2 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class TargetConfidenceScoreLabel : IUtf8JsonSerializable + internal partial class TargetConfidenceScoreLabel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("positive"u8); - writer.WriteNumberValue(Positive); - writer.WritePropertyName("negative"u8); - writer.WriteNumberValue(Negative); - writer.WriteEndObject(); - } - internal static TargetConfidenceScoreLabel DeserializeTargetConfidenceScoreLabel(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -53,13 +42,5 @@ internal static TargetConfidenceScoreLabel FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeTargetConfidenceScoreLabel(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.cs index a5fd885e39e7..16ffd92b8856 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetConfidenceScoreLabel.cs @@ -13,15 +13,15 @@ internal partial class TargetConfidenceScoreLabel /// Initializes a new instance of . /// Confidence score for positive sentiment. /// Confidence score for negative sentiment. - public TargetConfidenceScoreLabel(double positive, double negative) + internal TargetConfidenceScoreLabel(double positive, double negative) { Positive = positive; Negative = negative; } /// Confidence score for positive sentiment. - public double Positive { get; set; } + public double Positive { get; } /// Confidence score for negative sentiment. - public double Negative { get; set; } + public double Negative { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.Serialization.cs index 9463bf0453dd..8a590272fb4e 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.Serialization.cs @@ -6,44 +6,33 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class TargetRelation : IUtf8JsonSerializable + internal partial class TargetRelation { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("relationType"u8); - writer.WriteStringValue(RelationType.ToSerialString()); - writer.WritePropertyName("ref"u8); - writer.WriteStringValue(Ref); - writer.WriteEndObject(); - } - internal static TargetRelation DeserializeTargetRelation(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - TargetRelationType relationType = default; string @ref = default; + TargetRelationType relationType = default; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("relationType"u8)) + if (property.NameEquals("ref"u8)) { - relationType = property.Value.GetString().ToTargetRelationType(); + @ref = property.Value.GetString(); continue; } - if (property.NameEquals("ref"u8)) + if (property.NameEquals("relationType"u8)) { - @ref = property.Value.GetString(); + relationType = property.Value.GetString().ToTargetRelationType(); continue; } } - return new TargetRelation(relationType, @ref); + return new TargetRelation(@ref, relationType); } /// Deserializes the model from a raw response. @@ -53,13 +42,5 @@ internal static TargetRelation FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeTargetRelation(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.cs index a595cedd0ca0..7959443414ea 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TargetRelation.cs @@ -9,24 +9,24 @@ namespace Azure.AI.TextAnalytics.Models { - /// The TargetRelation. + /// Represents the relation between assessments and/or targets. internal partial class TargetRelation { /// Initializes a new instance of . - /// The type related to the target. /// The JSON pointer indicating the linked object. + /// The type related to the target. /// is null. - public TargetRelation(TargetRelationType relationType, string @ref) + internal TargetRelation(string @ref, TargetRelationType relationType) { Argument.AssertNotNull(@ref, nameof(@ref)); - RelationType = relationType; Ref = @ref; + RelationType = relationType; } - /// The type related to the target. - public TargetRelationType RelationType { get; set; } /// The JSON pointer indicating the linked object. - public string Ref { get; set; } + public string Ref { get; } + /// The type related to the target. + public TargetRelationType RelationType { get; } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.Serialization.cs deleted file mode 100644 index e3f07659b600..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.Serialization.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class TaskIdentifier : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WriteEndObject(); - } - - internal static TaskIdentifier DeserializeTaskIdentifier(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new TaskIdentifier(taskName); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static TaskIdentifier FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeTaskIdentifier(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.cs deleted file mode 100644 index f78d1e8a48e8..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskIdentifier.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// Base task object. - internal partial class TaskIdentifier - { - /// Initializes a new instance of . - public TaskIdentifier() - { - } - - /// Initializes a new instance of . - /// - internal TaskIdentifier(string taskName) - { - TaskName = taskName; - } - - /// Gets or sets the task name. - public string TaskName { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.Serialization.cs deleted file mode 100644 index 5aa09944032d..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.Serialization.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class TaskParameters : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - if (Optional.IsDefined(LoggingOptOut)) - { - writer.WritePropertyName("loggingOptOut"u8); - writer.WriteBooleanValue(LoggingOptOut.Value); - } - writer.WriteEndObject(); - } - - internal static TaskParameters DeserializeTaskParameters(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - bool? loggingOptOut = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("loggingOptOut"u8)) - { - if (property.Value.ValueKind == JsonValueKind.Null) - { - continue; - } - loggingOptOut = property.Value.GetBoolean(); - continue; - } - } - return new TaskParameters(loggingOptOut); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static TaskParameters FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeTaskParameters(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.cs deleted file mode 100644 index 495f0fe7e626..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskParameters.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// Base parameters object for a text analysis task. - internal partial class TaskParameters - { - /// Initializes a new instance of . - public TaskParameters() - { - } - - /// Initializes a new instance of . - /// - internal TaskParameters(bool? loggingOptOut) - { - LoggingOptOut = loggingOptOut; - } - - /// Gets or sets the logging opt out. - public bool? LoggingOptOut { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.Serialization.cs deleted file mode 100644 index f3655863487c..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.Serialization.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class TaskState : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - - internal static TaskState DeserializeTaskState(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - DateTimeOffset lastUpdateDateTime = default; - TextAnalyticsOperationStatus status = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("lastUpdateDateTime"u8)) - { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); - continue; - } - if (property.NameEquals("status"u8)) - { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); - continue; - } - } - return new TaskState(lastUpdateDateTime, status); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static TaskState FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeTaskState(document.RootElement); - } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.cs deleted file mode 100644 index ba59841c4775..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TaskState.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The TaskState. - internal partial class TaskState - { - /// Initializes a new instance of . - /// - /// - public TaskState(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status) - { - LastUpdateDateTime = lastUpdateDateTime; - Status = status; - } - - /// Gets or sets the last update date time. - public DateTimeOffset LastUpdateDateTime { get; set; } - /// Gets or sets the status. - public TextAnalyticsOperationStatus Status { get; set; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.Serialization.cs similarity index 85% rename from sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.Serialization.cs rename to sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.Serialization.cs index 498a4e801e4a..95b4860d2f23 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.Serialization.cs @@ -10,9 +10,9 @@ namespace Azure.AI.TextAnalytics.Models { - internal partial class AnalyzeTasks + internal partial class Tasks { - internal static AnalyzeTasks DeserializeAnalyzeTasks(JsonElement element) + internal static Tasks DeserializeTasks(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { @@ -60,15 +60,15 @@ internal static AnalyzeTasks DeserializeAnalyzeTasks(JsonElement element) continue; } } - return new AnalyzeTasks(completed, failed, inProgress, total, items ?? new ChangeTrackingList()); + return new Tasks(completed, failed, inProgress, total, items ?? new ChangeTrackingList()); } /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static AnalyzeTasks FromResponse(Response response) + internal static Tasks FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeAnalyzeTasks(document.RootElement); + return DeserializeTasks(document.RootElement); } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.cs similarity index 64% rename from sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.cs rename to sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.cs index dfb2aaacde11..f25e08b0c874 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/AnalyzeTasks.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/Tasks.cs @@ -9,15 +9,15 @@ namespace Azure.AI.TextAnalytics.Models { - /// The TasksStateTasks. - internal partial class AnalyzeTasks + /// Container for the tasks status for the LRO job. + internal partial class Tasks { - /// Initializes a new instance of . - /// - /// - /// - /// - internal AnalyzeTasks(int completed, int failed, int inProgress, int total) + /// Initializes a new instance of . + /// Count of completed tasks. + /// Count of failed tasks. + /// Count of inprogress tasks. + /// Count of total tasks. + internal Tasks(int completed, int failed, int inProgress, int total) { Completed = completed; Failed = failed; @@ -26,16 +26,17 @@ internal AnalyzeTasks(int completed, int failed, int inProgress, int total) Items = new ChangeTrackingList(); } - /// Initializes a new instance of . - /// - /// - /// - /// + /// Initializes a new instance of . + /// Count of completed tasks. + /// Count of failed tasks. + /// Count of inprogress tasks. + /// Count of total tasks. /// + /// Enumerable of Analyze text job results. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// - internal AnalyzeTasks(int completed, int failed, int inProgress, int total, IReadOnlyList items) + internal Tasks(int completed, int failed, int inProgress, int total, IReadOnlyList items) { Completed = completed; Failed = failed; @@ -44,16 +45,16 @@ internal AnalyzeTasks(int completed, int failed, int inProgress, int total, IRea Items = items; } - /// Gets the completed. + /// Count of completed tasks. public int Completed { get; } - /// Gets the failed. + /// Count of failed tasks. public int Failed { get; } - /// Gets the in progress. + /// Count of inprogress tasks. public int InProgress { get; } - /// Gets the total. + /// Count of total tasks. public int Total { get; } /// - /// Gets the items + /// Enumerable of Analyze text job results. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , , , , , , and . /// diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.Serialization.cs deleted file mode 100644 index 5aa29343b65c..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.Serialization.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class TasksState - { - internal static TasksState DeserializeTasksState(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - AnalyzeTasks tasks = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("tasks"u8)) - { - tasks = AnalyzeTasks.DeserializeAnalyzeTasks(property.Value); - continue; - } - } - return new TasksState(tasks); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static TasksState FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeTasksState(document.RootElement); - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.cs deleted file mode 100644 index 1d37bb1bebd0..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TasksState.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; - -namespace Azure.AI.TextAnalytics.Models -{ - /// The TasksState. - internal partial class TasksState - { - /// Initializes a new instance of . - /// - /// is null. - internal TasksState(AnalyzeTasks tasks) - { - Argument.AssertNotNull(tasks, nameof(tasks)); - - Tasks = tasks; - } - - /// Gets the tasks. - public AnalyzeTasks Tasks { get; } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextAnalyticsOperationStatus.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextAnalyticsOperationStatus.cs index 52e0d5d885a3..c3ae113e1c92 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextAnalyticsOperationStatus.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextAnalyticsOperationStatus.cs @@ -10,7 +10,7 @@ namespace Azure.AI.TextAnalytics { - /// The State. + /// The status of the task at the mentioned last update time. public readonly partial struct TextAnalyticsOperationStatus : IEquatable { private readonly string _value; @@ -25,25 +25,25 @@ public TextAnalyticsOperationStatus(string value) private const string NotStartedValue = "notStarted"; private const string RunningValue = "running"; private const string SucceededValue = "succeeded"; + private const string PartiallyCompletedValue = "partiallyCompleted"; private const string FailedValue = "failed"; private const string CancelledValue = "cancelled"; private const string CancellingValue = "cancelling"; - private const string PartiallyCompletedValue = "partiallyCompleted"; - /// notStarted. + /// Not started status. public static TextAnalyticsOperationStatus NotStarted { get; } = new TextAnalyticsOperationStatus(NotStartedValue); - /// running. + /// Running status. public static TextAnalyticsOperationStatus Running { get; } = new TextAnalyticsOperationStatus(RunningValue); - /// succeeded. + /// Succeeded status. public static TextAnalyticsOperationStatus Succeeded { get; } = new TextAnalyticsOperationStatus(SucceededValue); - /// failed. + /// Partially completed status. + public static TextAnalyticsOperationStatus PartiallyCompleted { get; } = new TextAnalyticsOperationStatus(PartiallyCompletedValue); + /// Failed status. public static TextAnalyticsOperationStatus Failed { get; } = new TextAnalyticsOperationStatus(FailedValue); - /// cancelled. + /// Cancelled status. public static TextAnalyticsOperationStatus Cancelled { get; } = new TextAnalyticsOperationStatus(CancelledValue); - /// cancelling. + /// Cancelling status. public static TextAnalyticsOperationStatus Cancelling { get; } = new TextAnalyticsOperationStatus(CancellingValue); - /// partiallyCompleted. - public static TextAnalyticsOperationStatus PartiallyCompleted { get; } = new TextAnalyticsOperationStatus(PartiallyCompletedValue); /// Determines if two values are the same. public static bool operator ==(TextAnalyticsOperationStatus left, TextAnalyticsOperationStatus right) => left.Equals(right); /// Determines if two values are not the same. diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentBatchStatistics.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentBatchStatistics.Serialization.cs index 9930f232dfbb..b2fc9e60779c 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentBatchStatistics.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentBatchStatistics.Serialization.cs @@ -6,26 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial class TextDocumentBatchStatistics : IUtf8JsonSerializable + public partial class TextDocumentBatchStatistics { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("documentsCount"u8); - writer.WriteNumberValue(DocumentCount); - writer.WritePropertyName("validDocumentsCount"u8); - writer.WriteNumberValue(ValidDocumentCount); - writer.WritePropertyName("erroneousDocumentsCount"u8); - writer.WriteNumberValue(InvalidDocumentCount); - writer.WritePropertyName("transactionsCount"u8); - writer.WriteNumberValue(TransactionCount); - writer.WriteEndObject(); - } - internal static TextDocumentBatchStatistics DeserializeTextDocumentBatchStatistics(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) @@ -69,13 +54,5 @@ internal static TextDocumentBatchStatistics FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeTextDocumentBatchStatistics(document.RootElement); } - - /// Convert into a . - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentStatistics.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentStatistics.Serialization.cs index 1516415dbc76..2305a11607c3 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentStatistics.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/TextDocumentStatistics.Serialization.cs @@ -6,22 +6,11 @@ #nullable disable using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics { - public partial struct TextDocumentStatistics : IUtf8JsonSerializable + public partial struct TextDocumentStatistics { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("charactersCount"u8); - writer.WriteNumberValue(CharacterCount); - writer.WritePropertyName("transactionsCount"u8); - writer.WriteNumberValue(TransactionCount); - writer.WriteEndObject(); - } - internal static TextDocumentStatistics DeserializeTextDocumentStatistics(JsonElement element) { int charactersCount = default; @@ -49,13 +38,5 @@ internal static TextDocumentStatistics FromResponse(Response response) using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeTextDocumentStatistics(document.RootElement); } - - /// Convert into a . - internal RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.Serialization.cs index 97d1fae9b7d8..09e31c8931fc 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.Serialization.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.Serialization.cs @@ -7,63 +7,45 @@ using System; using System.Text.Json; -using Azure.Core; namespace Azure.AI.TextAnalytics.Models { - internal partial class UnknownAnalyzeTextLROResult : IUtf8JsonSerializable + internal partial class UnknownAnalyzeTextLROResult { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WritePropertyName("lastUpdateDateTime"u8); - writer.WriteStringValue(LastUpdateDateTime, "O"); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WriteEndObject(); - } - internal static UnknownAnalyzeTextLROResult DeserializeUnknownAnalyzeTextLROResult(JsonElement element) { if (element.ValueKind == JsonValueKind.Null) { return null; } - AnalyzeTextLROResultsKind kind = "Unknown"; - string taskName = default; DateTimeOffset lastUpdateDateTime = default; TextAnalyticsOperationStatus status = default; + string taskName = default; + AnalyzeTextLROResultsKind kind = "Unknown"; foreach (var property in element.EnumerateObject()) { - if (property.NameEquals("kind"u8)) + if (property.NameEquals("lastUpdateDateTime"u8)) { - kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); + lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); continue; } - if (property.NameEquals("taskName"u8)) + if (property.NameEquals("status"u8)) { - taskName = property.Value.GetString(); + status = new TextAnalyticsOperationStatus(property.Value.GetString()); continue; } - if (property.NameEquals("lastUpdateDateTime"u8)) + if (property.NameEquals("taskName"u8)) { - lastUpdateDateTime = property.Value.GetDateTimeOffset("O"); + taskName = property.Value.GetString(); continue; } - if (property.NameEquals("status"u8)) + if (property.NameEquals("kind"u8)) { - status = new TextAnalyticsOperationStatus(property.Value.GetString()); + kind = new AnalyzeTextLROResultsKind(property.Value.GetString()); continue; } } - return new UnknownAnalyzeTextLROResult(lastUpdateDateTime, status, kind, taskName); + return new UnknownAnalyzeTextLROResult(lastUpdateDateTime, status, taskName, kind); } /// Deserializes the model from a raw response. @@ -73,13 +55,5 @@ internal static UnknownAnalyzeTextLROResult DeserializeUnknownAnalyzeTextLROResu using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); return DeserializeUnknownAnalyzeTextLROResult(document.RootElement); } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.cs index c0cd7664f0b0..165b2f79f81b 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROResult.cs @@ -13,11 +13,11 @@ namespace Azure.AI.TextAnalytics.Models internal partial class UnknownAnalyzeTextLROResult : AnalyzeTextLROResult { /// Initializes a new instance of . - /// - /// - /// Enumeration of supported Text Analysis long-running operation task results. - /// - internal UnknownAnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, AnalyzeTextLROResultsKind kind, string taskName) : base(lastUpdateDateTime, status, kind, taskName) + /// The last updated time in UTC for the task. + /// The status of the task at the mentioned last update time. + /// task name. + /// Kind of the task. + internal UnknownAnalyzeTextLROResult(DateTimeOffset lastUpdateDateTime, TextAnalyticsOperationStatus status, string taskName, AnalyzeTextLROResultsKind kind) : base(lastUpdateDateTime, status, taskName, kind) { Kind = kind; } diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.Serialization.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.Serialization.cs deleted file mode 100644 index b3dbc208c71b..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.Serialization.cs +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Text.Json; -using Azure.Core; - -namespace Azure.AI.TextAnalytics.Models -{ - internal partial class UnknownAnalyzeTextLROTask : IUtf8JsonSerializable - { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("kind"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(TaskName)) - { - writer.WritePropertyName("taskName"u8); - writer.WriteStringValue(TaskName); - } - writer.WriteEndObject(); - } - - internal static UnknownAnalyzeTextLROTask DeserializeUnknownAnalyzeTextLROTask(JsonElement element) - { - if (element.ValueKind == JsonValueKind.Null) - { - return null; - } - AnalyzeTextLROTaskKind kind = "Unknown"; - string taskName = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("kind"u8)) - { - kind = new AnalyzeTextLROTaskKind(property.Value.GetString()); - continue; - } - if (property.NameEquals("taskName"u8)) - { - taskName = property.Value.GetString(); - continue; - } - } - return new UnknownAnalyzeTextLROTask(taskName, kind); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static new UnknownAnalyzeTextLROTask FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions); - return DeserializeUnknownAnalyzeTextLROTask(document.RootElement); - } - - /// Convert into a . - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.cs deleted file mode 100644 index 97ce51e05c78..000000000000 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextLROTask.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Azure.AI.TextAnalytics.Models -{ - /// Unknown version of AnalyzeTextLROTask. - internal partial class UnknownAnalyzeTextLROTask : AnalyzeTextLROTask - { - /// Initializes a new instance of . - /// - /// Enumeration of supported long-running Text Analysis tasks. - internal UnknownAnalyzeTextLROTask(string taskName, AnalyzeTextLROTaskKind kind) : base(taskName, kind) - { - Kind = kind; - } - } -} diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextTaskResult.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextTaskResult.cs index 3dcb18adc922..e60bd7fb241f 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextTaskResult.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/Models/UnknownAnalyzeTextTaskResult.cs @@ -11,7 +11,7 @@ namespace Azure.AI.TextAnalytics.Models internal partial class UnknownAnalyzeTextTaskResult : AnalyzeTextTaskResult { /// Initializes a new instance of . - /// Enumeration of supported Text Analysis task results. + /// The kind of task result. internal UnknownAnalyzeTextTaskResult(AnalyzeTextTaskResultsKind kind) : base(kind) { Kind = kind; diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/TextAnalyticsModelFactory.cs b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/TextAnalyticsModelFactory.cs index 9556c557bacb..69e607e9fa49 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/TextAnalyticsModelFactory.cs +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/Generated/TextAnalyticsModelFactory.cs @@ -5,6 +5,9 @@ #nullable disable +using System; +using System.Collections.Generic; + namespace Azure.AI.TextAnalytics { /// Model factory for models. diff --git a/sdk/textanalytics/Azure.AI.TextAnalytics/src/autorest.md b/sdk/textanalytics/Azure.AI.TextAnalytics/src/autorest.md index d94ea8061331..6ae647c3caf6 100644 --- a/sdk/textanalytics/Azure.AI.TextAnalytics/src/autorest.md +++ b/sdk/textanalytics/Azure.AI.TextAnalytics/src/autorest.md @@ -7,7 +7,7 @@ Run `dotnet build /t:GenerateCode` to generate code. ``` yaml input-file: -- https://github.com/Azure/azure-rest-api-specs/blob/53240ebc58b3c4e99de723194032064db1d97e63/specification/cognitiveservices/data-plane/Language/stable/2023-04-01/analyzetext.json +- https://github.com/Azure/azure-rest-api-specs/blob/20f7cf8268ee45be7fb0d580bae78b95200f1b41/specification/cognitiveservices/data-plane/Language/stable/2023-04-01/analyzetext.json generation1-convenience-client: true ```