Merge pull request #2056 from Drakkar-Software/dev

master merge

Author: GuillaumeDSM

CHANGELOG.md

@@ -6,16 +6,18 @@ 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.11] - 2022-10-12
+## [0.4.12] - 2022-10-15
+### Fixed
+- Copy trading
+
+## [0.4.11] - 2022-10-14
 ### Added
 - User inputs system
 - Phemex exchange
 - Run storage
 ### Updated
 - Configuration for each tentacle
 - Community bot system instead of devices
-### Fixed
-- Exchange API issues (Bybit, Kucoin)
 
 ## [0.4.10] - 2022-09-13
 ### Updated

README.md

@@ -1,4 +1,4 @@
-# OctoBot [0.4.11](https://octobot.click/gh-changelog)
+# OctoBot [0.4.12](https://octobot.click/gh-changelog)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg)](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)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg)](https://octobot.click/gh-dockerhub)

octobot/cli.py

@@ -120,6 +120,7 @@ def _create_startup_config(logger):
         config.read(should_raise=False)
     else:
         _read_config(config, logger)
+        _ensure_profile(config, logger)
         _validate_config(config, logger)
     return config
 
@@ -135,6 +136,19 @@ def _read_config(config, logger):
         raise errors.ConfigError(e)
 
 
+def _ensure_profile(config, logger):
+    if config.profile is None:
+        # no selected profile or profile not found
+        try:
+            config.select_profile(common_constants.DEFAULT_PROFILE)
+        except KeyError:
+            logger.error(f"Missing default profiles. Please make sure that the {config.profiles_path} "
+                         f"folder is accessible. To reinstall default profiles, delete the "
+                         f"'{tentacles_manager_constants.TENTACLES_PATH}' "
+                         f"folder or start OctoBot with the following arguments: tentacles --install --all")
+            raise errors.NoProfileError
+
+
 def _validate_config(config, logger):
     try:
         config.validate()

octobot/community/authentication.py

@@ -272,6 +272,8 @@ async def select_bot(self, bot_id):
         if fetched_bot is None:
             raise errors.BotNotFoundError(f"Can't find bot with id: {bot_id}")
         self.user_account.set_selected_bot_raw_data(fetched_bot)
+        bot_name = self.user_account.get_bot_name_or_id(self.user_account.get_selected_bot_raw_data())
+        self.logger.debug(f"Selected bot '{bot_name}'")
         self.user_account.gql_bot_id = bot_id
         self._save_gql_bot_id(self.user_account.gql_bot_id)
         await self.on_new_bot_select()

octobot/community/community_user_account.py

@@ -22,7 +22,6 @@ class CommunityUserAccount:
     BOT_DEVICE = "device"
     NO_SELECTED_BOT_DESC = "No selected bot. Please select a bot to enable your community features."
 
-
     def __init__(self):
         self.gql_user_id = None
         self.gql_bot_id = None
@@ -62,6 +61,12 @@ def get_selected_bot_device_uuid(self):
         except AttributeError:
             raise errors.NoBotDeviceError("No device associated to the select bot")
 
+    def get_selected_bot_device_name(self):
+        try:
+            return self.get_selected_bot_raw_data(raise_on_missing=True).get(self.BOT_DEVICE, {}).get("name", None)
+        except AttributeError:
+            raise errors.NoBotDeviceError("No device associated to the select bot")
+
     @staticmethod
     def get_bot_id(bot):
         return bot["_id"]

octobot/community/feeds/community_mqtt_feed.py

@@ -267,7 +267,8 @@ async def _connect(self):
         self._update_client_config(self._mqtt_client)
         self._register_callbacks(self._mqtt_client)
         self._mqtt_client.set_auth_credentials(self._device_uuid, None)
-        self.logger.debug(f"Connecting client")
+        self.logger.debug(f"Connecting client using device "
+                          f"'{self.authenticator.user_account.get_selected_bot_device_name()}'")
         self._connect_task = asyncio.create_task(
             self._mqtt_client.connect(self.feed_url, self.mqtt_broker_port, version=self.MQTT_VERSION)
         )

octobot/constants.py

@@ -21,7 +21,7 @@
 
 PROJECT_NAME = "OctoBot"
 AUTHOR = "DrakkarSoftware"
-SHORT_VERSION = "0.4.11"  # major.minor.revision
+SHORT_VERSION = "0.4.12"  # major.minor.revision
 PATCH_VERSION = ""  # patch : pX
 VERSION_DEV_PHASE = ""  # alpha : a / beta : b / release candidate : rc
 VERSION_PHASE = ""  # XX

requirements.txt

@@ -3,7 +3,7 @@ cython==0.29.26
 
 # Drakkar-Software requirements
 OctoBot-Commons==1.7.24
-OctoBot-Trading==2.2.18
+OctoBot-Trading==2.2.19
 OctoBot-Evaluators==1.7.5
 OctoBot-Tentacles-Manager==2.7.3
 OctoBot-Services==1.3.6

tests/unit_tests/community/test_community_mqtt_feed.py

@@ -30,6 +30,7 @@
 
 FEED_URL = "x.y.z"
 TOKEN = "acb1"
+NAME = "name_a"
 
 
 def _build_message(value, identifier):
@@ -65,6 +66,8 @@ async def connected_community_feed(authenticator):
         feed.INIT_TIMEOUT = 1
         with mock.patch.object(authenticator.user_account, "get_selected_bot_device_uuid", mock.Mock(return_value=TOKEN)) \
                 as get_selected_bot_device_uuid_mock, \
+             mock.patch.object(authenticator.user_account, "get_selected_bot_device_name", mock.Mock(return_value=NAME)
+                               ) as _get_selected_bot_device_uuid_mock, \
              mock.patch.object(feed, "_subscribe", mock.AsyncMock()) as _subscribe_mock, \
              mock.patch.object(gmqtt.Client, "connect", mock.AsyncMock()) as _connect_mock:
             await feed.register_feed_callback(commons_enums.CommunityChannelTypes.SIGNAL, mock.AsyncMock())