Loading backup
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
using Managing.Application.Workers.Abstractions;
|
using Managing.Application.Workers;
|
||||||
|
using Managing.Application.Workers.Abstractions;
|
||||||
using static Managing.Common.Enums;
|
using static Managing.Common.Enums;
|
||||||
|
|
||||||
namespace Managing.Api.Workers.Workers;
|
namespace Managing.Api.Workers.Workers;
|
||||||
|
|||||||
@@ -6,27 +6,18 @@ using static Managing.Common.Enums;
|
|||||||
|
|
||||||
namespace Managing.Api.Workers;
|
namespace Managing.Api.Workers;
|
||||||
|
|
||||||
public class BotManagerWorker : BaseWorker<BotManagerWorker>
|
public class BotManagerWorker(
|
||||||
{
|
|
||||||
private readonly IMediator _mediator;
|
|
||||||
private static readonly WorkerType _workerType = WorkerType.Fee;
|
|
||||||
|
|
||||||
public BotManagerWorker(
|
|
||||||
ILogger<BotManagerWorker> logger,
|
ILogger<BotManagerWorker> logger,
|
||||||
IMediator tradingService,
|
IMediator mediadior,
|
||||||
IWorkerService workerService) : base(
|
IWorkerService workerService)
|
||||||
_workerType,
|
: BaseWorker<BotManagerWorker>(WorkerType.BotManager,
|
||||||
logger,
|
logger,
|
||||||
TimeSpan.FromMinutes(1),
|
TimeSpan.FromMinutes(1),
|
||||||
workerService
|
workerService)
|
||||||
)
|
{
|
||||||
{
|
|
||||||
_mediator = tradingService;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override async Task Run(CancellationToken cancellationToken)
|
protected override async Task Run(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var loadBackupBotCommand = new LoadBackupBotCommand();
|
var loadBackupBotCommand = new LoadBackupBotCommand();
|
||||||
await _mediator.Send(loadBackupBotCommand, cancellationToken);
|
await mediadior.Send(loadBackupBotCommand, cancellationToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
},
|
},
|
||||||
"InfluxDb": {
|
"InfluxDb": {
|
||||||
"Url": "http://localhost:8086/",
|
"Url": "http://localhost:8086/",
|
||||||
"Organization": "",
|
"Organization": "managing-org",
|
||||||
"Token": ""
|
"Token": "Fw2FPL2OwTzDHzSbR2Sd5xs0EKQYy00Q-hYKYAhr9cC1_q5YySONpxuf_Ck0PTjyUiF13xXmi__bu_pXH-H9zA=="
|
||||||
},
|
},
|
||||||
"Serilog": {
|
"Serilog": {
|
||||||
"MinimumLevel": {
|
"MinimumLevel": {
|
||||||
|
|||||||
@@ -28,13 +28,15 @@ namespace Managing.Application.Tests
|
|||||||
var discordService = new Mock<IMessengerService>().Object;
|
var discordService = new Mock<IMessengerService>().Object;
|
||||||
var tradingBotLogger = TradingBaseTests.CreateTradingBotLogger();
|
var tradingBotLogger = TradingBaseTests.CreateTradingBotLogger();
|
||||||
var backtestLogger = TradingBaseTests.CreateBacktesterLogger();
|
var backtestLogger = TradingBaseTests.CreateBacktesterLogger();
|
||||||
|
var botService = new Mock<IBotService>().Object;
|
||||||
_botFactory = new BotFactory(
|
_botFactory = new BotFactory(
|
||||||
_exchangeService,
|
_exchangeService,
|
||||||
tradingBotLogger,
|
tradingBotLogger,
|
||||||
_moneyManagementService.Object,
|
_moneyManagementService.Object,
|
||||||
discordService,
|
discordService,
|
||||||
_accountService.Object,
|
_accountService.Object,
|
||||||
_tradingService.Object);
|
_tradingService.Object,
|
||||||
|
botService);
|
||||||
_backtester = new Backtester(_exchangeService, _botFactory, backtestRepository, backtestLogger);
|
_backtester = new Backtester(_exchangeService, _botFactory, backtestRepository, backtestLogger);
|
||||||
_elapsedTimes = new List<double>();
|
_elapsedTimes = new List<double>();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ namespace Managing.Application.Bots
|
|||||||
flipPosition: true)
|
flipPosition: true)
|
||||||
{
|
{
|
||||||
BotType = BotType.FlippingBot;
|
BotType = BotType.FlippingBot;
|
||||||
Start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed override void Start()
|
public sealed override void Start()
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ namespace Managing.Application.Bots
|
|||||||
isForWatchingOnly)
|
isForWatchingOnly)
|
||||||
{
|
{
|
||||||
BotType = BotType.ScalpingBot;
|
BotType = BotType.ScalpingBot;
|
||||||
Start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public sealed override void Start()
|
public sealed override void Start()
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ namespace Managing.Application.Bots
|
|||||||
_botService = botService;
|
_botService = botService;
|
||||||
_workflow = workflow;
|
_workflow = workflow;
|
||||||
Interval = 100;
|
Interval = 100;
|
||||||
Start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Start()
|
public override void Start()
|
||||||
|
|||||||
@@ -670,7 +670,6 @@ public class TradingBot : Bot, ITradingBot
|
|||||||
{
|
{
|
||||||
Name = Name,
|
Name = Name,
|
||||||
BotType = BotType,
|
BotType = BotType,
|
||||||
Strategies = Strategies,
|
|
||||||
Signals = Signals,
|
Signals = Signals,
|
||||||
Positions = Positions,
|
Positions = Positions,
|
||||||
Timeframe = Timeframe,
|
Timeframe = Timeframe,
|
||||||
@@ -687,7 +686,6 @@ public class TradingBot : Bot, ITradingBot
|
|||||||
public override void LoadBackup(BotBackup backup)
|
public override void LoadBackup(BotBackup backup)
|
||||||
{
|
{
|
||||||
var data = JsonConvert.DeserializeObject<TradingBotBackup>(backup.Data);
|
var data = JsonConvert.DeserializeObject<TradingBotBackup>(backup.Data);
|
||||||
Strategies = data.Strategies;
|
|
||||||
Signals = data.Signals;
|
Signals = data.Signals;
|
||||||
Positions = data.Positions;
|
Positions = data.Positions;
|
||||||
WalletBalances = data.WalletBalances;
|
WalletBalances = data.WalletBalances;
|
||||||
@@ -698,7 +696,6 @@ public class TradingBotBackup
|
|||||||
{
|
{
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public BotType BotType { get; set; }
|
public BotType BotType { get; set; }
|
||||||
public HashSet<IStrategy> Strategies { get; set; }
|
|
||||||
public HashSet<Signal> Signals { get; set; }
|
public HashSet<Signal> Signals { get; set; }
|
||||||
public List<Position> Positions { get; set; }
|
public List<Position> Positions { get; set; }
|
||||||
public Timeframe Timeframe { get; set; }
|
public Timeframe Timeframe { get; set; }
|
||||||
|
|||||||
@@ -18,8 +18,22 @@ namespace Managing.Application.ManageBot
|
|||||||
await _botRepository.InsertBotAsync(botBackup);
|
await _botRepository.InsertBotAsync(botBackup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public BotBackup GetBotBackup(string name)
|
||||||
|
{
|
||||||
|
return _botRepository.GetBots().FirstOrDefault(b => b.Name == name);
|
||||||
|
}
|
||||||
|
|
||||||
public void SaveBotBackup(string name, Enums.BotType botType, string data)
|
public void SaveBotBackup(string name, Enums.BotType botType, string data)
|
||||||
{
|
{
|
||||||
|
var backup = GetBotBackup(name);
|
||||||
|
|
||||||
|
if (backup != null)
|
||||||
|
{
|
||||||
|
backup.Data = data;
|
||||||
|
_botRepository.UpdateBackupBot(backup);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var botBackup = new BotBackup
|
var botBackup = new BotBackup
|
||||||
{
|
{
|
||||||
Name = name,
|
Name = name,
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ using Newtonsoft.Json;
|
|||||||
using Managing.Application.Bots;
|
using Managing.Application.Bots;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Managing.Application.ManageBot
|
namespace Managing.Application.ManageBot;
|
||||||
|
|
||||||
|
public class LoadBackupBotCommandHandler : IRequestHandler<LoadBackupBotCommand, string>
|
||||||
{
|
{
|
||||||
public class LoadBackupBotCommandHandler : IRequestHandler<LoadBackupBotCommand, string>
|
|
||||||
{
|
|
||||||
private readonly IBotFactory _botFactory;
|
private readonly IBotFactory _botFactory;
|
||||||
private readonly ITaskCache _taskCache;
|
private readonly ITaskCache _taskCache;
|
||||||
private readonly IMoneyManagementService _moneyManagementService;
|
private readonly IMoneyManagementService _moneyManagementService;
|
||||||
@@ -21,12 +21,14 @@ namespace Managing.Application.ManageBot
|
|||||||
IBotFactory botFactory,
|
IBotFactory botFactory,
|
||||||
ITaskCache taskCache,
|
ITaskCache taskCache,
|
||||||
IMoneyManagementService moneyManagementService,
|
IMoneyManagementService moneyManagementService,
|
||||||
IBotRepository botRepository)
|
IBotRepository botRepository,
|
||||||
|
ILogger<LoadBackupBotCommandHandler> logger)
|
||||||
{
|
{
|
||||||
_botFactory = botFactory;
|
_botFactory = botFactory;
|
||||||
_taskCache = taskCache;
|
_taskCache = taskCache;
|
||||||
_moneyManagementService = moneyManagementService;
|
_moneyManagementService = moneyManagementService;
|
||||||
_botRepository = botRepository;
|
_botRepository = botRepository;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<string> Handle(LoadBackupBotCommand request, CancellationToken cancellationToken)
|
public Task<string> Handle(LoadBackupBotCommand request, CancellationToken cancellationToken)
|
||||||
@@ -40,6 +42,8 @@ namespace Managing.Application.ManageBot
|
|||||||
foreach (var backupBot in backupBots)
|
foreach (var backupBot in backupBots)
|
||||||
{
|
{
|
||||||
// Check if bot is existing in cache
|
// Check if bot is existing in cache
|
||||||
|
try
|
||||||
|
{
|
||||||
switch (backupBot.BotType)
|
switch (backupBot.BotType)
|
||||||
{
|
{
|
||||||
case BotType.SimpleBot:
|
case BotType.SimpleBot:
|
||||||
@@ -64,6 +68,7 @@ namespace Managing.Application.ManageBot
|
|||||||
{
|
{
|
||||||
_logger.LogInformation($"Starting backup bot {backupBot.Name}");
|
_logger.LogInformation($"Starting backup bot {backupBot.Name}");
|
||||||
StartBot(backupBot);
|
StartBot(backupBot);
|
||||||
|
scalpingBot = _taskCache.Get<ITradingBot>(backupBot.Name);
|
||||||
scalpingBot.LoadBackup(backupBot);
|
scalpingBot.LoadBackup(backupBot);
|
||||||
result.Add(scalpingBot.GetName(), BotStatus.Backup);
|
result.Add(scalpingBot.GetName(), BotStatus.Backup);
|
||||||
}
|
}
|
||||||
@@ -77,7 +82,12 @@ namespace Managing.Application.ManageBot
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError($"Error loading bot {backupBot.Name}", ex.Message);
|
||||||
|
result.Add(backupBot.Name, BotStatus.Down);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Task.FromResult(botStatus.ToString());
|
return Task.FromResult(botStatus.ToString());
|
||||||
}
|
}
|
||||||
@@ -90,6 +100,7 @@ namespace Managing.Application.ManageBot
|
|||||||
Func<Task<IBot>> simpleBot = () => Task.FromResult(_botFactory.CreateSimpleBot(backupBot.Name, null));
|
Func<Task<IBot>> simpleBot = () => Task.FromResult(_botFactory.CreateSimpleBot(backupBot.Name, null));
|
||||||
var bot1 = _taskCache.AddOrGetExisting(backupBot.Name, simpleBot).Result;
|
var bot1 = _taskCache.AddOrGetExisting(backupBot.Name, simpleBot).Result;
|
||||||
bot1.LoadBackup(backupBot);
|
bot1.LoadBackup(backupBot);
|
||||||
|
bot1.Start();
|
||||||
break;
|
break;
|
||||||
case BotType.ScalpingBot:
|
case BotType.ScalpingBot:
|
||||||
var data = JsonConvert.DeserializeObject<TradingBotBackup>(backupBot.Data);
|
var data = JsonConvert.DeserializeObject<TradingBotBackup>(backupBot.Data);
|
||||||
@@ -103,6 +114,7 @@ namespace Managing.Application.ManageBot
|
|||||||
data.IsForWatchingOnly));
|
data.IsForWatchingOnly));
|
||||||
var bot2 = _taskCache.AddOrGetExisting(backupBot.Name, scalpingBot).Result;
|
var bot2 = _taskCache.AddOrGetExisting(backupBot.Name, scalpingBot).Result;
|
||||||
bot2.LoadBackup(backupBot);
|
bot2.LoadBackup(backupBot);
|
||||||
|
bot2.Start();
|
||||||
break;
|
break;
|
||||||
case BotType.FlippingBot:
|
case BotType.FlippingBot:
|
||||||
var dataFlippingBot = JsonConvert.DeserializeObject<TradingBotBackup>(backupBot.Data);
|
var dataFlippingBot = JsonConvert.DeserializeObject<TradingBotBackup>(backupBot.Data);
|
||||||
@@ -116,12 +128,12 @@ namespace Managing.Application.ManageBot
|
|||||||
dataFlippingBot.IsForWatchingOnly));
|
dataFlippingBot.IsForWatchingOnly));
|
||||||
var bot3 = _taskCache.AddOrGetExisting(backupBot.Name, flippingBot).Result;
|
var bot3 = _taskCache.AddOrGetExisting(backupBot.Name, flippingBot).Result;
|
||||||
bot3.LoadBackup(backupBot);
|
bot3.LoadBackup(backupBot);
|
||||||
|
bot3.Start();
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class LoadBackupBotCommand : IRequest<string>
|
public class LoadBackupBotCommand : IRequest<string>
|
||||||
{
|
{
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -26,13 +26,19 @@ namespace Managing.Application.ManageBot
|
|||||||
switch (request.BotType)
|
switch (request.BotType)
|
||||||
{
|
{
|
||||||
case BotType.SimpleBot:
|
case BotType.SimpleBot:
|
||||||
Func<Task<IBot>> simpleBot = () => Task.FromResult(_botFactory.CreateSimpleBot(request.Name, null));
|
var bot = _botFactory.CreateSimpleBot(request.Name, null);
|
||||||
|
bot.Start();
|
||||||
|
Func<Task<IBot>> simpleBot = () => Task.FromResult(bot);
|
||||||
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, simpleBot).Result.GetStatus());
|
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, simpleBot).Result.GetStatus());
|
||||||
case BotType.ScalpingBot:
|
case BotType.ScalpingBot:
|
||||||
Func<Task<ITradingBot>> scalpingBot = () => Task.FromResult(_botFactory.CreateScalpingBot(request.AccountName, moneyManagement, request.Name, request.Ticker, request.Scenario, request.Timeframe, request.IsForWatchingOnly));
|
var sBot = _botFactory.CreateScalpingBot(request.AccountName, moneyManagement, request.Name, request.Ticker, request.Scenario, request.Timeframe, request.IsForWatchingOnly);
|
||||||
|
sBot.Start();
|
||||||
|
Func<Task<ITradingBot>> scalpingBot = () => Task.FromResult(sBot);
|
||||||
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, scalpingBot).Result.GetStatus());
|
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, scalpingBot).Result.GetStatus());
|
||||||
case BotType.FlippingBot:
|
case BotType.FlippingBot:
|
||||||
Func<Task<ITradingBot>> flippingBot = () => Task.FromResult(_botFactory.CreateFlippingBot(request.AccountName, moneyManagement, request.Name, request.Ticker, request.Scenario, request.Timeframe, request.IsForWatchingOnly));
|
var fBot = _botFactory.CreateFlippingBot(request.AccountName, moneyManagement, request.Name, request.Ticker, request.Scenario, request.Timeframe, request.IsForWatchingOnly);
|
||||||
|
fBot.Start();
|
||||||
|
Func<Task<ITradingBot>> flippingBot = () => Task.FromResult(fBot);
|
||||||
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, flippingBot).Result.GetStatus());
|
return Task.FromResult(_taskCache.AddOrGetExisting(request.Name, flippingBot).Result.GetStatus());
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ public static class ApiBootstrap
|
|||||||
// Cache
|
// Cache
|
||||||
services.AddDistributedMemoryCache();
|
services.AddDistributedMemoryCache();
|
||||||
services.AddTransient<ICacheService, CacheService>();
|
services.AddTransient<ICacheService, CacheService>();
|
||||||
services.AddTransient<ITaskCache, TaskCache>();
|
services.AddSingleton<ITaskCache, TaskCache>();
|
||||||
|
|
||||||
// Processors
|
// Processors
|
||||||
services.AddTransient<IExchangeProcessor, EvmProcessor>();
|
services.AddTransient<IExchangeProcessor, EvmProcessor>();
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ using Managing.Application.Trading.Commands;
|
|||||||
using Managing.Domain.Trades;
|
using Managing.Domain.Trades;
|
||||||
using Managing.Infrastructure.Evm.Services;
|
using Managing.Infrastructure.Evm.Services;
|
||||||
using Managing.Application.Bots.Base;
|
using Managing.Application.Bots.Base;
|
||||||
|
using Managing.Application.ManageBot;
|
||||||
|
|
||||||
namespace Managing.Bootstrap;
|
namespace Managing.Bootstrap;
|
||||||
|
|
||||||
@@ -58,6 +59,7 @@ public static class WorkersBootstrap
|
|||||||
services.AddSingleton<ITradingService, TradingService>();
|
services.AddSingleton<ITradingService, TradingService>();
|
||||||
services.AddSingleton<ISettingsService, SettingsService>();
|
services.AddSingleton<ISettingsService, SettingsService>();
|
||||||
services.AddSingleton<IBacktester, Backtester>();
|
services.AddSingleton<IBacktester, Backtester>();
|
||||||
|
services.AddSingleton<IBotService, BotService>();
|
||||||
|
|
||||||
services.AddTransient<ICommandHandler<OpenPositionRequest, Position>, OpenPositionCommandHandler>();
|
services.AddTransient<ICommandHandler<OpenPositionRequest, Position>, OpenPositionCommandHandler>();
|
||||||
services.AddTransient<ICommandHandler<ClosePositionCommand, Position>, ClosePositionCommandHandler>();
|
services.AddTransient<ICommandHandler<ClosePositionCommand, Position>, ClosePositionCommandHandler>();
|
||||||
@@ -93,6 +95,7 @@ public static class WorkersBootstrap
|
|||||||
services.AddTransient<ISettingsRepository, SettingsRepository>();
|
services.AddTransient<ISettingsRepository, SettingsRepository>();
|
||||||
services.AddTransient<ITradingRepository, TradingRepository>();
|
services.AddTransient<ITradingRepository, TradingRepository>();
|
||||||
services.AddTransient<IBacktestRepository, BacktestRepository>();
|
services.AddTransient<IBacktestRepository, BacktestRepository>();
|
||||||
|
services.AddTransient<IBotRepository, BotRepository>();
|
||||||
|
|
||||||
// Cache
|
// Cache
|
||||||
services.AddDistributedMemoryCache();
|
services.AddDistributedMemoryCache();
|
||||||
|
|||||||
@@ -317,7 +317,8 @@ public static class Enums
|
|||||||
PositionFetcher,
|
PositionFetcher,
|
||||||
TraderWatcher,
|
TraderWatcher,
|
||||||
LeaderboardWorker,
|
LeaderboardWorker,
|
||||||
Noobiesboard
|
Noobiesboard,
|
||||||
|
BotManager
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum WorkflowUsage
|
public enum WorkflowUsage
|
||||||
|
|||||||
@@ -64,7 +64,8 @@ namespace Managing.Infrastructure.Storage
|
|||||||
public T Get<T>(string key)
|
public T Get<T>(string key)
|
||||||
{
|
{
|
||||||
var existingValue = (AsyncLazy<T>)_cache.Get(key);
|
var existingValue = (AsyncLazy<T>)_cache.Get(key);
|
||||||
return existingValue.Value.Result;
|
if (existingValue != null) return existingValue.Value.Result;
|
||||||
|
return default(T);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual List<T> GetCache<T>()
|
public virtual List<T> GetCache<T>()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
VITE_API_URL_LOCAL=https://localhost:443
|
VITE_API_URL_LOCAL=http://localhost:5000
|
||||||
VITE_API_URL_SERVER=https://dev-managing-api.apps.managing.live
|
VITE_API_URL_SERVER=https://dev-managing-api.apps.managing.live
|
||||||
VITE_WORKER_URL_LOCAL=https://localhost:5002
|
VITE_WORKER_URL_LOCAL=https://localhost:5002
|
||||||
VITE_WORKER_URL_SERVER=https://dev-managing-worker.apps.managing.live
|
VITE_WORKER_URL_SERVER=https://dev-managing-worker.apps.managing.live
|
||||||
|
|||||||
Reference in New Issue
Block a user