Added logs view

Absolute volume allocation for created trades

Author: iilunin

API/APIServer.py

@@ -1,14 +1,17 @@
 from datetime import datetime, timedelta
+from distutils.log import Log
 
 from flask import Flask, app, render_template
 from flask_jwt_extended import JWTManager
 from flask_restful import Api
 from flask_cors import CORS
 
+from API.Endpoints.LogsEndpoint import LogsEndpoint
 from API.Endpoints.APIexchangeInfoEndpoint import APIExchangeInfoEndpoint
 from API.Endpoints.BalanceEndpoint import BalanceEndpoint
 from API.Endpoints.JWTEndpoint import JWTEndpoint
 from API.Endpoints.OrderBookEndpoint import OrderBookEndpoint
+from API.Endpoints.ProxyEndpoint import ProxyEndpoint
 from API.Endpoints.TradeEndpoint import TradeEndpoint
 from API.Endpoints.TradeListEndpoint import TradeListEndpoint
 from Bot.TradeHandler import TradeHandler
@@ -40,6 +43,12 @@ def __init__(self, trade_handler: TradeHandler):
         # self.api.add_resource(BalanceEndpoint, APIServer.API_PREFIX + '/balance',
         #                       resource_class_kwargs={'trade_handler': self.th})
 
+        self.api.add_resource(ProxyEndpoint, APIServer.API_PREFIX + '/proxy/icon',
+                              resource_class_kwargs={'trade_handler': self.th})
+
+        self.api.add_resource(LogsEndpoint, APIServer.API_PREFIX + '/logs/<file>',
+                              resource_class_kwargs={'trade_handler': self.th})
+
         self.api.add_resource(OrderBookEndpoint, APIServer.API_PREFIX + '/orderbook/<symbol>',
                               resource_class_kwargs={'trade_handler': self.th})
 

API/Endpoints/LogsEndpoint.py

@@ -0,0 +1,12 @@
+from API.Endpoints.BotAPIResource import BotAPIResource
+from flask_jwt_extended import jwt_required
+
+
+class LogsEndpoint(BotAPIResource):
+
+    @jwt_required()
+    def get(self, file):
+        if not file:
+            return self.list_files()
+
+        return self.get_file_contents(None if file == 'latest' else file)

API/Endpoints/ProxyEndpoint.py

@@ -0,0 +1,13 @@
+import io
+import requests
+
+from flask import send_file
+
+from API.Endpoints.BotAPIResource import BotAPIResource
+
+
+class ProxyEndpoint(BotAPIResource):
+
+    def get(self):
+        r = requests.get('https://img.shields.io/github/stars/iilunin/crypto-bot.svg?style=social&label=Star&maxAge=2592000')
+        return send_file(io.BytesIO(r.content), mimetype='image/svg+xml;charset=utf-8', as_attachment=False)

Bot/Strategy/TargetsAndStopLossStrategy.py

@@ -153,7 +153,7 @@ def all_strategies(self):
 
     def emergent_close_position(self):
         try:
-            self.fx.cancel_open_orders(self.symbol())
+            self.cancel_all_open_orders()
 
             AccountBalances().update_balances(self.fx.get_all_balances_dict())
 

Bot/Strategy/TradingStrategy.py

@@ -113,8 +113,7 @@ def validate_target_orders(self, force_cancel_open_orders=False):
 
         update_required = False
         if force_cancel_open_orders or (len(active_trade_targets) == 0 and has_open_orders):
-            self.logInfo('Cancelling all Open orders')
-            self.fx.cancel_open_orders(self.symbol())
+            self.cancel_all_open_orders()
         else:
             for active_trade_target in active_trade_targets:
 
@@ -145,6 +144,10 @@ def validate_target_orders(self, force_cancel_open_orders=False):
             if update_required:
                 self.trigger_target_updated()
 
+    def cancel_all_open_orders(self):
+        self.logInfo('Cancelling all Open orders for "{}"'.format(self.symbol()))
+        self.fx.cancel_open_orders(self.symbol())
+
     def _update_trade_target_status_change(self, t: Target, status: str) -> bool:
         if status == FXConnector.ORDER_STATUS_FILLED:
             t.set_completed()

Bot/TradeHandler.py

@@ -93,6 +93,7 @@ def remove_strategy(self, strategy: TradingStrategy, api_call=False):
         if api_call:
             strategy.set_trade_removed()
 
+        strategy.cancel_all_open_orders()
         self.fx.listen_symbols([s.symbol() for s in self.strategies], self.listen_handler, self.user_data_handler)
         self.socket_message_rcvd = False
 

Docker/Dockerfile-botapi

