diff --git a/README.md b/README.md index 3f4a5ee..075a2c7 100644 --- a/README.md +++ b/README.md @@ -146,3 +146,10 @@ Contact us @ https://cryptapi.io/contacts/ #### 1.0.4 * Minor fixes + +#### 1.0.5 +* Minor fixes +* Improve error handling + +#### 1.0.6 +* Minor improvements diff --git a/cryptapi/CryptAPI.py b/cryptapi/CryptAPI.py index 0597f6b..daf5d3a 100644 --- a/cryptapi/CryptAPI.py +++ b/cryptapi/CryptAPI.py @@ -5,17 +5,33 @@ import requests from requests.models import PreparedRequest + +class CryptAPIException(Exception): + pass + + class CryptAPIHelper: CRYPTAPI_URL = 'https://api.cryptapi.io/' CRYPTAPI_HOST = 'api.cryptapi.io' def __init__(self, coin, own_address, callback_url, parameters=None, ca_params=None): - if parameters is None: + if not parameters: parameters = {} - if ca_params is None: + if not ca_params: ca_params = {} + if not callback_url: + raise Exception("Callback URL is Missing") + + if not coin: + raise Exception('Coin is Missing') + + if not own_address: + raise Exception('Address is Missing') + + coin = coin.replace('/', '_') + self.coin = coin self.own_address = own_address self.callback_url = callback_url @@ -24,9 +40,6 @@ def __init__(self, coin, own_address, callback_url, parameters=None, ca_params=N self.payment_Address = '' def get_address(self): - if self.coin is None or self.own_address is None: - return None - coin = self.coin if self.parameters: @@ -50,9 +63,6 @@ def get_logs(self): coin = self.coin callback_url = self.callback_url - if coin is None or callback_url is None: - return None - if self.parameters: req = PreparedRequest() req.prepare_url(self.callback_url, self.parameters) @@ -62,17 +72,9 @@ def get_logs(self): 'callback': callback_url } - _logs = CryptAPIHelper.process_request(coin, endpoint='logs', params=params) - - if _logs: - return _logs - - return None + return CryptAPIHelper.process_request(coin, endpoint='logs', params=params) def get_qrcode(self, value='', size=300): - if self.coin is None: - return None - params = { 'address': self.payment_Address, 'size': size @@ -81,12 +83,7 @@ def get_qrcode(self, value='', size=300): if value: params['value'] = value - _qrcode = CryptAPIHelper.process_request(self.coin, endpoint='qrcode', params=params) - - if _qrcode: - return _qrcode - - return None + return CryptAPIHelper.process_request(self.coin, endpoint='qrcode', params=params) def get_conversion(self, from_coin, value): params = { @@ -94,21 +91,11 @@ def get_conversion(self, from_coin, value): 'value': value } - _value = CryptAPIHelper.process_request(self.coin, endpoint='convert', params=params) - - if _value: - return _value - - return None + return CryptAPIHelper.process_request(self.coin, endpoint='convert', params=params) @staticmethod def get_info(coin=''): - _info = CryptAPIHelper.process_request(coin, endpoint='info') - - if _info: - return _info - - return None + return CryptAPIHelper.process_request(coin, endpoint='info') @staticmethod def get_supported_coins(): @@ -135,17 +122,14 @@ def get_estimate(coin, addresses=1, priority='default'): 'priority': priority } - _estimate = CryptAPIHelper.process_request(coin, endpoint='estimate', params=params) - - if _estimate: - return _estimate - - return None + return CryptAPIHelper.process_request(coin, endpoint='estimate', params=params) @staticmethod - def process_request(coin='', endpoint='', params=None): - if coin != '': + def process_request(coin=None, endpoint='', params=None): + if coin: coin += '/' + else: + coin = '' response = requests.get( url="{base_url}{coin}{endpoint}/".format( @@ -157,4 +141,9 @@ def process_request(coin='', endpoint='', params=None): headers={'Host': CryptAPIHelper.CRYPTAPI_HOST}, ) - return response.json() + response_obj = response.json() + + if response_obj.get('status') == 'error': + raise CryptAPIException(response_obj['error']) + + return response_obj diff --git a/requirements.txt b/requirements.txt index 37912b8..6f89372 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -requests>=2.31.0 \ No newline at end of file +requests>=2.32.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 0221603..66df14e 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ name='python-cryptapi', - version='1.0.4', + version='1.0.6', packages=find_packages(), diff --git a/test.py b/test.py index 4b93479..f5eb0dd 100644 --- a/test.py +++ b/test.py @@ -1,12 +1,17 @@ from cryptapi import CryptAPIHelper - -ca = CryptAPIHelper('bep20_usdt', '0xA6B78B56ee062185E405a1DDDD18cE8fcBC4395d', - 'https://webhook.site/15d94bb3-c3ae-4b68-8120-5dd962988a6d', { - 'order_id': '1345e13232' - }, { - 'convert': 1 - }) +ca = CryptAPIHelper( + 'bep20_usdt', + '0xA6B78B56ee062185E405a1DDDD18cE8fcBC4395d', + 'https://webhook.site/13308bd5-d20b-4d19-8597-bd9be7db36fe', + { + 'order_id': '1345e13232' + }, + { + 'convert': 1, + 'multi_token': 1 + } +) """ Get CA Address