Skip to content

Commit 78e96fe

Browse files
vishrvishr
committed
Restructured
Signed-off-by: Vishal Rana <vr@labstack.com>
1 parent 7cbf0be commit 78e96fe

File tree

2 files changed

+56
-106
lines changed

2 files changed

+56
-106
lines changed

‎labstack/client.py‎

Lines changed: 55 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -26,118 +26,107 @@ def download(self, id, path):
2626
f.write(chunk)
2727
f.flush()
2828

29-
def barcode_generate(self, format=None, content=None, size=None):
30-
json = {
31-
'format': format,
32-
'content': content,
33-
'size': size
29+
def currency_convert(self, from=None, to=None, value=None):
30+
params = {
31+
'from': from,
32+
'to': to,
33+
'value': value
3434
}
35-
r = requests.post(API_URL + '/barcode/generate', auth=self.interceptor,
36-
json=json)
37-
data = r.json()
38-
if self._error(r):
39-
raise APIError(data['code'], data['message'])
40-
return data
41-
42-
def barcode_scan(self, file=None):
43-
files = {'file': open(file, 'rb')}
44-
r = requests.post(API_URL + '/barcode/scan', auth=self.interceptor, files=files)
35+
r = requests.get(API_URL + '/currency/convert', auth=self.interceptor,
36+
params=params)
4537
data = r.json()
4638
if self._error(r):
4739
raise APIError(data['code'], data['message'])
4840
return data
4941

50-
def currency_convert(self, base=None):
51-
json = {'base': base}
52-
r = requests.post(API_URL + '/currency/convert', auth=self.interceptor,
53-
json=json)
42+
def currency_rates(self, base=None):
43+
params = {'base': base}
44+
r = requests.get(API_URL + '/currency/rates', auth=self.interceptor,
45+
params=params)
5446
data = r.json()
5547
if self._error(r):
5648
raise APIError(data['code'], data['message'])
5749
return data
58-
5950

60-
def dns_lookup(self, domain=None, type=None):
61-
json = {
62-
'domain': domain,
63-
'type': type
64-
}
65-
r = requests.post(API_URL + '/dns/lookup', auth=self.interceptor,
66-
json=json)
67-
data = r.json()
68-
if self._error(r):
69-
raise APIError(data['code'], data['message'])
70-
return data
71-
7251
def email_verify(self, email=None):
73-
json = {'email': email}
74-
r = requests.post(API_URL + '/email/verify', auth=self.interceptor,
75-
json=json)
52+
params = {'email': email}
53+
r = requests.get(API_URL + '/email/verify', auth=self.interceptor,
54+
params=params)
7655
data = r.json()
7756
if self._error(r):
7857
raise APIError(data['code'], data['message'])
7958
return data
8059

8160
def geocode_address(self, location=None, longitude=None, latitude=None, osm_tag=None, limit=None):
82-
json = {
61+
params = {
8362
'location': location,
8463
'longitude': longitude,
8564
'latitude': latitude,
8665
'osm_tag': osm_tag,
8766
'limit': limit
8867
}
89-
r = requests.post(API_URL + '/geocode/address', auth=self.interceptor,
90-
json=json)
68+
r = requests.get(API_URL + '/geocode/address', auth=self.interceptor,
69+
params=params)
9170
data = r.json()
9271
if self._error(r):
9372
raise APIError(data['code'], data['message'])
9473
return data
9574

9675
def geocode_ip(self, ip=None):
97-
json = {'ip': ip}
98-
r = requests.post(API_URL + '/geocode/ip', auth=self.interceptor,
99-
json=json)
76+
params = {'ip': ip}
77+
r = requests.get(API_URL + '/geocode/ip', auth=self.interceptor,
78+
params=params)
10079
data = r.json()
10180
if self._error(r):
10281
raise APIError(data['code'], data['message'])
10382
return data
10483

10584
def geocode_reverse(self, longitude=None, latitude=None, limit=None):
106-
json = {
85+
params = {
10786
'longitude': longitude,
10887
'latitude': latitude,
10988
'limit': limit
11089
}
111-
r = requests.post(API_URL + '/geocode/reverse', auth=self.interceptor,
112-
json=json)
90+
r = requests.get(API_URL + '/geocode/reverse', auth=self.interceptor,
91+
params=params)
11392
data = r.json()
11493
if self._error(r):
11594
raise APIError(data['code'], data['message'])
11695
return data
117-
118-
def image_compress(self, file=None):
119-
files = {'file': open(file, 'rb')}
120-
r = requests.post(API_URL + '/image/compress', auth=self.interceptor, files=files)
96+
97+
def compress_audio(self, file=None):
98+
files = {'file': open(file, 'rb')}
99+
r = requests.post(API_URL + '/compress/audio', auth=self.interceptor, files=files)
121100
data = r.json()
122101
if self._error(r):
123102
raise APIError(data['code'], data['message'])
124103
return data
125104

126-
def image_resize(self, file=None, width=None, height=None, format=None):
105+
def compress_image(self, file=None):
127106
files = {'file': open(file, 'rb')}
128-
data = {
129-
'width': width,
130-
'height': height,
131-
'format': format
132-
}
133-
r = requests.post('{}/image/resize'.format(API_URL), auth=self.interceptor,
134-
files=files, data=data)
107+
r = requests.post(API_URL + '/compress/image', auth=self.interceptor, files=files)
108+
data = r.json()
109+
if self._error(r):
110+
raise APIError(data['code'], data['message'])
111+
return data
112+
113+
def compress_pdf(self, file=None):
114+
files = {'file': open(file, 'rb')}
115+
r = requests.post(API_URL + '/compress/pdf', auth=self.interceptor, files=files)
116+
data = r.json()
117+
if self._error(r):
118+
raise APIError(data['code'], data['message'])
119+
return data
120+
121+
def compress_video(self, file=None):
122+
files = {'file': open(file, 'rb')}
123+
r = requests.post(API_URL + '/compress/video', auth=self.interceptor, files=files)
135124
data = r.json()
136125
if self._error(r):
137126
raise APIError(data['code'], data['message'])
138127
return data
139128

140-
def image_watermark(self, file=None, text=None, font=None, size=None, color=None, opacity=None,
129+
def watermark_image(self, file=None, text=None, font=None, size=None, color=None, opacity=None,
141130
position=None, margin=None):
142131
files = {'file': open(file, 'rb')}
143132
data = {
@@ -149,44 +138,14 @@ def image_watermark(self, file=None, text=None, font=None, size=None, color=None
149138
'position': position,
150139
'margin': margin
151140
}
152-
r = requests.post('{}/image/watermark'.format(API_URL), auth=self.interceptor,
141+
r = requests.post('{}/watermark/image'.format(API_URL), auth=self.interceptor,
153142
files=files, data=data)
154143
data = r.json()
155144
if self._error(r):
156145
raise APIError(data['code'], data['message'])
157146
return data
158-
159-
def pdf_compress(self, file=None):
160-
files = {'file': open(file, 'rb')}
161-
r = requests.post(API_URL + '/pdf/compress', auth=self.interceptor, files=files)
162-
data = r.json()
163-
if self._error(r):
164-
raise APIError(data['code'], data['message'])
165-
return data
166-
167-
def pdf_image(self, file=None, extract=None):
168-
files = {'file': open(file, 'rb')}
169-
data = {
170-
'extract': extract
171-
}
172-
r = requests.post(API_URL + '/pdf/image', auth=self.interceptor, files=files, data=data)
173-
data = r.json()
174-
if self._error(r):
175-
raise APIError(data['code'], data['message'])
176-
return data
177-
178-
def pdf_split(self, file=None, pages=None):
179-
files = {'file': open(file, 'rb')}
180-
data = {
181-
'pages': pages
182-
}
183-
r = requests.post(API_URL + '/pdf/split', auth=self.interceptor, files=files, data=data)
184-
data = r.json()
185-
if self._error(r):
186-
raise APIError(data['code'], data['message'])
187-
return data
188147

189-
def text_sentiment(self, text=None):
148+
def nlp_sentiment(self, text=None):
190149
json = {'text': text}
191150
r = requests.post(API_URL + '/text/sentiment', auth=self.interceptor,
192151
json=json)
@@ -195,7 +154,7 @@ def text_sentiment(self, text=None):
195154
raise APIError(data['code'], data['message'])
196155
return data
197156

198-
def text_spellcheck(self, text=None):
157+
def nlp_spellcheck(self, text=None):
199158
json = {'text': text}
200159
r = requests.post(API_URL + '/text/spellcheck', auth=self.interceptor,
201160
json=json)
@@ -204,7 +163,7 @@ def text_spellcheck(self, text=None):
204163
raise APIError(data['code'], data['message'])
205164
return data
206165

207-
def text_summary(self, text=None, url=None, language=None, length=None):
166+
def nlp_summary(self, text=None, url=None, language=None, length=None):
208167
json = {
209168
'text': text,
210169
'url': url,
@@ -218,23 +177,14 @@ def text_summary(self, text=None, url=None, language=None, length=None):
218177
raise APIError(data['code'], data['message'])
219178
return data
220179

221-
def webpage_pdf(self, url=None, size=None, layout=None):
222-
json = {
180+
def webpage_pdf(self, url=None, layout=None, format=None):
181+
params = {
223182
'url': url,
224-
'size': size,
225183
'layout': layout
184+
'format': format,
226185
}
227-
r = requests.post(API_URL + '/webpage/pdf', auth=self.interceptor,
228-
json=json)
229-
data = r.json()
230-
if self._error(r):
231-
raise APIError(data['code'], data['message'])
232-
return data
233-
234-
def word_lookup(self, word=None):
235-
json = {'word': word}
236-
r = requests.post(API_URL + '/word/lookup', auth=self.interceptor,
237-
json=json)
186+
r = requests.get(API_URL + '/webpage/pdf', auth=self.interceptor,
187+
params=params)
238188
data = r.json()
239189
if self._error(r):
240190
raise APIError(data['code'], data['message'])

‎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.20.0',
5+
version='0.21.0',
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)