@@ -8,7 +8,10 @@ WORKDIR /usr/src/app
 ENV \
   TRADE_DIR=/usr/src/trades \
   TRADE_COMPLETED_DIR=/usr/src/complete_trades \
-  CONF_DIR=/usr/src/configs
+  CONF_DIR=/usr/src/configs \
+  LOGS_DIR=/usr/src/logs
+
+RUN mkdir -p /usr/src/logs
 
 COPY requirements.txt /usr/src/app/
 

Dockerfile

@@ -49,6 +49,7 @@ ENV \
   TRADE_DIR=/usr/src/trades \
   TRADE_COMPLETED_DIR=/usr/src/complete_trades \
   CONF_DIR=/usr/src/configs
+  LOGS_DIR=/usr/src/logs
 
 COPY requirements.txt /usr/src/app/
 

Utils/Logger.py

@@ -1,13 +1,26 @@
 import logging
+import os
+from logging.handlers import TimedRotatingFileHandler, RotatingFileHandler
+from os import environ, path, listdir
+from os.path import isfile, join
 
 LOG_FORMAT = '%(asctime)s[%(levelname)s][%(name)s|%(threadName)s]: %(message)s'
 logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
 
+LOG_DIR = environ.get('LOGS_DIR')
+CURRENT_LOG_FN = path.join(LOG_DIR, 'log.txt') if LOG_DIR else None
+
+if LOG_DIR:
+    handler = RotatingFileHandler(CURRENT_LOG_FN, maxBytes=1048576, backupCount=7)
+    handler.setFormatter(logging.Formatter(LOG_FORMAT))
 
 class Logger:
     def __init__(self, logger=None):
         self.logger = logger if logger else logging.getLogger(self._get_logger_name())
 
+        if LOG_DIR:
+            self.logger.addHandler(handler)
+
     def logInfo(self, msg):
         self.logger.log(logging.INFO, msg)
 
@@ -20,6 +33,19 @@ def logError(self, msg):
     def logDebug(self, msg):
         self.logger.log(logging.DEBUG, msg)
 
+    def list_files(self):
+        if not LOG_DIR:
+            return None
+
+        return [f for f in listdir(LOG_DIR) if isfile(join(LOG_DIR, f))]
+
+    def get_file_contents(self, file):
+        if not file:
+            file = CURRENT_LOG_FN
+        f = open(file, 'r')
+        return f.read()
+
+
     def _get_logger_name(self):
         return self.__class__.__name__
 

admin/src/app/app.component.ts

@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
+import { MatIconRegistry } from '@angular/material/icon';
 import { MatSnackBar } from '@angular/material/snack-bar';
+import { DomSanitizer } from '@angular/platform-browser';
 import { AuthService } from './auth.service';
