Merge pull request #2028 from Drakkar-Software/dev

master merge

Author: GuillaumeDSM

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.9] - 2022-09-07
+### Updated
+- Beta tentacles
+### Fixed
+- Profile export
+
 ## [0.4.8] - 2022-09-04
 ### Fixed
 - Device creation

README.md

@@ -1,4 +1,4 @@
-# OctoBot [0.4.8](https://octobot.click/gh-changelog)
+# OctoBot [0.4.9](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/configuration_manager.py

@@ -22,6 +22,7 @@
 import octobot_commons.configuration as configuration
 import octobot_commons.constants as common_constants
 import octobot_commons.logging as logging
+import octobot_commons.errors as common_errors
 import octobot_tentacles_manager.constants as tentacles_manager_constants
 
 import octobot_trading.api as trading_api
@@ -144,13 +145,19 @@ def set_default_profile(config, from_default_config_file=constants.DEFAULT_CONFI
 
 
 def get_default_tentacles_url(version=None):
+    beta_tentacle_bundle = os.getenv(constants.ENV_BETA_TENTACLES_PACKAGE_NAME, constants.BETA_TENTACLE_PACKAGE_NAME)
+    # use beta tentacles repository for beta tentacles
+    tentacles_repository = \
+        os.getenv(constants.ENV_BETA_TENTACLES_REPOSITORY, constants.BETA_TENTACLES_REPOSITORY) \
+        if version == beta_tentacle_bundle else \
+        os.getenv(constants.ENV_TENTACLES_REPOSITORY, constants.TENTACLES_REPOSITORY)
     if version is None:
         version = constants.TENTACLES_REQUIRED_VERSION \
             if constants.TENTACLES_REQUIRED_VERSION else constants.LONG_VERSION
     return os.getenv(
         constants.ENV_TENTACLES_URL,
         f"{constants.OCTOBOT_ONLINE}/"
-        f"{os.getenv(constants.ENV_TENTACLES_REPOSITORY, constants.TENTACLES_REPOSITORY)}/"
+        f"{tentacles_repository}/"
         f"{os.getenv(constants.ENV_TENTACLES_PACKAGES_SOURCE, constants.OFFICIALS)}/"
         f"{os.getenv(constants.ENV_TENTACLES_PACKAGES_TYPE, constants.TENTACLE_PACKAGES)}/"
         f"{os.getenv(constants.ENV_TENTACLE_CATEGORY, constants.TENTACLE_CATEGORY)}/"

octobot/constants.py

@@ -20,7 +20,7 @@
 
 PROJECT_NAME = "OctoBot"
 AUTHOR = "DrakkarSoftware"
-SHORT_VERSION = "0.4.8"  # major.minor.revision
+SHORT_VERSION = "0.4.9"  # major.minor.revision
 PATCH_VERSION = ""  # patch : pX
 VERSION_DEV_PHASE = ""  # alpha : a / beta : b / release candidate : rc
 VERSION_PHASE = ""  # XX
@@ -35,9 +35,11 @@
 OCTOBOT_ONLINE = os.getenv("TENTACLES_OCTOBOT_ONLINE_URL", "https://static.octobot.online")
 OCTOBOT_FEEDBACK = os.getenv("FEEDBACK_OCTOBOT_ONLINE_URL", "https://feedback.octobot.online/")
 TENTACLES_REPOSITORY = "tentacles"
+BETA_TENTACLES_REPOSITORY = "dev-tentacles"
 OFFICIALS = "officials"
 TENTACLE_CATEGORY = "full"
 TENTACLE_PACKAGE_NAME = "base"
+BETA_TENTACLE_PACKAGE_NAME = "beta"
 TENTACLE_PACKAGES = "packages"
 COMPILED_TENTACLE_CATEGORY = "extra"
 
@@ -92,8 +94,10 @@
 ENV_TENTACLES_URL = "TENTACLES_URL"
 ENV_COMPILED_TENTACLES_URL = "COMPILED_TENTACLES_URL"
 ENV_TENTACLES_REPOSITORY = "TENTACLES_REPOSITORY"
+ENV_BETA_TENTACLES_REPOSITORY = "BETA_TENTACLES_REPOSITORY"
 ENV_TENTACLES_URL_TAG = "TENTACLES_URL_TAG"
 ENV_TENTACLE_PACKAGE_NAME = "TENTACLE_PACKAGE_NAME"
+ENV_BETA_TENTACLES_PACKAGE_NAME = "BETA_TENTACLES_PACKAGE_NAME"
 ENV_TENTACLES_PACKAGES_TYPE = "TENTACLES_PACKAGES_TYPE"
 ENV_TENTACLES_PACKAGES_SOURCE = "TENTACLES_PACKAGES_SOURCE"
 ENV_COMPILED_TENTACLES_CATEGORY = "COMPILED_TENTACLES_CATEGORY"