Refactored response handling to use the same schema generation as input properties.

Author: dbanty

CHANGELOG.md

@@ -11,11 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Any request/response field that is not `required` and wasn't specified is now set to `UNSET` instead of `None`. 
 - Values that are `UNSET` will not be sent along in API calls
+- Schemas defined with `type=object` will now be converted into classes, just like if they were created as ref components. 
+    The previous behavior was a combination of skipping and using generic Dicts for these schemas.
+- Response schema handling was unified with input schema handling, meaning that responses will behave differently than before. 
+    Specifically, instead of the content-type deciding what the generated Python type is, the schema itself will.
+- Instead of skipping input properties with no type, enum, anyOf, or oneOf declared, the property will be declared as `None`.
 
 ### Additions
 
 - Added a `--custom-template-path` option for providing custom jinja2 templates (#231 - Thanks @erichulburd!).
 - Better compatibility for "required" (whether or not the field must be included) and "nullable" (whether or not the field can be null) (#205 & #208). Thanks @bowenwr & @emannguitar!
+- Support for all the same schemas in responses as are supported in parameters.
 
 ## 0.6.2 - 2020-11-03
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/defaults_tests_defaults_post.py

@@ -5,7 +5,7 @@
 Client = httpx.Client
 
 import datetime
-from typing import List, Union, cast
+from typing import Dict, List, Union
 
 from dateutil.parser import isoparse
 
@@ -16,9 +16,13 @@
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_basic_list_of_booleans.py

@@ -4,10 +4,14 @@
 
 Client = httpx.Client
 
+from typing import List, cast
+
 
 def _parse_response(*, response: httpx.Response) -> Optional[List[bool]]:
     if response.status_code == 200:
-        return [bool(item) for item in cast(List[bool], response.json())]
+        response_200 = cast(List[bool], response.json())
+
+        return response_200
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_basic_list_of_floats.py

@@ -4,10 +4,14 @@
 
 Client = httpx.Client
 
+from typing import List, cast
+
 
 def _parse_response(*, response: httpx.Response) -> Optional[List[float]]:
     if response.status_code == 200:
-        return [float(item) for item in cast(List[float], response.json())]
+        response_200 = cast(List[float], response.json())
+
+        return response_200
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_basic_list_of_integers.py

@@ -4,10 +4,14 @@
 
 Client = httpx.Client
 
+from typing import List, cast
+
 
 def _parse_response(*, response: httpx.Response) -> Optional[List[int]]:
     if response.status_code == 200:
-        return [int(item) for item in cast(List[int], response.json())]
+        response_200 = cast(List[int], response.json())
+
+        return response_200
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_basic_list_of_strings.py

@@ -4,10 +4,14 @@
 
 Client = httpx.Client
 
+from typing import List, cast
+
 
 def _parse_response(*, response: httpx.Response) -> Optional[List[str]]:
     if response.status_code == 200:
-        return [str(item) for item in cast(List[str], response.json())]
+        response_200 = cast(List[str], response.json())
+
+        return response_200
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/get_user_list.py

@@ -5,7 +5,7 @@
 Client = httpx.Client
 
 import datetime
-from typing import List, Union, cast
+from typing import Dict, List, Union
 
 from ...models.a_model import AModel
 from ...models.an_enum import AnEnum
@@ -14,9 +14,17 @@
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[List[AModel], HTTPValidationError]]:
     if response.status_code == 200:
-        return [AModel.from_dict(item) for item in cast(List[Dict[str, Any]], response.json())]
+        response_200 = []
+        for response_200_item_data in response.json():
+            response_200_item = AModel.from_dict(response_200_item_data)
+
+            response_200.append(response_200_item)
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/int_enum_tests_int_enum_post.py

@@ -4,15 +4,21 @@
 
 Client = httpx.Client
 
+from typing import Dict
+
 from ...models.an_int_enum import AnIntEnum
 from ...models.http_validation_error import HTTPValidationError
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/json_body_tests_json_body_post.py

@@ -4,17 +4,19 @@
 
 Client = httpx.Client
 
-from typing import Dict, cast
-
 from ...models.a_model import AModel
 from ...models.http_validation_error import HTTPValidationError
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/octet_stream_tests_octet_stream_get.py

@@ -4,14 +4,20 @@
 
 Client = httpx.Client
 
+from io import BytesIO
 
-def _parse_response(*, response: httpx.Response) -> Optional[bytes]:
+from ...types import File
+
+
+def _parse_response(*, response: httpx.Response) -> Optional[File]:
     if response.status_code == 200:
-        return bytes(response.content)
+        response_200 = File(payload=BytesIO(response.content))
+
+        return response_200
     return None
 
 
-def _build_response(*, response: httpx.Response) -> httpx.Response[bytes]:
+def _build_response(*, response: httpx.Response) -> httpx.Response[File]:
     return httpx.Response(
         status_code=response.status_code,
         content=response.content,
@@ -23,7 +29,7 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[bytes]:
 def httpx_request(
     *,
     client: Client,
-) -> httpx.Response[bytes]:
+) -> httpx.Response[File]:
 
     response = client.request(
         "get",

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/optional_value_tests_optional_query_param.py

@@ -4,17 +4,21 @@
 
 Client = httpx.Client
 
-from typing import List, Union
+from typing import Dict, List, Union
 
 from ...models.http_validation_error import HTTPValidationError
 from ...types import UNSET, Unset
 
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/test_inline_objects.py

@@ -1,24 +1,35 @@
+from typing import Optional
+
 import httpx
 
 Client = httpx.Client
 
 from ...models.json_body import JsonBody
+from ...models.response_200 import Response_200
+
+
+def _parse_response(*, response: httpx.Response) -> Optional[Response_200]:
+    if response.status_code == 200:
+        response_200 = Response_200.from_dict(response.json())
+
+        return response_200
+    return None
 
 
-def _build_response(*, response: httpx.Response) -> httpx.Response[None]:
+def _build_response(*, response: httpx.Response) -> httpx.Response[Response_200]:
     return httpx.Response(
         status_code=response.status_code,
         content=response.content,
         headers=response.headers,
-        parsed=None,
+        parsed=_parse_response(response=response),
     )
 
 
 def httpx_request(
     *,
     client: Client,
     json_body: JsonBody,
-) -> httpx.Response[None]:
+) -> httpx.Response[Response_200]:
 
     json_json_body = json_body.to_dict()
 

end_to_end_tests/golden-record-custom/custom_e2e/api/tests/upload_file_tests_upload_post.py

@@ -4,7 +4,7 @@
 
 Client = httpx.Client
 
-from typing import Union
+from typing import Dict, Union, cast
 
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError
@@ -16,9 +16,13 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[
     HTTPValidationError
 ]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None
 
 

end_to_end_tests/golden-record-custom/custom_e2e/models/__init__.py

@@ -7,4 +7,5 @@
 from .different_enum import DifferentEnum
 from .http_validation_error import HTTPValidationError
 from .json_body import JsonBody
+from .response_200 import Response_200
 from .validation_error import ValidationError

end_to_end_tests/golden-record-custom/custom_e2e/models/body_upload_file_tests_upload_post.py

@@ -1,3 +1,4 @@
+from io import BytesIO
 from typing import Any, Dict
 
 import attr
@@ -22,7 +23,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     @staticmethod
     def from_dict(d: Dict[str, Any]) -> "BodyUploadFileTestsUploadPost":
-        some_file = d["some_file"]
+        some_file = File(payload=BytesIO(d["some_file"]))
 
         return BodyUploadFileTestsUploadPost(
             some_file=some_file,

end_to_end_tests/golden-record-custom/custom_e2e/models/response_200.py

@@ -0,0 +1,27 @@
+from typing import Any, Dict
+
+import attr
+
+
+@attr.s(auto_attribs=True)
+class Response_200:
+    """  """
+
+    a_property: str
+
+    def to_dict(self) -> Dict[str, Any]:
+        a_property = self.a_property
+
+        field_dict = {
+            "a_property": a_property,
+        }
+
+        return field_dict
+
+    @staticmethod
+    def from_dict(d: Dict[str, Any]) -> "Response_200":
+        a_property = d["a_property"]
+
+        return Response_200(
+            a_property=a_property,
+        )

end_to_end_tests/golden-record-custom/custom_e2e/models/validation_error.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, List, cast
 
 import attr
 
@@ -27,7 +27,7 @@ def to_dict(self) -> Dict[str, Any]:
 
     @staticmethod
     def from_dict(d: Dict[str, Any]) -> "ValidationError":
-        loc = d["loc"]
+        loc = cast(List[str], d["loc"])
 
         msg = d["msg"]
 

end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Union
 
 import httpx
 from dateutil.parser import isoparse
@@ -86,9 +86,13 @@ def _get_kwargs(
 
 def _parse_response(*, response: httpx.Response) -> Optional[Union[None, HTTPValidationError]]:
     if response.status_code == 200:
-        return None
+        response_200 = None
+
+        return response_200
     if response.status_code == 422:
-        return HTTPValidationError.from_dict(cast(Dict[str, Any], response.json()))
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
     return None