From 12a6a3d97514c8336a3dee606a06acec999b27e4 Mon Sep 17 00:00:00 2001 From: calebchiam Date: Fri, 30 Sep 2022 23:54:09 +0300 Subject: [PATCH] add tqdm to all iterators --- convokit/model/conversation.py | 8 +++++--- convokit/model/corpus.py | 6 +++--- convokit/model/speaker.py | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/convokit/model/conversation.py b/convokit/model/conversation.py index e351efb73..2c66ac20e 100644 --- a/convokit/model/conversation.py +++ b/convokit/model/conversation.py @@ -1,6 +1,8 @@ from collections import defaultdict from typing import Dict, List, Callable, Generator, Optional +from tqdm import tqdm + from convokit.util import warn from .corpusComponent import CorpusComponent from .corpusUtil import * @@ -71,8 +73,8 @@ def iter_utterances( By default, the selector includes all Utterances in the Conversation. :return: a generator of Utterances """ - for ut_id in self._utterance_ids: - utt = self._owner.get_utterance(ut_id) + for utt_id in tqdm(self._utterance_ids): + utt = self._owner.get_utterance(utt_id) if selector(utt): yield utt @@ -134,7 +136,7 @@ def iter_speakers( for ut_id in self._utterance_ids: ut = self._owner.get_utterance(ut_id) self._speaker_ids.add(ut.speaker.id) - for speaker_id in self._speaker_ids: + for speaker_id in tqdm(self._speaker_ids): speaker = self._owner.get_speaker(speaker_id) if selector(speaker): yield speaker diff --git a/convokit/model/corpus.py b/convokit/model/corpus.py index 8b24e9386..c32a1107c 100644 --- a/convokit/model/corpus.py +++ b/convokit/model/corpus.py @@ -435,7 +435,7 @@ def iter_utterances( By default, the selector includes all Utterances in the Corpus. :return: a generator of Utterances """ - for v in self.utterances.values(): + for v in tqdm(self.utterances.values()): if selector(v): yield v @@ -465,7 +465,7 @@ def iter_conversations( By default, the selector includes all Conversations in the Corpus. :return: a generator of Conversations """ - for v in self.conversations.values(): + for v in tqdm(self.conversations.values()): if selector(v): yield v @@ -496,7 +496,7 @@ def iter_speakers( :return: a generator of Speakers """ - for speaker in self.speakers.values(): + for speaker in tqdm(self.speakers.values()): if selector(speaker): yield speaker diff --git a/convokit/model/speaker.py b/convokit/model/speaker.py index 0f4018aa5..806d1750c 100644 --- a/convokit/model/speaker.py +++ b/convokit/model/speaker.py @@ -1,6 +1,8 @@ from functools import total_ordering from typing import Dict, List, Optional +from tqdm import tqdm + from .corpusComponent import CorpusComponent from .corpusUtil import * @@ -77,7 +79,7 @@ def iter_utterances(self, selector=lambda utt: True): # -> Generator[Utterance, By default, the selector includes all Utterances in the Corpus. :return: An iterator of the Utterances made by the speaker """ - for v in self.utterances.values(): + for v in tqdm(self.utterances.values()): if selector(v): yield v @@ -117,7 +119,7 @@ def iter_conversations( :return: An iterator of the Conversations that the speaker has participated in """ - for v in self.conversations.values(): + for v in tqdm(self.conversations.values()): if selector(v): yield v