Skip to content

[pull] develop from freqtrade:develop #1590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jan 1, 2026
Merged

[pull] develop from freqtrade:develop #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78dde7d
chore: don't use bitwise comparisons for bool comparisons
xmatthias Jan 1, 2026
595309c
chore: improve type-safety for Volumepairlist
xmatthias Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions freqtrade/plugins/pairlist/PercentChangePairList.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None:
self._sort_direction: str | None = self._pairlistconfig.get("sort_direction", "desc")
self._def_candletype = self._config["candle_type_def"]

if (self._lookback_days > 0) & (self._lookback_period > 0):
if (self._lookback_days > 0) and (self._lookback_period > 0):
raise OperationalException(
"Ambiguous configuration: lookback_days and lookback_period both set in pairlist "
"config. Please set lookback_days only or lookback_period and lookback_timeframe "
Expand All @@ -70,7 +70,7 @@ def __init__(self, *args, **kwargs) -> None:
_tf_in_sec = self._tf_in_min * 60

# whether to use range lookback or not
self._use_range = (self._tf_in_min > 0) & (self._lookback_period > 0)
self._use_range = (self._tf_in_min > 0) and (self._lookback_period > 0)

if self._use_range & (self._refresh_period < _tf_in_sec):
raise OperationalException(
Expand Down
22 changes: 11 additions & 11 deletions freqtrade/plugins/pairlist/VolumePairList.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ def __init__(self, *args, **kwargs) -> None:
'for "pairlist.config.number_assets"'
)

self._stake_currency = self._config["stake_currency"]
self._number_pairs = self._pairlistconfig["number_assets"]
self._stake_currency: str = self._config["stake_currency"]
self._number_pairs: int = self._pairlistconfig["number_assets"]
self._sort_key: Literal["quoteVolume"] = self._pairlistconfig.get("sort_key", "quoteVolume")
self._min_value = self._pairlistconfig.get("min_value", 0)
self._max_value = self._pairlistconfig.get("max_value", None)
self._min_value: float | None = self._pairlistconfig.get("min_value", 0)
self._max_value: float | None = self._pairlistconfig.get("max_value", None)
self._refresh_period = self._pairlistconfig.get("refresh_period", 1800)
self._pair_cache: FtTTLCache = FtTTLCache(maxsize=1, ttl=self._refresh_period)
self._lookback_days = self._pairlistconfig.get("lookback_days", 0)
self._lookback_timeframe = self._pairlistconfig.get("lookback_timeframe", "1d")
self._lookback_period = self._pairlistconfig.get("lookback_period", 0)
self._lookback_days: int = self._pairlistconfig.get("lookback_days", 0)
self._lookback_timeframe: str = self._pairlistconfig.get("lookback_timeframe", "1d")
self._lookback_period: int = self._pairlistconfig.get("lookback_period", 0)
self._def_candletype = self._config["candle_type_def"]

if (self._lookback_days > 0) & (self._lookback_period > 0):
if (self._lookback_days > 0) and (self._lookback_period > 0):
raise OperationalException(
"Ambiguous configuration: lookback_days and lookback_period both set in pairlist "
"config. Please set lookback_days only or lookback_period and lookback_timeframe "
Expand All @@ -64,9 +64,9 @@ def __init__(self, *args, **kwargs) -> None:
_tf_in_sec = self._tf_in_min * 60

# whether to use range lookback or not
self._use_range = (self._tf_in_min > 0) & (self._lookback_period > 0)
self._use_range = (self._tf_in_min > 0) and (self._lookback_period > 0)

if self._use_range & (self._refresh_period < _tf_in_sec):
if self._use_range and (self._refresh_period < _tf_in_sec):
raise OperationalException(
f"Refresh period of {self._refresh_period} seconds is smaller than one "
f"timeframe of {self._lookback_timeframe}. Please adjust refresh_period "
Expand Down Expand Up @@ -297,7 +297,7 @@ def filter_pairlist(self, pairlist: list[str], tickers: dict) -> list[str]:
# Tickers mode - filter based on incoming pairlist.
filtered_tickers = [v for k, v in tickers.items() if k in pairlist]

if self._min_value > 0:
if self._min_value and self._min_value > 0:
filtered_tickers = [v for v in filtered_tickers if v[self._sort_key] > self._min_value]
if self._max_value is not None:
filtered_tickers = [v for v in filtered_tickers if v[self._sort_key] < self._max_value]
Expand Down
Loading