Merge pull request #1830 from Drakkar-Software/dev

master merge

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *It is strongly advised to perform an update of your tentacles after updating OctoBot. (start.py tentacles --install --all)*
 
+## [0.4.0-beta15] - 2021-09-09
+### Fixed
+- Real time evaluators related backtesting issues
+- Multiple decimal.Decimal related issues
+- Issues with orders parsing
+
 ## [0.4.0-beta14] - 2021-09-09
 ### Added
 - [New tentacle] 

README.md

@@ -1,4 +1,4 @@
-# OctoBot [0.4.0-beta14](https://github.com/Drakkar-Software/OctoBot/tree/dev/CHANGELOG.md)
+# OctoBot [0.4.0-beta15](https://github.com/Drakkar-Software/OctoBot/tree/dev/CHANGELOG.md)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg)](https://pypi.python.org/pypi/OctoBot/)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e07fb190156d4efb8e7d07aaa5eff2e1)](https://app.codacy.com/gh/Drakkar-Software/OctoBot?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot&utm_campaign=Badge_Grade_Dashboard)[![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg)](https://hub.docker.com/r/drakkarsoftware/octobot)
@@ -45,7 +45,7 @@ Octobot's main feature is **evolution** : you can [install](https://docs.octobot
 ## Installation
 OctoBot's installation is **very simple**... because **very documented** ! See the [installation guides](https://www.octobot.online/guides/#installation) for more info.
 
-#### With executable
+#### [With executable](https://docs.octobot.online/installation/with-binary)
 Follow the [2 steps installation guide](https://www.octobot.online/executable_installation/) 
 
 In short:
@@ -60,7 +60,15 @@ docker run -itd --name OctoBot -p 80:5001 -v $(pwd)/user:/octobot/user -v $(pwd)
 ```
 And then open [http://localhost](http://localhost).
 
-#### [With python sources](https://docs.octobot.online/installation/with-docker)
+#### [With pip](https://docs.octobot.online/installation/with-pip)
+
+In short :
+```
+pip install OctoBot>=0.4.0b14
+Octobot
+```
+
+#### [With python sources](https://docs.octobot.online/installation/with-python-only)
 Follow the [python installation guide](https://www.octobot.online/python_installation/) 
 
 In short :

octobot/community/community_manager.py

@@ -165,8 +165,8 @@ def _get_profitability(self):
 
         for exchange_manager in self.exchange_managers:
             profitability, _, _, _, _ = trading_api.get_profitability_stats(exchange_manager)
-            total_profitability += profitability
-            total_origin_values += trading_api.get_current_portfolio_value(exchange_manager)
+            total_profitability += float(profitability)
+            total_origin_values += float(trading_api.get_current_portfolio_value(exchange_manager))
 
         return total_profitability * 100 / total_origin_values if total_origin_values > 0 else 0
 
@@ -180,9 +180,9 @@ def _get_traded_volumes(self):
                 # cost is in quote currency for a traded pair
                 currency = symbol_util.split_symbol(trade.symbol)[-1]
                 if currency in volume_by_currency:
-                    volume_by_currency[currency] += trade.total_cost
+                    volume_by_currency[currency] += float(trade.total_cost)
                 else:
-                    volume_by_currency[currency] = trade.total_cost
+                    volume_by_currency[currency] = float(trade.total_cost)
         return volume_by_currency
 
     def _get_supports(self):
@@ -209,7 +209,7 @@ def _get_real_portfolio_value(self):
                 if current_value == 0:
                     current_value = trading_api.get_origin_portfolio_value(exchange_manager)
                 total_value += current_value
-            return total_value
+            return float(total_value)
         else:
             return 0
 

octobot/constants.py

@@ -21,7 +21,7 @@
 SHORT_VERSION = "0.4.0"  # major.minor.revision
 PATCH_VERSION = ""  # patch : pX
 VERSION_DEV_PHASE = "b"  # alpha : a / beta : b / release candidate : rc
-VERSION_PHASE = "14"  # XX
+VERSION_PHASE = "15"  # XX
 VERSION = f"{SHORT_VERSION}{VERSION_DEV_PHASE}{VERSION_PHASE}"
 LONG_VERSION = f"{SHORT_VERSION}{PATCH_VERSION}{VERSION_DEV_PHASE}{VERSION_PHASE}"
 

octobot/logger.py

@@ -33,6 +33,7 @@
 
 import octobot_trading.exchange_channel as exchanges_channel
 import octobot_trading.enums as trading_enums
+import octobot_trading.api as trading_api
 
 import octobot.constants as constants
 import octobot.configuration_manager as configuration_manager
@@ -270,7 +271,8 @@ async def mark_price_callback(
 
 
 async def balance_callback(exchange: str, exchange_id: str, balance):
-    BOT_CHANNEL_LOGGER.debug(f"BALANCE : EXCHANGE = {exchange} || BALANCE = {balance}")
+    BOT_CHANNEL_LOGGER.debug(f"BALANCE : EXCHANGE = {exchange} || BALANCE = "
+                             f"{trading_api.format_portfolio(balance, as_decimal=False)}")
 
 
 async def balance_profitability_callback(

octobot/updater/updater_factory.py

@@ -24,8 +24,10 @@
 def create_updater():
     bot_type = os_util.get_octobot_type()
 
+    if bot_type == commons_enums.OctoBotTypes.DOCKER.value:
+        return None
     if bot_type == commons_enums.OctoBotTypes.BINARY.value:
         return binary_updater.BinaryUpdater()
-    if bot_type == commons_enums.OctoBotTypes.PYTHON.value or bot_type == commons_enums.OctoBotTypes.DOCKER.value:
+    if bot_type == commons_enums.OctoBotTypes.PYTHON.value:
         return python_updater.PythonUpdater()
     return None

requirements.txt

@@ -3,12 +3,13 @@ cython==0.29.24
 
 # Drakkar-Software requirements
 OctoBot-Commons==1.6.12
-OctoBot-Trading==1.13.17
-OctoBot-Evaluators==1.6.19
+OctoBot-Trading==1.13.19
+OctoBot-Evaluators==1.6.20
 OctoBot-Tentacles-Manager==2.5.2
 OctoBot-Services==1.2.24
 OctoBot-Backtesting==1.6.23
 Async-Channel==2.0.12
+trading-backend==1.0.11
 
 ## Others
 colorlog==4.7.2