Skip to content

Commit 7acfca9

Browse files
committed
http requests error raise refacto
1 parent 885aff2 commit 7acfca9

File tree

1 file changed

+13
-38
lines changed

1 file changed

+13
-38
lines changed

meilisearch/_httprequests.py

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,28 @@ def __init__(self, config):
1313
'Content-Type': 'application/json'
1414
}
1515

16-
def get(self, path):
16+
def send_request(self, http_method, path, body=None):
1717
try:
18-
request = requests.get(
19-
self.config.url + '/' + path,
20-
headers=self.headers,
21-
)
18+
request_path = self.config.url + '/' + path
19+
if body is None:
20+
request = http_method(request_path, headers=self.headers)
21+
else:
22+
request = http_method(request_path, headers=self.headers, json=body)
2223
return self.__validate(request)
2324
except requests.exceptions.ConnectionError as err:
2425
raise MeiliSearchCommunicationError(err)
2526

27+
def get(self, path):
28+
return self.send_request(requests.get, path)
29+
2630
def post(self, path, body=None):
27-
if body is None:
28-
body = {}
29-
try:
30-
request = requests.post(
31-
self.config.url + '/' + path,
32-
headers=self.headers,
33-
json=body
34-
)
35-
return self.__validate(request)
36-
except requests.exceptions.ConnectionError as err:
37-
raise MeiliSearchCommunicationError(err)
31+
return self.send_request(requests.post, path, body)
32+
3833
def put(self, path, body=None):
39-
if body is None:
40-
body = {}
41-
try:
42-
request = requests.put(
43-
self.config.url + '/' + path,
44-
headers=self.headers,
45-
json=body
46-
)
47-
return self.__validate(request)
48-
except requests.exceptions.ConnectionError as err:
49-
raise MeiliSearchCommunicationError(err)
34+
return self.send_request(requests.put, path, body)
5035

5136
def delete(self, path, body=None):
52-
if body is None:
53-
body = {}
54-
try:
55-
request = requests.delete(
56-
self.config.url + '/' + path,
57-
headers=self.headers,
58-
json=body
59-
)
60-
return self.__validate(request)
61-
except requests.exceptions.ConnectionError as err:
62-
raise MeiliSearchCommunicationError(err)
37+
return self.send_request(requests.delete, path, body)
6338

6439
@staticmethod
6540
def __to_json(request):

0 commit comments

Comments
 (0)