Merge branch 'freqtrade:develop' into allow-pairs-with-prefix-in-marketcap-pairList

This commit is contained in:
mrpabloyeah
2025-08-11 22:36:37 +02:00
committed by GitHub
11 changed files with 884 additions and 61 deletions

View File

@@ -580,7 +580,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Download artifact 📦 - name: Download artifact 📦
uses: actions/download-artifact@v4 uses: actions/download-artifact@v5
with: with:
pattern: freqtrade*-build pattern: freqtrade*-build
path: dist path: dist
@@ -609,7 +609,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: Download artifact 📦 - name: Download artifact 📦
uses: actions/download-artifact@v4 uses: actions/download-artifact@v5
with: with:
pattern: freqtrade*-build pattern: freqtrade*-build
path: dist path: dist

View File

@@ -28,9 +28,9 @@ repos:
additional_dependencies: additional_dependencies:
- types-cachetools==6.1.0.20250717 - types-cachetools==6.1.0.20250717
- types-filelock==3.2.7 - types-filelock==3.2.7
- types-requests==2.32.4.20250611 - types-requests==2.32.4.20250809
- types-tabulate==0.9.0.20241207 - types-tabulate==0.9.0.20241207
- types-python-dateutil==2.9.0.20250708 - types-python-dateutil==2.9.0.20250809
- scipy-stubs==1.16.1.0 - scipy-stubs==1.16.1.0
- SQLAlchemy==2.0.42 - SQLAlchemy==2.0.42
# stages: [push] # stages: [push]

View File

@@ -1,4 +1,4 @@
FROM python:3.13.5-slim-bookworm AS base FROM python:3.13.6-slim-bookworm AS base
# Setup env # Setup env
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8

View File

@@ -4,7 +4,7 @@ python -m pip install --upgrade pip
python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')" python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"
pip install -U wheel "numpy<3.0" pip install -U wheel "numpy<3.0"
pip install --only-binary ta-lib --find-links=build_helpers\ ta-lib pip install --only-binary ta-lib --find-links=build_helpers\ "ta-lib<0.6.0"
pip install -r requirements-dev.txt pip install -r requirements-dev.txt
pip install -e . pip install -e .

File diff suppressed because it is too large Load Diff

View File

@@ -493,7 +493,7 @@ class FreqaiDataDrawer:
dk.data["data_path"] = str(dk.data_path) dk.data["data_path"] = str(dk.data_path)
dk.data["model_filename"] = str(dk.model_filename) dk.data["model_filename"] = str(dk.model_filename)
dk.data["training_features_list"] = list(dk.data_dictionary["train_features"].columns) dk.data["training_features_list"] = dk.training_features_list
dk.data["label_list"] = dk.label_list dk.data["label_list"] = dk.label_list
with (save_path / f"{dk.model_filename}_{METADATA}.json").open("w") as fp: with (save_path / f"{dk.model_filename}_{METADATA}.json").open("w") as fp:

View File

@@ -514,12 +514,7 @@ class IFreqaiModel(ABC):
current coin/bot loop current coin/bot loop
""" """
if "training_features_list_raw" in dk.data: if dk.training_features_list != dk.data["training_features_list"]:
feature_list = dk.data["training_features_list_raw"]
else:
feature_list = dk.data["training_features_list"]
if dk.training_features_list != feature_list:
raise OperationalException( raise OperationalException(
"Trying to access pretrained model with `identifier` " "Trying to access pretrained model with `identifier` "
"but found different features furnished by current strategy. " "but found different features furnished by current strategy. "

View File

@@ -598,6 +598,8 @@ def generate_strategy_stats(
"timerange": config.get("timerange", ""), "timerange": config.get("timerange", ""),
"enable_protections": config.get("enable_protections", False), "enable_protections": config.get("enable_protections", False),
"strategy_name": strategy, "strategy_name": strategy,
"freqaimodel": config.get("freqaimodel", None),
"freqai_identifier": config.get("freqai", {}).get("identifier", None),
# Parameters relevant for backtesting # Parameters relevant for backtesting
"stoploss": config["stoploss"], "stoploss": config["stoploss"],
"trailing_stop": config.get("trailing_stop", False), "trailing_stop": config.get("trailing_stop", False),

View File

@@ -6,9 +6,9 @@
-r requirements-freqai-rl.txt -r requirements-freqai-rl.txt
-r docs/requirements-docs.txt -r docs/requirements-docs.txt
ruff==0.12.7 ruff==0.12.8
mypy==1.17.1 mypy==1.17.1
pre-commit==4.2.0 pre-commit==4.3.0
pytest==8.4.1 pytest==8.4.1
pytest-asyncio==1.1.0 pytest-asyncio==1.1.0
pytest-cov==6.2.1 pytest-cov==6.2.1
@@ -18,7 +18,7 @@ pytest-timeout==2.4.0
pytest-xdist==3.8.0 pytest-xdist==3.8.0
isort==6.0.1 isort==6.0.1
# For datetime mocking # For datetime mocking
time-machine==2.16.0 time-machine==2.17.0
# Convert jupyter notebooks to markdown documents # Convert jupyter notebooks to markdown documents
nbconvert==7.16.6 nbconvert==7.16.6
@@ -27,6 +27,6 @@ nbconvert==7.16.6
scipy-stubs==1.16.1.0 # keep in sync with `scipy` in `requirements-hyperopt.txt` scipy-stubs==1.16.1.0 # keep in sync with `scipy` in `requirements-hyperopt.txt`
types-cachetools==6.1.0.20250717 types-cachetools==6.1.0.20250717
types-filelock==3.2.7 types-filelock==3.2.7
types-requests==2.32.4.20250611 types-requests==2.32.4.20250809
types-tabulate==0.9.0.20241207 types-tabulate==0.9.0.20241207
types-python-dateutil==2.9.0.20250708 types-python-dateutil==2.9.0.20250809

View File

@@ -2,7 +2,7 @@
-r requirements-freqai.txt -r requirements-freqai.txt
# Required for freqai-rl # Required for freqai-rl
torch==2.7.1; sys_platform != 'darwin' or platform_machine != 'x86_64' torch==2.8.0; sys_platform != 'darwin' or platform_machine != 'x86_64'
gymnasium==0.29.1 gymnasium==0.29.1
# SB3 >=2.5.0 depends on torch 2.3.0 - which implies it dropped support x86 macos # SB3 >=2.5.0 depends on torch 2.3.0 - which implies it dropped support x86 macos
stable_baselines3==2.7.0; sys_platform != 'darwin' or platform_machine != 'x86_64' stable_baselines3==2.7.0; sys_platform != 'darwin' or platform_machine != 'x86_64'

View File

@@ -7,8 +7,8 @@ ft-pandas-ta==0.3.15
ta-lib==0.5.5 ta-lib==0.5.5
technical==1.5.2 technical==1.5.2
ccxt==4.4.98 ccxt==4.4.99
cryptography==45.0.5 cryptography==45.0.6
aiohttp==3.12.15 aiohttp==3.12.15
SQLAlchemy==2.0.42 SQLAlchemy==2.0.42
python-telegram-bot==22.3 python-telegram-bot==22.3