(feat) change encoder decoder

hummingbot · Sep 18, 2023 · d179f58 · d179f58
1 parent c69c8f7
commit d179f58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pages/backtest_manager/analyze.py b/pages/backtest_manager/analyze.py
@@ -2,15 +2,14 @@
 from hummingbot.data_feed.candles_feed.candles_factory import CandlesConfig
 from hummingbot.smart_components.strategy_frameworks.data_types import OrderLevel
 from hummingbot.smart_components.strategy_frameworks.directional_trading import DirectionalTradingBacktestingEngine
+from hummingbot.smart_components.utils import ConfigEncoderDecoder
 
 import constants
 import os
 import json
 import streamlit as st
-from docker_manager import DockerManager
 
 from quants_lab.strategy.strategy_analysis import StrategyAnalysis
-from utils.enum_encoder import EnumEncoderDecoder
 from utils.graphs import BacktestingGraphs
 from utils.optuna_database_manager import OptunaDBManager
 from utils.os_utils import load_controllers, dump_dict_to_yaml
@@ -60,7 +59,7 @@ def initialize_session_state_vars():
     trial_selected = st.selectbox("Select a trial to backtest", list(trials.keys()))
     trial = trials[trial_selected]
     # Transform trial config in a dictionary
-    encoder_decoder = EnumEncoderDecoder(TradeType, OrderType, PositionMode)
+    encoder_decoder = ConfigEncoderDecoder(TradeType, OrderType, PositionMode)
     trial_config = encoder_decoder.decode(json.loads(trial["config"]))
 
     # Strategy parameters section

diff --git a/pages/backtest_manager/analyze_v2.py b/pages/backtest_manager/analyze_v2.py
@@ -2,6 +2,7 @@
 from hummingbot.data_feed.candles_feed.candles_factory import CandlesConfig
 from hummingbot.smart_components.strategy_frameworks.data_types import OrderLevel, TripleBarrierConf
 from hummingbot.smart_components.strategy_frameworks.directional_trading import DirectionalTradingBacktestingEngine
+from hummingbot.smart_components.utils import ConfigEncoderDecoder
 
 import constants
 import os
@@ -10,7 +11,6 @@
 from decimal import Decimal
 
 from quants_lab.strategy.strategy_analysis import StrategyAnalysis
-from utils.enum_encoder import EnumEncoderDecoder
 from utils.graphs import BacktestingGraphs
 from utils.optuna_database_manager import OptunaDBManager
 from utils.os_utils import load_controllers
@@ -61,7 +61,7 @@ def initialize_session_state_vars():
     trial_selected = st.selectbox("Select a trial to backtest", list(trials.keys()))
     trial = trials[trial_selected]
     # Transform trial config in a dictionary
-    encoder_decoder = EnumEncoderDecoder(TradeType, OrderType, PositionMode)
+    encoder_decoder = ConfigEncoderDecoder(TradeType, OrderType, PositionMode)
     trial_config = encoder_decoder.decode(json.loads(trial["config"]))
 
     # Strategy parameters section
@@ -189,7 +189,7 @@ def initialize_session_state_vars():
         config = controller["config"](**st.session_state["strategy_params"])
         controller = controller["class"](config=config)
         if save_config:
-            encoder_decoder = EnumEncoderDecoder(TradeType, OrderType, PositionMode)
+            encoder_decoder = ConfigEncoderDecoder(TradeType, OrderType, PositionMode)
             encoder_decoder.yaml_dump(config.dict(),
                                       f"hummingbot_files/controller_configs/{config.strategy_name}_{trial_selected}.yml")
         run_backtesting_button = st.button("⚙️Run Backtesting!")

diff --git a/pages/backtest_manager/simulate.py b/pages/backtest_manager/simulate.py
@@ -8,11 +8,10 @@
 from hummingbot.data_feed.candles_feed.candles_factory import CandlesConfig
 from hummingbot.smart_components.strategy_frameworks.data_types import OrderLevel, TripleBarrierConf
 from hummingbot.smart_components.strategy_frameworks.directional_trading import DirectionalTradingBacktestingEngine
-from streamlit_elements import elements, mui
+from hummingbot.smart_components.utils import ConfigEncoderDecoder
 
 import constants
 from quants_lab.strategy.strategy_analysis import StrategyAnalysis
-from utils.enum_encoder import EnumEncoderDecoder
 from utils.graphs import BacktestingGraphs
 from utils.os_utils import load_controllers
 
@@ -128,9 +127,10 @@
     config = controller["config"](**st.session_state["strategy_params"])
     controller = controller["class"](config=config)
     if save_config:
-        encoder_decoder = EnumEncoderDecoder(TradeType, OrderType, PositionMode)
+        encoder_decoder = ConfigEncoderDecoder(TradeType, OrderType, PositionMode)
+        # TODO: make this configurable
         encoder_decoder.yaml_dump(config.dict(),
-                                  f"hummingbot_files/controller_configs/{config.strategy_name}_{trial_selected}.yml")
+                                  f"hummingbot_files/controller_configs/{config.strategy_name}.yml")
     run_backtesting_button = st.button("⚙️Run Backtesting!")
 if run_backtesting_button:
     try: