Merge pull request #1659 from Drakkar-Software/dev

Master update

Author: GuillaumeDSM

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
         git clone -q $OCTOBOT_GH_REPO -b ${TARGET_BRANCH} || git clone -q $OCTOBOT_GH_REPO -b $OCTOBOT_DEFAULT_BRANCH
         cd OctoBot
         git status
-        pip install --prefer-binary -r dev_requirements.txt -r requirements.txt
+        pip install --prefer-binary -r dev_requirements.txt -r requirements.txt -r full_requirements.txt
         cd ..
         mkdir new_tentacles
         cp -r Automation Backtesting Evaluator Meta Services Trading profiles new_tentacles
@@ -70,7 +70,7 @@ jobs:
         cd OctoBot
         git status
         pip install --upgrade pip setuptools wheel
-        pip install --prefer-binary -r dev_requirements.txt -r requirements.txt
+        pip install --prefer-binary -r dev_requirements.txt -r requirements.txt -r full_requirements.txt
         cd ..
         mkdir new_tentacles
         xcopy Automation new_tentacles\\Automation /E/H/I
@@ -134,7 +134,7 @@ jobs:
           git clone -q $OCTOBOT_GH_REPO -b ${TARGET_BRANCH} || git clone -q $OCTOBOT_GH_REPO -b $OCTOBOT_DEFAULT_BRANCH
           cd OctoBot
           git status
-          pip install --prefer-binary -r dev_requirements.txt -r requirements.txt
+          pip install --prefer-binary -r dev_requirements.txt -r requirements.txt -r full_requirements.txt
           cd ..
           mkdir new_tentacles
           cp -r Automation Backtesting Evaluator Meta Services Trading profiles new_tentacles

Evaluator/Social/forum_evaluator/forum.py

@@ -30,8 +30,7 @@
 # RedditForumEvaluator is used to get an overall state of a market, it will not trigger a trade
 # (notify its evaluators) but is used to measure hype and trend of a market.
 class RedditForumEvaluator(evaluators.SocialEvaluator):
-
-    SERVICE_FEED_CLASS = Services_feeds.RedditServiceFeed
+    SERVICE_FEED_CLASS = Services_feeds.RedditServiceFeed if hasattr(Services_feeds, 'RedditServiceFeed') else None
 
     def __init__(self, tentacles_setup_config):
         evaluators.SocialEvaluator.__init__(self, tentacles_setup_config)

Evaluator/Social/news_evaluator/news.py

@@ -27,7 +27,7 @@
 # disable inheritance to disable tentacle visibility. Disabled as starting from feb 9 2023, API is now paid only
 # class TwitterNewsEvaluator(evaluators.SocialEvaluator):
 class TwitterNewsEvaluator:
-    SERVICE_FEED_CLASS = Services_feeds.TwitterServiceFeed
+    SERVICE_FEED_CLASS = Services_feeds.TwitterServiceFeed if hasattr(Services_feeds, 'TwitterServiceFeed') else None
 
     # max time to live for a pulse is 10min
     _EVAL_MAX_TIME_TO_LIVE = 10 * commons_constants.MINUTE_TO_SECONDS

Evaluator/Social/signal_evaluator/signal.py

@@ -23,7 +23,7 @@
 
 
 class TelegramSignalEvaluator(evaluators.SocialEvaluator):
