Add error handling

Author: Laurynas Butkus

convertapi/__init__.py

@@ -3,7 +3,7 @@
 from .exceptions import *
 from .client import Client
 from .upload_io import UploadIO
-from .api import convert
+from .api import convert, user
 
 # configuration
 

convertapi/api.py

@@ -1,5 +1,10 @@
+import convertapi
+
 from .task import Task
 
 def convert(to_format, params, from_format = None, timeout = None):
     task = Task(from_format, to_format, params, timeout = timeout)
     return task.run()
+
+def user(timeout = None):
+    return convertapi.client.get('user', timeout = timeout)

convertapi/client.py

@@ -37,10 +37,13 @@ def download(self, url, path):
 		return path
 
 	def handle_response(self, r):
-		r.raise_for_status()
-
-		# if r.status_code >= 400:
-		# 	raise ConvertApiError(json['Message'])
+		try:
+			r.raise_for_status()
+		except requests.RequestException as e:
+			try:
+				raise ApiError(r.json())
+			except ValueError:
+				raise e
 
 		return r.json()
 

convertapi/exceptions.py

@@ -1,3 +1,12 @@
-class ConvertApiError(BaseException):
-	def __init__(self, *args, **kwargs):
-		super(ConvertApiError, self).__init__(*args, **kwargs)
+class BaseError(BaseException):
+	pass
+
+class ApiError(BaseError):
+	def __init__(self, result):
+		super(ApiError, self).__init__(result['Message'])
+
+		self.code = result['Code']
+		self.invalid_parameters = result['InvalidParameters']
+
+	def __str__(self):
+ 		return  "%s Code: %s. %s" % (self.message, self.code, self.invalid_parameters)

tests/test_convertapi.py

@@ -2,9 +2,10 @@
 import os
 import io
 import tempfile
+import requests
 
 from . import utils
-from nose.tools import eq_
+from nose.tools import *
 
 class TestConvertapi(utils.TestCase):
 	def setUp(self):
@@ -45,3 +46,7 @@ def test_chained_conversion(self):
 		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx' })
 		zip_result = convertapi.convert('zip', { 'Files': result.files })
 		eq_('test.zip', zip_result.file.filename)
+
+	@raises(convertapi.ApiError)
+	def test_api_error(self):
+		convertapi.convert('pdf', { 'Url': 'https://www.w3.org/TR/PNG/iso_8859-1.txt' }, 'web', 600)