logsvc added

Author: whittlem

.github/workflows/container-websvc.yml

@@ -3,7 +3,7 @@ name: WebSvc Container
 on:
   push:
     branches:
-      - beta # update to main later
+      - main
     tags:
       - '**'
   pull_request:

.github/workflows/container.yml

@@ -2,20 +2,11 @@ name: Container
 
 on:
   push:
-    # Publish `main` as Docker `latest` image.
     branches:
       - main
-      # - beta
-      # - '*docker*'
-
-    # Publish `v1.2.3` tags as releases.
     tags:
-      - '**' # All tags kick off a new container build Save history ad 5.0.x etc
-
-  # Run tests for any PRs.
+      - '**'
   pull_request:
-
-  # Manual runs
   workflow_dispatch:
 
 env:

controllers/PyCryptoBot.py

@@ -1061,13 +1061,17 @@ def _notify(notification: str = "", level: str = "normal") -> None:
                     # if not live
                     else:
                         if self.state.last_buy_size == 0 and self.state.last_buy_filled == 0:
-                            # Sim mode can now use buymaxsize as the amount used for a buy
-                            if self.buymaxsize is not None:
+                            # sim mode can now use buymaxsize as the amount used for a buy
+                            if self.buymaxsize > 0:
                                 self.state.last_buy_size = self.buymaxsize
                                 self.state.first_buy_size = self.buymaxsize
+                            else:
+                                # TODO: calculate correct buy amount based on quote currency balance
+                                self.state.last_buy_size = 1
+                                self.state.first_buy_size = 1
                         # add option for buy last sell size
                         elif (
-                            self.buymaxsize is not None
+                            self.buymaxsize > 0
                             and self.buylastsellsize
                             and self.state.last_sell_size > self.state.minimum_order_quote(quote=self.state.last_sell_size, balancechk=True)
                         ):
@@ -1089,7 +1093,7 @@ def _notify(notification: str = "", level: str = "normal") -> None:
                                 + "\n - TEST BUY at "
                                 + str(self.price)
                                 + "\n - Buy Size: "
-                                + str(_truncate(self.state.last_buy_size, 4))
+                                + str(_truncate(self.state.last_buy_size, 4))  # TODO: why is this 0?
                             )
 
                         if not self.is_verbose:
@@ -1320,6 +1324,8 @@ def _notify(notification: str = "", level: str = "normal") -> None:
 
                     # if not live
                     else:
