chore: simplify progress-tracker typing

This commit is contained in:
Matthias
2024-11-22 15:24:52 +01:00
parent 19f23106e7
commit b67beaa35a
3 changed files with 6 additions and 17 deletions
+4 -4
View File
@@ -20,7 +20,7 @@ from freqtrade.exchange import Exchange
from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist
from freqtrade.util import dt_now, dt_ts, format_ms_time from freqtrade.util import dt_now, dt_ts, format_ms_time
from freqtrade.util.migrations import migrate_data from freqtrade.util.migrations import migrate_data
from freqtrade.util.progress_tracker import ProgressLike, retrieve_progress_tracker from freqtrade.util.progress_tracker import CustomProgress, retrieve_progress_tracker
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -328,7 +328,7 @@ def refresh_backtest_ohlcv_data(
erase: bool = False, erase: bool = False,
data_format: str | None = None, data_format: str | None = None,
prepend: bool = False, prepend: bool = False,
progress_tracker: ProgressLike | None = None, progress_tracker: CustomProgress | None = None,
) -> list[str]: ) -> list[str]:
""" """
Refresh stored ohlcv data for backtesting and hyperopt operations. Refresh stored ohlcv data for backtesting and hyperopt operations.
@@ -495,7 +495,7 @@ def refresh_backtest_trades_data(
new_pairs_days: int = 30, new_pairs_days: int = 30,
erase: bool = False, erase: bool = False,
data_format: str = "feather", data_format: str = "feather",
progress_tracker: ProgressLike | None = None, progress_tracker: CustomProgress | None = None,
) -> list[str]: ) -> list[str]:
""" """
Refresh stored trades data for backtesting and hyperopt operations. Refresh stored trades data for backtesting and hyperopt operations.
@@ -597,7 +597,7 @@ def download_data(
config: Config, config: Config,
exchange: Exchange, exchange: Exchange,
*, *,
progress_tracker: ProgressLike | None = None, progress_tracker: CustomProgress | None = None,
) -> None: ) -> None:
""" """
Download data function. Used from both cli and API. Download data function. Used from both cli and API.
-1
View File
@@ -16,7 +16,6 @@ from freqtrade.util.ft_precise import FtPrecise
from freqtrade.util.measure_time import MeasureTime from freqtrade.util.measure_time import MeasureTime
from freqtrade.util.periodic_cache import PeriodicCache from freqtrade.util.periodic_cache import PeriodicCache
from freqtrade.util.progress_tracker import ( # noqa F401 from freqtrade.util.progress_tracker import ( # noqa F401
ProgressLike,
get_progress_tracker, get_progress_tracker,
retrieve_progress_tracker, retrieve_progress_tracker,
) )
+2 -12
View File
@@ -1,10 +1,6 @@
from contextlib import AbstractContextManager
from typing import Protocol
from rich.progress import ( from rich.progress import (
BarColumn, BarColumn,
MofNCompleteColumn, MofNCompleteColumn,
TaskID,
TaskProgressColumn, TaskProgressColumn,
TextColumn, TextColumn,
TimeElapsedColumn, TimeElapsedColumn,
@@ -14,19 +10,13 @@ from rich.progress import (
from freqtrade.util.rich_progress import CustomProgress from freqtrade.util.rich_progress import CustomProgress
class ProgressLike(Protocol, AbstractContextManager["ProgressLike"]): def retrieve_progress_tracker(pt: CustomProgress | None) -> CustomProgress:
def add_task(self, description: str, *args, **kwargs) -> TaskID: ...
def update(self, task_id: TaskID, *, advance: float | None = None, **kwargs): ...
def retrieve_progress_tracker(pt: ProgressLike | None) -> ProgressLike:
if pt is None: if pt is None:
return get_progress_tracker() return get_progress_tracker()
return pt return pt
def get_progress_tracker(**kwargs) -> ProgressLike: def get_progress_tracker(**kwargs) -> CustomProgress:
""" """
Get progress Bar with custom columns. Get progress Bar with custom columns.
""" """