Merge pull request #2305 from Drakkar-Software/dev

Master merge

Author: GuillaumeDSM

CHANGELOG.md

@@ -6,6 +6,20 @@ 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.47] - 2023-04-02
+### Added
+- [Evaluators] ChatGPT evaluator
+- [Exchanges] Restore Coinbase support
+- [Profiles] Risk and complexity
+### Updated
+- [WebInterface] Improve candle charts display. Special thanks to Tim !
+- [Services] Telegram, flask, reddit and other connectors versions
+### Fixed
+- [OKX] create order issues
+- [WebInterface] Fix unexpected client disconnections
+- [PNL] invalid trades PNL related issues
+
+
 ## [0.4.46] - 2023-03-24
 ### Updated
 - [Telegram] portfolio display

README.md

@@ -1,4 +1,4 @@
-# OctoBot [0.4.46](https://octobot.click/gh-changelog)
+# OctoBot [0.4.47](https://octobot.click/gh-changelog)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg?logo=pypi)](https://octobot.click/gh-pypi)
 [![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)

exchanges_tests/abstract_authenticated_exchange_tester.py

@@ -100,9 +100,9 @@ async def inner_test_create_and_fill_market_orders(self):
         price = self.get_order_price(current_price, False)
         size = self.get_order_size(portfolio, price)
         buy_market = await self.create_market_order(current_price, size, trading_enums.TradeOrderSide.BUY)
-        self.check_created_market_order(buy_market, size, trading_enums.TradeOrderSide.BUY)
         post_buy_portfolio = {}
         try:
+            self.check_created_market_order(buy_market, size, trading_enums.TradeOrderSide.BUY)
             filled_order = await self.wait_for_fill(buy_market)
             await self.check_require_order_fees_from_trades(
                 filled_order[trading_enums.ExchangeConstantsOrderColumns.ID.value]
@@ -568,6 +568,8 @@ async def create_market_order(self, current_price, size, side, symbol=None,
 
     async def create_order(self, price, current_price, size, side, order_type,
                            symbol=None, push_on_exchange=True):
+        if size == trading_constants.ZERO:
+            raise AssertionError(f"Trying to create and order with a size of {size}")
         current_order = personal_data.create_order_instance(
             self.exchange_manager.trader,
             order_type=order_type,

exchanges_tests/test_coinbasepro.py exchanges_tests/test_coinbase.pyexchanges_tests/test_coinbasepro.py renamed to exchanges_tests/test_coinbase.py

@@ -21,18 +21,16 @@
 pytestmark = pytest.mark.asyncio
 
 
-class TestCoinbaseproAuthenticatedExchange(
+class TestCoinbaseAuthenticatedExchange(
     abstract_authenticated_exchange_tester.AbstractAuthenticatedExchangeTester
 ):
-    # BROKEN: waiting for ccxt update on coinbase advanced
-
     # enter exchange name as a class variable here
-    EXCHANGE_NAME = "coinbasepro"
-    EXCHANGE_TENTACLE_NAME = "CoinbasePro"
-    ORDER_CURRENCY = "BTC"
-    SETTLEMENT_CURRENCY = "USD"
+    EXCHANGE_NAME = "coinbase"
+    ORDER_CURRENCY = "ADA"
+    SETTLEMENT_CURRENCY = "BTC"
     SYMBOL = f"{ORDER_CURRENCY}/{SETTLEMENT_CURRENCY}"
-    ORDER_SIZE = 50  # % of portfolio to include in test orders
+    ORDER_SIZE = 20  # % of portfolio to include in test orders
+    CONVERTS_ORDER_SIZE_BEFORE_PUSHING_TO_EXCHANGES = True
 
     async def test_get_portfolio(self):
         await super().test_get_portfolio()

octobot/__init__.py

@@ -16,5 +16,5 @@
 
 PROJECT_NAME = "OctoBot"
 AUTHOR = "Drakkar-Software"
-VERSION = "0.4.46"  # major.minor.revision
+VERSION = "0.4.47"  # major.minor.revision
 LONG_VERSION = f"{VERSION}"

octobot/api/backtesting.py

@@ -25,6 +25,7 @@ def create_independent_backtesting(config,
                                    run_on_common_part_only=True,
                                    start_timestamp=None,
                                    end_timestamp=None,
+                                   portfolio=None,
                                    enable_logs=True,
                                    stop_when_finished=False,
                                    enforce_total_databases_max_size_after_run=True,
@@ -39,6 +40,7 @@ def create_independent_backtesting(config,
         join_backtesting_timeout=join_backtesting_timeout,
         start_timestamp=start_timestamp,
         end_timestamp=end_timestamp,
+        portfolio=portfolio,
         enable_logs=enable_logs,
         stop_when_finished=stop_when_finished,
         enforce_total_databases_max_size_after_run=enforce_total_databases_max_size_after_run,

octobot/backtesting/independent_backtesting.pxd

@@ -38,6 +38,7 @@ cdef class IndependentBacktesting:
     cdef public dict symbols_to_create_exchange_classes
     cdef public double risk
     cdef public dict starting_portfolio
+    cdef public dict input_portfolio
     cdef public dict fees_config
     cdef public bint stopped
 

octobot/backtesting/independent_backtesting.py

@@ -51,6 +51,7 @@ def __init__(self, config,
                  join_backtesting_timeout=backtesting_constants.BACKTESTING_DEFAULT_JOIN_TIMEOUT,
                  start_timestamp=None,
                  end_timestamp=None,
+                 portfolio=None,
                  enable_logs=True,
                  stop_when_finished=False,
                  enforce_total_databases_max_size_after_run=True,
@@ -66,6 +67,7 @@ def __init__(self, config,
         self.symbols_to_create_exchange_classes = {}
         self.risk = 0.1
         self.starting_portfolio = {}
+        self.input_portfolio = portfolio
         self.fees_config = {}
         self.forced_time_frames = []
         self.optimizer_id = None
@@ -216,8 +218,10 @@ async def _register_available_data(self):
     def _init_default_config_values(self):
         self.risk = copy.deepcopy(self.octobot_origin_config[common_constants.CONFIG_TRADING][
                                       common_constants.CONFIG_TRADER_RISK])
-        self.starting_portfolio = copy.deepcopy(self.octobot_origin_config[common_constants.CONFIG_SIMULATOR][
-                                                    common_constants.CONFIG_STARTING_PORTFOLIO])
+        self.starting_portfolio = copy.deepcopy(
+            self.input_portfolio or
+            self.octobot_origin_config[common_constants.CONFIG_SIMULATOR][common_constants.CONFIG_STARTING_PORTFOLIO]
+        )
         self.fees_config = copy.deepcopy(self.octobot_origin_config[common_constants.CONFIG_SIMULATOR][
                                              common_constants.CONFIG_SIMULATOR_FEES])
         if evaluator_constants.CONFIG_FORCED_TIME_FRAME in self.octobot_origin_config:

octobot/backtesting/octobot_backtesting.py

@@ -223,6 +223,8 @@ def check_remaining_objects(self):
             exchanges.ExchangeSimulator: exchanges_count,
             exchange_data.OHLCVUpdaterSimulator: exchanges_count
         }
+        # trigger garbage collector to get a fresh memory picture
+        gc.collect()
         for obj in gc.get_objects():
             if isinstance(obj, to_watch_objects):
                 if isinstance(obj, exchanges.ExchangeManager) and not obj.is_initialized:

octobot/config/profile_schema.json

@@ -22,6 +22,12 @@
         "origin_url": {
           "type": ["string", "null"]
         },
+        "complexity": {
+          "type": "number"
+        },
+        "risk": {
+          "type": "number"
+        },
         "read_only": {
           "type": "boolean"
         }