|
7 | 7 |
|
8 | 8 | import logging |
9 | 9 | from collections import deque |
10 | | -from datetime import datetime, timezone |
| 10 | +from datetime import UTC, datetime |
11 | 11 | from typing import Any |
12 | 12 |
|
13 | 13 | from pandas import DataFrame, Timedelta, Timestamp, to_timedelta |
@@ -98,7 +98,7 @@ def _set_cached_df( |
98 | 98 | :param candle_type: Any of the enum CandleType (must match trading mode!) |
99 | 99 | """ |
100 | 100 | pair_key = (pair, timeframe, candle_type) |
101 | | - self.__cached_pairs[pair_key] = (dataframe, datetime.now(timezone.utc)) |
| 101 | + self.__cached_pairs[pair_key] = (dataframe, datetime.now(UTC)) |
102 | 102 |
|
103 | 103 | # For multiple producers we will want to merge the pairlists instead of overwriting |
104 | 104 | def _set_producer_pairs(self, pairlist: list[str], producer_name: str = "default"): |
@@ -131,7 +131,7 @@ def _emit_df(self, pair_key: PairWithTimeframe, dataframe: DataFrame, new_candle |
131 | 131 | "data": { |
132 | 132 | "key": pair_key, |
133 | 133 | "df": dataframe.tail(1), |
134 | | - "la": datetime.now(timezone.utc), |
| 134 | + "la": datetime.now(UTC), |
135 | 135 | }, |
136 | 136 | } |
137 | 137 | self.__rpc.send_msg(msg) |
@@ -164,7 +164,7 @@ def _replace_external_df( |
164 | 164 | if producer_name not in self.__producer_pairs_df: |
165 | 165 | self.__producer_pairs_df[producer_name] = {} |
166 | 166 |
|
167 | | - _last_analyzed = datetime.now(timezone.utc) if not last_analyzed else last_analyzed |
| 167 | + _last_analyzed = datetime.now(UTC) if not last_analyzed else last_analyzed |
168 | 168 |
|
169 | 169 | self.__producer_pairs_df[producer_name][pair_key] = (dataframe, _last_analyzed) |
170 | 170 | logger.debug(f"External DataFrame for {pair_key} from {producer_name} added.") |
@@ -275,12 +275,12 @@ def get_producer_df( |
275 | 275 | # If we have no data from this Producer yet |
276 | 276 | if producer_name not in self.__producer_pairs_df: |
277 | 277 | # We don't have this data yet, return empty DataFrame and datetime (01-01-1970) |
278 | | - return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc)) |
| 278 | + return (DataFrame(), datetime.fromtimestamp(0, tz=UTC)) |
279 | 279 |
|
280 | 280 | # If we do have data from that Producer, but no data on this pair_key |
281 | 281 | if pair_key not in self.__producer_pairs_df[producer_name]: |
282 | 282 | # We don't have this data yet, return empty DataFrame and datetime (01-01-1970) |
283 | | - return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc)) |
| 283 | + return (DataFrame(), datetime.fromtimestamp(0, tz=UTC)) |
284 | 284 |
|
285 | 285 | # We have it, return this data |
286 | 286 | df, la = self.__producer_pairs_df[producer_name][pair_key] |
@@ -396,10 +396,10 @@ def get_analyzed_dataframe(self, pair: str, timeframe: str) -> tuple[DataFrame, |
396 | 396 | if (max_index := self.__slice_index.get(pair)) is not None: |
397 | 397 | df = df.iloc[max(0, max_index - MAX_DATAFRAME_CANDLES) : max_index] |
398 | 398 | else: |
399 | | - return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc)) |
| 399 | + return (DataFrame(), datetime.fromtimestamp(0, tz=UTC)) |
400 | 400 | return df, date |
401 | 401 | else: |
402 | | - return (DataFrame(), datetime.fromtimestamp(0, tz=timezone.utc)) |
| 402 | + return (DataFrame(), datetime.fromtimestamp(0, tz=UTC)) |
403 | 403 |
|
404 | 404 | @property |
405 | 405 | def runmode(self) -> RunMode: |
|
0 commit comments