Skip to content

Added retry for 429s #44

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
lauren12292 merged 3 commits into from
Apr 21, 2016
Merged

Added retry for 429s #44

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
5016f2e
Added retry for 429s
Apr 14, 2016
34c93de
Merge branch 'develop' of github.com:rosette-api/csharp into RCB-379_…
Apr 21, 2016
a772cf0
Fixed a minor merge issue
Apr 21, 2016
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: 1 addition & 1 deletion docker/compile-and-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function runExample() {
if [[ ${result} == *"Exception"* ]]; then
retcode=1
fi
echo ${result}
echo "${result}"
echo "---------- ${1} end -------------"
}
#------------------ Functions End ------------------------------------------------
Expand Down
66 changes: 33 additions & 33 deletions rosette_api.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "rosette_api", "rosette_api\rosette_api.csproj", "{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "rosette_apiUnitTests", "rosette_apiUnitTests\rosette_apiUnitTests.csproj", "{10EAD22C-041F-4436-A391-935897309C23}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F17AACDD-48B8-43EA-BF0C-0129592B2BC9}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Release|Any CPU.Build.0 = Release|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "rosette_api", "rosette_api\rosette_api.csproj", "{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "rosette_apiUnitTests", "rosette_apiUnitTests\rosette_apiUnitTests.csproj", "{10EAD22C-041F-4436-A391-935897309C23}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F17AACDD-48B8-43EA-BF0C-0129592B2BC9}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D719A8A7-C5C7-49CF-BFFC-523D605E5E37}.Release|Any CPU.Build.0 = Release|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10EAD22C-041F-4436-A391-935897309C23}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
111 changes: 38 additions & 73 deletions rosette_api/CAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ public class CAPI {
/// <param name="uristring">(string, optional): Base URL for the HttpClient requests. If none is given, will use the default API URI</param>
/// <param name="maxRetry">(int, optional): Maximum number of times to retry a request on HttpResponse error. Default is 3 times.</param>
/// <param name="client">(HttpClient, optional): Forces the API to use a custom HttpClient.</param>
public CAPI(string user_key, string uristring = "https://api.rosette.com/rest/v1/", int maxRetry = 1, HttpClient client = null) {
public CAPI(string user_key, string uristring = "https://api.rosette.com/rest/v1/", int maxRetry = 5, HttpClient client = null) {
UserKey = user_key;
URIstring = (uristring == null) ? "https://api.rosette.com/rest/v1/" : uristring;
MaxRetry = (maxRetry == 0) ? 1 : maxRetry;
MillisecondsBetweenRetries = 500000;
Debug = false;
Timeout = 300;
Client = client;
Expand Down Expand Up @@ -125,6 +126,14 @@ private set {
/// </summary>
public int MaxRetry { get; set; }

/// <summary>MillisecondsBetweenRetries
/// <para>
/// Getter, Setter for the MillisecondsBetweenRetries
/// MillisecondsBetweenRetries: milliseconds between retry attempts
/// </para>
/// </summary>
public int MillisecondsBetweenRetries { get; set; }

/// <summary>Client
/// <para>
/// Getter, Setter for the Client
Expand Down Expand Up @@ -762,24 +771,30 @@ private RosetteResponse getResponse(HttpClient client, string jsonRequest = null
wholeURI = wholeURI.Substring(1);
}

if (jsonRequest != null) {
HttpContent content = new StringContent(jsonRequest);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.PostAsync(wholeURI, content));
responseMsg = task.Result;
}
else if (multiPart != null) {
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.PostAsync(wholeURI, multiPart));
responseMsg = task.Result;
}
else {
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.GetAsync(wholeURI));
responseMsg = task.Result;
}
for (int attempt = 0; attempt < MaxRetry; attempt++) {
if (jsonRequest != null) {
HttpContent content = new StringContent(jsonRequest);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.PostAsync(wholeURI, content));
responseMsg = task.Result;
}
else if (multiPart != null) {
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.PostAsync(wholeURI, multiPart));
responseMsg = task.Result;
}
else {
Task<HttpResponseMessage> task = Task.Run<HttpResponseMessage>(async () => await client.GetAsync(wholeURI));
responseMsg = task.Result;
}
if ((int)responseMsg.StatusCode == 429) {
System.Threading.Thread.Sleep(MillisecondsBetweenRetries);
continue;
}

