(feat) last controllers version

cardosofede · cardosofede · commit ff1a78aa5e79 · 2025-04-04T20:31:01.000-03:00
diff --git a/bots/controllers/generic/grid_strike_grid_component.py b/bots/controllers/generic/grid_strike_grid_component.py
@@ -17,7 +17,7 @@ class GridStrikeConfig(ControllerConfigBase):
     """
     Configuration required to run the GridStrike strategy for one connector and trading pair.
     """
-    controller_type: str = "generic"
+    controller_type = "generic"
     controller_name: str = "grid_strike_grid_component"
     candles_config: List[CandlesConfig] = []
 
diff --git a/bots/controllers/generic/pmm.py b/bots/controllers/generic/pmm.py
@@ -2,8 +2,8 @@
 from typing import Dict, List, Optional, Set, Tuple, Union
 
 from pydantic import Field, field_validator
+from pydantic_core.core_schema import ValidationInfo
 
-from hummingbot.client.config.config_data_types import ClientFieldData
 from hummingbot.core.data_type.common import OrderType, PositionMode, PriceType, TradeType
 from hummingbot.core.data_type.trade_fee import TokenAmount
 from hummingbot.data_feed.candles_feed.data_types import CandlesConfig
@@ -137,19 +137,17 @@ class PMMConfig(ControllerConfigBase):
     )
     global_take_profit: Decimal = Decimal("0.02")
 
-    # TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually.
-    # Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information.
-    @validator("take_profit", pre=True, always=True)
+    @field_validator("take_profit", mode="before")
+    @classmethod
     def validate_target(cls, v):
         if isinstance(v, str):
             if v == "":
                 return None
             return Decimal(v)
         return v
 
-    # TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually.
-    # Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information.
-    @validator('take_profit_order_type', pre=True, allow_reuse=True, always=True)
+    @field_validator('take_profit_order_type', mode="before")
+    @classmethod
     def validate_order_type(cls, v) -> OrderType:
         if isinstance(v, OrderType):
             return v
@@ -165,20 +163,8 @@ def validate_order_type(cls, v) -> OrderType:
                 pass
         raise ValueError(f"Invalid order type: {v}. Valid options are: {', '.join(OrderType.__members__)}")
 
-    @property
-    def triple_barrier_config(self) -> TripleBarrierConfig:
-        return TripleBarrierConfig(
-            take_profit=self.take_profit,
-            trailing_stop=None,
-            open_order_type=OrderType.LIMIT_MAKER,  # Defaulting to LIMIT as is a Maker Controller
-            take_profit_order_type=self.take_profit_order_type,
-            stop_loss_order_type=OrderType.MARKET,  # Defaulting to MARKET as per requirement
-            time_limit_order_type=OrderType.MARKET  # Defaulting to MARKET as per requirement
-        )
-
-    # TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually.
-    # Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information.
-    @validator('buy_spreads', 'sell_spreads', pre=True, always=True)
+    @field_validator('buy_spreads', 'sell_spreads', mode="before")
+    @classmethod
     def parse_spreads(cls, v):
         if v is None:
             return []
@@ -188,18 +174,18 @@ def parse_spreads(cls, v):
             return [float(x.strip()) for x in v.split(',')]
         return v
 
-    # TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually.
-    # Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information.
-    @validator('buy_amounts_pct', 'sell_amounts_pct', pre=True, always=True)
-    def parse_and_validate_amounts(cls, v, values, field):
+    @field_validator('buy_amounts_pct', 'sell_amounts_pct', mode="before")
+    @classmethod
+    def parse_and_validate_amounts(cls, v, validation_info: ValidationInfo):
+        field_name = validation_info.field_name
         if v is None or v == "":
-            spread_field = field.name.replace('amounts_pct', 'spreads')
-            return [1 for _ in values[spread_field]]
+            spread_field = field_name.replace('amounts_pct', 'spreads')
+            return [1 for _ in validation_info.data[spread_field]]
         if isinstance(v, str):
             return [float(x.strip()) for x in v.split(',')]
-        elif isinstance(v, list) and len(v) != len(values[field.name.replace('amounts_pct', 'spreads')]):
+        elif isinstance(v, list) and len(v) != len(validation_info.data[field_name.replace('amounts_pct', 'spreads')]):
             raise ValueError(
-                f"The number of {field.name} must match the number of {field.name.replace('amounts_pct', 'spreads')}.")
+                f"The number of {field_name} must match the number of {field_name.replace('amounts_pct', 'spreads')}.")
         return v
 
     @field_validator('position_mode', mode="before")
@@ -211,6 +197,17 @@ def validate_position_mode(cls, v) -> PositionMode:
             raise ValueError(f"Invalid position mode: {v}. Valid options are: {', '.join(PositionMode.__members__)}")
         return v
 
