fix #28

Author: yuji38kwmt

annofabapi/api.py

@@ -177,7 +177,7 @@ def _request_wrapper(self, http_method: str, url_path: str, query_params: Option
         annofabapi.utils.log_error_response(logger, response)
 
         response.encoding = 'utf-8'
-        response.raise_for_status()
+        annofabapi.utils.raise_for_status(response)
 
         content = self._response_to_content(response)
         return content, response
@@ -200,7 +200,7 @@ def login(self) -> Tuple[Dict[str, Any], requests.Response]:
 
         url = f"{self.URL_PREFIX}/login"
         response = self.session.post(url, json=login_info)
-        response.raise_for_status()
+        annofabapi.utils.raise_for_status(response)
 
         json_obj = response.json()
         self.token_dict = json_obj["token"]

annofabapi/api2.py

@@ -81,7 +81,7 @@ def _request_wrapper(self, http_method: str, url_path: str, query_params: Option
         annofabapi.utils.log_error_response(logger, response)
 
         response.encoding = 'utf-8'
-        response.raise_for_status()
+        annofabapi.utils.raise_for_status(response)
 
         content = self.api._response_to_content(response)
         return content, response

annofabapi/utils.py

@@ -12,6 +12,26 @@
 import requests
 
 
+def raise_for_status(response: requests.Response):
+    """
+    HTTP Status CodeがErrorの場合、`requests.exceptions.HTTPError`を発生させる。
+    そのとき`response.text`もHTTPErrorに加えて、HTTPError発生時にエラーの原因が分かるようにする。
+
+    Args:
+        response: Response
+
+    Raises:
+        requests.exceptions.HTTPError:
+
+    """
+    try:
+        response.raise_for_status()
+    except requests.exceptions.HTTPError as e:
+        http_error_msg = f"{e.args[0]} , {response.text}"
+        e.args = (http_error_msg,)
+        raise e
+
+
 def log_error_response(arg_logger: logging.Logger, response: requests.Response):
     """
     HTTP Statusが400以上ならば、loggerにresponse/request情報を出力する
@@ -39,7 +59,7 @@ def download(url: str, dest_path: str):
 
     """
     response = requests.get(url)
-    response.raise_for_status()
+    raise_for_status(response)
 
     p = Path(dest_path)
     p.parent.mkdir(parents=True, exist_ok=True)

annofabapi/wrapper.py

@@ -199,7 +199,7 @@ def upload_file_to_s3(self, project_id: str, file_path: str, content_type: Optio
                                            headers={'content-type': new_content_type})
 
         annofabapi.utils.log_error_response(logger, res_put)
-        res_put.raise_for_status()
+        annofabapi.utils.raise_for_status(res_put)
         return content["path"]
 
     def put_input_data_from_file(self, project_id: str, input_data_id: str, file_path: str,
@@ -648,7 +648,7 @@ def upload_instruction_image(self, project_id: str, image_id: str, file_path: st
             res_put = self.api.session.put(s3_url, params=query_dict, data=f,
                                            headers={'content-type': new_content_type})
         annofabapi.utils.log_error_response(logger, res_put)
-        res_put.raise_for_status()
+        annofabapi.utils.raise_for_status(res_put)
         return content["path"]
 
     #########################################