Skip to content

Commit

Permalink
Fix load user exception issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jrrodri committed Mar 11, 2019
1 parent 80c2083 commit be9b2c8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
12 changes: 9 additions & 3 deletions abraia/abraia.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@
class Abraia(Client):
def __init__(self, folder=''):
super(Abraia, self).__init__()
self.userid = self.load_user()['user']['id']
self.path = ''
self.params = {}
self.userid = self.userid()
self.folder = folder
self.params = {}
self.path = ''

def userid(self):
try:
return self.user()['id']
except Exception:
return None

def user(self):
return self.load_user()['user']
Expand Down
17 changes: 10 additions & 7 deletions scripts/abraia
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ abraia = Abraia(folder='batch/')


def process_info():
print('Abraia CLI v0.4.5')
user = abraia.user()
print('Email:', user['email'])
print('Credits:', user['credits'])
print('Transformations:', user['transforms'])
print('Processed data:', user['bandwidth'])
print('Abraia CLI v0.4.6')
try:
user = abraia.user()
print('Email:', user['email'])
print('Credits:', user['credits'])
print('Transformations:', user['transforms'])
print('Processed data:', user['bandwidth'])
except APIError as error:
print('Error', error.code, error.message)


def process_configure():
Expand Down Expand Up @@ -142,7 +145,7 @@ def add_parser_store(subparser):

def parse_input():
parser = argparse.ArgumentParser(description='Abraia image optimization tool')
parser.add_argument('-V', '--version', action='version', version='0.4.5')
parser.add_argument('-V', '--version', action='version', version='0.4.6')
subparser = parser.add_subparsers(dest='command')
parser_info = add_parser_info(subparser)
parser_configure = add_parser_configure(subparser)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setup(
name='abraia',
version='0.4.5',
version='0.4.6',
description='Abraia Python SDK',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down

0 comments on commit be9b2c8

Please sign in to comment.