fix(generator): Treat empty schemas like Any instead of None. Tha…

…nks @forest-benchling! [#417 & #445] * Support AnyProperty * Install Poetry requirements and re * Remove NoneProperty * Add test case, change to check for Any instead of None * Fix test * fix: Remove need for unnecessary `if True` when constructing unions of Any properties. Co-authored-by: Forest Tong <forest@benchling.com>
openapi-generators · Jul 2, 2021 · 0056677 · 0056677
1 parent 84247e5
commit 0056677
Show file tree

Hide file tree

Showing 23 changed files with 112 additions and 97 deletions.
diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py
@@ -30,7 +30,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -43,7 +43,7 @@ def sync_detailed(
     *,
     client: Client,
     common: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         common=common,
@@ -60,7 +60,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     common: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         common=common,

diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py b/end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py
@@ -30,7 +30,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -43,7 +43,7 @@ def sync_detailed(
     *,
     client: Client,
     common: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         common=common,
@@ -60,7 +60,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     common: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         common=common,

diff --git a/...golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py b/...golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py
@@ -31,7 +31,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -45,7 +45,7 @@ def sync_detailed(
     client: Client,
     param_path: Union[Unset, str] = UNSET,
     param_query: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         param_path=param_path,
@@ -64,7 +64,7 @@ async def asyncio_detailed(
     client: Client,
     param_path: Union[Unset, str] = UNSET,
     param_query: Union[Unset, str] = UNSET,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         param_path=param_path,

diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py
@@ -131,9 +131,9 @@ def _get_kwargs(
     }
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidationError, None]]:
+def _parse_response(*, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
     if response.status_code == 200:
-        response_200 = None
+        response_200 = response.json()
 
         return response_200
     if response.status_code == 422:
@@ -143,7 +143,7 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidatio
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Union[HTTPValidationError, None]]:
+def _build_response(*, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -172,7 +172,7 @@ def sync_detailed(
     required_model_prop: ModelWithUnionProperty,
     nullable_model_prop: Union[Unset, None, ModelWithUnionProperty] = UNSET,
     nullable_required_model_prop: Optional[ModelWithUnionProperty],
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         string_prop=string_prop,
@@ -221,7 +221,7 @@ def sync(
     required_model_prop: ModelWithUnionProperty,
     nullable_model_prop: Union[Unset, None, ModelWithUnionProperty] = UNSET,
     nullable_required_model_prop: Optional[ModelWithUnionProperty],
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """ """
 
     return sync_detailed(
@@ -266,7 +266,7 @@ async def asyncio_detailed(
     required_model_prop: ModelWithUnionProperty,
     nullable_model_prop: Union[Unset, None, ModelWithUnionProperty] = UNSET,
     nullable_required_model_prop: Optional[ModelWithUnionProperty],
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         string_prop=string_prop,
@@ -314,7 +314,7 @@ async def asyncio(
     required_model_prop: ModelWithUnionProperty,
     nullable_model_prop: Union[Unset, None, ModelWithUnionProperty] = UNSET,
     nullable_required_model_prop: Optional[ModelWithUnionProperty],
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """ """
 
     return (

diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py
@@ -34,9 +34,9 @@ def _get_kwargs(
     }
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidationError, None]]:
+def _parse_response(*, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
     if response.status_code == 200:
-        response_200 = None
+        response_200 = response.json()
 
         return response_200
     if response.status_code == 422:
@@ -46,7 +46,7 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidatio
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Union[HTTPValidationError, None]]:
+def _build_response(*, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -59,7 +59,7 @@ def sync_detailed(
     *,
     client: Client,
     int_enum: AnIntEnum,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         int_enum=int_enum,
@@ -76,7 +76,7 @@ def sync(
     *,
     client: Client,
     int_enum: AnIntEnum,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """ """
 
     return sync_detailed(
@@ -89,7 +89,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     int_enum: AnIntEnum,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         int_enum=int_enum,
@@ -105,7 +105,7 @@ async def asyncio(
     *,
     client: Client,
     int_enum: AnIntEnum,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """ """
 
     return (

diff --git a/...to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py b/...to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py
@@ -29,9 +29,9 @@ def _get_kwargs(
     }
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidationError, None]]:
+def _parse_response(*, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
     if response.status_code == 200:
-        response_200 = None
+        response_200 = response.json()
 
         return response_200
     if response.status_code == 422:
@@ -41,7 +41,7 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidatio
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Union[HTTPValidationError, None]]:
+def _build_response(*, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -54,7 +54,7 @@ def sync_detailed(
     *,
     client: Client,
     json_body: AModel,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         json_body=json_body,
@@ -71,7 +71,7 @@ def sync(
     *,
     client: Client,
     json_body: AModel,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """Try sending a JSON body"""
 
     return sync_detailed(
@@ -84,7 +84,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     json_body: AModel,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         json_body=json_body,
@@ -100,7 +100,7 @@ async def asyncio(
     *,
     client: Client,
     json_body: AModel,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """Try sending a JSON body"""
 
     return (

diff --git a/...end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py b/...end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py
@@ -23,7 +23,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -35,7 +35,7 @@ def _build_response(*, response: httpx.Response) -> Response[None]:
 def sync_detailed(
     *,
     client: Client,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
     )
@@ -50,7 +50,7 @@ def sync_detailed(
 async def asyncio_detailed(
     *,
     client: Client,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
     )

diff --git a/...s/golden-record/my_test_api_client/api/tests/optional_value_tests_optional_query_param.py b/...s/golden-record/my_test_api_client/api/tests/optional_value_tests_optional_query_param.py
@@ -35,9 +35,9 @@ def _get_kwargs(
     }
 
 
-def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidationError, None]]:
+def _parse_response(*, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
     if response.status_code == 200:
-        response_200 = None
+        response_200 = response.json()
 
         return response_200
     if response.status_code == 422:
@@ -47,7 +47,7 @@ def _parse_response(*, response: httpx.Response) -> Optional[Union[HTTPValidatio
     return None
 
 
-def _build_response(*, response: httpx.Response) -> Response[Union[HTTPValidationError, None]]:
+def _build_response(*, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -60,7 +60,7 @@ def sync_detailed(
     *,
     client: Client,
     query_param: Union[Unset, List[str]] = UNSET,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         query_param=query_param,
@@ -77,7 +77,7 @@ def sync(
     *,
     client: Client,
     query_param: Union[Unset, List[str]] = UNSET,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """Test optional query parameters"""
 
     return sync_detailed(
@@ -90,7 +90,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     query_param: Union[Unset, List[str]] = UNSET,
-) -> Response[Union[HTTPValidationError, None]]:
+) -> Response[Union[Any, HTTPValidationError]]:
     kwargs = _get_kwargs(
         client=client,
         query_param=query_param,
@@ -106,7 +106,7 @@ async def asyncio(
     *,
     client: Client,
     query_param: Union[Unset, List[str]] = UNSET,
-) -> Optional[Union[HTTPValidationError, None]]:
+) -> Optional[Union[Any, HTTPValidationError]]:
     """Test optional query parameters"""
 
     return (

diff --git a/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py b/end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py
@@ -26,7 +26,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -39,7 +39,7 @@ def sync_detailed(
     *,
     client: Client,
     form_data: AFormData,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         form_data=form_data,
@@ -56,7 +56,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     form_data: AFormData,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         form_data=form_data,

diff --git a/...olden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py b/...olden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py
@@ -26,7 +26,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -39,7 +39,7 @@ def sync_detailed(
     *,
     client: Client,
     my_token: str,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         my_token=my_token,
@@ -56,7 +56,7 @@ async def asyncio_detailed(
     *,
     client: Client,
     my_token: str,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
         client=client,
         my_token=my_token,