[TradingMode] support dsl calls

Author: GuillaumeDSM

packages/commons/octobot_commons/configuration/__init__.py

@@ -46,6 +46,8 @@
     get_password_hash,
 )
 from octobot_commons.configuration.user_inputs import (
+    USER_INPUT_TYPE_TO_PYTHON_TYPE,
+    MAX_USER_INPUT_ORDER,
     UserInput,
     UserInputFactory,
     sanitize_user_input_name,
@@ -85,6 +87,8 @@
     "decrypt",
     "decrypt_element_if_possible",
     "get_password_hash",
+    "USER_INPUT_TYPE_TO_PYTHON_TYPE",
+    "MAX_USER_INPUT_ORDER",
     "UserInput",
     "UserInputFactory",
     "sanitize_user_input_name",

packages/commons/octobot_commons/configuration/user_inputs.py

@@ -20,8 +20,23 @@
 import octobot_commons.dict_util as dict_util
 
 
+USER_INPUT_TYPE_TO_PYTHON_TYPE = {
+    enums.UserInputTypes.INT.value: int,
+    enums.UserInputTypes.FLOAT.value: float,
+    enums.UserInputTypes.BOOLEAN.value: bool,
+    enums.UserInputTypes.TEXT.value: str,
+    enums.UserInputTypes.OBJECT.value: dict,
+    enums.UserInputTypes.OBJECT_ARRAY.value: list,
+    enums.UserInputTypes.STRING_ARRAY.value: list,
+    enums.UserInputTypes.OPTIONS.value: str,
+    enums.UserInputTypes.MULTIPLE_OPTIONS.value: list,
+}
+
+
+MAX_USER_INPUT_ORDER = 9999
+
+
 class UserInput:
-    MAX_ORDER = 9999
 
     def __init__(
         self,

packages/commons/octobot_commons/dsl_interpreter/interpreter.py

@@ -361,7 +361,7 @@ def _visit_node(self, node: typing.Optional[ast.AST]) -> typing.Union[
             )
 
         raise octobot_commons.errors.UnsupportedOperatorError(
-            f"Unsupported AST node type: {type(node).__name__}"
+            f"Unsupported AST node type: {type(node).__name__}. Expression: {self._parsed_expression}"
         )
 
     def _get_name_from_node(self, node: ast.AST) -> str:

packages/commons/octobot_commons/dsl_interpreter/operators/re_callable_operator_mixin.py

@@ -93,7 +93,26 @@ def get_last_execution_result(
             ]).last_execution_result
         return None
 
-    def build_re_callable_result(
+    def create_re_callable_result(
+        self,
+        reset_to_id: typing.Optional[str] = None,
+        waiting_time: typing.Optional[float] = None,
+        last_execution_time: typing.Optional[float] = None,
+        **kwargs: typing.Any,
+    ) -> ReCallingOperatorResult:
+        """
+        Builds a re-callable result from the given parameters.
+        """
+        return ReCallingOperatorResult(
+            reset_to_id=reset_to_id,
+            last_execution_result={
+                ReCallingOperatorResultKeys.WAITING_TIME.value: waiting_time,
+                ReCallingOperatorResultKeys.LAST_EXECUTION_TIME.value: last_execution_time,
+                **kwargs,
+            },
+        )
+
+    def create_re_callable_result_dict(
         self,
         reset_to_id: typing.Optional[str] = None,
         waiting_time: typing.Optional[float] = None,
@@ -104,12 +123,10 @@ def build_re_callable_result(
         Builds a dict formatted re-callable result from the given parameters.
         """
         return {
-            ReCallingOperatorResult.__name__: ReCallingOperatorResult(
+            ReCallingOperatorResult.__name__: self.create_re_callable_result(
                 reset_to_id=reset_to_id,
-                last_execution_result={
-                    ReCallingOperatorResultKeys.WAITING_TIME.value: waiting_time,
-                    ReCallingOperatorResultKeys.LAST_EXECUTION_TIME.value: last_execution_time,
-                    **kwargs,
-                },
+                waiting_time=waiting_time,
+                last_execution_time=last_execution_time,
+                **kwargs,
             ).to_dict(include_default_values=False)
         }

packages/commons/octobot_commons/str_util.py

@@ -0,0 +1,21 @@
+#  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 re
+
+
+def camel_to_snake(name: str) -> str:
+    """Convert CamelCase to snake_case (e.g. for DSL operator names)."""
+    return re.sub(r"(?<!^)(?=[A-Z])", "_", name).lower()

packages/commons/tests/dsl_interpreter/operators/test_re_callable_operator_mixin.py

@@ -148,9 +148,9 @@ def test_get_last_execution_result_with_reset_to_id_format(self):
         })
         assert result == inner
 
-    def test_build_re_callable_result(self):
+    def test_create_re_callable_result_dict(self):
         operator = _TestReCallableOperator()
-        result = operator.build_re_callable_result(
+        result = operator.create_re_callable_result_dict(
             last_execution_time=1000.0,
             waiting_time=5.0,
         )
@@ -163,9 +163,9 @@ def test_build_re_callable_result(self):
             re_callable_operator_mixin.ReCallingOperatorResultKeys.WAITING_TIME.value
         ] == 5.0
 
-    def test_build_re_callable_result_with_reset_to_id(self):
+    def test_create_re_callable_result_dict_with_reset_to_id(self):
         operator = _TestReCallableOperator()
-        result = operator.build_re_callable_result(
+        result = operator.create_re_callable_result_dict(
             reset_to_id="target_123",
             last_execution_time=1000.0,
             waiting_time=5.0,
@@ -174,9 +174,9 @@ def test_build_re_callable_result_with_reset_to_id(self):
         assert inner["reset_to_id"] == "target_123"
         assert "last_execution_result" in inner
 
-    def test_build_re_callable_result_with_extra_kwargs(self):
+    def test_create_re_callable_result_dict_with_extra_kwargs(self):
         operator = _TestReCallableOperator()
-        result = operator.build_re_callable_result(
+        result = operator.create_re_callable_result_dict(
             last_execution_time=1000.0,
             waiting_time=5.0,
             extra_field=42,

packages/commons/tests/test_str_util.py

@@ -0,0 +1,38 @@
+#  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 octobot_commons.str_util as str_util
+
+
+def test_camel_to_snake_empty():
+    assert str_util.camel_to_snake("") == ""
+
+
+def test_camel_to_snake_single_letter():
+    assert str_util.camel_to_snake("A") == "a"
+
+
+def test_camel_to_snake_trading_mode_style():
+    assert str_util.camel_to_snake("GridTradingMode") == "grid_trading_mode"
+    assert str_util.camel_to_snake("IndexTradingMode") == "index_trading_mode"
+    assert str_util.camel_to_snake("AbstractTradingMode") == "abstract_trading_mode"
+
+
+def test_camel_to_snake_already_lowercase():
+    assert str_util.camel_to_snake("already_snake") == "already_snake"
+
+
+def test_camel_to_snake_single_word_upper():
+    assert str_util.camel_to_snake("Trading") == "trading"

packages/flow/octobot_flow/entities/automations/additional_actions.py

@@ -3,7 +3,7 @@
 
 
 @dataclasses.dataclass
-class AdditionalActions(octobot_commons.dataclasses.FlexibleDataclass):
+class AdditionalActions(octobot_commons.dataclasses.MinimizableDataclass):
     # todo implement this when necessary
     check_min_portfolio: bool = False
     optimize_portfolio: bool = False

packages/flow/octobot_flow/jobs/automation_job.py

@@ -207,15 +207,22 @@ async def _init_all_required_exchange_data(
         exchange_account_job = exchange_account_job_import.ExchangeAccountJob(
             self.automation_state, self.fetched_actions
         )
-        symbol = set(
-            exchange_account_job.get_all_actions_symbols()
-            + octobot_flow.logic.dsl.get_actions_symbol_dependencies(to_execute_actions)
+        minimal_profile_data = octobot_flow.logic.configuration.create_profile_data(
+            self.automation_state.exchange_account_details,
+            self.automation_state.automation.metadata.automation_id,
+            set()
+        )
+        symbols = set(
+            exchange_account_job.get_all_actions_symbols(minimal_profile_data)
+            + octobot_flow.logic.dsl.get_actions_symbol_dependencies(
+                to_execute_actions, minimal_profile_data
+            )
         )
         async with exchange_account_job.account_exchange_context(
             octobot_flow.logic.configuration.create_profile_data(
                 self.automation_state.exchange_account_details,
                 self.automation_state.automation.metadata.automation_id,
-                symbol
+                symbols
             )
         ):
             await exchange_account_job.update_public_data()

packages/flow/octobot_flow/jobs/automation_runner_job.py

@@ -69,8 +69,9 @@ async def run(self):
     async def _execute_actions(self) -> tuple[list[octobot_flow.enums.ChangedElements], float]:
         actions_executor = octobot_flow.logic.actions.ActionsExecutor(
             self._maybe_community_repository, self._exchange_manager, 
+            self.profile_data_provider.get_profile_data(),
             self.automation_state.automation, self._to_execute_actions,
-            self._as_reference_account
+            self._as_reference_account,
         )
         await actions_executor.execute()
         return actions_executor.changed_elements, (
@@ -113,11 +114,16 @@ def init_strategy_exchange_data(self, exchange_data: exchange_data_import.Exchan
         exchange_data.orders_details.open_orders = exchange_account_elements.orders.open_orders
 
     def _get_profile_data(self) -> commons_profiles.ProfileData:
+        minimal_profile_data = octobot_flow.logic.configuration.create_profile_data(
+            self.automation_state.exchange_account_details,
+            self.automation_state.automation.metadata.automation_id,
+            set()
+        )
         return octobot_flow.logic.configuration.create_profile_data(
             self.automation_state.exchange_account_details,
             self.automation_state.automation.metadata.automation_id,
             set(octobot_flow.logic.dsl.get_actions_symbol_dependencies(
-                self._to_execute_actions
+                self._to_execute_actions, minimal_profile_data
             ))
         )