progressbar cleanup

dvc/progress.py

@@ -32,6 +32,11 @@ class Tqdm(tqdm):
     """
     maximum-compatibility tqdm-based progressbars
     """
+    BAR_FMT_DEFAULT = (
+        "{percentage:3.0f}%|{bar:10}|{desc} {bar:-10b}{n}/{total}"
+        " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]"
+    )
+    BAR_FMT_NOTOTAL = "{desc} {bar:b}{n} [{elapsed}<??:??, {rate_fmt:>11}{postfix}]"
 
     def __init__(
         self,
@@ -40,6 +45,7 @@ def __init__(
         bytes=False,  # pylint: disable=W0622
         desc_truncate=None,
         leave=None,
+        bar_format=None,
         **kwargs
     ):
         """
@@ -49,6 +55,7 @@ def __init__(
         kwargs  : anything accepted by `tqdm.tqdm()`
         """
         kwargs = deepcopy(kwargs)
+        kwargs.setdefault("unit_scale", True)
         if bytes:
             for k, v in dict(
                 unit="B", unit_scale=True, unit_divisor=1024, miniters=1
@@ -61,15 +68,24 @@ def __init__(
                 logging.getLogger(__name__).getEffectiveLevel()
                 >= logging.CRITICAL
             )
+        if bar_format is None:
+            if kwargs.get('total', getattr(iterable, '__len__', None)) is None:
+                bar_format = self.BAR_FMT_NOTOTAL
+            else:
+                bar_format = self.BAR_FMT_DEFAULT
         super(Tqdm, self).__init__(
-            iterable=iterable, disable=disable, leave=leave, **kwargs
+            iterable=iterable,
+            disable=disable,
+            leave=leave,
+            bar_format=bar_format,
+            **kwargs
         )
 
     def update_desc(self, desc, n=1, truncate=True):
         """
-        Calls `set_description(truncate(desc))` and `update(n)`
+        Calls `set_description_str(truncate(desc))` and `update(n)`
         """
-        self.set_description(
+        self.set_description_str(
             self.truncate(desc) if truncate else desc, refresh=False
         )
         self.update(n)

dvc/remote/base.py

@@ -638,7 +638,9 @@ def cache_exists(self, checksums, jobs=None):
         if not self.no_traverse:
             return list(set(checksums) & set(self.all()))
 
-        with Tqdm(total=len(checksums), unit="md5") as pbar:
+        with Tqdm(
+            desc="Querying remote cache", total=len(checksums), unit="md5"
+        ) as pbar:
 
             def exists_with_progress(path_info):
                 ret = self.exists(path_info)

dvc/remote/local/__init__.py

@@ -254,7 +254,9 @@ def move(self, from_info, to_info):
     def cache_exists(self, checksums, jobs=None):
         return [
             checksum
-            for checksum in Tqdm(checksums, unit="md5")
+            for checksum in Tqdm(
+                checksums, unit="md5", desc="Querying local cache"
+            )
             if not self.changed_cache_file(checksum)
         ]
 
@@ -319,7 +321,6 @@ def status(
         ret = self._group(checksum_infos, show_checksums=show_checksums) or {}
         md5s = list(ret)
 
-        logger.info("Collecting information from local cache...")
         local_exists = self.cache_exists(md5s, jobs=jobs)
 
         # This is a performance optimization. We can safely assume that,
@@ -329,7 +330,6 @@ def status(
         if download and sorted(local_exists) == sorted(md5s):
             remote_exists = local_exists
         else:
-            logger.info("Collecting information from remote cache...")
             remote_exists = list(remote.cache_exists(md5s, jobs=jobs))
 
         self._fill_statuses(ret, local_exists, remote_exists)

dvc/remote/ssh/__init__.py

@@ -267,7 +267,9 @@ def cache_exists(self, checksums, jobs=None):
         if not self.no_traverse:
             return list(set(checksums) & set(self.all()))
 
-        with Tqdm(total=len(checksums), unit="md5") as pbar:
+        with Tqdm(
+            desc="Querying remote cache", total=len(checksums), unit="md5"
+        ) as pbar:
 
             def exists_with_progress(chunks):
                 return self.batch_exists(chunks, callback=pbar.update_desc)
@@ -278,5 +280,5 @@ def exists_with_progress(chunks):
                 results = executor.map(exists_with_progress, chunks)
                 in_remote = itertools.chain.from_iterable(results)
                 ret = list(itertools.compress(checksums, in_remote))
-                pbar.update_desc("", 0)  # clear path name description
+                pbar.set_description_str("Querying remote cache")
                 return ret

dvc/repo/checkout.py

@@ -51,4 +51,4 @@ def checkout(self, target=None, with_deps=False, force=False, recursive=False):
                     )
 
                 stage.checkout(force=force, progress_callback=pbar.update_desc)
-            pbar.update_desc("Checkout", 0)  # clear path name description
+            pbar.set_description_str("Checkout")

setup.py

@@ -61,7 +61,7 @@ def run(self):
     "funcy>=1.12",
     "pathspec>=0.5.9",
     "shortuuid>=0.5.0",
-    "tqdm>=4.34.0",
+    "tqdm>=4.35.0",
     "win-unicode-console>=0.5; sys_platform == 'win32'",
 ]