+                        # TODO
+
                         margin, profit, sell_fee = calculate_margin(
                             buy_size=self.state.last_buy_size,
                             buy_filled=self.state.last_buy_filled,
@@ -2991,6 +2997,10 @@ def get_additional_df(self, short_granularity, websocket) -> pd.DataFrame:
     def get_last_buy(self) -> dict:
         """Retrieves the last exchange buy order and returns a dictionary"""
 
+        if not self.is_live:
+            # not live, return None
+            return None
+
         try:
             if self.exchange == Exchange.COINBASEPRO:
                 api = CBAuthAPI(
@@ -3074,11 +3084,11 @@ def get_last_buy(self) -> dict:
             return None
 
     def get_taker_fee(self):
-        if self.is_sim and self.exchange == Exchange.COINBASEPRO:
+        if not self.is_live and self.exchange == Exchange.COINBASEPRO:
             return 0.005  # default lowest fee tier
-        elif self.is_sim and self.exchange == Exchange.BINANCE:
+        elif not self.is_live and self.exchange == Exchange.BINANCE:
             return 0.0  # default lowest fee tier
-        elif self.is_sim and self.exchange == Exchange.KUCOIN:
+        elif not self.is_live and self.exchange == Exchange.KUCOIN:
             return 0.0015  # default lowest fee tier
         elif self.takerfee > -1.0:
             return self.takerfee
@@ -3114,7 +3124,16 @@ def get_taker_fee(self):
             return 0.005
 
     def get_maker_fee(self):
-        if self.exchange == Exchange.COINBASEPRO:
+        if not self.is_live and self.exchange == Exchange.COINBASEPRO:
+            print("WENT IN HERE - GOOD - REMOVE THIS")
+            return 0.005  # default lowest fee tier
+        elif not self.is_live and self.exchange == Exchange.BINANCE:
+            return 0.0  # default lowest fee tier
+        elif not self.is_live and self.exchange == Exchange.KUCOIN:
+            return 0.0015  # default lowest fee tier
+        elif self.makerfee > -1.0:
+            return self.makerfee
+        elif self.exchange == Exchange.COINBASEPRO:
             api = CBAuthAPI(
                 self.api_key,
                 self.api_secret,

logsvc.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+
+import os
+import re
+import sys
+import argparse
+import webbrowser
+from threading import Timer
+from logsvc.app import app
+
+parser = argparse.ArgumentParser(description="PyCryptoBot Log Reader")
+parser.add_argument(
+    "--host",
+    type=str,
+    help="web service ip (default: 127.0.0.1)",
+)
+parser.add_argument(
+    "--port",
+    type=int,
+    help="web service port (default: 5000)",
+)
+parser.add_argument("--quiet", action="store_true", help="don't open browser")
+parser.add_argument("--debug", action="store_true", help="enable debugging")
+
+args = parser.parse_args()
+
+# listen on local host
+http_host = "0.0.0.0"
+if args.host is not None:
+    p = re.compile(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+    if p.match(args.host):
+        http_host = args.host
+    else:
+        parser.print_help(sys.stderr)
+
+# flask listening port
+http_port = 5000
+if args.port is not None:
+    if args.port >= 0 and args.port <= 65535:
+        http_port = args.port
+    else:
+        parser.print_help(sys.stderr)
+
+
+def open_browser() -> None:
+    webbrowser.open_new(f"http://{http_host}:{http_port}/")
+
+
+if __name__ == "__main__":
+    if args.quiet is False:
+        Timer(1, open_browser).start()
+
+    port = int(os.environ.get("PORT", http_port))
+
+    # pyright: reportUndefinedVariable=false
+    app.run(host=http_host, port=port, debug=args.debug)  # noqa: F821

logsvc/__init__.py

@@ -0,0 +1,56 @@
+import io
+import os
+import sys
+import time
+import requests
+from threading import Lock
+from flask import Flask, render_template, session
+from flask_socketio import SocketIO, emit
+from pygtail import Pygtail
+
+__all__ = ("follow",)
+
+# threading", "eventlet", "gevent" or None for auto detection
+async_mode = None
+
+app = Flask(__name__)
+socketio = SocketIO(app, async_mode=async_mode)
+thread = None
+thread_lock = Lock()
+
+
+def log_reader_thread():
+    with io.open("pycryptobot.log") as fp:
+        line = fp.readline().strip()
+        while line:
+            # don't print existing lines
+            line = fp.readline().strip()
+
+        while True:
+            line = fp.readline().strip()
+            if len(line):
+                socketio.emit("log_msg", {"data": line})
+            socketio.sleep(0.1)
+
+
+@app.route("/")
+def index():
+    return render_template("index.html", async_mode=socketio.async_mode)
+
+
+@socketio.event
+def my_event(message):
+    session["receive_count"] = session.get("receive_count", 0) + 1
+    emit("log_msg", {"data": message["data"]})
+
+
+@socketio.event
+def connect():
+    global thread
+    with thread_lock:
+        if thread is None:
+            thread = socketio.start_background_task(log_reader_thread)
+
+
+if __name__ == "__main__":
+    socketio.run(app)

logsvc/app/__init__.py

@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+
+<head>
+    <title>PyCryptoBot Log</title>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
+        integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg=="
+        crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.0.4/socket.io.js"
+        integrity="sha512-aMGMvNYu8Ue4G+fHa359jcPb1u+ytAF+P2SCb+PxrjCdO3n3ZTxJ30zuH39rimUggmTwmh2u7wvQsDTHESnmfQ=="
+        crossorigin="anonymous"></script>
+    <script type="text/javascript" charset="utf-8">
+        $(document).ready(function () {
+            var socket = io();
+
+            socket.on('log_msg', function (msg, cb) {
+                $('#log').append('<br>' + $('<div/>').text(msg.data).html());
+                if (cb)
+                    cb();
+
+                window.scrollTo(0, document.body.scrollHeight);
+            });
+        });
+    </script>
+</head>
+
+<body>
+    <h1>PyCryptoBot Log</h1>
+    <div id="log"></div>
+</body>
+
+</html>

logsvc/app/templates/index.html

@@ -44,6 +44,9 @@ def __init__(self, app=None):
         self.quotebalance = self.get_balance(app.quote_currency)
         self.basebalance = self.get_balance(app.base_currency)
 
+        self.base_balance_before = 0.0
+        self.quote_balance_before = 0.0
+
         self.orders = pd.DataFrame()
 
     def _convert_status(self, val):

models/TradingAccount.py

@@ -308,6 +308,8 @@ def get_maker_fee(self, market: str = "") -> float:
     def get_taker_fee(self, market: str = "") -> float:
         """Retrieves the taker fee"""
 
+        print("SHOULD NOT HAVE GONE IN HERE!")
+
         if len(market) is not None:
             fees = self.get_fees(market)
         else: