Skip to content

BOM-84 #27

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

BOM-84 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2102366
BOM-84
oerodger Jan 6, 2023
f0cefcb
Remove unused methods
oerodger Jan 6, 2023
c1cd5c3
Fix error result
oerodger Jan 11, 2023
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
1 change: 1 addition & 0 deletions Intento.SDK/Intento.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

Expand Down
61 changes: 28 additions & 33 deletions Intento.SDK/Translate/TranslateDynamicService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
using System.Threading.Tasks;
using System.Web;
using Intento.SDK.Client;
using Intento.SDK.Exceptions;
using Intento.SDK.Logging;
using Intento.SDK.Translate.Converters;
using Intento.SDK.Translate.DTO;
using Intento.SDK.Translate.Options;
using Intento.SDK.Validation;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Polly;

namespace Intento.SDK.Translate
{
Expand Down Expand Up @@ -203,14 +205,33 @@ await Client.PostAsync<TranslateRequest, TranslateResponse>(url, request,
// Not a (1) - return result immediately, nothing to wait
return jsonResult;
}

var taskCompletion = new TaskCompletionSource<bool>();
var wrapperTask = await Task.WhenAny(
WaitAsync(taskCompletion, id, 1000),
TimeoutError());
var wrapper = await wrapperTask;
taskCompletion.SetResult(true);

var wrapperResult = await Policy
.Handle<Exception>().Or<IntentoApiException>()
.WaitAndRetryAsync(20, _ => TimeSpan.FromSeconds(1))
.ExecuteAndCaptureAsync(async () =>
{
var response = await CheckAsyncJobAsync(id);
if (response.Done)
{
return response;
}

throw new IntentoException("Job is active");
});
if (wrapperResult.FinalException != null)
{
return new TranslateResponse
{
Error = new TranslationRequestError
{
Message = "Async operation haven't finished yet",
Data = wrapperResult.FinalException.Message
}
};
}

var wrapper = wrapperResult.Result;
if (wrapper.Done)
{
jsonResult = wrapper.Response is { Length: > 0 } ? wrapper.Response[0] : new TranslateResponse
Expand Down Expand Up @@ -610,32 +631,6 @@ public async Task<TranslateResponseWrapper> CheckAsyncJobAsync(string asyncId)
var result = await Client.GetAsync<TranslateResponseWrapper>($"operations/{asyncId}");
return result;
}

private async Task<TranslateResponseWrapper> WaitAsync(TaskCompletionSource<bool> taskCompletion,
string asyncId, int delay = 1000)
{
await Task.WhenAny(taskCompletion.Task, Task.Delay(delay));
var response = await CheckAsyncJobAsync(asyncId);
if (response.Done)
{
return response;
}

return await WaitAsync(taskCompletion, asyncId, delay);
}

private async Task<TranslateResponseWrapper> TimeoutError()
{
await Task.Delay(20000);
return new TranslateResponseWrapper
{
Done = true,
Error = new Error
{
Reason = "Timeout of async operation"
}
};
}

private string ConvertToBase64String(Stream stream)
{
Expand Down