Skip to content

Commit cea1fdc

Browse files
committed
Bumped v0.18.1
Signed-off-by: Vishal Rana <vr@labstack.com>
1 parent 5782e84 commit cea1fdc

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

labstack/client.py

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ def __init__(self, api_key):
1515
self.api_key = api_key
1616
self.interceptor = _Interceptor(api_key)
1717

18+
def _error(r):
19+
return not 200 <= r.status_code < 300
20+
1821
def download(self, id, path):
1922
r = requests.get('{}/download/{}'.format(API_URL, id), stream=True)
2023
with open(path, 'wb') as f:
@@ -32,24 +35,24 @@ def barcode_generate(self, format=None, content=None, size=None):
3235
r = requests.post(API_URL + '/barcode/generate', auth=self.interceptor,
3336
json=json)
3437
data = r.json()
35-
if not 200 <= r.status_code < 300:
38+
if self._error(r):
3639
raise APIError(data['code'], data['message'])
3740
return data
3841

3942
def barcode_scan(self, file=None):
4043
files = {'file': open(file, 'rb')}
4144
r = requests.post(API_URL + '/barcode/scan', auth=self.interceptor, files=files)
4245
data = r.json()
43-
if not 200 <= r.status_code < 300:
46+
if self._error(r):
4447
raise APIError(data['code'], data['message'])
4548
return data
4649

47-
def currency_exchange(self, base=None):
50+
def currency_convert(self, base=None):
4851
json = {'base': base}
49-
r = requests.post(API_URL + '/currency/exchange', auth=self.interceptor,
52+
r = requests.post(API_URL + '/currency/convert', auth=self.interceptor,
5053
json=json)
5154
data = r.json()
52-
if not 200 <= r.status_code < 300:
55+
if self._error(r):
5356
raise APIError(data['code'], data['message'])
5457
return data
5558

@@ -62,7 +65,7 @@ def dns_lookup(self, domain=None, type=None):
6265
r = requests.post(API_URL + '/dns/lookup', auth=self.interceptor,
6366
json=json)
6467
data = r.json()
65-
if not 200 <= r.status_code < 300:
68+
if self._error(r):
6669
raise APIError(data['code'], data['message'])
6770
return data
6871

@@ -71,15 +74,15 @@ def email_verify(self, email=None):
7174
r = requests.post(API_URL + '/email/verify', auth=self.interceptor,
7275
json=json)
7376
data = r.json()
74-
if not 200 <= r.status_code < 300:
77+
if self._error(r):
7578
raise APIError(data['code'], data['message'])
7679
return data
7780

7881
def image_compress(self, file=None):
7982
files = {'file': open(file, 'rb')}
8083
r = requests.post(API_URL + '/image/compress', auth=self.interceptor, files=files)
8184
data = r.json()
82-
if not 200 <= r.status_code < 300:
85+
if self._error(r):
8386
raise APIError(data['code'], data['message'])
8487
return data
8588

@@ -93,7 +96,7 @@ def image_resize(self, file=None, width=None, height=None, format=None):
9396
r = requests.post('{}/image/resize'.format(API_URL), auth=self.interceptor,
9497
files=files, data=data)
9598
data = r.json()
96-
if not 200 <= r.status_code < 300:
99+
if self._error(r):
97100
raise APIError(data['code'], data['message'])
98101
return data
99102

@@ -112,15 +115,15 @@ def image_watermark(self, file=None, text=None, font=None, size=None, color=None
112115
r = requests.post('{}/image/watermark'.format(API_URL), auth=self.interceptor,
113116
files=files, data=data)
114117
data = r.json()
115-
if not 200 <= r.status_code < 300:
118+
if self._error(r):
116119
raise APIError(data['code'], data['message'])
117120
return data
118121

119122
def pdf_compress(self, file=None):
120123
files = {'file': open(file, 'rb')}
121124
r = requests.post(API_URL + '/pdf/compress', auth=self.interceptor, files=files)
122125
data = r.json()
123-
if not 200 <= r.status_code < 300:
126+
if self._error(r):
124127
raise APIError(data['code'], data['message'])
125128
return data
126129

@@ -131,7 +134,7 @@ def pdf_image(self, file=None, extract=None):
131134
}
132135
r = requests.post(API_URL + '/pdf/image', auth=self.interceptor, files=files, data=data)
133136
data = r.json()
134-
if not 200 <= r.status_code < 300:
137+
if self._error(r):
135138
raise APIError(data['code'], data['message'])
136139
return data
137140

@@ -142,7 +145,7 @@ def pdf_split(self, file=None, pages=None):
142145
}
143146
r = requests.post(API_URL + '/pdf/split', auth=self.interceptor, files=files, data=data)
144147
data = r.json()
145-
if not 200 <= r.status_code < 300:
148+
if self._error(r):
146149
raise APIError(data['code'], data['message'])
147150
return data
148151

@@ -151,7 +154,7 @@ def text_sentiment(self, text=None):
151154
r = requests.post(API_URL + '/text/sentiment', auth=self.interceptor,
152155
json=json)
153156
data = r.json()
154-
if not 200 <= r.status_code < 300:
157+
if self._error(r):
155158
raise APIError(data['code'], data['message'])
156159
return data
157160

@@ -160,7 +163,7 @@ def text_spellcheck(self, text=None):
160163
r = requests.post(API_URL + '/text/spellcheck', auth=self.interceptor,
161164
json=json)
162165
data = r.json()
163-
if not 200 <= r.status_code < 300:
166+
if self._error(r):
164167
raise APIError(data['code'], data['message'])
165168
return data
166169

@@ -174,7 +177,7 @@ def text_summary(self, text=None, url=None, language=None, length=None):
174177
r = requests.post(API_URL + '/text/summary', auth=self.interceptor,
175178
json=json)
176179
data = r.json()
177-
if not 200 <= r.status_code < 300:
180+
if self._error(r):
178181
raise APIError(data['code'], data['message'])
179182
return data
180183

@@ -187,7 +190,7 @@ def webpage_pdf(self, url=None, size=None, layout=None):
187190
r = requests.post(API_URL + '/webpage/pdf', auth=self.interceptor,
188191
json=json)
189192
data = r.json()
190-
if not 200 <= r.status_code < 300:
193+
if self._error(r):
191194
raise APIError(data['code'], data['message'])
192195
return data
193196

@@ -196,7 +199,7 @@ def word_lookup(self, word=None):
196199
r = requests.post(API_URL + '/word/lookup', auth=self.interceptor,
197200
json=json)
198201
data = r.json()
199-
if not 200 <= r.status_code < 300:
202+
if self._error(r):
200203
raise APIError(data['code'], data['message'])
201204
return data
202205

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name='labstack',
5-
version='0.18.0',
5+
version='0.18.1',
66
description='Official Python client library for the LabStack API',
77
long_description='`<https://github.com/labstack/labstack-python>`_',
88
keywords='image compress, image resize, text summary, barcode generate, barcode scan',

0 commit comments

Comments
 (0)