X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3788d765ed4e7ddf00794085af757714bc102cf..f71478e49c1a9462ca3b94a72d280581d98b8fff:/nominatim/indexer/progress.py?ds=sidebyside diff --git a/nominatim/indexer/progress.py b/nominatim/indexer/progress.py index b758e10d..33df37fb 100644 --- a/nominatim/indexer/progress.py +++ b/nominatim/indexer/progress.py @@ -18,11 +18,11 @@ class ProgressLogger: """ Tracks and prints progress for the indexing process. `name` is the name of the indexing step being tracked. `total` sets up the total number of items that need processing. - `log_interval` denotes the interval in seconds at which progres + `log_interval` denotes the interval in seconds at which progress should be reported. """ - def __init__(self, name, total, log_interval=1): + def __init__(self, name: str, total: int, log_interval: int = 1) -> None: self.name = name self.total_places = total self.done_places = 0 @@ -30,7 +30,7 @@ class ProgressLogger: self.log_interval = log_interval self.next_info = INITIAL_PROGRESS if LOG.isEnabledFor(logging.WARNING) else total + 1 - def add(self, num=1): + def add(self, num: int = 1) -> None: """ Mark `num` places as processed. Print a log message if the logging is at least info and the log interval has passed. """ @@ -55,14 +55,14 @@ class ProgressLogger: self.next_info += int(places_per_sec) * self.log_interval - def done(self): + def done(self) -> int: """ Print final statistics about the progress. """ rank_end_time = datetime.now() if rank_end_time == self.rank_start_time: - diff_seconds = 0 - places_per_sec = self.done_places + diff_seconds = 0.0 + places_per_sec = float(self.done_places) else: diff_seconds = (rank_end_time - self.rank_start_time).total_seconds() places_per_sec = self.done_places / diff_seconds @@ -70,3 +70,5 @@ class ProgressLogger: LOG.warning("Done %d/%d in %d @ %.3f per second - FINISHED %s\n", self.done_places, self.total_places, int(diff_seconds), places_per_sec, self.name) + + return self.done_places