+import { BotApi } from './botapi';
 import { NotificationService, NotificatoinType } from './services/notification.service'
 
 @Component({
@@ -15,7 +18,10 @@ export class AppComponent {
   constructor(
     private notificationService: NotificationService, 
     private snackBar: MatSnackBar,
-    public auth: AuthService
+    public auth: AuthService,
+    private matIconRegistry: MatIconRegistry,
+    private domSanitizer: DomSanitizer,
+    private bot: BotApi
   ) {
     this.notificationService.notification$.subscribe(message => {
 
@@ -25,6 +31,10 @@ export class AppComponent {
           panelClass: [this.getPanelClass(message.type)]});
           // panelClass: ["blue-snackbar"]});
     });
+    
+    this.matIconRegistry.addSvgIcon(  
+      'my_git', domSanitizer.bypassSecurityTrustResourceUrl(`${this.bot.API_URL}/proxy/icon`)
+    );
   }
 
   private getPanelClass(type: NotificatoinType): string {

admin/src/app/app.module.ts

@@ -65,6 +65,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
 import { MainTabsComponent } from './main-tabs/main-tabs.component';
 import { BalancesComponent } from './balances/balances.component';
 import { AutoCompleteComponent } from './auto-complete/auto-complete.component';
+import { LogsComponent } from './logs/logs.component';
 // endmaterial
 // const schemas: any[] = [];
 // schemas.push(CUSTOM_ELEMENTS_SCHEMA);
@@ -81,7 +82,8 @@ import { AutoCompleteComponent } from './auto-complete/auto-complete.component';
     LogInComponent,
     MainTabsComponent,
     BalancesComponent,
-    AutoCompleteComponent
+    AutoCompleteComponent,
+    LogsComponent
   ],
   imports: [
     CommonModule,

admin/src/app/botapi.ts

@@ -30,6 +30,12 @@ export class BotApi {
   constructor(private http: HttpClient) {
   }
 
+  getRecentLogFileContents(filename='latest'): Observable<String> {
+    return this.http.get<String>(`${this.API_URL}/logs/${filename}`).pipe(
+      retry(this.RETRIES),
+      catchError(this.handleError('getActiveTrades', '')));
+  }
+
   addTrade(trade: TradeDetails ): Observable<ApiResult> {
     const sanitizedTrade: any = Object.assign({}, trade, {stoploss: trade.stoploss});
     deleteProperty(sanitizedTrade, '_stoploss');
@@ -148,6 +154,7 @@ export class BotApi {
     console.log('BotApi: ' + message);
   }
 
+
   /**
    * Handle Http operation that failed.
    * Let the app continue.

admin/src/app/logs/logs.component.css

@@ -0,0 +1,19 @@
+/* make-scrollable {
+    height: 800px;
+    overflow-y: scroll;
+} */
+
+.log-item {
+    height: 32px;
+    font-size: 16px;
+}
+
+div {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 16px;
+    position: relative;
+    height: inherit;
+}

admin/src/app/logs/logs.component.html

@@ -0,0 +1,16 @@
+<!-- <div class="full-width">
+    <mat-list *ngFor="let log of logContents">
+        <mat-list-item class="log-item"><p>{{log}}</p></mat-list-item>
+    </mat-list>
+</div> -->
+<div class="full-width">
+    <button mat-icon-button matTooltip="Refresh Log" (click)="refreshLogs()">
+        <mat-icon>refresh</mat-icon>
+    </button>
+    <button mat-icon-button matTooltip="Copy Log" *ngIf="logContents">
+        <mat-icon [cdkCopyToClipboard]="this.logContents.join('\n')">file_copy</mat-icon>
+    </button>
+</div>
+<div class="full-width" *ngFor="let log of logContents">
+    <p>{{log}}</p>
+</div>

admin/src/app/logs/logs.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LogsComponent } from './logs.component';
+
+describe('LogsComponent', () => {
+  let component: LogsComponent;
+  let fixture: ComponentFixture<LogsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ LogsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LogsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

admin/src/app/logs/logs.component.ts

@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { BotApi } from '../botapi';
+
+@Component({
+  selector: 'app-logs',
+  templateUrl: './logs.component.html',
+  styleUrls: ['./logs.component.css']
+})
+export class LogsComponent implements OnInit {
+
+  logContents: String[];
+
+  constructor(private api: BotApi) { }
+
+  ngOnInit(): void {
+    this.refreshLogs();  
+  }
+
+  refreshLogs(): void {
+    this.api.getRecentLogFileContents().subscribe(r => {
+      if (r){
+        this.logContents = r.trim().split('\n').reverse();
+      }
+    })
+  }
+
+}

admin/src/app/main-tabs/main-tabs.component.css

@@ -24,4 +24,19 @@
 
 h1.app-name {
     margin-left: 16px;
-}
+}
+
+mat-icon[name=git] {
+    width: 100px;
+    padding: 10 px;
+}
+
+span[name=gitcontainer]{
+    align-content: center;
+    text-align: center;
+    justify-content: center;
+}
+
+.spacer {
+    flex: 1 1 auto;
+ }

admin/src/app/main-tabs/main-tabs.component.html

@@ -1,7 +1,11 @@
 <div class="toolbar-container" *ngIf="auth.isLoggedIn()">
     <mat-toolbar color="primary" class="menu-toolbar">
       <button mat-icon-button (click)="snav.toggle()"><mat-icon>menu</mat-icon></button>
-      <h1 class="app-name">Crypto Bot</h1>
+      <span>Crypto Trading Bot</span>
+  <span class="spacer"></span>
+    <!-- <a href="https://github.com/iilunin/crypto-bot/" target="_blank" rel="noopener"> -->
+      <mat-icon aria-label="Example thumbs up SVG icon"  svgIcon="my_git" name="git" matTooltip="give the repo a star"></mat-icon>
+    <!-- </a> -->
     </mat-toolbar>
 
     <mat-sidenav-container class="side-nav-container" [style.marginTop.px]="56">
@@ -19,6 +23,12 @@ <h1 class="app-name">Crypto Bot</h1>
                     <div mat-line>Balances</div>
                 </mat-list-item>
             </a>
+            <a routerLink="/logs">
+              <mat-list-item>
+                  <mat-icon mat-list-icon>file_copy</mat-icon>
+                  <div mat-line>Logs</div>
+              </mat-list-item>
+          </a>
             <mat-divider></mat-divider>
             <a routerLink="/" (click)="auth.logout()">
                 <mat-list-item>