Merge pull request #2729 from Drakkar-Software/dev

Dev merge
Drakkar-Software · Aug 27, 2024 · 83c0143 · 83c0143
2 parents 21fb908 + 65ecb57
commit 83c0143
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/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)*
 
+## [2.0.5] - 2024-08-27
+### Fixed
+- [Portfolio] Fixed ZeroDivisionError issues
+- [Grid] Fixed Auto-dispatch interval display issues
+- [Evaluators] Log warning on outdated evaluation push
+
 ## [2.0.4] - 2024-08-25
 ### Added
 - [BitMart] The BitMart exchange is now officially supported
@@ -20,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [MEXC] Fixed MEXC traded pairs fetching issues
 - [OKX] Fixed leveraging parsing issues
 - [WebInterface] Fixed order cancel UI issues
-- [Configuration] Fixed recovery file related iss
+- [Configuration] Fixed recovery file related issues
 
 ## [2.0.3] - 2024-08-03
 ### Added

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OctoBot [2.0.4](https://github.com/Drakkar-Software/OctoBot/blob/master/CHANGELOG.md)
+# OctoBot [2.0.5](https://github.com/Drakkar-Software/OctoBot/blob/master/CHANGELOG.md)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot.svg?logo=pypi)](https://pypi.org/project/OctoBot)
 [![Downloads](https://pepy.tech/badge/octobot/month)](https://pepy.tech/project/octobot)
 [![Dockerhub](https://img.shields.io/docker/pulls/drakkarsoftware/octobot.svg?logo=docker)](https://hub.docker.com/r/drakkarsoftware/octobot)

diff --git a/octobot/__init__.py b/octobot/__init__.py
@@ -16,5 +16,5 @@
 
 PROJECT_NAME = "OctoBot"
 AUTHOR = "Drakkar-Software"
-VERSION = "2.0.4"  # major.minor.revision
+VERSION = "2.0.5"  # major.minor.revision
 LONG_VERSION = f"{VERSION}"
diff --git a/octobot/cli.py b/octobot/cli.py
@@ -196,15 +196,15 @@ async def _get_authenticated_community_if_possible(config, logger):
                             constants.USER_ACCOUNT_EMAIL, None, auth_key=constants.USER_AUTH_KEY
                         )
                     except authentication.AuthenticationError as err:
-                        logger.debug(f"Auth key auth failure ({err}). Trying other methods if available.")
+                        logger.info(f"Auth key auth failure ({err}). Trying other methods if available.")
                 if constants.USER_ACCOUNT_EMAIL and constants.USER_PASSWORD_TOKEN:
                     try:
                         logger.debug("Attempting password token authentication")
                         await community_auth.login(
                             constants.USER_ACCOUNT_EMAIL, None, password_token=constants.USER_PASSWORD_TOKEN
                         )
                     except authentication.AuthenticationError as err:
-                        logger.debug(f"Password token auth failure ({err}). Trying with saved session.")
+                        logger.info(f"Password token auth failure ({err}). Trying with saved session.")
             if not community_auth.is_initialized():
                 # try with saved credentials if any
                 has_tentacles = tentacles_manager_api.is_tentacles_architecture_valid()

diff --git a/octobot/constants.py b/octobot/constants.py
@@ -163,6 +163,7 @@
 
 # logs
 LOGS_FOLDER = "logs"
+FORCED_LOG_LEVEL = os.getenv("FORCED_LOG_LEVEL", "")
 ENV_TRADING_ENABLE_DEBUG_LOGS = os_util.parse_boolean_environment_var("ENV_TRADING_ENABLE_DEBUG_LOGS", "False")
 
 # system

diff --git a/octobot/logger.py b/octobot/logger.py
@@ -14,10 +14,10 @@
 #  You should have received a copy of the GNU General Public
 #  License along with OctoBot. If not, see <https://www.gnu.org/licenses/>.
 import logging
+import logging.config as config
 import os
 import shutil
 import traceback
-import logging.config as config
 
 import sys
 import async_channel.channels as channel_instances
@@ -91,6 +91,11 @@ def _load_logger_config():
                 os.mkdir(commons_constants.USER_FOLDER)
             shutil.copyfile(constants.LOGGING_CONFIG_FILE, configuration_manager.get_user_local_config_file())
         config.fileConfig(configuration_manager.get_user_local_config_file())
+        if constants.FORCED_LOG_LEVEL:
+            logging.getLogger("Logging Configuration").info(
+                f"Applying forced logging level {constants.FORCED_LOG_LEVEL}"
+            )
+            common_logging.set_global_logger_level(constants.FORCED_LOG_LEVEL)
     except Exception as ex:
         config.fileConfig(constants.LOGGING_CONFIG_FILE)
         logging.getLogger("Logging Configuration").warning(f"Impossible to initialize local logging configuration file,"

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 # Drakkar-Software requirements
 OctoBot-Commons==1.9.55
-OctoBot-Trading==2.4.104
-OctoBot-Evaluators==1.9.5
+OctoBot-Trading==2.4.105
+OctoBot-Evaluators==1.9.6
 OctoBot-Tentacles-Manager==2.9.16
 OctoBot-Services==1.6.17
 OctoBot-Backtesting==1.9.7