-    SERVICE_FEED_CLASS = Services_feeds.TelegramServiceFeed
+    SERVICE_FEED_CLASS = Services_feeds.TelegramServiceFeed if hasattr(Services_feeds, 'TelegramServiceFeed') else None
 
     def init_user_inputs(self, inputs: dict) -> None:
         channels_config = self.UI.user_input(services_constants.CONFIG_TELEGRAM_CHANNEL,
@@ -106,7 +106,7 @@ def _get_tentacle_registration_topic(self, all_symbols_by_crypto_currencies, tim
 
 
 class TelegramChannelSignalEvaluator(evaluators.SocialEvaluator):
-    SERVICE_FEED_CLASS = Services_feeds.TelegramApiServiceFeed
+    SERVICE_FEED_CLASS = Services_feeds.TelegramApiServiceFeed if hasattr(Services_feeds, 'TelegramApiServiceFeed') else None
 
     SIGNAL_PATTERN_KEY = "signal_pattern"
     SIGNAL_PATTERN_MARKET_BUY_KEY = "MARKET_BUY"

Evaluator/Social/trends_evaluator/trends.py

@@ -25,7 +25,7 @@
 
 
 class GoogleTrendsEvaluator(evaluators.SocialEvaluator):
-    SERVICE_FEED_CLASS = Services_feeds.GoogleServiceFeed
+    SERVICE_FEED_CLASS = Services_feeds.GoogleServiceFeed if hasattr(Services_feeds, 'GoogleServiceFeed') else None
 
     def __init__(self, tentacles_setup_config):
         evaluators.SocialEvaluator.__init__(self, tentacles_setup_config)

Evaluator/TA/ai_evaluator/ai.py

@@ -27,7 +27,14 @@
 import octobot_trading.api as trading_api
 import octobot_services.api as services_api
 import octobot_services.errors as services_errors
-import tentacles.Services.Services_bases.gpt_service as gpt_service
+import tentacles.Services.Services_bases
+
+
+def _get_gpt_service():
+    try:
+        return tentacles.Services.Services_bases.GPTService
+    except (AttributeError, ImportError):
+        raise ImportError("the gpt_service tentacle is not installed")
 
 
 class GPTEvaluator(evaluators.TAEvaluator):
@@ -58,7 +65,7 @@ def __init__(self, tentacles_setup_config):
         self.source = None
         self.period = None
         self.min_confidence_threshold = 100
-        self.gpt_model = gpt_service.GPTService.DEFAULT_MODEL
+        self.gpt_model = _get_gpt_service().DEFAULT_MODEL
         self.is_backtesting = False
         self.min_allowed_timeframe = os.getenv("MIN_GPT_TIMEFRAME", None)
         self.enable_model_selector = os_util.parse_boolean_environment_var("ENABLE_GPT_MODELS_SELECTOR", "True")
@@ -70,7 +77,7 @@ def __init__(self, tentacles_setup_config):
         except ValueError:
             self.logger.error(f"Invalid timeframe configuration: unknown timeframe: '{self.min_allowed_timeframe}'")
         self.allow_reevaluations = os_util.parse_boolean_environment_var(self.ALLOW_GPT_REEVALUATION_ENV, "True")
-        self.gpt_tokens_limit = gpt_service.GPTService.NO_TOKEN_LIMIT_VALUE
+        self.gpt_tokens_limit = _get_gpt_service().NO_TOKEN_LIMIT_VALUE
         self.services_config = None
 
     def enable_reevaluation(self) -> bool:
@@ -93,7 +100,7 @@ async def load_and_save_user_inputs(self, bot_id: str) -> dict:
         :return: the filled user input configuration
         """
         self.is_backtesting = self._is_in_backtesting()
-        if self.is_backtesting and not gpt_service.GPTService.BACKTESTING_ENABLED:
+        if self.is_backtesting and not _get_gpt_service().BACKTESTING_ENABLED:
             self.logger.error(f"{self.get_name()} is disabled in backtesting. It will only emit neutral evaluations")
         await self._init_GPT_models()
         return await super().load_and_save_user_inputs(bot_id)
@@ -122,10 +129,10 @@ def init_user_inputs(self, inputs: dict) -> None:
         if self.enable_model_selector:
             current_value = self.specific_config.get("GPT_model")
             models = list(self.GPT_MODELS) or (
-                [current_value] if current_value else [gpt_service.GPTService.DEFAULT_MODEL]
+                [current_value] if current_value else [_get_gpt_service().DEFAULT_MODEL]
             )
             self.gpt_model = self.UI.user_input(
-                "GPT model", enums.UserInputTypes.OPTIONS, gpt_service.GPTService.DEFAULT_MODEL,
+                "GPT model", enums.UserInputTypes.OPTIONS, _get_gpt_service().DEFAULT_MODEL,
                 inputs, options=sorted(models),
                 title="GPT Model: the GPT model to use. Enable the evaluator to load other models."
             )
@@ -140,18 +147,18 @@ def init_user_inputs(self, inputs: dict) -> None:
         if self.ALLOW_TOKEN_LIMIT_UPDATE:
             self.gpt_tokens_limit = self.UI.user_input(
                 "max_gpt_tokens", enums.UserInputTypes.INT,
-                self.gpt_tokens_limit, inputs, min_val=gpt_service.GPTService.NO_TOKEN_LIMIT_VALUE,
+                self.gpt_tokens_limit, inputs, min_val=_get_gpt_service().NO_TOKEN_LIMIT_VALUE,
                 title=f"OpenAI token limit: maximum daily number of tokens to consume with a given OctoBot instance. "
-                      f"Use {gpt_service.GPTService.NO_TOKEN_LIMIT_VALUE} to remove the limit."
+                      f"Use {_get_gpt_service().NO_TOKEN_LIMIT_VALUE} to remove the limit."
             )
 
     async def _init_GPT_models(self):
         if not self.GPT_MODELS:
-            self.GPT_MODELS = [gpt_service.GPTService.DEFAULT_MODEL]
+            self.GPT_MODELS = [_get_gpt_service().DEFAULT_MODEL]
             if self.enable_model_selector and not self.is_backtesting:
                 try:
                     service = await services_api.get_service(
-                        gpt_service.GPTService, self.is_backtesting, self.services_config
+                        _get_gpt_service(), self.is_backtesting, self.services_config
                     )
                     self.GPT_MODELS = service.models
                     self.ALLOW_TOKEN_LIMIT_UPDATE = service.allow_token_limit_update()
@@ -226,7 +233,7 @@ def get_formatted_data(self, computed_data) -> str:
     async def ask_gpt(self, preprompt, inputs, symbol, time_frame, candle_time) -> str:
         try:
             service = await services_api.get_service(
-                gpt_service.GPTService,
+                _get_gpt_service(),
                 self.is_backtesting,
                 {} if self.is_backtesting else self.services_config
             )

Evaluator/Util/text_analysis/text_analysis.py

@@ -14,7 +14,17 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 
-import vaderSentiment.vaderSentiment as vaderSentiment
+import octobot_commons.constants as commons_constants
+try:
+    import vaderSentiment.vaderSentiment as vaderSentiment
+except ImportError:
+    if commons_constants.USE_MINIMAL_LIBS:
+        # mock vaderSentiment imports
+        class VaderSentimentImportMock:
+            class SentimentIntensityAnalyzer:
+                def __init__(self, *args):
+                    raise ImportError("vaderSentiment not installed")
+    vaderSentiment = VaderSentimentImportMock()
 
 
 class TextAnalysis:

Meta/DSL_operators/ta_operators/tests/test_docs_examples.py

@@ -0,0 +1,47 @@
+#  Drakkar-Software OctoBot-Commons
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import pytest
+
+from tentacles.Meta.DSL_operators.exchange_operators.tests import (
+    historical_prices,
+    historical_volume,
+    historical_times,
+    exchange_manager_with_candles,
+    interpreter,
+)
+
+
+@pytest.mark.asyncio
+async def test_mm_formulas_docs_examples(interpreter):
+    # ensure examples in the docs are working (meaning returning a parsable number)
+    assert round(await interpreter.interprete("close[-1]"), 2) == 92.22
+    assert round(await interpreter.interprete("open[-1]"), 2) == 92.22
+    assert round(await interpreter.interprete("high[-3]"), 2) == 92.92
+    assert round(await interpreter.interprete("low[-1]"), 2) == 92.22
+    assert round(await interpreter.interprete("volume[-2]"), 2) == 1211
+    assert round(await interpreter.interprete("time[-1]"), 2) == 41
+    assert round(await interpreter.interprete("ma(close, 12)[-1]"), 2) == 92.95
+    assert round(await interpreter.interprete("ema(open, 24)[-1]"), 2) == 90.21
+    assert round(await interpreter.interprete("vwma(close, volume, 4)[-1]"), 2) == 92.54
+    assert round(await interpreter.interprete("rsi(close, 14)[-1]"), 2) == 67.55
+    assert round(await interpreter.interprete("max(close[-1], open[-1])"), 2) == 92.22
+    assert round(await interpreter.interprete("min(ma(close, 12)[-1], ema(open, 24)[-1])"), 2) == 90.21
+    assert round(await interpreter.interprete("mean(close[-1], open[-1], high[-1], low[-1])"), 2) == 92.22
+    assert round(await interpreter.interprete("round(ma(close, 12)[-1], 2)"), 2) == 92.95
+    assert round(await interpreter.interprete("floor(close[-1])"), 2) == 92
+    assert round(await interpreter.interprete("ceil(close[-1])"), 2) == 93
+    assert round(await interpreter.interprete("abs(close[-1] - open[-1])"), 2) == 0
+    assert round(await interpreter.interprete("100 if close[-1] > open[-1] else (90 + 1)"), 2) == 91

Meta/Keywords/scripting_library/configuration/tentacles_configuration.py

@@ -22,21 +22,23 @@
 
 import octobot_tentacles_manager.api
 
+_EXPECTED_MAX_TENTACLES_COUNT = 256
+
 
 def get_config_history_propagated_tentacles_config_keys(tentacle: str) -> list[str]:
     tentacle_class = octobot_tentacles_manager.api.get_tentacle_class_from_string(tentacle)
     return tentacle_class.get_config_history_propagated_tentacles_config_keys()
 
 
 # cached to avoid calling default_parents_inspection when unnecessary
-@functools.lru_cache(maxsize=128)
+@functools.lru_cache(maxsize=_EXPECTED_MAX_TENTACLES_COUNT)
 def is_trading_mode_tentacle(tentacle_name: str) -> bool:
     tentacle_class = octobot_tentacles_manager.api.get_tentacle_class_from_string(tentacle_name)
     return tentacles_management.default_parents_inspection(tentacle_class, octobot_trading.modes.AbstractTradingMode)
 
 
 # cached to avoid calling default_parents_inspection when unnecessary
-@functools.lru_cache(maxsize=128)
+@functools.lru_cache(maxsize=_EXPECTED_MAX_TENTACLES_COUNT)
 def is_exchange_tentacle(tentacle_name: str) -> bool:
     tentacle_class = octobot_tentacles_manager.api.get_tentacle_class_from_string(tentacle_name)
     return tentacles_management.default_parents_inspection(tentacle_class, exchanges.RestExchange)

Services/Interfaces/telegram_bot_interface/__init__.py

@@ -1 +1,3 @@
-from .telegram_bot import TelegramBotInterface
+import octobot_commons.constants as commons_constants
+if not commons_constants.USE_MINIMAL_LIBS:
+    from .telegram_bot import TelegramBotInterface