RosetteResponse response = new RosetteResponse(responseMsg);
RosetteResponse response = new RosetteResponse(responseMsg);

return response;
return response;
}

}
return null;
Expand Down Expand Up @@ -891,69 +906,19 @@ private bool checkVersion(string versionToCheck = null) {
if (versionToCheck == null) {
versionToCheck = Version;
}
HttpClient client = SetupClient();
HttpResponseMessage responseMsg = null;
int retry = 0;
version_checked = true;
last_version_check = DateTime.Now;
_uri = string.Format("info?clientVersion={0}", versionToCheck);
RosetteResponse response = getResponse(SetupClient(), string.Empty);

while (responseMsg == null || (!responseMsg.IsSuccessStatusCode && retry <= MaxRetry)) {
if (retry > 0) {
System.Threading.Thread.Sleep(500);
}
string url = string.Format("info?clientVersion={0}", versionToCheck);
HttpContent content = new StringContent(string.Empty);
responseMsg = client.PostAsync(url, content).Result;
retry = retry + 1;
}
string text = "";
try {
text = getMessage(responseMsg)[0];
}
catch (RosetteException) {
throw;
}
var result = new JavaScriptSerializer().Deserialize<dynamic>(text);
// compatibility with server side is at minor version level of semver
if (!result["versionChecked"]) {
if (!response.Content.ContainsKey("versionChecked") || response.Content["versionChecked"].ToString() != "True") {
version_checked = false;
throw new RosetteException("The server version is not compatible with binding version " + versionToCheck, -6);
}
else {
version_checked = true;
last_version_check = DateTime.Now;
}
}
return version_checked;
}

/// <summary>getMessage
/// <para>Helper function to parse out responseMsg based on gzip or not</para>
/// </summary>
/// <param name="responseMsg">(HttpResponseMessage): Response Message sent from the server</param>
/// <returns>(string): Content of the response message</returns>
private List<string> getMessage(HttpResponseMessage responseMsg) {
if (responseMsg.IsSuccessStatusCode) {
byte[] byteArray = responseMsg.Content.ReadAsByteArrayAsync().Result;
IEnumerator<KeyValuePair<string, IEnumerable<string>>> responseHeadersEnum = responseMsg.Headers.GetEnumerator();
Dictionary<string, string> responseHeadersDict = new Dictionary<string, string>();
while (responseHeadersEnum.MoveNext()) {
KeyValuePair<string, IEnumerable<string>> pair = responseHeadersEnum.Current;
responseHeadersDict.Add(pair.Key, pair.Value.ToArray()[0]);
}

if (responseMsg.Content.Headers.ContentEncoding.Contains("gzip") || (byteArray[0] == '\x1f' && byteArray[1] == '\x8b' && byteArray[2] == '\x08')) {
byteArray = Decompress(byteArray);
}
MemoryStream stream = new MemoryStream(byteArray);
StreamReader reader = new StreamReader(stream, Encoding.UTF8);
List<string> message = new List<string>();
message.Add(reader.ReadToEnd());
message.Add(new JavaScriptSerializer().Serialize(responseHeadersDict));
return message;
}
else {
throw new RosetteException(responseMsg.ReasonPhrase, (int)responseMsg.StatusCode);
}
}

/// <summary>Decompress
/// <para>Method to decompress GZIP files
/// Source: http://www.dotnetperls.com/decompress
Expand Down
8 changes: 8 additions & 0 deletions rosette_api/RosetteResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ public RosetteResponse(HttpResponseMessage responseMsg) {
}
}

private string headersAsString() {
StringBuilder itemString = new StringBuilder();
foreach (var item in Headers)
itemString.AppendFormat("-- {0}:{1} -- ", item.Key, item.Value);

return itemString.ToString();
}


/// <summary>Decompress
/// <para>Method to decompress GZIP files
Expand Down
115 changes: 0 additions & 115 deletions rosette_apiExamples/rosette_apiExamples.csproj
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions rosette_apiExamples/rosette_apiExamples.sln
View file
Open in desktop

This file was deleted.

Loading