Merge pull request #742 from Drakkar-Software/dev

Master merge

Author: GuillaumeDSM

Services/Interfaces/telegram_bot_interface/telegram_bot.py

@@ -265,7 +265,12 @@ def command_market_status(update, _):
                                                            "evaluations, please retry in a few seconds.`")
 
     @staticmethod
-    def command_error(update, _, error=None):
+    def command_error(update, context, error=None):
+        ctx_error = context.error if hasattr(context, 'error') else None
+        if update is None and error is None and ctx_error is not None:
+            TelegramBotInterface.get_logger().error(f"Telegram bot error: {ctx_error}")
+            return
+        error = error or ctx_error
         TelegramBotInterface.get_logger().warning("Command receiver error. Please check logs for more details.") \
             if error is None else TelegramBotInterface.get_logger().exception(error, False)
         if update is not None and TelegramBotInterface._is_valid_user(update):

Services/Interfaces/web_interface/api/bots.py

@@ -20,11 +20,14 @@
 import tentacles.Services.Interfaces.web_interface.api as api
 import tentacles.Services.Interfaces.web_interface.login as login
 import tentacles.Services.Interfaces.web_interface.models as models
+import tentacles.Services.Interfaces.web_interface.util as util
 
 
 @api.api.route("/select_bot", methods=['POST'])
 @login.login_required_when_activated
 def select_bot():
+    if not models.can_select_bot():
+        return util.get_rest_reply(flask.jsonify("Can't select bot on this setup"), 500)
     models.select_bot(flask.request.get_json())
     bot = models.get_selected_user_bot()
     flask.flash(f"Selected {bot['name']} bot", "success")
@@ -34,6 +37,8 @@ def select_bot():
 @api.api.route("/create_bot", methods=['POST'])
 @login.login_required_when_activated
 def create_bot():
+    if not models.can_select_bot():
+        return util.get_rest_reply(flask.jsonify("Can't create bot on this setup"), 500)
     new_bot = models.create_new_bot()
     models.select_bot(community.CommunityUserAccount.get_bot_id(new_bot))
     bot = models.get_selected_user_bot()

Services/Interfaces/web_interface/controllers/community.py

@@ -50,7 +50,8 @@ def community():
         all_user_bots=models.get_all_user_bots(),
         selected_user_bot=models.get_selected_user_bot(),
         default_tentacles_package_image=default_image,
-        can_logout=not authentication.Authenticator.instance().must_be_authenticated_through_authenticator()
+        can_logout=models.can_logout(),
+        can_select_bot=models.can_select_bot(),
     )
 
 

Services/Interfaces/web_interface/controllers/community_authentication.py

@@ -60,8 +60,7 @@ def community_login():
 @web_interface.server_instance.route("/community_logout")
 @login.login_required_when_activated
 def community_logout():
-    if authentication.Authenticator.instance().must_be_authenticated_through_authenticator():
-        # can't logout when authentication is required
+    if models.can_logout():
         return flask.redirect(flask.url_for('community'))
     authentication.Authenticator.instance().logout()
     interfaces_util.run_in_bot_main_loop(

Services/Interfaces/web_interface/controllers/configuration.py

@@ -47,7 +47,11 @@ def profile():
     missing_tentacles = set()
     profiles = models.get_profiles()
     config_exchanges = display_config[commons_constants.CONFIG_EXCHANGES]
-
+    enabled_exchanges = [
+        exchange
+        for exchange, exchange_config in config_exchanges.items()
+        if exchange_config.get(commons_constants.CONFIG_ENABLED_OPTION, True)
+    ]
     return flask.render_template('profile.html',
                                  current_profile=current_profile,
                                  profiles=profiles,
@@ -63,9 +67,7 @@ def profile():
 
                                  real_trader_activated=interfaces_util.has_real_and_or_simulated_traders()[0],
 
-                                 symbol_list=sorted(models.get_symbol_list([exchange
-                                                                            for exchange in display_config[
-                                                                                commons_constants.CONFIG_EXCHANGES]])),
+                                 symbol_list=sorted(models.get_symbol_list(enabled_exchanges)),
                                  full_symbol_list=models.get_all_symbols_dict(),
                                  evaluator_config=models.get_evaluator_detailed_config(media_url, missing_tentacles),
                                  strategy_config=models.get_strategy_config(media_url, missing_tentacles),

Services/Interfaces/web_interface/controllers/trading.py

@@ -84,7 +84,11 @@ def trading():
                                  watched_symbols=models.get_watched_symbols(),
                                  pairs_with_status=interfaces_util.get_currencies_with_status(),
                                  has_real_trader=has_real_trader,
-                                 exchanges_load=exchanges_load)
+                                 exchanges_load=exchanges_load,
+                                 is_community_feed_connected=models.is_community_feed_connected(),
+                                 last_signal_time=models.get_last_signal_time(),
+                                 followed_strategy_url=models.get_followed_strategy_url(),
+                                 )
 
 
 @web_interface.server_instance.route("/trades")

