Added improved naming scheme using parent elements

Author: dbanty

CHANGELOG.md

@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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`.
+- Class (models and Enums) names will now contain the name of their parent element (if any). For example, a property 
+    declared in an endpoint will be named like {endpoint_name}_{previous_class_name}. Classes will no longer be
+    deduplicated by appending a number to the end of the generated name, so if two names conflict with this new naming 
+    scheme, there will be an error instead.
 
 ### Additions
 

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

@@ -6,19 +6,19 @@
 
 Client = httpx.Client
 
-from ...models.json_body import JsonBody
-from ...models.response_200 import Response_200
+from ...models.test_inline_objects_json_body import TestInlineObjectsJsonBody
+from ...models.test_inline_objects_response_200 import TestInlineObjectsResponse_200
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Response_200]:
+def _parse_response(*, response: httpx.Response) -> Optional[TestInlineObjectsResponse_200]:
     if response.status_code == 200:
-        response_200 = Response_200.from_dict(response.json())
+        response_200 = TestInlineObjectsResponse_200.from_dict(response.json())
 
         return response_200
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Response_200]:
+def _build_response(*, response: httpx.Response) -> Response[TestInlineObjectsResponse_200]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -30,8 +30,8 @@ def _build_response(*, response: httpx.Response) -> Response[Response_200]:
 def httpx_request(
     *,
     client: Client,
-    json_body: JsonBody,
-) -> Response[Response_200]:
+    json_body: TestInlineObjectsJsonBody,
+) -> Response[TestInlineObjectsResponse_200]:
 
     json_json_body = json_body.to_dict()
 

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

@@ -6,6 +6,6 @@
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from .different_enum import DifferentEnum
 from .http_validation_error import HTTPValidationError
-from .json_body import JsonBody
-from .response_200 import Response_200
+from .test_inline_objects_json_body import TestInlineObjectsJsonBody
+from .test_inline_objects_response_200 import TestInlineObjectsResponse_200
 from .validation_error import ValidationError

end_to_end_tests/golden-record-custom/custom_e2e/models/json_body.py renamed to end_to_end_tests/golden-record-custom/custom_e2e/models/test_inline_objects_json_body.py

@@ -4,7 +4,7 @@
 
 
 @attr.s(auto_attribs=True)
-class JsonBody:
+class TestInlineObjectsJsonBody:
     """  """
 
     a_property: str
@@ -19,9 +19,9 @@ def to_dict(self) -> Dict[str, Any]:
         return field_dict
 
     @staticmethod
-    def from_dict(d: Dict[str, Any]) -> "JsonBody":
+    def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsJsonBody":
         a_property = d["a_property"]
 
-        return JsonBody(
+        return TestInlineObjectsJsonBody(
             a_property=a_property,
         )

end_to_end_tests/golden-record/my_test_api_client/models/json_body.py renamed to end_to_end_tests/golden-record-custom/custom_e2e/models/test_inline_objects_response_200.py

@@ -4,7 +4,7 @@
 
 
 @attr.s(auto_attribs=True)
-class JsonBody:
+class TestInlineObjectsResponse_200:
     """  """
 
     a_property: str
@@ -19,9 +19,9 @@ def to_dict(self) -> Dict[str, Any]:
         return field_dict
 
     @staticmethod
-    def from_dict(d: Dict[str, Any]) -> "JsonBody":
+    def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsResponse_200":
         a_property = d["a_property"]
 
-        return JsonBody(
+        return TestInlineObjectsResponse_200(
             a_property=a_property,
         )

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

@@ -3,15 +3,15 @@
 import httpx
 
 from ...client import Client
-from ...models.json_body import JsonBody
-from ...models.response_200 import Response_200
+from ...models.test_inline_objects_json_body import TestInlineObjectsJsonBody
+from ...models.test_inline_objects_response_200 import TestInlineObjectsResponse_200
 from ...types import Response
 
 
 def _get_kwargs(
     *,
     client: Client,
-    json_body: JsonBody,
+    json_body: TestInlineObjectsJsonBody,
 ) -> Dict[str, Any]:
     url = "{}/tests/inline_objects".format(client.base_url)
 
@@ -28,15 +28,15 @@ def _get_kwargs(
     }
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Response_200]:
+def _parse_response(*, response: httpx.Response) -> Optional[TestInlineObjectsResponse_200]:
     if response.status_code == 200:
-        response_200 = Response_200.from_dict(response.json())
+        response_200 = TestInlineObjectsResponse_200.from_dict(response.json())
 
         return response_200
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Response_200]:
+def _build_response(*, response: httpx.Response) -> Response[TestInlineObjectsResponse_200]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -48,8 +48,8 @@ def _build_response(*, response: httpx.Response) -> Response[Response_200]:
 def sync_detailed(
     *,
     client: Client,
-    json_body: JsonBody,
-) -> Response[Response_200]:
+    json_body: TestInlineObjectsJsonBody,
+) -> Response[TestInlineObjectsResponse_200]:
     kwargs = _get_kwargs(
         client=client,
         json_body=json_body,
@@ -65,8 +65,8 @@ def sync_detailed(
 def sync(
     *,
     client: Client,
-    json_body: JsonBody,
-) -> Optional[Response_200]:
+    json_body: TestInlineObjectsJsonBody,
+) -> Optional[TestInlineObjectsResponse_200]:
     """  """
 
     return sync_detailed(
@@ -78,8 +78,8 @@ def sync(
 async def asyncio_detailed(
     *,
     client: Client,
-    json_body: JsonBody,
-) -> Response[Response_200]:
+    json_body: TestInlineObjectsJsonBody,
+) -> Response[TestInlineObjectsResponse_200]:
     kwargs = _get_kwargs(
         client=client,
         json_body=json_body,
@@ -94,8 +94,8 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: Client,
-    json_body: JsonBody,
-) -> Optional[Response_200]:
+    json_body: TestInlineObjectsJsonBody,
+) -> Optional[TestInlineObjectsResponse_200]:
     """  """
 
     return (

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -6,6 +6,6 @@
 from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from .different_enum import DifferentEnum
 from .http_validation_error import HTTPValidationError
-from .json_body import JsonBody
-from .response_200 import Response_200
+from .test_inline_objects_json_body import TestInlineObjectsJsonBody
+from .test_inline_objects_response_200 import TestInlineObjectsResponse_200
 from .validation_error import ValidationError

end_to_end_tests/golden-record-custom/custom_e2e/models/response_200.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/test_inline_objects_json_body.py

@@ -4,7 +4,7 @@
 
 
 @attr.s(auto_attribs=True)
-class Response_200:
+class TestInlineObjectsJsonBody:
     """  """
 
     a_property: str
@@ -19,9 +19,9 @@ def to_dict(self) -> Dict[str, Any]:
         return field_dict
 
     @staticmethod
-    def from_dict(d: Dict[str, Any]) -> "Response_200":
+    def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsJsonBody":
         a_property = d["a_property"]
 
-        return Response_200(
+        return TestInlineObjectsJsonBody(
             a_property=a_property,
         )

end_to_end_tests/golden-record/my_test_api_client/models/response_200.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/test_inline_objects_response_200.py

@@ -4,7 +4,7 @@
 
 
 @attr.s(auto_attribs=True)
-class Response_200:
+class TestInlineObjectsResponse_200:
     """  """
 
     a_property: str
@@ -19,9 +19,9 @@ def to_dict(self) -> Dict[str, Any]:
         return field_dict
 
     @staticmethod
-    def from_dict(d: Dict[str, Any]) -> "Response_200":
+    def from_dict(d: Dict[str, Any]) -> "TestInlineObjectsResponse_200":
         a_property = d["a_property"]
 
-        return Response_200(
+        return TestInlineObjectsResponse_200(
             a_property=a_property,
         )

openapi_python_client/parser/openapi.py

@@ -119,13 +119,19 @@ def parse_multipart_body(body: oai.RequestBody) -> Optional[Reference]:
 
     @staticmethod
     def parse_request_json_body(
-        *, body: oai.RequestBody, schemas: Schemas
+        *, body: oai.RequestBody, schemas: Schemas, parent_name: str
     ) -> Tuple[Union[Property, PropertyError, None], Schemas]:
         """ Return json_body """
         body_content = body.content
         json_body = body_content.get("application/json")
         if json_body is not None and json_body.media_type_schema is not None:
-            return property_from_data("json_body", required=True, data=json_body.media_type_schema, schemas=schemas)
+            return property_from_data(
+                name="json_body",
+                required=True,
+                data=json_body.media_type_schema,
+                schemas=schemas,
+                parent_name=parent_name,
+            )
         return None, schemas
 
     @staticmethod
@@ -138,7 +144,9 @@ def _add_body(
             return endpoint, schemas
 
         endpoint.form_body_reference = Endpoint.parse_request_form_body(data.requestBody)
-        json_body, schemas = Endpoint.parse_request_json_body(body=data.requestBody, schemas=schemas)
+        json_body, schemas = Endpoint.parse_request_json_body(
+            body=data.requestBody, schemas=schemas, parent_name=endpoint.name
+        )
         if isinstance(json_body, ParseError):
             return ParseError(detail=f"cannot parse body of endpoint {endpoint.name}", data=json_body.data), schemas
 
@@ -161,7 +169,9 @@ def _add_body(
     def _add_responses(*, endpoint: "Endpoint", data: oai.Responses, schemas: Schemas) -> Tuple["Endpoint", Schemas]:
         endpoint = deepcopy(endpoint)
         for code, response_data in data.items():
-            response, schemas = response_from_data(status_code=int(code), data=response_data, schemas=schemas)
+            response, schemas = response_from_data(
+                status_code=int(code), data=response_data, schemas=schemas, parent_name=endpoint.name
+            )
             if isinstance(response, ParseError):
                 endpoint.errors.append(
                     ParseError(
@@ -188,7 +198,11 @@ def _add_parameters(
             if isinstance(param, oai.Reference) or param.param_schema is None:
                 continue
             prop, schemas = property_from_data(
-                name=param.name, required=param.required, data=param.param_schema, schemas=schemas
+                name=param.name,
+                required=param.required,
+                data=param.param_schema,
+                schemas=schemas,
+                parent_name=endpoint.name,
             )
             if isinstance(prop, ParseError):
                 return ParseError(detail=f"cannot parse parameter of endpoint {endpoint.name}", data=prop.data), schemas