+    @property
+    def triple_barrier_config(self) -> TripleBarrierConfig:
+        return TripleBarrierConfig(
+            take_profit=self.take_profit,
+            trailing_stop=None,
+            open_order_type=OrderType.LIMIT_MAKER,  # Defaulting to LIMIT as is a Maker Controller
+            take_profit_order_type=self.take_profit_order_type,
+            stop_loss_order_type=OrderType.MARKET,  # Defaulting to MARKET as per requirement
+            time_limit_order_type=OrderType.MARKET  # Defaulting to MARKET as per requirement
+        )
+
     def update_parameters(self, trade_type: TradeType, new_spreads: Union[List[float], str], new_amounts_pct: Optional[Union[List[int], str]] = None):
         spreads_field = 'buy_spreads' if trade_type == TradeType.BUY else 'sell_spreads'
         amounts_pct_field = 'buy_amounts_pct' if trade_type == TradeType.BUY else 'sell_amounts_pct'
diff --git a/bots/controllers/generic/quantum_grid_allocator.py b/bots/controllers/generic/quantum_grid_allocator.py
@@ -2,10 +2,8 @@
 from typing import Dict, List, Set, Union
 
 import pandas_ta as ta  # noqa: F401
-from pydantic import field_validator
-from pydantic.v1 import Field, validator
+from pydantic import Field, field_validator
 
-from hummingbot.client.config.config_data_types import ClientFieldData
 from hummingbot.core.data_type.common import OrderType, PositionMode, PriceType, TradeType
 from hummingbot.data_feed.candles_feed.data_types import CandlesConfig
 from hummingbot.strategy_v2.controllers import ControllerBase, ControllerConfigBase
@@ -21,34 +19,33 @@ class QGAConfig(ControllerConfigBase):
     candles_config: List[CandlesConfig] = []
 
     # Portfolio allocation zones
-    long_only_threshold: Decimal = Field(default=Decimal("0.2"), client_data=ClientFieldData(is_updatable=True))
-    short_only_threshold: Decimal = Field(default=Decimal("0.2"), client_data=ClientFieldData(is_updatable=True))
-    hedge_ratio: Decimal = Field(default=Decimal("2"), client_data=ClientFieldData(is_updatable=True))
+    long_only_threshold: Decimal = Field(default=Decimal("0.2"), json_schema_extra={"is_updatable": True})
+    short_only_threshold: Decimal = Field(default=Decimal("0.2"), json_schema_extra={"is_updatable": True})
+    hedge_ratio: Decimal = Field(default=Decimal("2"), json_schema_extra={"is_updatable": True})
 
     # Grid allocation multipliers
-    base_grid_value_pct: Decimal = Field(default=Decimal("0.08"), client_data=ClientFieldData(is_updatable=True))
-    max_grid_value_pct: Decimal = Field(default=Decimal("0.15"), client_data=ClientFieldData(is_updatable=True))
+    base_grid_value_pct: Decimal = Field(default=Decimal("0.08"), json_schema_extra={"is_updatable": True})
+    max_grid_value_pct: Decimal = Field(default=Decimal("0.15"), json_schema_extra={"is_updatable": True})
 
     # Order frequency settings
-    safe_extra_spread: Decimal = Field(default=Decimal("0.0001"), client_data=ClientFieldData(is_updatable=True))
-    favorable_order_frequency: int = Field(default=2, client_data=ClientFieldData(is_updatable=True))
-    unfavorable_order_frequency: int = Field(default=5, client_data=ClientFieldData(is_updatable=True))
-    max_orders_per_batch: int = Field(default=1, client_data=ClientFieldData(is_updatable=True))
+    safe_extra_spread: Decimal = Field(default=Decimal("0.0001"), json_schema_extra={"is_updatable": True})
+    favorable_order_frequency: int = Field(default=2, json_schema_extra={"is_updatable": True})
+    unfavorable_order_frequency: int = Field(default=5, json_schema_extra={"is_updatable": True})
+    max_orders_per_batch: int = Field(default=1, json_schema_extra={"is_updatable": True})
 
     # Portfolio allocation
     portfolio_allocation: Dict[str, Decimal] = Field(
         default={
             "SOL": Decimal("0.50"),  # 50%
         },
-        client_data=ClientFieldData(is_updatable=True)
-    )
+        json_schema_extra={"is_updatable": True})
     # Grid parameters
-    grid_range: Decimal = Field(default=Decimal("0.002"), client_data=ClientFieldData(is_updatable=True))
-    tp_sl_ratio: Decimal = Field(default=Decimal("0.8"), client_data=ClientFieldData(is_updatable=True))
-    min_order_amount: Decimal = Field(default=Decimal("5"), client_data=ClientFieldData(is_updatable=True))
+    grid_range: Decimal = Field(default=Decimal("0.002"), json_schema_extra={"is_updatable": True})
+    tp_sl_ratio: Decimal = Field(default=Decimal("0.8"), json_schema_extra={"is_updatable": True})
+    min_order_amount: Decimal = Field(default=Decimal("5"), json_schema_extra={"is_updatable": True})
     # Risk parameters
-    max_deviation: Decimal = Field(default=Decimal("0.05"), client_data=ClientFieldData(is_updatable=True))
-    max_open_orders: int = Field(default=2, client_data=ClientFieldData(is_updatable=True))
+    max_deviation: Decimal = Field(default=Decimal("0.05"), json_schema_extra={"is_updatable": True})
+    max_open_orders: int = Field(default=2, json_schema_extra={"is_updatable": True})
     # Exchange settings
     connector_name: str = "binance"
     leverage: int = 1
