fmconsult-utils-python-sdk 2.0.6__tar.gz → 2.0.8__tar.gz

{fmconsult_utils_python_sdk-2.0.6 → fmconsult_utils_python_sdk-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmconsult-utils-python-sdk
-Version: 2.0.6
+Version: 2.0.8
 Summary: Canivete suiço da FMConsult
 Author-email: Filipe Coelho <filipe@fmconsult.com.br>
 License: MIT License

{fmconsult_utils_python_sdk-2.0.6 → fmconsult_utils_python_sdk-2.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fmconsult-utils-python-sdk"
-version = "2.0.6"
+version = "2.0.8"
 description = "Canivete suiço da FMConsult"
 readme = "README.md"
 requires-python = ">=3.11"

fmconsult_utils_python_sdk-2.0.8/src/fmconsult/exceptions/bad_request_exception.py

@@ -0,0 +1,13 @@
+class BadRequestException(Exception):
+
+    def __init__(self, 
+                 message="he request is malformed or missing required parameters",
+                 response_body=None,
+                 request_details=None
+    ):
+        self.status = 'bad request'
+        self.message = message
+        self.status_code = 400
+        self.response_body = response_body
+        self.request_details = request_details
+        super().__init__(self.message)

{fmconsult_utils_python_sdk-2.0.6 → fmconsult_utils_python_sdk-2.0.8}/src/fmconsult/http/api.py

@@ -34,11 +34,13 @@ class ApiBase(object):
             res = requests.request(**req_args, timeout=60)
             res.raise_for_status() # Verifica se ocorreu algum erro HTTP
             return res
+        
         except (ConnectionError, ChunkedEncodingError) as e:
             logging.error(e)
             logging.error(f"Connection error occurred: {e}. Retrying {attempt + 1}/{max_retries}...")
             if attempt == max_retries - 1:
                 raise # Lança a exceção se o limite de tentativas for atingido
+            
         except requests.exceptions.RequestException as e:
             logging.error(e)
             logging.error(f"An error occurred: {e}")
@@ -87,31 +89,50 @@ class ApiBase(object):
       logging.info(req_args)
 
       res = self.__make_request(req_args)
+
+      res_data = None
+      try:
+        res_data = res.json()
+      except ValueError:
+        res_data = res.text
+    
+      logging.info(res_data)
       
       if res.status_code == 503:
         raise UnavailableException()
+      
       elif res.status_code == 404:
         raise  NotFoundException(res.content)
+      
       elif res.status_code == 409:
         raise ConflictException(res.content)
+      
       elif res.status_code == 401:
         raise UnauthorizedException(res.content)
+      
       elif res.status_code == 400:
-        raise BadRequestException(res.content)
+        raise BadRequestException(
+          message='Bad request from API',
+          response_body=res_data,
+          request_details=req_args
+        )
+      
       elif res.status_code != 200:
         raise Exception(res.content)
         
-      res = res.content.decode('utf-8')
-
       logging.info(f'{str(http_method).upper()} response:')
       logging.info(jsonpickle.encode(res))
       
-      return res
+      return res_data
+    
     except UnavailableException as e:
       raise e
-    except BadRequestException as e:
-        raise e
+    
     except NotFoundException as e:
         raise e
+    
+    except BadRequestException as e:
+        raise e
+    
     except Exception as e:
         raise e

{fmconsult_utils_python_sdk-2.0.6 → fmconsult_utils_python_sdk-2.0.8}/src/fmconsult_utils_python_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmconsult-utils-python-sdk
-Version: 2.0.6
+Version: 2.0.8
 Summary: Canivete suiço da FMConsult
 Author-email: Filipe Coelho <filipe@fmconsult.com.br>
 License: MIT License

fmconsult_utils_python_sdk-2.0.6/src/fmconsult/exceptions/bad_request_exception.py

@@ -1,7 +0,0 @@
-class BadRequestException(Exception):
-
-    def __init__(self, message="he request is malformed or missing required parameters"):
-        self.message = message
-        self.status_code = 400
-        self.status = 'bad request'
-        super().__init__(self.message)