|
1 | 1 | import json |
2 | 2 | import logging |
3 | | -from typing import Optional |
| 3 | +from typing import NoReturn, Optional |
4 | 4 |
|
5 | 5 | from requests import Response, Session |
6 | 6 | from requests.adapters import HTTPAdapter, Retry |
@@ -94,23 +94,31 @@ def request( |
94 | 94 |
|
95 | 95 | return GreenAPIResponse(response.status_code, response.text) |
96 | 96 |
|
97 | | - def __handle_response(self, response: Response): |
98 | | - if response.status_code != 200: |
99 | | - error_message = ( |
100 | | - f"Request was failed with status code: {response.status_code}." |
101 | | - ) |
102 | | - |
103 | | - if self.raise_errors: |
104 | | - raise GreenAPIError(error_message) |
105 | | - self.logger.log(logging.ERROR, error_message) |
106 | | - |
107 | | - if self.debug_mode: |
| 97 | + def __handle_response(self, response: Response) -> Optional[NoReturn]: |
| 98 | + status_code = response.status_code |
| 99 | + if status_code != 200 or self.debug_mode: |
108 | 100 | data = json.dumps( |
109 | 101 | json.loads(response.text), ensure_ascii=False, indent=4 |
110 | 102 | ) |
111 | 103 |
|
| 104 | + if status_code != 200: |
| 105 | + data = json.dumps( |
| 106 | + json.loads(response.text), ensure_ascii=False, indent=4 |
| 107 | + ) |
| 108 | + |
| 109 | + error_message = ( |
| 110 | + f"Request was failed with status code: {status_code}." |
| 111 | + f" Data: {data}" |
| 112 | + ) |
| 113 | + |
| 114 | + if self.raise_errors: |
| 115 | + raise GreenAPIError(error_message) |
| 116 | + self.logger.log(logging.ERROR, error_message) |
| 117 | + |
| 118 | + return None |
| 119 | + |
112 | 120 | self.logger.log( |
113 | | - logging.DEBUG, f"Request was successful with data: {data}\n" |
| 121 | + logging.DEBUG, f"Request was successful with data: {data}" |
114 | 122 | ) |
115 | 123 |
|
116 | 124 | def __prepare_logger(self) -> None: |
|
0 commit comments