From 1bf4d9dbd018ac455d6118b179a64c06b80c5811 Mon Sep 17 00:00:00 2001 From: Guillaume De Saint Martin Date: Tue, 19 Dec 2023 21:42:04 +0100 Subject: [PATCH] [Tentacles] replace static by tentacles url --- octobot/commands.py | 4 ---- octobot/configuration_manager.py | 15 ++------------- octobot/constants.py | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/octobot/commands.py b/octobot/commands.py index c99c3ca48..0528f4622 100644 --- a/octobot/commands.py +++ b/octobot/commands.py @@ -46,10 +46,6 @@ def call_tentacles_manager(command_args): octobot_logger.init_logger() tentacles_urls = [ configuration_manager.get_default_tentacles_url(), - # tentacles_manager_api.get_compiled_tentacles_url( - # constants.DEFAULT_COMPILED_TENTACLES_URL, - # constants.TENTACLES_REQUIRED_VERSION - # ) ] sys.exit(tentacles_manager_cli.handle_tentacles_manager_command(command_args, tentacles_urls=tentacles_urls, diff --git a/octobot/configuration_manager.py b/octobot/configuration_manager.py index e4f79926b..9ac59bdf7 100644 --- a/octobot/configuration_manager.py +++ b/octobot/configuration_manager.py @@ -154,8 +154,8 @@ def get_default_tentacles_url(version=None): if constants.TENTACLES_REQUIRED_VERSION else constants.LONG_VERSION return os.getenv( constants.ENV_TENTACLES_URL, - f"{constants.STATIC_OCTOBOT_ONLINE}/" - f"{tentacles_repository}/" + f"https://{tentacles_repository}." + f"{constants.OCTOBOT_ONLINE}/" 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)}/" @@ -165,17 +165,6 @@ def get_default_tentacles_url(version=None): ) -def get_default_compiled_tentacles_url(): - return os.getenv( - constants.ENV_COMPILED_TENTACLES_URL, - f"{constants.STATIC_OCTOBOT_ONLINE}/{constants.TENTACLES_REPOSITORY}/" - f"{os.getenv(constants.ENV_TENTACLES_PACKAGES_SOURCE, constants.OFFICIALS)}/" - f"{os.getenv(constants.ENV_COMPILED_TENTACLES_PACKAGES_TYPE, constants.TENTACLE_PACKAGES)}/" - f"{os.getenv(constants.ENV_COMPILED_TENTACLES_CATEGORY, constants.COMPILED_TENTACLE_CATEGORY)}/" - f"{os.getenv(constants.ENV_COMPILED_TENTACLES_SUBCATEGORY, '')}" - ) - - def get_user_local_config_file(): try: import octobot_commons.constants as commons_constants diff --git a/octobot/constants.py b/octobot/constants.py index a4c41aa3d..2181deb5f 100644 --- a/octobot/constants.py +++ b/octobot/constants.py @@ -39,7 +39,7 @@ OCTOBOT_DOCS_URL = os.getenv("DOCS_OCTOBOT_ONLINE_URL", "https://www.octobot.cloud/guides") EXCHANGES_DOCS_URL = os.getenv("DOCS_OCTOBOT_ONLINE_URL", "https://www.octobot.cloud/guides/exchanges/") DEVELOPER_DOCS_URL = os.getenv("DOCS_OCTOBOT_ONLINE_URL", "https://www.octobot.cloud/guides/developers/") -STATIC_OCTOBOT_ONLINE = os.getenv("TENTACLES_OCTOBOT_ONLINE_URL", "https://static.octobot.online") +OCTOBOT_ONLINE = os.getenv("TENTACLES_OCTOBOT_ONLINE_URL", "octobot.online") OCTOBOT_FEEDBACK = os.getenv("FEEDBACK_OCTOBOT_ONLINE_URL", "https://feedback.octobot.cloud/") TENTACLES_REPOSITORY = "tentacles" BETA_TENTACLES_REPOSITORY = "dev-tentacles"