openapi-json-schema-tools · spacether · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars
@@ -393,7 +393,11 @@ class BaseApi(api_client.Api):
                 {{/if}}
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/exceptions.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/exceptions.handlebars
@@ -1,6 +1,10 @@
 # coding: utf-8
 
 {{>partial_header}}
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -90,19 +94,26 @@ class ApiKeyError(OpenApiException, KeyError):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar("T")
 
-    def __init__(self, status=None, reason=None, api_response: '{{packageName}}.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         """Custom error messages for exception"""

diff --git a/...urces/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/...urces/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -655,6 +655,10 @@ paths:
           description: Success
         '404':
           description: Not found
+          content:
+            application/json:
+              schema:
+                type: object
       requestBody:
         content:
           application/x-www-form-urlencoded:

diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/exceptions.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/exceptions.py
@@ -8,6 +8,10 @@
     The version of the OpenAPI document: 0.0.1
     Generated by: https://openapi-generator.tech
 """
+import dataclasses
+import typing
+
+from urllib3._collections import HTTPHeaderDict
 
 
 class OpenApiException(Exception):
@@ -97,19 +101,26 @@ def __init__(self, msg, path_to_item=None):
         super(ApiKeyError, self).__init__(full_msg)
 
 
-class ApiException(OpenApiException):
+T = typing.TypeVar("T")
 
-    def __init__(self, status=None, reason=None, api_response: 'unit_test_api.api_client.ApiResponse' = None):
-        if api_response:
-            self.status = api_response.response.status
-            self.reason = api_response.response.reason
-            self.body = api_response.response.data
-            self.headers = api_response.response.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+@dataclasses.dataclass
+class ApiException(OpenApiException, typing.Generic[T]):
+    status: int
+    reason: str
+    api_response: typing.Optional[T] = None
+
+    @property
+    def body(self) -> typing.Union[str, bytes, None]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.data
+
+    @property
+    def headers(self) -> typing.Optional[HTTPHeaderDict]:
+        if not self.api_response:
+            return None
+        return self.api_response.response.getheaders()
 
     def __str__(self):
         """Custom error messages for exception"""

diff --git a/...body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py b/...body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...ody_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi b/...ody_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/.../paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py b/.../paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi b/...paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py b/...api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...pi/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi b/...pi/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...equest_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py b/...equest_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...quest_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi b/...quest_body_post_additionalproperties_should_not_look_in_applicators_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...nit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py b/...nit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...it_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi b/...it_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...t/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post.py b/...t/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/.../3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post.pyi b/.../3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py b/...test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...est/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi b/...est/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/.../python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py b/.../python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi b/...python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...on/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py b/...on/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...n/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi b/...n/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...t_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py b/...t_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/..._test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi b/..._test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post.pyi
@@ -150,7 +150,11 @@ class BaseApi(api_client.Api):
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response
 

diff --git a/...it_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py b/...it_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post.py
@@ -155,7 +155,11 @@ class instances
                 api_response = api_client.ApiResponseWithoutDeserialization(response=response)
 
         if not 200 <= response.status <= 299:
-            raise exceptions.ApiException(api_response=api_response)
+            raise exceptions.ApiException(
+                status=response.status,
+                reason=response.reason,
+                api_response=api_response
+            )
 
         return api_response