From 28b99dc4c78a7bc4d80b09951615a4c73644545f Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 19 Nov 2019 16:19:54 +0000 Subject: [PATCH] expose and use name, no_progress_bar Fixes https://github.com/iterative/dvc/pull/2809#discussion_r347180388 --- dvc/remote/gs.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index 45dc6b7bd..d4a59cfb5 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -48,10 +48,20 @@ def dynamic_chunk_size(func): @dynamic_chunk_size -def _upload_to_bucket(bucket, from_file, to_info, chunk_size=None, **kwargs): - blob = bucket.blob(to_info.path, chunk_size=chunk_size, **kwargs) +def _upload_to_bucket( + bucket, + from_file, + to_info, + chunk_size=None, + name=None, + no_progress_bar=True, +): + blob = bucket.blob(to_info.path, chunk_size=chunk_size) with Tqdm( - desc=to_info.path, total=os.path.getsize(from_file), bytes=True + desc=name or to_info.path, + total=os.path.getsize(from_file), + bytes=True, + disable=no_progress_bar, ) as pbar: with io.open(from_file, mode="rb") as fd: raw_read = fd.read @@ -138,14 +148,25 @@ class RemoteGS(RemoteBASE): paths = set(self._list_paths(path_info.bucket, path_info.path)) return any(path_info.path == path for path in paths) - def _upload(self, from_file, to_info, **_kwargs): + def _upload(self, from_file, to_info, name=None, no_progress_bar=True): bucket = self.gs.bucket(to_info.bucket) - _upload_to_bucket(bucket, from_file, to_info) + _upload_to_bucket( + bucket, + from_file, + to_info, + name=name, + no_progress_bar=no_progress_bar, + ) - def _download(self, from_info, to_file, **_kwargs): + def _download(self, from_info, to_file, name=None, no_progress_bar=True): bucket = self.gs.bucket(from_info.bucket) blob = bucket.get_blob(from_info.path) - with Tqdm(desc=from_info.path, total=blob.size, bytes=True) as pbar: + with Tqdm( + desc=name or from_info.path, + total=blob.size, + bytes=True, + disable=no_progress_bar, + ) as pbar: with io.open(to_file, mode="wb") as fd: raw_write = fd.write