diff --git a/build_helpers/pyarrow-11.0.0-cp39-cp39-linux_armv7l.whl b/build_helpers/pyarrow-12.0.0-cp39-cp39-linux_armv7l.whl similarity index 59% rename from build_helpers/pyarrow-11.0.0-cp39-cp39-linux_armv7l.whl rename to build_helpers/pyarrow-12.0.0-cp39-cp39-linux_armv7l.whl index a7ad80bdf..2a8d1ff51 100644 Binary files a/build_helpers/pyarrow-11.0.0-cp39-cp39-linux_armv7l.whl and b/build_helpers/pyarrow-12.0.0-cp39-cp39-linux_armv7l.whl differ diff --git a/freqtrade/freqai/freqai_interface.py b/freqtrade/freqai/freqai_interface.py index cf8097870..b453500b8 100644 --- a/freqtrade/freqai/freqai_interface.py +++ b/freqtrade/freqai/freqai_interface.py @@ -623,9 +623,11 @@ class IFreqaiModel(ABC): strategy, corr_dataframes, base_dataframes, pair ) - new_trained_timerange = dk.buffer_timerange(new_trained_timerange) + trained_timestamp = new_trained_timerange.stopts - unfiltered_dataframe = dk.slice_dataframe(new_trained_timerange, unfiltered_dataframe) + buffered_timerange = dk.buffer_timerange(new_trained_timerange) + + unfiltered_dataframe = dk.slice_dataframe(buffered_timerange, unfiltered_dataframe) # find the features indicated by strategy and store in datakitchen dk.find_features(unfiltered_dataframe) @@ -635,8 +637,8 @@ class IFreqaiModel(ABC): model = self.train(unfiltered_dataframe, pair, dk) self.tb_logger.close() - self.dd.pair_dict[pair]["trained_timestamp"] = new_trained_timerange.stopts - dk.set_new_model_names(pair, new_trained_timerange.stopts) + self.dd.pair_dict[pair]["trained_timestamp"] = trained_timestamp + dk.set_new_model_names(pair, trained_timestamp) self.dd.save_data(model, pair, dk) if self.plot_features: diff --git a/requirements.txt b/requirements.txt index baa7e4d26..448bf1fc4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ tables==3.8.0 blosc==1.11.1 joblib==1.2.0 rich==13.3.5 -pyarrow==11.0.0; platform_machine != 'armv7l' +pyarrow==12.0.0; platform_machine != 'armv7l' # find first, C search in arrays py_find_1st==1.1.5 diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index 95414a83f..e27c8d2c0 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -41,9 +41,6 @@ def can_run_model(model: str) -> None: if is_pytorch_model and is_mac() and not is_arm(): pytest.skip("Reinforcement learning / PyTorch module not available on intel based Mac OS.") - if is_pytorch_model: - pytest.skip("Reinforcement learning / PyTorch currently not available on python 3.11.") - @pytest.mark.parametrize('model, pca, dbscan, float32, can_short, shuffle, buffer', [ ('LightGBMRegressor', True, False, True, True, False, 0),