@@ -58,25 +55,21 @@ class QGAConfig(ControllerConfigBase):
     # Grid price multipliers
     min_spread_between_orders: Decimal = Field(
         default=Decimal("0.0001"),  # 0.01% between orders
-        client_data=ClientFieldData(is_updatable=True)
-    )
+        json_schema_extra={"is_updatable": True})
     grid_tp_multiplier: Decimal = Field(
         default=Decimal("0.0001"),  # 0.2% take profit
-        client_data=ClientFieldData(is_updatable=True)
-    )
+        json_schema_extra={"is_updatable": True})
     # Grid safety parameters
     limit_price_spread: Decimal = Field(
         default=Decimal("0.001"),  # 0.1% spread for limit price
-        client_data=ClientFieldData(is_updatable=True)
-    )
+        json_schema_extra={"is_updatable": True})
     activation_bounds: Decimal = Field(
         default=Decimal("0.0002"),  # Activation bounds for orders
-        client_data=ClientFieldData(is_updatable=True)
-    )
+        json_schema_extra={"is_updatable": True})
     bb_lenght: int = 100
     bb_std_dev: float = 2.0
     interval: str = "1s"
-    dynamic_grid_range: bool = Field(default=False, client_data=ClientFieldData(is_updatable=True))
+    dynamic_grid_range: bool = Field(default=False, json_schema_extra={"is_updatable": True})
     show_terminated_details: bool = False
 
     @property
diff --git a/bots/controllers/generic/xemm_multiple_levels.py b/bots/controllers/generic/xemm_multiple_levels.py
@@ -3,9 +3,8 @@
 from typing import Dict, List, Set
 
 import pandas as pd
-from pydantic.v1 import Field, validator
+from pydantic import Field, field_validator
 
-from hummingbot.client.config.config_data_types import ClientFieldData
 from hummingbot.client.ui.interface_utils import format_df_for_printout
 from hummingbot.core.data_type.common import PriceType, TradeType
 from hummingbot.data_feed.candles_feed.data_types import CandlesConfig
@@ -20,63 +19,39 @@ class XEMMMultipleLevelsConfig(ControllerConfigBase):
     candles_config: List[CandlesConfig] = []
     maker_connector: str = Field(
         default="mexc",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the maker connector: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the maker connector: ", "prompt_on_new": True})
     maker_trading_pair: str = Field(
         default="PEPE-USDT",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the maker trading pair: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the maker trading pair: ", "prompt_on_new": True})
     taker_connector: str = Field(
         default="binance",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the taker connector: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the taker connector: ", "prompt_on_new": True})
     taker_trading_pair: str = Field(
         default="PEPE-USDT",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the taker trading pair: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the taker trading pair: ", "prompt_on_new": True})
     buy_levels_targets_amount: List[List[Decimal]] = Field(
         default="0.003,10-0.006,20-0.009,30",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the buy levels targets with the following structure: (target_profitability1,amount1-target_profitability2,amount2): ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={
+            "prompt": "Enter the buy levels targets with the following structure: (target_profitability1,amount1-target_profitability2,amount2): ",
+            "prompt_on_new": True})
     sell_levels_targets_amount: List[List[Decimal]] = Field(
         default="0.003,10-0.006,20-0.009,30",
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the sell levels targets with the following structure: (target_profitability1,amount1-target_profitability2,amount2): ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={
+            "prompt": "Enter the sell levels targets with the following structure: (target_profitability1,amount1-target_profitability2,amount2): ",
+            "prompt_on_new": True})
     min_profitability: Decimal = Field(
         default=0.003,
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the minimum profitability: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the minimum profitability: ", "prompt_on_new": True})
     max_profitability: Decimal = Field(
         default=0.01,
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the maximum profitability: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the maximum profitability: ", "prompt_on_new": True})
     max_executors_imbalance: int = Field(
         default=1,
-        client_data=ClientFieldData(
-            prompt=lambda e: "Enter the maximum executors imbalance: ",
-            prompt_on_new=True
-        ))
+        json_schema_extra={"prompt": "Enter the maximum executors imbalance: ", "prompt_on_new": True})
 
-    # TODO[pydantic]: We couldn't refactor the `validator`, please replace it by `field_validator` manually.
-    # Check https://docs.pydantic.dev/dev-v2/migration/#changes-to-validators for more information.
-    @validator("buy_levels_targets_amount", "sell_levels_targets_amount", pre=True, always=True)
-    def validate_levels_targets_amount(cls, v, values):
+    @field_validator("buy_levels_targets_amount", "sell_levels_targets_amount", mode="before")
+    @classmethod
+    def validate_levels_targets_amount(cls, v):
         if isinstance(v, str):
             v = [list(map(Decimal, x.split(","))) for x in v.split("-")]
         return v
diff --git a/bots/controllers/generic/xgridt.py b/bots/controllers/generic/xgridt.py
diff --git a/bots/controllers/market_making/dman_maker_v2.py b/bots/controllers/market_making/dman_maker_v2.py
