mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: ensure date-column is in ms range

Browse Source
This commit is contained in:
Matthias
2026-04-13 19:54:36 +02:00
parent 16547dbdbe
commit 2c5dc72985
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/data/history/datahandlers/featherdatahandler.py
+2 -2
View File
@@ -1,6 +1,6 @@
import logging import logging
from pandas import DataFrame, read_feather, to_datetime from pandas import DataFrame, read_feather
from pyarrow import dataset from pyarrow import dataset
from freqtrade.configuration import TimeRange from freqtrade.configuration import TimeRange
@@ -71,7 +71,7 @@ class FeatherDataHandler(IDataHandler):
"volume": "float", "volume": "float",
} }
) )
pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) pairdata["date"] = pairdata["date"].dt.as_unit("ms")
return pairdata return pairdata
except Exception as e: except Exception as e:
logger.exception( logger.exception(
freqtrade/data/history/datahandlers/jsondatahandler.py
+1 -1
View File
@@ -80,7 +80,7 @@ class JsonDataHandler(IDataHandler):
"volume": "float", "volume": "float",
} }
) )
pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True).dt.as_unit("ms")
return pairdata return pairdata
def ohlcv_append( def ohlcv_append(
freqtrade/data/history/datahandlers/parquetdatahandler.py
+2 -2
View File
@@ -1,6 +1,6 @@
import logging import logging
from pandas import DataFrame, read_parquet, to_datetime from pandas import DataFrame, read_parquet
from freqtrade.configuration import TimeRange from freqtrade.configuration import TimeRange
from freqtrade.constants import DEFAULT_DATAFRAME_COLUMNS, DEFAULT_TRADES_COLUMNS from freqtrade.constants import DEFAULT_DATAFRAME_COLUMNS, DEFAULT_TRADES_COLUMNS
@@ -68,7 +68,7 @@ class ParquetDataHandler(IDataHandler):
"volume": "float", "volume": "float",
} }
) )
pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) pairdata["date"] = pairdata["date"].dt.as_unit("ms")
return pairdata return pairdata
except Exception as e: except Exception as e:
logger.exception( logger.exception(
tests/conftest.py
+6 -6
View File
@@ -176,20 +176,20 @@ def generate_test_data(
base = np.random.normal(base, 2, size=size) base = np.random.normal(base, 2, size=size)
if timeframe == "1y": if timeframe == "1y":
date = pd.date_range(start, periods=size, freq="1YS", tz="UTC") date = pd.date_range(start, periods=size, freq="1YS", tz="UTC", unit="ms")
elif timeframe == "1M": elif timeframe == "1M":
date = pd.date_range(start, periods=size, freq="1MS", tz="UTC") date = pd.date_range(start, periods=size, freq="1MS", tz="UTC", unit="ms")
elif timeframe == "3M": elif timeframe == "3M":
date = pd.date_range(start, periods=size, freq="3MS", tz="UTC") date = pd.date_range(start, periods=size, freq="3MS", tz="UTC", unit="ms")
elif timeframe == "1w" or timeframe == "7d": elif timeframe == "1w" or timeframe == "7d":
date = pd.date_range(start, periods=size, freq="1W-MON", tz="UTC") date = pd.date_range(start, periods=size, freq="1W-MON", tz="UTC", unit="ms")
else: else:
tf_mins = timeframe_to_minutes(timeframe) tf_mins = timeframe_to_minutes(timeframe)
if tf_mins >= 1: if tf_mins >= 1:
date = pd.date_range(start, periods=size, freq=f"{tf_mins}min", tz="UTC") date = pd.date_range(start, periods=size, freq=f"{tf_mins}min", tz="UTC", unit="ms")
else: else:
tf_secs = timeframe_to_seconds(timeframe) tf_secs = timeframe_to_seconds(timeframe)
date = pd.date_range(start, periods=size, freq=f"{tf_secs}s", tz="UTC") date = pd.date_range(start, periods=size, freq=f"{tf_secs}s", tz="UTC", unit="ms")
df = pd.DataFrame( df = pd.DataFrame(
{ {
"date": date, "date": date,