Skip to content

[FR] Updates on Copy API #12770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maririos merged 2 commits into from
Jun 15, 2020
Merged

[FR] Updates on Copy API #12770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a11e078
change to datetime
maririos Jun 13, 2020
1f46ad1
changelog
maririos Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/formrecognizer/Azure.AI.FormRecognizer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## 1.0.0-preview.4 (Unreleased)

### Breaking changes
- Property `CopyAuthorization.ExpiresOn` type is now `DateTimeOffset`.

## 1.0.0-preview.3 (06-10-2020)

Expand Down
11 changes: 4 additions & 7 deletions sdk/formrecognizer/Azure.AI.FormRecognizer/src/CopyAuthorization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Text.Json;

namespace Azure.AI.FormRecognizer.Training
Expand All @@ -13,8 +14,7 @@ public class CopyAuthorization
/// <summary>Model identifier in the target Form Recognizer Resource. </summary>
public string ModelId { get; }
/// <summary> The time when the access token expires. The date is represented as the number of seconds from 1970-01-01T0:0:0Z UTC until the expiration time. </summary>
//public DateTimeOffset ExpiresOn { get; set; }
public long ExpiresOn { get; }
public DateTimeOffset ExpiresOn { get; }
/// <summary> Token claim used to authorize the request. </summary>
internal string AccessToken { get; }
/// <summary> Azure Resource Id of the target Form Recognizer resource where the model is copied to. </summary>
Expand All @@ -26,8 +26,7 @@ internal CopyAuthorization(string modelId, string accessToken, long expirationDa
{
ModelId = modelId;
AccessToken = accessToken;
//ExpiresOn = DateTimeOffset.FromUnixTimeSeconds(expirationDateTimeTicks);
ExpiresOn = expirationDateTimeTicks;
ExpiresOn = DateTimeOffset.FromUnixTimeSeconds(expirationDateTimeTicks);
ResourceId = resourceId;
Region = region;
}
Expand All @@ -45,7 +44,6 @@ public static CopyAuthorization FromJson(string accessToken)
return new CopyAuthorization(
parse.modelId,
parse.accessToken,
//DateTimeOffset.FromUnixTimeSeconds(parse.expirationDateTimeTicks),
parse.expirationDateTimeTicks,
parse.resourceId,
parse.resourceRegion);
Expand Down Expand Up @@ -74,8 +72,7 @@ public CopyAuthorizationParse(CopyAuthorization target)
{
modelId = target.ModelId;
accessToken = target.AccessToken;
//expirationDateTimeTicks = target.ExpiresOn.ToUnixTimeSeconds();
expirationDateTimeTicks = target.ExpiresOn;
expirationDateTimeTicks = target.ExpiresOn.ToUnixTimeSeconds();
resourceId = target.ResourceId;
resourceRegion = target.Region;
}
Expand Down
4 changes: 2 additions & 2 deletions sdk/formrecognizer/Azure.AI.FormRecognizer/src/FormTrainingClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public virtual CopyModelOperation StartCopyModel(string modelId, CopyAuthorizati
Guid guid = ClientCommon.ValidateModelId(modelId, nameof(modelId));
var request = new CopyRequest(target.ResourceId,
target.Region,
new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn/*.ToUnixTimeSeconds()*/));
new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn.ToUnixTimeSeconds()));

Response response = ServiceClient.CopyCustomModel(guid, request, cancellationToken);
string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
Expand All @@ -341,7 +341,7 @@ public virtual async Task<CopyModelOperation> StartCopyModelAsync(string modelId
Guid guid = ClientCommon.ValidateModelId(modelId, nameof(modelId));
var request = new CopyRequest(target.ResourceId,
target.Region,
new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn/*.ToUnixTimeSeconds()*/));
new CopyAuthorizationResult(target.ModelId, target.AccessToken, target.ExpiresOn.ToUnixTimeSeconds()));

Response response = await ServiceClient.CopyCustomModelAsync(guid, request, cancellationToken).ConfigureAwait(false);
string location = ClientCommon.GetResponseHeader(response.Headers, Constants.OperationLocationHeader);
Expand Down
1 change: 0 additions & 1 deletion ...ecognizer/Azure.AI.FormRecognizer/tests/FormTrainingClient/FormTrainingClientLiveTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ public async Task TrainingOps(bool labeled)
}

[Test]
[Ignore("Tracked by issue: https://github.com/Azure/azure-sdk-for-net/issues/12193")]
public async Task CopyModel()
{
var sourceClient = CreateInstrumentedFormTrainingClient();
Expand Down
Loading