Skip to content

Commit

Permalink
Make Api Connection reusable in derived classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@StefanoRaggi
StefanoRaggi committed Jun 12, 2017
1 parent 66de67c commit f61d2e7
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions Api/Api.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using Newtonsoft.Json;
using QuantConnect.API;
using QuantConnect.Configuration;
using QuantConnect.Data;
using QuantConnect.Data.Market;
using QuantConnect.Interfaces;
using QuantConnect.Orders;
using QuantConnect.Packets;
Expand All @@ -38,18 +35,21 @@ namespace QuantConnect.Api
/// </summary>
public class Api : IApi
{
private ApiConnection _connection;
private ApiWebSocketConnection _socketConnection;
private static MarketHoursDatabase _marketHoursDatabase;
private string _dataFolder;

/// <summary>
/// Returns the underlying API connection
/// </summary>
protected ApiConnection ApiConnection { get; private set; }

/// <summary>
/// Initialize the API using the config.json file.
/// </summary>

public virtual void Initialize(int userId, string token, string dataFolder)
{
_connection = new ApiConnection(userId, token);
ApiConnection = new ApiConnection(userId, token);
_socketConnection = new ApiWebSocketConnection(userId, token);
_marketHoursDatabase = MarketHoursDatabase.FromDataFolder(dataFolder);
_dataFolder = dataFolder;
Expand All @@ -68,7 +68,7 @@ public bool Connected
{
get
{
return _connection.Connected;
return ApiConnection.Connected;
}
}

Expand All @@ -91,7 +91,7 @@ public ProjectResponse CreateProject(string name, Language language)
}), ParameterType.RequestBody);

ProjectResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -109,7 +109,7 @@ public ProjectResponse ReadProject(int projectId)
request.AddParameter("projectId", projectId);

ProjectResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -123,7 +123,7 @@ public ProjectResponse ListProjects()
var request = new RestRequest("projects/read", Method.GET);
request.RequestFormat = DataFormat.Json;
ProjectResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -145,7 +145,7 @@ public ProjectFilesResponse AddProjectFile(int projectId, string name, string co
request.AddParameter("content", content);

ProjectFilesResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -167,7 +167,7 @@ public RestResponse UpdateProjectFileName(int projectId, string oldFileName, str
request.AddParameter("newName", newFileName);

RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -189,7 +189,7 @@ public RestResponse UpdateProjectFileContent(int projectId, string fileName, str
request.AddParameter("content", newFileContents);

RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -207,7 +207,7 @@ public ProjectFilesResponse ReadProjectFiles(int projectId)
request.AddParameter("projectId", projectId);

ProjectFilesResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -227,7 +227,7 @@ public ProjectFilesResponse ReadProjectFile(int projectId, string fileName)
request.AddParameter("name", fileName);

ProjectFilesResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -246,7 +246,7 @@ public RestResponse DeleteProjectFile(int projectId, string name)
request.AddParameter("name", name);

RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -265,7 +265,7 @@ public RestResponse DeleteProject(int projectId)
projectId = projectId
}), ParameterType.RequestBody);
RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -283,7 +283,7 @@ public Compile CreateCompile(int projectId)
projectId = projectId
}), ParameterType.RequestBody);
Compile result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -301,7 +301,7 @@ public Compile ReadCompile(int projectId, string compileId)
request.AddParameter("projectId", projectId);
request.AddParameter("compileId", compileId);
Compile result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -321,7 +321,7 @@ public Backtest CreateBacktest(int projectId, string compileId, string backtestN
request.AddParameter("compileId", compileId);
request.AddParameter("backtestName", backtestName);
Backtest result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -338,7 +338,7 @@ public Backtest ReadBacktest(int projectId, string backtestId)
request.AddParameter("backtestId", backtestId);
request.AddParameter("projectId", projectId);
Backtest result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -363,7 +363,7 @@ public RestResponse UpdateBacktest(int projectId, string backtestId, string name
note = note
}), ParameterType.RequestBody);
Backtest result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -378,7 +378,7 @@ public BacktestList ListBacktests(int projectId)
var request = new RestRequest("backtests/read", Method.GET);
request.AddParameter("projectId", projectId);
BacktestList result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -396,7 +396,7 @@ public RestResponse DeleteBacktest(int projectId, string backtestId)
request.AddParameter("backtestId", backtestId);
request.AddParameter("projectId", projectId);
RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand Down Expand Up @@ -429,7 +429,7 @@ public LiveAlgorithm CreateLiveAlgorithm(int projectId,
request.AddParameter("application/json", body, ParameterType.RequestBody);

LiveAlgorithm result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand Down Expand Up @@ -470,7 +470,7 @@ public LiveList ListLiveAlgorithms(AlgorithmStatus? status = null,
request.AddParameter("end", epochEndTime);

LiveList result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -487,7 +487,7 @@ public LiveAlgorithmResults ReadLiveAlgorithm(int projectId, string deployId)
request.AddParameter("projectId", projectId);
request.AddParameter("deployId", deployId);
LiveAlgorithmResults result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -503,7 +503,7 @@ public RestResponse LiquidateLiveAlgorithm(int projectId)
request.RequestFormat = DataFormat.Json;
request.AddParameter("projectId", projectId);
RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -519,7 +519,7 @@ public RestResponse StopLiveAlgorithm(int projectId)
request.RequestFormat = DataFormat.Json;
request.AddParameter("projectId", projectId);
RestResponse result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -546,7 +546,7 @@ public LiveLog ReadLiveLogs(int projectId, string algorithmId, DateTime? startTi
request.AddParameter("end", epochEndTime);

LiveLog result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand All @@ -570,7 +570,7 @@ public Link ReadDataLink(Symbol symbol, Resolution resolution, DateTime date)
request.AddParameter("date", date.ToString("yyyyMMdd"));

Link result;
_connection.TryRequest(request, out result);
ApiConnection.TryRequest(request, out result);
return result;
}

Expand Down

0 comments on commit f61d2e7

Please sign in to comment.