diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py index 079ba1a97..fd4a5c5ee 100644 --- a/freqtrade/data/history/history_utils.py +++ b/freqtrade/data/history/history_utils.py @@ -20,7 +20,7 @@ from freqtrade.exchange import Exchange from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist from freqtrade.util import dt_now, dt_ts, format_ms_time 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__) @@ -328,7 +328,7 @@ def refresh_backtest_ohlcv_data( erase: bool = False, data_format: str | None = None, prepend: bool = False, - progress_tracker: ProgressLike | None = None, + progress_tracker: CustomProgress | None = None, ) -> list[str]: """ Refresh stored ohlcv data for backtesting and hyperopt operations. @@ -495,7 +495,7 @@ def refresh_backtest_trades_data( new_pairs_days: int = 30, erase: bool = False, data_format: str = "feather", - progress_tracker: ProgressLike | None = None, + progress_tracker: CustomProgress | None = None, ) -> list[str]: """ Refresh stored trades data for backtesting and hyperopt operations. @@ -597,7 +597,7 @@ def download_data( config: Config, exchange: Exchange, *, - progress_tracker: ProgressLike | None = None, + progress_tracker: CustomProgress | None = None, ) -> None: """ Download data function. Used from both cli and API. diff --git a/freqtrade/util/__init__.py b/freqtrade/util/__init__.py index 3d227880e..7a4d4d119 100644 --- a/freqtrade/util/__init__.py +++ b/freqtrade/util/__init__.py @@ -16,7 +16,6 @@ from freqtrade.util.ft_precise import FtPrecise from freqtrade.util.measure_time import MeasureTime from freqtrade.util.periodic_cache import PeriodicCache from freqtrade.util.progress_tracker import ( # noqa F401 - ProgressLike, get_progress_tracker, retrieve_progress_tracker, ) diff --git a/freqtrade/util/progress_tracker.py b/freqtrade/util/progress_tracker.py index 790b603c7..3f46e0b82 100644 --- a/freqtrade/util/progress_tracker.py +++ b/freqtrade/util/progress_tracker.py @@ -1,10 +1,6 @@ -from contextlib import AbstractContextManager -from typing import Protocol - from rich.progress import ( BarColumn, MofNCompleteColumn, - TaskID, TaskProgressColumn, TextColumn, TimeElapsedColumn, @@ -14,19 +10,13 @@ from rich.progress import ( from freqtrade.util.rich_progress import CustomProgress -class ProgressLike(Protocol, AbstractContextManager["ProgressLike"]): - 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: +def retrieve_progress_tracker(pt: CustomProgress | None) -> CustomProgress: if pt is None: return get_progress_tracker() return pt -def get_progress_tracker(**kwargs) -> ProgressLike: +def get_progress_tracker(**kwargs) -> CustomProgress: """ Get progress Bar with custom columns. """