Services/Interfaces/web_interface/models/__init__.py

@@ -65,6 +65,11 @@
     get_selected_user_bot,
     select_bot,
     create_new_bot,
+    can_select_bot,
+    can_logout,
+    get_followed_strategy_url,
+    is_community_feed_connected,
+    get_last_signal_time,
 )
 from tentacles.Services.Interfaces.web_interface.models.configuration import (
     get_evaluators_tentacles_startup_activation,
@@ -225,6 +230,11 @@
     "get_selected_user_bot",
     "select_bot",
     "create_new_bot",
+    "can_select_bot",
+    "can_logout",
+    "get_followed_strategy_url",
+    "is_community_feed_connected",
+    "get_last_signal_time",
     "get_evaluators_tentacles_startup_activation",
     "get_trading_tentacles_startup_activation",
     "get_tentacle_documentation",

Services/Interfaces/web_interface/models/community.py

@@ -15,7 +15,9 @@
 #  License along with this library.
 import octobot_services.interfaces.util as interfaces_util
 import octobot.community as octobot_community
+import octobot.constants as octobot_constants
 import octobot_commons.authentication as authentication
+import octobot_trading.api as trading_api
 
 
 def get_community_metrics_to_display():
@@ -83,3 +85,31 @@ def select_bot(bot_id):
 
 def create_new_bot():
     return interfaces_util.run_in_bot_main_loop(authentication.Authenticator.instance().create_new_bot())
+
+
+def can_select_bot():
+    return not octobot_constants.COMMUNITY_BOT_ID
+
+
+def can_logout():
+    return not authentication.Authenticator.instance().must_be_authenticated_through_authenticator()
+
+
+def get_followed_strategy_url():
+    trading_mode = interfaces_util.get_bot_api().get_trading_mode()
+    if trading_mode is None:
+        return None
+    identifier = trading_api.get_trading_mode_followed_strategy_signals_identifier(trading_mode)
+    if identifier is None:
+        return None
+    return authentication.Authenticator.instance().get_signal_community_url(
+        identifier
+    )
+
+
+def is_community_feed_connected():
+    return authentication.Authenticator.instance().is_feed_connected()
+
+
+def get_last_signal_time():
+    return authentication.Authenticator.instance().get_feed_last_message_time()

Services/Interfaces/web_interface/models/configuration.py

@@ -85,6 +85,19 @@
 
 DEFAULT_EXCHANGE = "binance"
 
+
+def _get_currency_dict(symbol, identifier):
+    return {
+        SYMBOL_KEY: symbol.upper(),
+        ID_KEY: identifier
+    }
+
+
+# forced cryptocurrencies to be displayed in currency selector
+FORCED_CURRENCIES_DICT = {
+    "HollaEx": _get_currency_dict("XHT", "hollaex-token")
+}
+
 # buffers to faster config page loading
 markets_by_exchanges = {}
 all_symbols_dict = {}
@@ -701,10 +714,11 @@ def get_all_symbols_dict():
                     break
                 for currency_data in request_response.json():
                     if _is_legit_currency(currency_data[NAME_KEY]):
-                        all_symbols_dict[currency_data[NAME_KEY]] = {
-                            SYMBOL_KEY: currency_data[SYMBOL_KEY].upper(),
-                            ID_KEY: currency_data[ID_KEY]
-                        }
+                        all_symbols_dict[currency_data[NAME_KEY]] = _get_currency_dict(
+                            currency_data[SYMBOL_KEY],
+                            currency_data[ID_KEY]
+                        )
+            _add_forced_currencies(all_symbols_dict)
         except Exception as e:
             details = f"code: {request_response.status_code}, body: {request_response.text}" \
                 if request_response else {request_response}
@@ -714,6 +728,10 @@ def get_all_symbols_dict():
     return all_symbols_dict
 
 
+def _add_forced_currencies(symbols_dict):
+    symbols_dict.update(FORCED_CURRENCIES_DICT)
+
+
 def get_exchange_logo(exchange_name):
     try:
         return exchange_logos[exchange_name]

Services/Interfaces/web_interface/static/js/components/configuration.js

@@ -400,7 +400,8 @@ function _save_config(element, restart_after_save) {
                 const new_value = parse_new_value(configElement);
                 const config_key = get_config_key(configElement);
 
-                if (get_config_value_changed(configElement, new_value, config_key)) {
+                if (get_config_value_changed(configElement, new_value, config_key)
+                    && !config_key.endsWith("_Empty")) {
                     updated_config[config_type][config_key] = new_value;
                 }
             }