chore: rename response model attribute

This commit is contained in:
Matthias
2024-12-28 15:46:38 +01:00
parent 66efc9a469
commit 689767e3ca
3 changed files with 10 additions and 9 deletions
+3 -2
View File
@@ -1109,10 +1109,11 @@ class AwesomeStrategy(IStrategy):
:param **kwargs: Ensure to keep this here so updates to this won't break your strategy. :param **kwargs: Ensure to keep this here so updates to this won't break your strategy.
:return: List of AnnotationType objects :return: List of AnnotationType objects
""" """
annotations = []
while start_dt < end_date: while start_dt < end_date:
start_dt += timedelta(hours=1) start_dt += timedelta(hours=1)
if start_dt.hour in (8, 15): if start_dt.hour in (8, 15):
mark_areas.append( annotations.append(
{ {
"type": "area", "type": "area",
"label": "Trade open and close hours", "label": "Trade open and close hours",
@@ -1123,6 +1124,6 @@ class AwesomeStrategy(IStrategy):
} }
) )
return mark_areas return annotations
``` ```
+1 -1
View File
@@ -537,7 +537,7 @@ class PairHistory(BaseModel):
columns: list[str] columns: list[str]
all_columns: list[str] = [] all_columns: list[str] = []
data: SerializeAsAny[list[Any]] data: SerializeAsAny[list[Any]]
mark_areas: list[AnnotationType] | None = None annotations: list[AnnotationType] | None = None
length: int length: int
buy_signals: int buy_signals: int
sell_signals: int sell_signals: int
+6 -6
View File
@@ -1300,7 +1300,7 @@ class RPC:
dataframe: DataFrame, dataframe: DataFrame,
last_analyzed: datetime, last_analyzed: datetime,
selected_cols: list[str], selected_cols: list[str],
mark_areas: list[dict[str, Any]] = None, annotations: list[dict[str, Any]] = None,
) -> dict[str, Any]: ) -> dict[str, Any]:
has_content = len(dataframe) != 0 has_content = len(dataframe) != 0
dataframe_columns = list(dataframe.columns) dataframe_columns = list(dataframe.columns)
@@ -1356,7 +1356,7 @@ class RPC:
"data_start_ts": 0, "data_start_ts": 0,
"data_stop": "", "data_stop": "",
"data_stop_ts": 0, "data_stop_ts": 0,
"mark_areas": mark_areas, "annotations": annotations,
} }
if has_content: if has_content:
res.update( res.update(
@@ -1375,7 +1375,7 @@ class RPC:
"""Analyzed dataframe in Dict form""" """Analyzed dataframe in Dict form"""
_data, last_analyzed = self.__rpc_analysed_dataframe_raw(pair, timeframe, limit) _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( return RPC._convert_dataframe_to_dict(
self._freqtrade.config["strategy"], self._freqtrade.config["strategy"],
@@ -1384,7 +1384,7 @@ class RPC:
_data, _data,
last_analyzed, last_analyzed,
selected_cols, selected_cols,
mark_areas, annotations,
) )
def __rpc_analysed_dataframe_raw( def __rpc_analysed_dataframe_raw(
@@ -1468,7 +1468,7 @@ class RPC:
df_analyzed = strategy.analyze_ticker(_data[pair], {"pair": pair}) df_analyzed = strategy.analyze_ticker(_data[pair], {"pair": pair})
df_analyzed = trim_dataframe(df_analyzed, timerange_parsed, startup_candles=startup_candles) 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( return RPC._convert_dataframe_to_dict(
strategy.get_strategy_name(), strategy.get_strategy_name(),
@@ -1477,7 +1477,7 @@ class RPC:
df_analyzed.copy(), df_analyzed.copy(),
dt_now(), dt_now(),
selected_cols, selected_cols,
mark_areas, annotations,
) )
def _rpc_plot_config(self) -> dict[str, Any]: def _rpc_plot_config(self) -> dict[str, Any]: