diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.Serialization.cs index b86f5dd40c52..cf936dfcca13 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.Serialization.cs @@ -49,7 +49,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr writer.WritePropertyName("progress"u8); writer.WriteNumberValue(Progress); writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); + writer.WriteStringValue(DocumentId); writer.WritePropertyName("characterCharged"u8); writer.WriteNumberValue(CharactersCharged); if (options.Format != "W" && _serializedAdditionalRawData != null) diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.cs index ad2734f53e62..95517d47a911 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentStatusResult.cs @@ -53,13 +53,13 @@ public partial class DocumentStatusResult /// List of possible statuses for job or document. /// To language. /// Progress of the translation if available. - /// Document Id. - /// , or is null. - internal DocumentStatusResult(Uri sourceDocumentUri, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, string translatedToLanguageCode, float progress, string id) + /// Document Id. + /// , or is null. + internal DocumentStatusResult(Uri sourceDocumentUri, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, string translatedToLanguageCode, float progress, string documentId) { Argument.AssertNotNull(sourceDocumentUri, nameof(sourceDocumentUri)); Argument.AssertNotNull(translatedToLanguageCode, nameof(translatedToLanguageCode)); - Argument.AssertNotNull(id, nameof(id)); + Argument.AssertNotNull(documentId, nameof(documentId)); SourceDocumentUri = sourceDocumentUri; CreatedOn = createdOn; @@ -67,7 +67,7 @@ internal DocumentStatusResult(Uri sourceDocumentUri, DateTimeOffset createdOn, D Status = status; TranslatedToLanguageCode = translatedToLanguageCode; Progress = progress; - Id = id; + DocumentId = documentId; } /// Initializes a new instance of . @@ -82,10 +82,10 @@ internal DocumentStatusResult(Uri sourceDocumentUri, DateTimeOffset createdOn, D /// inner error with more descriptive details. /// /// Progress of the translation if available. - /// Document Id. + /// Document Id. /// Character charged by the API. /// Keeps track of any properties unknown to the library. - internal DocumentStatusResult(Uri translatedDocumentUri, Uri sourceDocumentUri, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, string translatedToLanguageCode, JsonElement error, float progress, string id, long charactersCharged, IDictionary serializedAdditionalRawData) + internal DocumentStatusResult(Uri translatedDocumentUri, Uri sourceDocumentUri, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, string translatedToLanguageCode, JsonElement error, float progress, string documentId, long charactersCharged, IDictionary serializedAdditionalRawData) { TranslatedDocumentUri = translatedDocumentUri; SourceDocumentUri = sourceDocumentUri; @@ -95,7 +95,7 @@ internal DocumentStatusResult(Uri translatedDocumentUri, Uri sourceDocumentUri, TranslatedToLanguageCode = translatedToLanguageCode; _error = error; Progress = progress; - Id = id; + DocumentId = documentId; CharactersCharged = charactersCharged; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -104,5 +104,7 @@ internal DocumentStatusResult(Uri translatedDocumentUri, Uri sourceDocumentUri, internal DocumentStatusResult() { } + /// Document Id. + public string DocumentId { get; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationClient.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationClient.cs index 16a29a17f69d..62cac82cdf11 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationClient.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationClient.cs @@ -52,32 +52,32 @@ public DocumentTranslationClient(Uri endpoint, TokenCredential credential, Docum } /// Returns the status for a specific document. - /// Format - uuid. The batch id. + /// Format - uuid. The batch id. /// Format - uuid. The document id. /// The cancellation token to use. /// /// Returns the translation status for a specific document based on the request Id /// and document Id. /// - public virtual async Task> GetDocumentStatusAsync(Guid id, Guid documentId, CancellationToken cancellationToken = default) + public virtual async Task> GetDocumentStatusAsync(Guid translationId, Guid documentId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = await GetDocumentStatusAsync(id, documentId, context).ConfigureAwait(false); + Response response = await GetDocumentStatusAsync(translationId, documentId, context).ConfigureAwait(false); return Response.FromValue(DocumentStatusResult.FromResponse(response), response); } /// Returns the status for a specific document. - /// Format - uuid. The batch id. + /// Format - uuid. The batch id. /// Format - uuid. The document id. /// The cancellation token to use. /// /// Returns the translation status for a specific document based on the request Id /// and document Id. /// - public virtual Response GetDocumentStatus(Guid id, Guid documentId, CancellationToken cancellationToken = default) + public virtual Response GetDocumentStatus(Guid translationId, Guid documentId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = GetDocumentStatus(id, documentId, context); + Response response = GetDocumentStatus(translationId, documentId, context); return Response.FromValue(DocumentStatusResult.FromResponse(response), response); } @@ -96,18 +96,18 @@ public virtual Response GetDocumentStatus(Guid id, Guid do /// /// /// - /// Format - uuid. The batch id. + /// Format - uuid. The batch id. /// Format - uuid. The document id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual async Task GetDocumentStatusAsync(Guid id, Guid documentId, RequestContext context) + public virtual async Task GetDocumentStatusAsync(Guid translationId, Guid documentId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.GetDocumentStatus"); scope.Start(); try { - using HttpMessage message = CreateGetDocumentStatusRequest(id, documentId, context); + using HttpMessage message = CreateGetDocumentStatusRequest(translationId, documentId, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -132,18 +132,18 @@ public virtual async Task GetDocumentStatusAsync(Guid id, Guid documen /// /// /// - /// Format - uuid. The batch id. + /// Format - uuid. The batch id. /// Format - uuid. The document id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual Response GetDocumentStatus(Guid id, Guid documentId, RequestContext context) + public virtual Response GetDocumentStatus(Guid translationId, Guid documentId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.GetDocumentStatus"); scope.Start(); try { - using HttpMessage message = CreateGetDocumentStatusRequest(id, documentId, context); + using HttpMessage message = CreateGetDocumentStatusRequest(translationId, documentId, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -154,7 +154,7 @@ public virtual Response GetDocumentStatus(Guid id, Guid documentId, RequestConte } /// Returns the status for a document translation request. - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// The cancellation token to use. /// /// Returns the status for a document translation request. @@ -162,15 +162,15 @@ public virtual Response GetDocumentStatus(Guid id, Guid documentId, RequestConte /// overall request status, as well as the status for documents that are being /// translated as part of that request. /// - public virtual async Task> GetTranslationStatusAsync(Guid id, CancellationToken cancellationToken = default) + public virtual async Task> GetTranslationStatusAsync(Guid translationId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = await GetTranslationStatusAsync(id, context).ConfigureAwait(false); + Response response = await GetTranslationStatusAsync(translationId, context).ConfigureAwait(false); return Response.FromValue(TranslationStatusResult.FromResponse(response), response); } /// Returns the status for a document translation request. - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// The cancellation token to use. /// /// Returns the status for a document translation request. @@ -178,10 +178,10 @@ public virtual async Task> GetTranslationStatu /// overall request status, as well as the status for documents that are being /// translated as part of that request. /// - public virtual Response GetTranslationStatus(Guid id, CancellationToken cancellationToken = default) + public virtual Response GetTranslationStatus(Guid translationId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = GetTranslationStatus(id, context); + Response response = GetTranslationStatus(translationId, context); return Response.FromValue(TranslationStatusResult.FromResponse(response), response); } @@ -200,17 +200,17 @@ public virtual Response GetTranslationStatus(Guid id, C /// /// /// - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual async Task GetTranslationStatusAsync(Guid id, RequestContext context) + public virtual async Task GetTranslationStatusAsync(Guid translationId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.GetTranslationStatus"); scope.Start(); try { - using HttpMessage message = CreateGetTranslationStatusRequest(id, context); + using HttpMessage message = CreateGetTranslationStatusRequest(translationId, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -235,17 +235,17 @@ public virtual async Task GetTranslationStatusAsync(Guid id, RequestCo /// /// /// - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual Response GetTranslationStatus(Guid id, RequestContext context) + public virtual Response GetTranslationStatus(Guid translationId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.GetTranslationStatus"); scope.Start(); try { - using HttpMessage message = CreateGetTranslationStatusRequest(id, context); + using HttpMessage message = CreateGetTranslationStatusRequest(translationId, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -256,7 +256,7 @@ public virtual Response GetTranslationStatus(Guid id, RequestContext context) } /// Cancel a currently processing or queued translation. - /// Format - uuid. The operation-id. + /// Format - uuid. The operation-id. /// The cancellation token to use. /// /// Cancel a currently processing or queued translation. @@ -268,15 +268,15 @@ public virtual Response GetTranslationStatus(Guid id, RequestContext context) /// All pending documents will be cancelled if /// possible. /// - public virtual async Task> CancelTranslationAsync(Guid id, CancellationToken cancellationToken = default) + public virtual async Task> CancelTranslationAsync(Guid translationId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = await CancelTranslationAsync(id, context).ConfigureAwait(false); + Response response = await CancelTranslationAsync(translationId, context).ConfigureAwait(false); return Response.FromValue(TranslationStatusResult.FromResponse(response), response); } /// Cancel a currently processing or queued translation. - /// Format - uuid. The operation-id. + /// Format - uuid. The operation-id. /// The cancellation token to use. /// /// Cancel a currently processing or queued translation. @@ -288,10 +288,10 @@ public virtual async Task> CancelTranslationAs /// All pending documents will be cancelled if /// possible. /// - public virtual Response CancelTranslation(Guid id, CancellationToken cancellationToken = default) + public virtual Response CancelTranslation(Guid translationId, CancellationToken cancellationToken = default) { RequestContext context = FromCancellationToken(cancellationToken); - Response response = CancelTranslation(id, context); + Response response = CancelTranslation(translationId, context); return Response.FromValue(TranslationStatusResult.FromResponse(response), response); } @@ -310,17 +310,17 @@ public virtual Response CancelTranslation(Guid id, Canc /// /// /// - /// Format - uuid. The operation-id. + /// Format - uuid. The operation-id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual async Task CancelTranslationAsync(Guid id, RequestContext context) + public virtual async Task CancelTranslationAsync(Guid translationId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.CancelTranslation"); scope.Start(); try { - using HttpMessage message = CreateCancelTranslationRequest(id, context); + using HttpMessage message = CreateCancelTranslationRequest(translationId, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -345,17 +345,17 @@ public virtual async Task CancelTranslationAsync(Guid id, RequestConte /// /// /// - /// Format - uuid. The operation-id. + /// Format - uuid. The operation-id. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The response returned from the service. - public virtual Response CancelTranslation(Guid id, RequestContext context) + public virtual Response CancelTranslation(Guid translationId, RequestContext context) { using var scope = ClientDiagnostics.CreateScope("DocumentTranslationClient.CancelTranslation"); scope.Start(); try { - using HttpMessage message = CreateCancelTranslationRequest(id, context); + using HttpMessage message = CreateCancelTranslationRequest(translationId, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -468,7 +468,7 @@ public virtual Response GetSupportedFormats(string type, RequestContext context) } /// Returns the status for all documents in a batch document translation request. - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// /// top indicates the total number of records the user wants to be returned across /// all pages. @@ -508,7 +508,7 @@ public virtual Response GetSupportedFormats(string type, RequestContext context) /// specifying a maxpagesize preference. The server SHOULD honor this preference /// if the specified page size is smaller than the server's default page size. /// - /// Ids to use in filtering. + /// Ids to use in filtering. /// Statuses to use in filtering. /// the start datetime to get items after. /// the end datetime to get items before. @@ -562,16 +562,16 @@ public virtual Response GetSupportedFormats(string type, RequestContext context) /// This reduces the risk of the client making assumptions about /// the data returned. /// - public virtual AsyncPageable GetDocumentsStatusAsync(Guid id, int? maxCount = null, int? skip = null, int? maxpagesize = null, IEnumerable ids = null, IEnumerable statuses = null, DateTimeOffset? createdDateTimeUtcStart = null, DateTimeOffset? createdDateTimeUtcEnd = null, IEnumerable orderby = null, CancellationToken cancellationToken = default) + public virtual AsyncPageable GetDocumentsStatusAsync(Guid translationId, int? maxCount = null, int? skip = null, int? maxpagesize = null, IEnumerable documentIds = null, IEnumerable statuses = null, DateTimeOffset? createdDateTimeUtcStart = null, DateTimeOffset? createdDateTimeUtcEnd = null, IEnumerable orderby = null, CancellationToken cancellationToken = default) { RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => DocumentStatusResult.DeserializeDocumentStatusResult(e), ClientDiagnostics, _pipeline, "DocumentTranslationClient.GetDocumentsStatus", "value", "nextLink", context); } /// Returns the status for all documents in a batch document translation request. - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// /// top indicates the total number of records the user wants to be returned across /// all pages. @@ -611,7 +611,7 @@ public virtual AsyncPageable GetDocumentsStatusAsync(Guid /// specifying a maxpagesize preference. The server SHOULD honor this preference /// if the specified page size is smaller than the server's default page size. /// - /// Ids to use in filtering. + /// Ids to use in filtering. /// Statuses to use in filtering. /// the start datetime to get items after. /// the end datetime to get items before. @@ -665,11 +665,11 @@ public virtual AsyncPageable GetDocumentsStatusAsync(Guid /// This reduces the risk of the client making assumptions about /// the data returned. /// - public virtual Pageable GetDocumentsStatus(Guid id, int? maxCount = null, int? skip = null, int? maxpagesize = null, IEnumerable ids = null, IEnumerable statuses = null, DateTimeOffset? createdDateTimeUtcStart = null, DateTimeOffset? createdDateTimeUtcEnd = null, IEnumerable orderby = null, CancellationToken cancellationToken = default) + public virtual Pageable GetDocumentsStatus(Guid translationId, int? maxCount = null, int? skip = null, int? maxpagesize = null, IEnumerable documentIds = null, IEnumerable statuses = null, DateTimeOffset? createdDateTimeUtcStart = null, DateTimeOffset? createdDateTimeUtcEnd = null, IEnumerable orderby = null, CancellationToken cancellationToken = default) { RequestContext context = cancellationToken.CanBeCanceled ? new RequestContext { CancellationToken = cancellationToken } : null; - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => DocumentStatusResult.DeserializeDocumentStatusResult(e), ClientDiagnostics, _pipeline, "DocumentTranslationClient.GetDocumentsStatus", "value", "nextLink", context); } @@ -688,7 +688,7 @@ public virtual Pageable GetDocumentsStatus(Guid id, int? m /// /// /// - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// /// top indicates the total number of records the user wants to be returned across /// all pages. @@ -728,7 +728,7 @@ public virtual Pageable GetDocumentsStatus(Guid id, int? m /// specifying a maxpagesize preference. The server SHOULD honor this preference /// if the specified page size is smaller than the server's default page size. /// - /// Ids to use in filtering. + /// Ids to use in filtering. /// Statuses to use in filtering. /// the start datetime to get items after. /// the end datetime to get items before. @@ -736,10 +736,10 @@ public virtual Pageable GetDocumentsStatus(Guid id, int? m /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - public virtual AsyncPageable GetDocumentsStatusAsync(Guid id, int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + public virtual AsyncPageable GetDocumentsStatusAsync(Guid translationId, int? maxCount, int? skip, int? maxpagesize, IEnumerable documentIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "DocumentTranslationClient.GetDocumentsStatus", "value", "nextLink", context); } @@ -758,7 +758,7 @@ public virtual AsyncPageable GetDocumentsStatusAsync(Guid id, int? m /// /// /// - /// Format - uuid. The operation id. + /// Format - uuid. The operation id. /// /// top indicates the total number of records the user wants to be returned across /// all pages. @@ -798,7 +798,7 @@ public virtual AsyncPageable GetDocumentsStatusAsync(Guid id, int? m /// specifying a maxpagesize preference. The server SHOULD honor this preference /// if the specified page size is smaller than the server's default page size. /// - /// Ids to use in filtering. + /// Ids to use in filtering. /// Statuses to use in filtering. /// the start datetime to get items after. /// the end datetime to get items before. @@ -806,18 +806,18 @@ public virtual AsyncPageable GetDocumentsStatusAsync(Guid id, int? m /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - public virtual Pageable GetDocumentsStatus(Guid id, int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + public virtual Pageable GetDocumentsStatus(Guid translationId, int? maxCount, int? skip, int? maxpagesize, IEnumerable documentIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, id, maxCount, skip, maxpagesize, ids, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetDocumentsStatusRequest(translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetDocumentsStatusNextPageRequest(nextLink, translationId, maxCount, skip, maxpagesize, documentIds, statuses, createdDateTimeUtcStart, createdDateTimeUtcEnd, orderby, context); return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "DocumentTranslationClient.GetDocumentsStatus", "value", "nextLink", context); } /// Submit a document translation request to the Document Translation service. /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. - /// Translation job submission batch request. + /// Translation job submission batch request. /// The cancellation token to use. - /// is null. + /// is null. /// /// Use this API to submit a bulk (batch) translation request to the Document /// Translation service. @@ -839,11 +839,11 @@ public virtual Pageable GetDocumentsStatus(Guid id, int? maxCount, i /// destination, it will be overwritten. The targetUrl for each target language /// must be unique. /// - public virtual async Task> StartTranslationAsync(WaitUntil waitUntil, StartTranslationDetails startTranslationDetails, CancellationToken cancellationToken = default) + public virtual async Task> StartTranslationAsync(WaitUntil waitUntil, TranslationBatch body, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(startTranslationDetails, nameof(startTranslationDetails)); + Argument.AssertNotNull(body, nameof(body)); - using RequestContent content = startTranslationDetails.ToRequestContent(); + using RequestContent content = body.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Operation response = await StartTranslationAsync(waitUntil, content, context).ConfigureAwait(false); return ProtocolOperationHelpers.Convert(response, TranslationStatusResult.FromResponse, ClientDiagnostics, "DocumentTranslationClient.StartTranslation"); @@ -851,9 +851,9 @@ public virtual async Task> StartTranslationAs /// Submit a document translation request to the Document Translation service. /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. - /// Translation job submission batch request. + /// Translation job submission batch request. /// The cancellation token to use. - /// is null. + /// is null. /// /// Use this API to submit a bulk (batch) translation request to the Document /// Translation service. @@ -875,11 +875,11 @@ public virtual async Task> StartTranslationAs /// destination, it will be overwritten. The targetUrl for each target language /// must be unique. /// - public virtual Operation StartTranslation(WaitUntil waitUntil, StartTranslationDetails startTranslationDetails, CancellationToken cancellationToken = default) + public virtual Operation StartTranslation(WaitUntil waitUntil, TranslationBatch body, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(startTranslationDetails, nameof(startTranslationDetails)); + Argument.AssertNotNull(body, nameof(body)); - using RequestContent content = startTranslationDetails.ToRequestContent(); + using RequestContent content = body.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); Operation response = StartTranslation(waitUntil, content, context); return ProtocolOperationHelpers.Convert(response, TranslationStatusResult.FromResponse, ClientDiagnostics, "DocumentTranslationClient.StartTranslation"); @@ -895,7 +895,7 @@ public virtual Operation StartTranslation(WaitUntil wai /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -934,7 +934,7 @@ public virtual async Task> StartTranslationAsync(WaitUntil /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -980,7 +980,7 @@ internal HttpMessage CreateStartTranslationRequest(RequestContent content, Reque return message; } - internal HttpMessage CreateGetTranslationsStatusRequest(int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + internal HttpMessage CreateGetTranslationsStatusRequest(int? maxCount, int? skip, int? maxpagesize, IEnumerable translationIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1002,9 +1002,9 @@ internal HttpMessage CreateGetTranslationsStatusRequest(int? maxCount, int? skip { uri.AppendQuery("maxpagesize", maxpagesize.Value, true); } - if (ids != null && !(ids is ChangeTrackingList changeTrackingList && changeTrackingList.IsUndefined)) + if (translationIds != null && !(translationIds is ChangeTrackingList changeTrackingList && changeTrackingList.IsUndefined)) { - uri.AppendQueryDelimited("ids", ids, ",", true); + uri.AppendQueryDelimited("ids", translationIds, ",", true); } if (statuses != null && !(statuses is ChangeTrackingList changeTrackingList0 && changeTrackingList0.IsUndefined)) { @@ -1027,7 +1027,7 @@ internal HttpMessage CreateGetTranslationsStatusRequest(int? maxCount, int? skip return message; } - internal HttpMessage CreateGetDocumentStatusRequest(Guid id, Guid documentId, RequestContext context) + internal HttpMessage CreateGetDocumentStatusRequest(Guid translationId, Guid documentId, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1036,7 +1036,7 @@ internal HttpMessage CreateGetDocumentStatusRequest(Guid id, Guid documentId, Re uri.Reset(_endpoint); uri.AppendRaw("/translator", false); uri.AppendPath("/document/batches/", false); - uri.AppendPath(id, true); + uri.AppendPath(translationId, true); uri.AppendPath("/documents/", false); uri.AppendPath(documentId, true); uri.AppendQuery("api-version", _apiVersion, true); @@ -1045,7 +1045,7 @@ internal HttpMessage CreateGetDocumentStatusRequest(Guid id, Guid documentId, Re return message; } - internal HttpMessage CreateGetTranslationStatusRequest(Guid id, RequestContext context) + internal HttpMessage CreateGetTranslationStatusRequest(Guid translationId, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1054,14 +1054,14 @@ internal HttpMessage CreateGetTranslationStatusRequest(Guid id, RequestContext c uri.Reset(_endpoint); uri.AppendRaw("/translator", false); uri.AppendPath("/document/batches/", false); - uri.AppendPath(id, true); + uri.AppendPath(translationId, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); return message; } - internal HttpMessage CreateCancelTranslationRequest(Guid id, RequestContext context) + internal HttpMessage CreateCancelTranslationRequest(Guid translationId, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1070,14 +1070,14 @@ internal HttpMessage CreateCancelTranslationRequest(Guid id, RequestContext cont uri.Reset(_endpoint); uri.AppendRaw("/translator", false); uri.AppendPath("/document/batches/", false); - uri.AppendPath(id, true); + uri.AppendPath(translationId, true); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); return message; } - internal HttpMessage CreateGetDocumentsStatusRequest(Guid id, int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + internal HttpMessage CreateGetDocumentsStatusRequest(Guid translationId, int? maxCount, int? skip, int? maxpagesize, IEnumerable documentIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1086,7 +1086,7 @@ internal HttpMessage CreateGetDocumentsStatusRequest(Guid id, int? maxCount, int uri.Reset(_endpoint); uri.AppendRaw("/translator", false); uri.AppendPath("/document/batches/", false); - uri.AppendPath(id, true); + uri.AppendPath(translationId, true); uri.AppendPath("/documents", false); uri.AppendQuery("api-version", _apiVersion, true); if (maxCount != null) @@ -1101,9 +1101,9 @@ internal HttpMessage CreateGetDocumentsStatusRequest(Guid id, int? maxCount, int { uri.AppendQuery("maxpagesize", maxpagesize.Value, true); } - if (ids != null && !(ids is ChangeTrackingList changeTrackingList && changeTrackingList.IsUndefined)) + if (documentIds != null && !(documentIds is ChangeTrackingList changeTrackingList && changeTrackingList.IsUndefined)) { - uri.AppendQueryDelimited("ids", ids, ",", true); + uri.AppendQueryDelimited("ids", documentIds, ",", true); } if (statuses != null && !(statuses is ChangeTrackingList changeTrackingList0 && changeTrackingList0.IsUndefined)) { @@ -1145,7 +1145,7 @@ internal HttpMessage CreateGetSupportedFormatsRequest(string type, RequestContex return message; } - internal HttpMessage CreateGetTranslationsStatusNextPageRequest(string nextLink, int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + internal HttpMessage CreateGetTranslationsStatusNextPageRequest(string nextLink, int? maxCount, int? skip, int? maxpagesize, IEnumerable translationIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1159,7 +1159,7 @@ internal HttpMessage CreateGetTranslationsStatusNextPageRequest(string nextLink, return message; } - internal HttpMessage CreateGetDocumentsStatusNextPageRequest(string nextLink, Guid id, int? maxCount, int? skip, int? maxpagesize, IEnumerable ids, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) + internal HttpMessage CreateGetDocumentsStatusNextPageRequest(string nextLink, Guid translationId, int? maxCount, int? skip, int? maxpagesize, IEnumerable documentIds, IEnumerable statuses, DateTimeOffset? createdDateTimeUtcStart, DateTimeOffset? createdDateTimeUtcEnd, IEnumerable orderby, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.Serialization.cs index 0a0f6a63ad3c..ce54796127f1 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.Serialization.cs @@ -60,7 +60,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode if (Optional.IsDefined(Type)) { writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); + writer.WriteStringValue(Type.Value.ToString()); } if (options.Format != "W" && _serializedAdditionalRawData != null) { @@ -105,7 +105,7 @@ internal static DocumentTranslationFileFormat DeserializeDocumentTranslationFile IReadOnlyList contentTypes = default; string defaultVersion = default; IReadOnlyList versions = default; - string type = default; + FileFormatType? type = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -156,7 +156,11 @@ internal static DocumentTranslationFileFormat DeserializeDocumentTranslationFile } if (property.NameEquals("type"u8)) { - type = property.Value.GetString(); + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + type = new FileFormatType(property.Value.GetString()); continue; } if (options.Format != "W") diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.cs index 80dfc1f0ffa3..93e596c5bc2a 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationFileFormat.cs @@ -71,7 +71,7 @@ internal DocumentTranslationFileFormat(string format, IEnumerable fileEx /// Supported Version. /// Supported Type for this format. /// Keeps track of any properties unknown to the library. - internal DocumentTranslationFileFormat(string format, IReadOnlyList fileExtensions, IReadOnlyList contentTypes, string defaultFormatVersion, IReadOnlyList formatVersions, string type, IDictionary serializedAdditionalRawData) + internal DocumentTranslationFileFormat(string format, IReadOnlyList fileExtensions, IReadOnlyList contentTypes, string defaultFormatVersion, IReadOnlyList formatVersions, FileFormatType? type, IDictionary serializedAdditionalRawData) { Format = format; FileExtensions = fileExtensions; @@ -94,6 +94,6 @@ internal DocumentTranslationFileFormat() /// Supported Content-Types for this format. public IReadOnlyList ContentTypes { get; } /// Supported Type for this format. - public string Type { get; } + public FileFormatType? Type { get; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationModelFactory.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationModelFactory.cs index 3f53271ce03d..0ee0b30127e4 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationModelFactory.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/DocumentTranslationModelFactory.cs @@ -5,6 +5,7 @@ #nullable disable +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -26,6 +27,66 @@ public static DocumentTranslationInput DocumentTranslationInput(TranslationSourc return new DocumentTranslationInput(source, targets?.ToList(), storageUriKind, serializedAdditionalRawData: null); } + /// Initializes a new instance of . + /// Location of the folder / container with your documents. + /// Category / custom system for translation request. + /// Target Language. + /// List of Glossary. + /// Storage Source. + /// A new instance for mocking. + public static TranslationTarget TranslationTarget(Uri targetUri = null, string categoryId = null, string languageCode = null, IEnumerable glossaries = null, TranslationStorageSource? translationStorageSource = null) + { + glossaries ??= new List(); + + return new TranslationTarget( + targetUri, + categoryId, + languageCode, + glossaries?.ToList(), + translationStorageSource, + serializedAdditionalRawData: null); + } + + /// Initializes a new instance of . + /// + /// Location of the glossary. + /// We will use the file extension to extract the + /// formatting if the format parameter is not supplied. + /// + /// If the translation + /// language pair is not present in the glossary, it will not be applied + /// + /// Format. + /// Optional Version. If not specified, default is used. + /// Storage Source. + /// A new instance for mocking. + public static TranslationGlossary TranslationGlossary(Uri glossaryUri = null, string format = null, string formatVersion = null, TranslationStorageSource? translationStorageSource = null) + { + return new TranslationGlossary(glossaryUri, format, formatVersion, translationStorageSource, serializedAdditionalRawData: null); + } + + /// Initializes a new instance of . + /// Total count. + /// Failed count. + /// Number of Success. + /// Number of in progress. + /// Count of not yet started. + /// Number of cancelled. + /// Total characters charged by the API. + /// A new instance for mocking. + public static TranslationStatusSummary TranslationStatusSummary(int total = default, int failed = default, int success = default, int inProgress = default, int notYetStarted = default, int cancelled = default, long totalCharacterCharged = default) + { + return new TranslationStatusSummary( + total, + failed, + success, + inProgress, + notYetStarted, + cancelled, + totalCharacterCharged, + serializedAdditionalRawData: null); + } + /// Initializes a new instance of . /// list of objects. /// A new instance for mocking. @@ -44,7 +105,7 @@ public static SupportedFileFormats SupportedFileFormats(IEnumerable Supported Version. /// Supported Type for this format. /// A new instance for mocking. - public static DocumentTranslationFileFormat DocumentTranslationFileFormat(string format = null, IEnumerable fileExtensions = null, IEnumerable contentTypes = null, string defaultFormatVersion = null, IEnumerable formatVersions = null, string type = null) + public static DocumentTranslationFileFormat DocumentTranslationFileFormat(string format = null, IEnumerable fileExtensions = null, IEnumerable contentTypes = null, string defaultFormatVersion = null, IEnumerable formatVersions = null, FileFormatType? type = null) { fileExtensions ??= new List(); contentTypes ??= new List(); diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/SingleDocumentTranslationClient.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/SingleDocumentTranslationClient.cs index c2f94f2c8170..2f99db2b3d0d 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/SingleDocumentTranslationClient.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/SingleDocumentTranslationClient.cs @@ -112,14 +112,14 @@ public SingleDocumentTranslationClient(Uri endpoint, TokenCredential credential, /// The cancellation token to use. /// or is null. /// Use this API to submit a single translation request to the Document Translation Service. - public virtual async Task> DocumentTranslateAsync(string targetLanguage, DocumentTranslateContent documentTranslateContent, string sourceLanguage = null, string category = null, bool? allowFallback = null, CancellationToken cancellationToken = default) + public virtual async Task> TranslateAsync(string targetLanguage, DocumentTranslateContent documentTranslateContent, string sourceLanguage = null, string category = null, bool? allowFallback = null, CancellationToken cancellationToken = default) { Argument.AssertNotNull(targetLanguage, nameof(targetLanguage)); Argument.AssertNotNull(documentTranslateContent, nameof(documentTranslateContent)); using MultipartFormDataRequestContent content = documentTranslateContent.ToMultipartRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); - Response response = await DocumentTranslateAsync(targetLanguage, content, content.ContentType, sourceLanguage, category, allowFallback, context).ConfigureAwait(false); + Response response = await TranslateAsync(targetLanguage, content, content.ContentType, sourceLanguage, category, allowFallback, context).ConfigureAwait(false); return Response.FromValue(response.Content, response); } @@ -147,14 +147,14 @@ public virtual async Task> DocumentTranslateAsync(string ta /// The cancellation token to use. /// or is null. /// Use this API to submit a single translation request to the Document Translation Service. - public virtual Response DocumentTranslate(string targetLanguage, DocumentTranslateContent documentTranslateContent, string sourceLanguage = null, string category = null, bool? allowFallback = null, CancellationToken cancellationToken = default) + public virtual Response Translate(string targetLanguage, DocumentTranslateContent documentTranslateContent, string sourceLanguage = null, string category = null, bool? allowFallback = null, CancellationToken cancellationToken = default) { Argument.AssertNotNull(targetLanguage, nameof(targetLanguage)); Argument.AssertNotNull(documentTranslateContent, nameof(documentTranslateContent)); using MultipartFormDataRequestContent content = documentTranslateContent.ToMultipartRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); - Response response = DocumentTranslate(targetLanguage, content, content.ContentType, sourceLanguage, category, allowFallback, context); + Response response = Translate(targetLanguage, content, content.ContentType, sourceLanguage, category, allowFallback, context); return Response.FromValue(response.Content, response); } @@ -168,7 +168,7 @@ public virtual Response DocumentTranslate(string targetLanguage, Doc /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -198,16 +198,16 @@ public virtual Response DocumentTranslate(string targetLanguage, Doc /// or is null. /// Service returned a non-success status code. /// The response returned from the service. - public virtual async Task DocumentTranslateAsync(string targetLanguage, RequestContent content, string contentType, string sourceLanguage = null, string category = null, bool? allowFallback = null, RequestContext context = null) + public virtual async Task TranslateAsync(string targetLanguage, RequestContent content, string contentType, string sourceLanguage = null, string category = null, bool? allowFallback = null, RequestContext context = null) { Argument.AssertNotNull(targetLanguage, nameof(targetLanguage)); Argument.AssertNotNull(content, nameof(content)); - using var scope = ClientDiagnostics.CreateScope("SingleDocumentTranslationClient.DocumentTranslate"); + using var scope = ClientDiagnostics.CreateScope("SingleDocumentTranslationClient.Translate"); scope.Start(); try { - using HttpMessage message = CreateDocumentTranslateRequest(targetLanguage, content, contentType, sourceLanguage, category, allowFallback, context); + using HttpMessage message = CreateTranslateRequest(targetLanguage, content, contentType, sourceLanguage, category, allowFallback, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -227,7 +227,7 @@ public virtual async Task DocumentTranslateAsync(string targetLanguage /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -257,16 +257,16 @@ public virtual async Task DocumentTranslateAsync(string targetLanguage /// or is null. /// Service returned a non-success status code. /// The response returned from the service. - public virtual Response DocumentTranslate(string targetLanguage, RequestContent content, string contentType, string sourceLanguage = null, string category = null, bool? allowFallback = null, RequestContext context = null) + public virtual Response Translate(string targetLanguage, RequestContent content, string contentType, string sourceLanguage = null, string category = null, bool? allowFallback = null, RequestContext context = null) { Argument.AssertNotNull(targetLanguage, nameof(targetLanguage)); Argument.AssertNotNull(content, nameof(content)); - using var scope = ClientDiagnostics.CreateScope("SingleDocumentTranslationClient.DocumentTranslate"); + using var scope = ClientDiagnostics.CreateScope("SingleDocumentTranslationClient.Translate"); scope.Start(); try { - using HttpMessage message = CreateDocumentTranslateRequest(targetLanguage, content, contentType, sourceLanguage, category, allowFallback, context); + using HttpMessage message = CreateTranslateRequest(targetLanguage, content, contentType, sourceLanguage, category, allowFallback, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -276,7 +276,7 @@ public virtual Response DocumentTranslate(string targetLanguage, RequestContent } } - internal HttpMessage CreateDocumentTranslateRequest(string targetLanguage, RequestContent content, string contentType, string sourceLanguage, string category, bool? allowFallback, RequestContext context) + internal HttpMessage CreateTranslateRequest(string targetLanguage, RequestContent content, string contentType, string sourceLanguage, string category, bool? allowFallback, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.Serialization.cs similarity index 66% rename from sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.Serialization.cs rename to sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.Serialization.cs index 0e0cde37b6ce..49bf3926d1f9 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.Translation.Document { - public partial class StartTranslationDetails : IUtf8JsonSerializable, IJsonModel + public partial class TranslationBatch : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(StartTranslationDetails)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(TranslationBatch)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -51,19 +51,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade writer.WriteEndObject(); } - StartTranslationDetails IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + TranslationBatch IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(StartTranslationDetails)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(TranslationBatch)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeStartTranslationDetails(document.RootElement, options); + return DeserializeTranslationBatch(document.RootElement, options); } - internal static StartTranslationDetails DeserializeStartTranslationDetails(JsonElement element, ModelReaderWriterOptions options = null) + internal static TranslationBatch DeserializeTranslationBatch(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -92,46 +92,46 @@ internal static StartTranslationDetails DeserializeStartTranslationDetails(JsonE } } serializedAdditionalRawData = rawDataDictionary; - return new StartTranslationDetails(inputs, serializedAdditionalRawData); + return new TranslationBatch(inputs, serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + 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(StartTranslationDetails)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(TranslationBatch)} does not support writing '{options.Format}' format."); } } - StartTranslationDetails IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + TranslationBatch IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeStartTranslationDetails(document.RootElement, options); + return DeserializeTranslationBatch(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(StartTranslationDetails)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(TranslationBatch)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static StartTranslationDetails FromResponse(Response response) + internal static TranslationBatch FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeStartTranslationDetails(document.RootElement); + return DeserializeTranslationBatch(document.RootElement); } /// Convert into a . diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.cs similarity index 79% rename from sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.cs rename to sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.cs index a3b452ac1eaf..82b309b8ec6a 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StartTranslationDetails.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationBatch.cs @@ -12,7 +12,7 @@ namespace Azure.AI.Translation.Document { /// Translation job submission batch request. - public partial class StartTranslationDetails + public partial class TranslationBatch { /// /// Keeps track of any properties unknown to the library. @@ -46,27 +46,27 @@ public partial class StartTranslationDetails /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// The input list of documents or folders containing documents. /// is null. - public StartTranslationDetails(IEnumerable inputs) + public TranslationBatch(IEnumerable inputs) { Argument.AssertNotNull(inputs, nameof(inputs)); Inputs = inputs.ToList(); } - /// Initializes a new instance of . + /// Initializes a new instance of . /// The input list of documents or folders containing documents. /// Keeps track of any properties unknown to the library. - internal StartTranslationDetails(IList inputs, IDictionary serializedAdditionalRawData) + internal TranslationBatch(IList inputs, IDictionary serializedAdditionalRawData) { Inputs = inputs; _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal StartTranslationDetails() + /// Initializes a new instance of for deserialization. + internal TranslationBatch() { } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.Serialization.cs index 0279b4b26394..1d930ee4776c 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.Serialization.cs @@ -35,10 +35,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri writer.WritePropertyName("version"u8); writer.WriteStringValue(FormatVersion); } - if (Optional.IsDefined(StorageSource)) + if (Optional.IsDefined(TranslationStorageSource)) { writer.WritePropertyName("storageSource"u8); - writer.WriteStringValue(StorageSource); + writer.WriteStringValue(TranslationStorageSource.Value.ToString()); } if (options.Format != "W" && _serializedAdditionalRawData != null) { @@ -81,7 +81,7 @@ internal static TranslationGlossary DeserializeTranslationGlossary(JsonElement e Uri glossaryUrl = default; string format = default; string version = default; - string storageSource = default; + TranslationStorageSource? storageSource = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -103,7 +103,11 @@ internal static TranslationGlossary DeserializeTranslationGlossary(JsonElement e } if (property.NameEquals("storageSource"u8)) { - storageSource = property.Value.GetString(); + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + storageSource = new TranslationStorageSource(property.Value.GetString()); continue; } if (options.Format != "W") diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.cs index 080b503641dd..b0052036f322 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationGlossary.cs @@ -76,14 +76,14 @@ public TranslationGlossary(Uri glossaryUri, string format) /// /// Format. /// Optional Version. If not specified, default is used. - /// Storage Source. + /// Storage Source. /// Keeps track of any properties unknown to the library. - internal TranslationGlossary(Uri glossaryUri, string format, string formatVersion, string storageSource, IDictionary serializedAdditionalRawData) + internal TranslationGlossary(Uri glossaryUri, string format, string formatVersion, TranslationStorageSource? translationStorageSource, IDictionary serializedAdditionalRawData) { GlossaryUri = glossaryUri; Format = format; FormatVersion = formatVersion; - StorageSource = storageSource; + TranslationStorageSource = translationStorageSource; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -91,5 +91,7 @@ internal TranslationGlossary(Uri glossaryUri, string format, string formatVersio internal TranslationGlossary() { } + /// Storage Source. + public TranslationStorageSource? TranslationStorageSource { get; set; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.Serialization.cs index 3f5b579942d4..6e0ef5670568 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.Serialization.cs @@ -38,10 +38,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite writer.WritePropertyName("language"u8); writer.WriteStringValue(LanguageCode); } - if (Optional.IsDefined(StorageSource)) + if (Optional.IsDefined(TranslationStorageSource)) { writer.WritePropertyName("storageSource"u8); - writer.WriteStringValue(StorageSource); + writer.WriteStringValue(TranslationStorageSource.Value.ToString()); } if (options.Format != "W" && _serializedAdditionalRawData != null) { @@ -84,7 +84,7 @@ internal static TranslationSource DeserializeTranslationSource(JsonElement eleme Uri sourceUrl = default; DocumentFilter filter = default; string language = default; - string storageSource = default; + TranslationStorageSource? storageSource = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -110,7 +110,11 @@ internal static TranslationSource DeserializeTranslationSource(JsonElement eleme } if (property.NameEquals("storageSource"u8)) { - storageSource = property.Value.GetString(); + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + storageSource = new TranslationStorageSource(property.Value.GetString()); continue; } if (options.Format != "W") diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.cs index 5ed53b202a19..5536c27f7869 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationSource.cs @@ -62,14 +62,14 @@ public TranslationSource(Uri sourceUri) /// Language code /// If none is specified, we will perform auto detect on the document /// - /// Storage Source. + /// Storage Source. /// Keeps track of any properties unknown to the library. - internal TranslationSource(Uri sourceUri, DocumentFilter filter, string languageCode, string storageSource, IDictionary serializedAdditionalRawData) + internal TranslationSource(Uri sourceUri, DocumentFilter filter, string languageCode, TranslationStorageSource? translationStorageSource, IDictionary serializedAdditionalRawData) { SourceUri = sourceUri; Filter = filter; LanguageCode = languageCode; - StorageSource = storageSource; + TranslationStorageSource = translationStorageSource; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -77,5 +77,7 @@ internal TranslationSource(Uri sourceUri, DocumentFilter filter, string language internal TranslationSource() { } + /// Storage Source. + public TranslationStorageSource? TranslationStorageSource { get; set; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.Serialization.cs index c61c6f4e1182..353ce010a33c 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.Serialization.cs @@ -27,7 +27,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade writer.WriteStartObject(); writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); + writer.WriteStringValue(TranslationId); writer.WritePropertyName("createdDateTimeUtc"u8); writer.WriteStringValue(CreatedOn, "O"); writer.WritePropertyName("lastActionDateTimeUtc"u8); @@ -40,7 +40,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade _error.WriteTo(writer); } writer.WritePropertyName("summary"u8); - writer.WriteObjectValue(Summary, options); + writer.WriteObjectValue(TranslationStatusSummary, options); if (options.Format != "W" && _serializedAdditionalRawData != null) { foreach (var item in _serializedAdditionalRawData) @@ -84,7 +84,7 @@ internal static TranslationStatusResult DeserializeTranslationStatusResult(JsonE DateTimeOffset lastActionDateTimeUtc = default; DocumentTranslationStatus status = default; JsonElement error = default; - StatusSummary summary = default; + TranslationStatusSummary summary = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -116,7 +116,7 @@ internal static TranslationStatusResult DeserializeTranslationStatusResult(JsonE } if (property.NameEquals("summary"u8)) { - summary = StatusSummary.DeserializeStatusSummary(property.Value, options); + summary = TranslationStatusSummary.DeserializeTranslationStatusSummary(property.Value, options); continue; } if (options.Format != "W") diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.cs index 96ad912cefc6..5447dc9f6097 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusResult.cs @@ -47,26 +47,26 @@ public partial class TranslationStatusResult private IDictionary _serializedAdditionalRawData; /// Initializes a new instance of . - /// Id of the operation. + /// Id of the translation operation. /// Operation created date time. /// Date time in which the operation's status has been updated. /// List of possible statuses for job or document. - /// Status Summary. - /// or is null. - internal TranslationStatusResult(string id, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, StatusSummary summary) + /// Status Summary. + /// or is null. + internal TranslationStatusResult(string translationId, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, TranslationStatusSummary translationStatusSummary) { - Argument.AssertNotNull(id, nameof(id)); - Argument.AssertNotNull(summary, nameof(summary)); + Argument.AssertNotNull(translationId, nameof(translationId)); + Argument.AssertNotNull(translationStatusSummary, nameof(translationStatusSummary)); - Id = id; + TranslationId = translationId; CreatedOn = createdOn; LastModified = lastModified; Status = status; - Summary = summary; + TranslationStatusSummary = translationStatusSummary; } /// Initializes a new instance of . - /// Id of the operation. + /// Id of the translation operation. /// Operation created date time. /// Date time in which the operation's status has been updated. /// List of possible statuses for job or document. @@ -74,16 +74,16 @@ internal TranslationStatusResult(string id, DateTimeOffset createdOn, DateTimeOf /// This contains an outer error with error code, message, details, target and an /// inner error with more descriptive details. /// - /// Status Summary. + /// Status Summary. /// Keeps track of any properties unknown to the library. - internal TranslationStatusResult(string id, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, JsonElement error, StatusSummary summary, IDictionary serializedAdditionalRawData) + internal TranslationStatusResult(string translationId, DateTimeOffset createdOn, DateTimeOffset lastModified, DocumentTranslationStatus status, JsonElement error, TranslationStatusSummary translationStatusSummary, IDictionary serializedAdditionalRawData) { - Id = id; + TranslationId = translationId; CreatedOn = createdOn; LastModified = lastModified; Status = status; _error = error; - Summary = summary; + TranslationStatusSummary = translationStatusSummary; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -91,7 +91,12 @@ internal TranslationStatusResult(string id, DateTimeOffset createdOn, DateTimeOf internal TranslationStatusResult() { } + + /// Id of the translation operation. + public string TranslationId { get; } /// List of possible statuses for job or document. public DocumentTranslationStatus Status { get; } + /// Status Summary. + public TranslationStatusSummary TranslationStatusSummary { get; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.Serialization.cs similarity index 73% rename from sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.Serialization.cs rename to sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.Serialization.cs index c5d7cb49178e..7319b7969dd9 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.Serialization.cs @@ -13,16 +13,16 @@ namespace Azure.AI.Translation.Document { - internal partial class StatusSummary : IUtf8JsonSerializable, IJsonModel + public partial class TranslationStatusSummary : IUtf8JsonSerializable, IJsonModel { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); - void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(StatusSummary)} does not support writing '{format}' format."); + throw new FormatException($"The model {nameof(TranslationStatusSummary)} does not support writing '{format}' format."); } writer.WriteStartObject(); @@ -58,19 +58,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt writer.WriteEndObject(); } - StatusSummary IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + TranslationStatusSummary IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") { - throw new FormatException($"The model {nameof(StatusSummary)} does not support reading '{format}' format."); + throw new FormatException($"The model {nameof(TranslationStatusSummary)} does not support reading '{format}' format."); } using JsonDocument document = JsonDocument.ParseValue(ref reader); - return DeserializeStatusSummary(document.RootElement, options); + return DeserializeTranslationStatusSummary(document.RootElement, options); } - internal static StatusSummary DeserializeStatusSummary(JsonElement element, ModelReaderWriterOptions options = null) + internal static TranslationStatusSummary DeserializeTranslationStatusSummary(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; @@ -130,7 +130,7 @@ internal static StatusSummary DeserializeStatusSummary(JsonElement element, Mode } } serializedAdditionalRawData = rawDataDictionary; - return new StatusSummary( + return new TranslationStatusSummary( total, failed, success, @@ -141,43 +141,43 @@ internal static StatusSummary DeserializeStatusSummary(JsonElement element, Mode serializedAdditionalRawData); } - BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + 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(StatusSummary)} does not support writing '{options.Format}' format."); + throw new FormatException($"The model {nameof(TranslationStatusSummary)} does not support writing '{options.Format}' format."); } } - StatusSummary IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + TranslationStatusSummary IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) { - var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; switch (format) { case "J": { using JsonDocument document = JsonDocument.Parse(data); - return DeserializeStatusSummary(document.RootElement, options); + return DeserializeTranslationStatusSummary(document.RootElement, options); } default: - throw new FormatException($"The model {nameof(StatusSummary)} does not support reading '{options.Format}' format."); + throw new FormatException($"The model {nameof(TranslationStatusSummary)} does not support reading '{options.Format}' format."); } } - string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal static StatusSummary FromResponse(Response response) + internal static TranslationStatusSummary FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); - return DeserializeStatusSummary(document.RootElement); + return DeserializeTranslationStatusSummary(document.RootElement); } /// Convert into a . diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.cs similarity index 83% rename from sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.cs rename to sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.cs index 3c55896e4707..a677d9e204b6 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/StatusSummary.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStatusSummary.cs @@ -11,7 +11,7 @@ namespace Azure.AI.Translation.Document { /// Status Summary. - internal partial class StatusSummary + public partial class TranslationStatusSummary { /// /// Keeps track of any properties unknown to the library. @@ -45,7 +45,7 @@ internal partial class StatusSummary /// private IDictionary _serializedAdditionalRawData; - /// Initializes a new instance of . + /// Initializes a new instance of . /// Total count. /// Failed count. /// Number of Success. @@ -53,7 +53,7 @@ internal partial class StatusSummary /// Count of not yet started. /// Number of cancelled. /// Total characters charged by the API. - internal StatusSummary(int total, int failed, int success, int inProgress, int notYetStarted, int cancelled, long totalCharacterCharged) + internal TranslationStatusSummary(int total, int failed, int success, int inProgress, int notYetStarted, int cancelled, long totalCharacterCharged) { Total = total; Failed = failed; @@ -64,7 +64,7 @@ internal StatusSummary(int total, int failed, int success, int inProgress, int n TotalCharacterCharged = totalCharacterCharged; } - /// Initializes a new instance of . + /// Initializes a new instance of . /// Total count. /// Failed count. /// Number of Success. @@ -73,7 +73,7 @@ internal StatusSummary(int total, int failed, int success, int inProgress, int n /// Number of cancelled. /// Total characters charged by the API. /// Keeps track of any properties unknown to the library. - internal StatusSummary(int total, int failed, int success, int inProgress, int notYetStarted, int cancelled, long totalCharacterCharged, IDictionary serializedAdditionalRawData) + internal TranslationStatusSummary(int total, int failed, int success, int inProgress, int notYetStarted, int cancelled, long totalCharacterCharged, IDictionary serializedAdditionalRawData) { Total = total; Failed = failed; @@ -85,8 +85,8 @@ internal StatusSummary(int total, int failed, int success, int inProgress, int n _serializedAdditionalRawData = serializedAdditionalRawData; } - /// Initializes a new instance of for deserialization. - internal StatusSummary() + /// Initializes a new instance of for deserialization. + internal TranslationStatusSummary() { } diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStorageSource.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStorageSource.cs new file mode 100644 index 000000000000..ee96b89722d5 --- /dev/null +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationStorageSource.cs @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace Azure.AI.Translation.Document +{ + /// Translation Storage Source. + public readonly partial struct TranslationStorageSource : IEquatable + { + private readonly string _value; + + /// Initializes a new instance of . + /// is null. + public TranslationStorageSource(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + private const string AzureBlobValue = "AzureBlob"; + + /// Azure blob storage source. + public static TranslationStorageSource AzureBlob { get; } = new TranslationStorageSource(AzureBlobValue); + /// Determines if two values are the same. + public static bool operator ==(TranslationStorageSource left, TranslationStorageSource right) => left.Equals(right); + /// Determines if two values are not the same. + public static bool operator !=(TranslationStorageSource left, TranslationStorageSource right) => !left.Equals(right); + /// Converts a to a . + public static implicit operator TranslationStorageSource(string value) => new TranslationStorageSource(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is TranslationStorageSource other && Equals(other); + /// + public bool Equals(TranslationStorageSource other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + /// + public override string ToString() => _value; + } +} diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.Serialization.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.Serialization.cs index 1ef904d5793d..855408ce2ede 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.Serialization.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.Serialization.cs @@ -45,10 +45,10 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite } writer.WriteEndArray(); } - if (Optional.IsDefined(StorageSource)) + if (Optional.IsDefined(TranslationStorageSource)) { writer.WritePropertyName("storageSource"u8); - writer.WriteStringValue(StorageSource); + writer.WriteStringValue(TranslationStorageSource.Value.ToString()); } if (options.Format != "W" && _serializedAdditionalRawData != null) { @@ -92,7 +92,7 @@ internal static TranslationTarget DeserializeTranslationTarget(JsonElement eleme string category = default; string language = default; IList glossaries = default; - string storageSource = default; + TranslationStorageSource? storageSource = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -128,7 +128,11 @@ internal static TranslationTarget DeserializeTranslationTarget(JsonElement eleme } if (property.NameEquals("storageSource"u8)) { - storageSource = property.Value.GetString(); + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + storageSource = new TranslationStorageSource(property.Value.GetString()); continue; } if (options.Format != "W") diff --git a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.cs b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.cs index c6f57183d073..cf22e1d86a61 100644 --- a/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.cs +++ b/sdk/translation/Azure.AI.Translation.Document/src/Generated/TranslationTarget.cs @@ -64,15 +64,15 @@ public TranslationTarget(Uri targetUri, string languageCode) /// Category / custom system for translation request. /// Target Language. /// List of Glossary. - /// Storage Source. + /// Storage Source. /// Keeps track of any properties unknown to the library. - internal TranslationTarget(Uri targetUri, string categoryId, string languageCode, IList glossaries, string storageSource, IDictionary serializedAdditionalRawData) + internal TranslationTarget(Uri targetUri, string categoryId, string languageCode, IList glossaries, TranslationStorageSource? translationStorageSource, IDictionary serializedAdditionalRawData) { TargetUri = targetUri; CategoryId = categoryId; LanguageCode = languageCode; Glossaries = glossaries; - StorageSource = storageSource; + TranslationStorageSource = translationStorageSource; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -82,5 +82,7 @@ internal TranslationTarget() } /// List of Glossary. public IList Glossaries { get; } + /// Storage Source. + public TranslationStorageSource? TranslationStorageSource { get; set; } } } diff --git a/sdk/translation/Azure.AI.Translation.Document/tsp-location.yaml b/sdk/translation/Azure.AI.Translation.Document/tsp-location.yaml index 7690921cc02f..bdfd0bd57401 100644 --- a/sdk/translation/Azure.AI.Translation.Document/tsp-location.yaml +++ b/sdk/translation/Azure.AI.Translation.Document/tsp-location.yaml @@ -1,3 +1,4 @@ directory: specification/translation/Azure.AI.DocumentTranslation -commit: 4bf64653380a8582fa070b62ae46b86f2455932e +commit: cf312302515b62e7905e658fe7912bb4f99e8121 repo: Azure/azure-rest-api-specs +additionalDirectories: