From 7d17e30ccf4fc0f4fb2826a228936d275311966e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Delacotte?= Date: Tue, 21 Oct 2025 20:39:50 +0200 Subject: [PATCH] =?UTF-8?q?Changement=20r=C3=A9pertoire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- README.md | 2 +- requirements.txt | 16 ++++++++-------- src/app.py | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index dec4654..5238672 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Utiliser une image Python -FROM python:3.10 +FROM python:3.12 # Créer un répertoire de travail WORKDIR /src diff --git a/README.md b/README.md index a4ac5a5..a44238e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Ajouter à la fin de populate_buy_trend : if self.dp.runmode.value in ('backtest'): - dataframe.to_feather(f"user_data/data/binance/{metadata['pair'].replace('/', '_')}_df.feather") + dataframe.to_feather(f"user_data/backtest_results/{metadata['pair'].replace('/', '_')}_df.feather") ### Lancer un backtest avec export signals diff --git a/requirements.txt b/requirements.txt index 615cb11..9d59ddd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -numpy==1.26.4 -pandas==2.2.3 -bottleneck==1.4.2 -numexpr==2.10.2 -pandas-ta==0.3.14b +numpy +pandas +bottleneck +numexpr +pandas-ta matplotlib -Flask==2.2.3 -Werkzeug==2.2.3 -joblib==1.4.2 +Flask +Werkzeug +joblib pyarrow pandas-ta diff --git a/src/app.py b/src/app.py index 3263a75..aeb1b28 100644 --- a/src/app.py +++ b/src/app.py @@ -32,8 +32,8 @@ def home(): # Filtre pour obtenir uniquement les fichiers (pas les dossiers) files = [os.path.basename(f) for f in files if os.path.isfile(f) and f.lower().endswith('.zip')] - # files2 = os.listdir(FREQTRADE_USERDATA_DIR + "/data/binance") - files2 = list(filter(os.path.isfile, glob.glob(FREQTRADE_USERDATA_DIR + "/data/binance/" + "*"))) + # files2 = os.listdir(FREQTRADE_USERDATA_DIR + "/backtest_results") + files2 = list(filter(os.path.isfile, glob.glob(FREQTRADE_USERDATA_DIR + "/backtest_results/" + "*"))) files2.sort(key=os.path.getctime) files2 = [os.path.basename(f) for f in files2 if os.path.isfile(f) and f.lower().endswith('.feather')] @@ -126,7 +126,7 @@ def read_json(filename): @app.route('/read_feather/') def read_feather(filename): - path = os.path.join(FREQTRADE_USERDATA_DIR + "/data/binance/", filename) + path = os.path.join(FREQTRADE_USERDATA_DIR + "/backtest_results/", filename) try: dataframe = pd.read_feather(path) # dataframe['min'] = talib.MIN(dataframe['close'], timeperiod=200) @@ -144,7 +144,7 @@ def read_feather(filename): @app.route('/generate_report') def generate_report(): filename = request.args.get('filename', '') - path = os.path.join(FREQTRADE_USERDATA_DIR + "/data/binance/", filename) + path = os.path.join(FREQTRADE_USERDATA_DIR + "/backtest_results/", filename) print(path) indicators = request.args.get('indicators', '').split(',') print(indicators) @@ -164,7 +164,7 @@ def generate_report(): @app.route('/get_chart_data') def get_chart_data(): filename = request.args.get('filename', '') - path = os.path.join(FREQTRADE_USERDATA_DIR + "/data/binance/", filename) + path = os.path.join(FREQTRADE_USERDATA_DIR + "/backtest_results/", filename) print(path) indicators = request.args.get('indicators', '').split(',') df = pd.read_feather(path) @@ -204,7 +204,7 @@ def get_chart_data(): # @app.route('/generate_model') # def generate_model(): # filename = request.args.get('filename', '') -# path = os.path.join(FREQTRADE_USERDATA_DIR + "/data/binance/", filename) +# path = os.path.join(FREQTRADE_USERDATA_DIR + "/backtest_results/", filename) # print(path) # # indicators = request.args.get('indicators', '').split(',') # df = pd.read_feather(path)