Fix naming and required/not required for shared enums/models

Author: dbanty

.gitignore

@@ -26,4 +26,5 @@ test-reports/
 htmlcov/
 
 # Generated end to end test data
-my-test-api-client
+my-test-api-client/
+custom-e2e/

end_to_end_tests/custom_config.yml

@@ -0,0 +1,13 @@
+project_name_override: "custom-e2e"
+package_name_override: "custom_e2e"
+class_overrides:
+  _ABCResponse:
+    class_name: ABCResponse
+    module_name: abc_response
+  AnEnumValueItem:
+    class_name: AnEnumValue
+    module_name: an_enum_value
+  NestedListOfEnumsItemItem:
+    class_name: AnEnumValue
+    module_name: an_enum_value
+field_prefix: attr_

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

@@ -35,7 +35,7 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    json_body: Dict[Any, Any],
+    json_body: DictProp,
     string_prop: Union[Unset, str] = "the default string",
     datetime_prop: Union[Unset, datetime.datetime] = isoparse("1010-10-10T00:00:00"),
     date_prop: Union[Unset, datetime.date] = isoparse("1010-10-10").date(),
@@ -58,10 +58,10 @@ def httpx_request(
     json_list_prop: Union[Unset, List[Any]] = UNSET
     if not isinstance(list_prop, Unset):
         json_list_prop = []
-        for an_enum_data in list_prop:
-            an_enum = an_enum_data.value
+        for list_prop_item_data in list_prop:
+            list_prop_item = list_prop_item_data.value
 
-            json_list_prop.append(an_enum)
+            json_list_prop.append(list_prop_item)
 
     json_union_prop: Union[Unset, float, str]
     if isinstance(union_prop, Unset):

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

@@ -37,10 +37,10 @@ def httpx_request(
 ) -> httpx.Response[Union[List[AModel], HTTPValidationError]]:
 
     json_an_enum_value = []
-    for an_enum_data in an_enum_value:
-        an_enum = an_enum_data.value
+    for an_enum_value_item_data in an_enum_value:
+        an_enum_value_item = an_enum_value_item_data.value
 
-        json_an_enum_value.append(an_enum)
+        json_an_enum_value.append(an_enum_value_item)
 
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()

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

@@ -28,13 +28,13 @@ def _build_response(*, response: httpx.Response) -> httpx.Response[Union[None, H
 def httpx_request(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> httpx.Response[Union[None, HTTPValidationError]]:
 
-    json_an_int_enum = an_int_enum.value
+    json_int_enum = int_enum.value
 
     params: Dict[str, Any] = {
-        "AnIntEnum": json_an_int_enum,
+        "int_enum": json_int_enum,
     }
 
     response = client.request(

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

@@ -4,7 +4,7 @@
 
 Client = httpx.Client
 
-from typing import List, Optional, Union
+from typing import List, Union
 
 from ...models.http_validation_error import HTTPValidationError
 from ...types import UNSET, Unset

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

@@ -4,7 +4,7 @@
 
 Client = httpx.Client
 
-from typing import Optional, Union
+from typing import Union
 
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError

end_to_end_tests/golden-record-custom/my_test_api_client/models/a_model.py

@@ -40,10 +40,10 @@ def _get_kwargs(
     json_list_prop: Union[Unset, List[Any]] = UNSET
     if not isinstance(list_prop, Unset):
         json_list_prop = []
-        for an_enum_data in list_prop:
-            an_enum = an_enum_data.value
+        for list_prop_item_data in list_prop:
+            list_prop_item = list_prop_item_data.value
 
-            json_list_prop.append(an_enum)
+            json_list_prop.append(list_prop_item)
 
     json_union_prop: Union[Unset, float, str]
     if isinstance(union_prop, Unset):
@@ -53,11 +53,11 @@ def _get_kwargs(
     else:
         json_union_prop = union_prop
 
-    json_an_enum = enum_prop.value
+    json_enum_prop: Union[Unset, AnEnum] = UNSET
+    if not isinstance(enum_prop, Unset):
+        json_enum_prop = enum_prop.value
 
-    params: Dict[str, Any] = {
-        "AnEnum": json_an_enum,
-    }
+    params: Dict[str, Any] = {}
     if string_prop is not UNSET:
         params["string_prop"] = string_prop
     if datetime_prop is not UNSET:
@@ -74,6 +74,8 @@ def _get_kwargs(
         params["list_prop"] = json_list_prop
     if union_prop is not UNSET:
         params["union_prop"] = json_union_prop
+    if enum_prop is not UNSET:
+        params["enum_prop"] = json_enum_prop
 
     json_json_body = json_body.to_dict()
 

end_to_end_tests/golden-record-custom/my_test_api_client/models/http_validation_error.py

@@ -21,10 +21,10 @@ def _get_kwargs(
     headers: Dict[str, Any] = client.get_headers()
 
     json_an_enum_value = []
-    for an_enum_data in an_enum_value:
-        an_enum = an_enum_data.value
+    for an_enum_value_item_data in an_enum_value:
+        an_enum_value_item = an_enum_value_item_data.value
 
-        json_an_enum_value.append(an_enum)
+        json_an_enum_value.append(an_enum_value_item)
 
     if isinstance(some_date, datetime.date):
         json_some_date = some_date.isoformat()

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

@@ -11,16 +11,16 @@
 def _get_kwargs(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> Dict[str, Any]:
     url = "{}/tests/int_enum".format(client.base_url)
 
     headers: Dict[str, Any] = client.get_headers()
 
-    json_an_int_enum = an_int_enum.value
+    json_int_enum = int_enum.value
 
     params: Dict[str, Any] = {
-        "AnIntEnum": json_an_int_enum,
+        "int_enum": json_int_enum,
     }
 
     return {
@@ -52,11 +52,11 @@ def _build_response(*, response: httpx.Response) -> Response[Union[None, HTTPVal
 def sync_detailed(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
-        an_int_enum=an_int_enum,
+        int_enum=int_enum,
     )
 
     response = httpx.post(
@@ -69,24 +69,24 @@ def sync_detailed(
 def sync(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 
     return sync_detailed(
         client=client,
-        an_int_enum=an_int_enum,
+        int_enum=int_enum,
     ).parsed
 
 
 async def asyncio_detailed(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> Response[Union[None, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
-        an_int_enum=an_int_enum,
+        int_enum=int_enum,
     )
 
     async with httpx.AsyncClient() as _client:
@@ -98,13 +98,13 @@ async def asyncio_detailed(
 async def asyncio(
     *,
     client: Client,
-    an_int_enum: AnIntEnum,
+    int_enum: AnIntEnum,
 ) -> Optional[Union[None, HTTPValidationError]]:
     """  """
 
     return (
         await asyncio_detailed(
             client=client,
-            an_int_enum=an_int_enum,
+            int_enum=int_enum,
         )
     ).parsed