From 132dffd239d155c453b3ce5e186104dc393cd204 Mon Sep 17 00:00:00 2001 From: Victor Grau Serrat Date: Tue, 27 Mar 2018 13:22:21 -0600 Subject: [PATCH] BLD: [mktplace] progress indicator for publishing data --- catalyst/marketplace/marketplace.py | 31 ++++++++++++++---------- catalyst/marketplace/utils/auth_utils.py | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index 1a27378f..bc1abad9 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -20,7 +20,6 @@ from requests_toolbelt.multipart.decoder import \ from catalyst.constants import ( LOG_LEVEL, AUTH_SERVER, ETH_REMOTE_NODE, MARKETPLACE_CONTRACT, MARKETPLACE_CONTRACT_ABI, ENIGMA_CONTRACT, ENIGMA_CONTRACT_ABI) -from catalyst.utils.cli import maybe_show_progress from catalyst.exchange.utils.stats_utils import set_print_settings from catalyst.marketplace.marketplace_errors import ( MarketplacePubAddressEmpty, MarketplaceDatasetNotFound, @@ -784,26 +783,32 @@ class Marketplace: else: key, secret = get_key_secret(provider_info[0], match['wallet']) - headers = get_signed_headers(dataset, key, secret) filenames = glob.glob(os.path.join(datadir, '*.csv')) if not filenames: raise MarketplaceNoCSVFiles(datadir=datadir) files = [] - for file in filenames: + for idx, file in enumerate(filenames): + log.info('Uploading file {} of {}: {}'.format( + idx, len(filenames), file)) + files = [] files.append(('file', open(file, 'rb'))) - r = requests.post('{}/marketplace/publish'.format(AUTH_SERVER), - files=files, - headers=headers) + headers = get_signed_headers(dataset, key, secret) + r = requests.post('{}/marketplace/publish'.format(AUTH_SERVER), + files=files, + headers=headers) - if r.status_code != 200: - raise MarketplaceHTTPRequest(request='upload file', - error=r.status_code) + if r.status_code != 200: + raise MarketplaceHTTPRequest(request='upload file', + error=r.status_code) - if 'error' in r.json(): - raise MarketplaceHTTPRequest(request='upload file', - error=r.json()['error']) + if 'error' in r.json(): + raise MarketplaceHTTPRequest(request='upload file', + error=r.json()['error']) - print('Dataset {} uploaded successfully.'.format(dataset)) + log.info('File processed successfully.') + + print('\nDataset {} uploaded and processed successfully.'.format( + dataset)) diff --git a/catalyst/marketplace/utils/auth_utils.py b/catalyst/marketplace/utils/auth_utils.py index 5eb0b66a..fc964a2d 100644 --- a/catalyst/marketplace/utils/auth_utils.py +++ b/catalyst/marketplace/utils/auth_utils.py @@ -123,7 +123,7 @@ def get_signed_headers(ds_name, key, secret): ------- """ - nonce = str(int(time.time())) + nonce = str(int(time.time() * 1000)) signature = hmac.new( secret.encode('utf-8'),