From 689767e3cae43f9024ccdf9cb8e9be88c7c46c66 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 28 Dec 2024 15:46:38 +0100 Subject: [PATCH] chore: rename response model attribute --- docs/strategy-callbacks.md | 5 +++-- freqtrade/rpc/api_server/api_schemas.py | 2 +- freqtrade/rpc/rpc.py | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/strategy-callbacks.md b/docs/strategy-callbacks.md index 0672c9c68..ebfc554d1 100644 --- a/docs/strategy-callbacks.md +++ b/docs/strategy-callbacks.md @@ -1109,10 +1109,11 @@ class AwesomeStrategy(IStrategy): :param **kwargs: Ensure to keep this here so updates to this won't break your strategy. :return: List of AnnotationType objects """ + annotations = [] while start_dt < end_date: start_dt += timedelta(hours=1) if start_dt.hour in (8, 15): - mark_areas.append( + annotations.append( { "type": "area", "label": "Trade open and close hours", @@ -1123,6 +1124,6 @@ class AwesomeStrategy(IStrategy): } ) - return mark_areas + return annotations ``` diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index 207b383ce..48feec123 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -537,7 +537,7 @@ class PairHistory(BaseModel): columns: list[str] all_columns: list[str] = [] data: SerializeAsAny[list[Any]] - mark_areas: list[AnnotationType] | None = None + annotations: list[AnnotationType] | None = None length: int buy_signals: int sell_signals: int diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index a3181e6c1..b5cdd3849 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -1300,7 +1300,7 @@ class RPC: dataframe: DataFrame, last_analyzed: datetime, selected_cols: list[str], - mark_areas: list[dict[str, Any]] = None, + annotations: list[dict[str, Any]] = None, ) -> dict[str, Any]: has_content = len(dataframe) != 0 dataframe_columns = list(dataframe.columns) @@ -1356,7 +1356,7 @@ class RPC: "data_start_ts": 0, "data_stop": "", "data_stop_ts": 0, - "mark_areas": mark_areas, + "annotations": annotations, } if has_content: res.update( @@ -1375,7 +1375,7 @@ class RPC: """Analyzed dataframe in Dict form""" _data, last_analyzed = self.__rpc_analysed_dataframe_raw(pair, timeframe, limit) - mark_areas = self._freqtrade.strategy.ft_plot_annotations(pair=pair, dataframe=_data) + annotations = self._freqtrade.strategy.ft_plot_annotations(pair=pair, dataframe=_data) return RPC._convert_dataframe_to_dict( self._freqtrade.config["strategy"], @@ -1384,7 +1384,7 @@ class RPC: _data, last_analyzed, selected_cols, - mark_areas, + annotations, ) def __rpc_analysed_dataframe_raw( @@ -1468,7 +1468,7 @@ class RPC: df_analyzed = strategy.analyze_ticker(_data[pair], {"pair": pair}) df_analyzed = trim_dataframe(df_analyzed, timerange_parsed, startup_candles=startup_candles) - mark_areas = strategy.ft_plot_annotations(pair=pair, dataframe=df_analyzed) + annotations = strategy.ft_plot_annotations(pair=pair, dataframe=df_analyzed) return RPC._convert_dataframe_to_dict( strategy.get_strategy_name(), @@ -1477,7 +1477,7 @@ class RPC: df_analyzed.copy(), dt_now(), selected_cols, - mark_areas, + annotations, ) def _rpc_plot_config(self) -> dict[str, Any]: