Update the client generator (dmontagu#23)

Author: dmontagu

example/client/__init__.py

@@ -1 +1,12 @@
+import inspect
+
+from pydantic import BaseModel
+
+from example.client import models
 from example.client.api_client import ApiClient, AsyncApis, SyncApis  # noqa F401
+
+for model in inspect.getmembers(models, inspect.isclass):
+    if model[1].__module__ == "example.client.models":
+        model_class = model[1]
+        if isinstance(model_class, BaseModel):
+            model_class.update_forward_refs()

example/client/api/pet_api.py

@@ -27,7 +27,11 @@ def _build_for_delete_pet(self, pet_id: int, api_key: str = None) -> Awaitable[N
             headers["api_key"] = str(api_key)
 
         return self.api_client.request(
-            type_=None, method="DELETE", url="/pet/{petId}", path_params=path_params, headers=headers
+            type_=None,
+            method="DELETE",
+            url="/pet/{petId}",
+            path_params=path_params,
+            headers=headers,
         )
 
     def _build_for_find_pets_by_status(self, status: List[str]) -> Awaitable[List[m.Pet]]:
@@ -36,23 +40,38 @@ def _build_for_find_pets_by_status(self, status: List[str]) -> Awaitable[List[m.
         """
         query_params = {"status": str(status)}
 
-        return self.api_client.request(type_=List[m.Pet], method="GET", url="/pet/findByStatus", params=query_params)
+        return self.api_client.request(
+            type_=List[m.Pet],
+            method="GET",
+            url="/pet/findByStatus",
+            params=query_params,
+        )
 
     def _build_for_find_pets_by_tags(self, tags: List[str]) -> Awaitable[List[m.Pet]]:
         """
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
         """
         query_params = {"tags": str(tags)}
 
-        return self.api_client.request(type_=List[m.Pet], method="GET", url="/pet/findByTags", params=query_params)
+        return self.api_client.request(
+            type_=List[m.Pet],
+            method="GET",
+            url="/pet/findByTags",
+            params=query_params,
+        )
 
     def _build_for_get_pet_by_id(self, pet_id: int) -> Awaitable[m.Pet]:
         """
         Returns a single pet
         """
         path_params = {"petId": str(pet_id)}
 
-        return self.api_client.request(type_=m.Pet, method="GET", url="/pet/{petId}", path_params=path_params)
+        return self.api_client.request(
+            type_=m.Pet,
+            method="GET",
+            url="/pet/{petId}",
+            path_params=path_params,
+        )
 
     def _build_for_update_pet(self, body: m.Pet) -> Awaitable[None]:
         body = jsonable_encoder(body)

example/client/api/store_api.py

@@ -21,14 +21,23 @@ def _build_for_delete_order(self, order_id: int) -> Awaitable[None]:
         path_params = {"orderId": str(order_id)}
 
         return self.api_client.request(
-            type_=None, method="DELETE", url="/store/order/{orderId}", path_params=path_params
+            type_=None,
+            method="DELETE",
+            url="/store/order/{orderId}",
+            path_params=path_params,
         )
 
-    def _build_for_get_inventory(self,) -> Awaitable[Dict[str, int]]:
+    def _build_for_get_inventory(
+        self,
+    ) -> Awaitable[Dict[str, int]]:
         """
         Returns a map of status codes to quantities
         """
-        return self.api_client.request(type_=Dict[str, int], method="GET", url="/store/inventory")
+        return self.api_client.request(
+            type_=Dict[str, int],
+            method="GET",
+            url="/store/inventory",
+        )
 
     def _build_for_get_order_by_id(self, order_id: int) -> Awaitable[m.Order]:
         """
@@ -37,7 +46,10 @@ def _build_for_get_order_by_id(self, order_id: int) -> Awaitable[m.Order]:
         path_params = {"orderId": str(order_id)}
 
         return self.api_client.request(
-            type_=m.Order, method="GET", url="/store/order/{orderId}", path_params=path_params
+            type_=m.Order,
+            method="GET",
+            url="/store/order/{orderId}",
+            path_params=path_params,
         )
 
     def _build_for_place_order(self, body: m.Order) -> Awaitable[m.Order]:
@@ -53,7 +65,9 @@ async def delete_order(self, order_id: int) -> None:
         """
         return await self._build_for_delete_order(order_id=order_id)
 
-    async def get_inventory(self,) -> Dict[str, int]:
+    async def get_inventory(
+        self,
+    ) -> Dict[str, int]:
         """
         Returns a map of status codes to quantities
         """
@@ -77,7 +91,9 @@ def delete_order(self, order_id: int) -> None:
         coroutine = self._build_for_delete_order(order_id=order_id)
         return get_event_loop().run_until_complete(coroutine)
 
-    def get_inventory(self,) -> Dict[str, int]:
+    def get_inventory(
+        self,
+    ) -> Dict[str, int]:
         """
         Returns a map of status codes to quantities
         """

example/client/api/user_api.py

@@ -38,20 +38,41 @@ def _build_for_delete_user(self, username: str) -> Awaitable[None]:
         """
         path_params = {"username": str(username)}
 
-        return self.api_client.request(type_=None, method="DELETE", url="/user/{username}", path_params=path_params)
+        return self.api_client.request(
+            type_=None,
+            method="DELETE",
+            url="/user/{username}",
+            path_params=path_params,
+        )
 
     def _build_for_get_user_by_name(self, username: str) -> Awaitable[m.User]:
         path_params = {"username": str(username)}
 
-        return self.api_client.request(type_=m.User, method="GET", url="/user/{username}", path_params=path_params)
+        return self.api_client.request(
+            type_=m.User,
+            method="GET",
+            url="/user/{username}",
+            path_params=path_params,
+        )
 
     def _build_for_login_user(self, username: str, password: str) -> Awaitable[str]:
         query_params = {"username": str(username), "password": str(password)}
 
-        return self.api_client.request(type_=str, method="GET", url="/user/login", params=query_params)
+        return self.api_client.request(
+            type_=str,
+            method="GET",
+            url="/user/login",
+            params=query_params,
+        )
 
-    def _build_for_logout_user(self,) -> Awaitable[None]:
-        return self.api_client.request(type_=None, method="GET", url="/user/logout")
+    def _build_for_logout_user(
+        self,
+    ) -> Awaitable[None]:
+        return self.api_client.request(
+            type_=None,
+            method="GET",
+            url="/user/logout",
+        )
 
     def _build_for_update_user(self, username: str, body: m.User) -> Awaitable[None]:
         """
@@ -91,7 +112,9 @@ async def get_user_by_name(self, username: str) -> m.User:
     async def login_user(self, username: str, password: str) -> str:
         return await self._build_for_login_user(username=username, password=password)
 
-    async def logout_user(self,) -> None:
+    async def logout_user(
+        self,
+    ) -> None:
         return await self._build_for_logout_user()
 
     async def update_user(self, username: str, body: m.User) -> None:
@@ -132,7 +155,9 @@ def login_user(self, username: str, password: str) -> str:
         coroutine = self._build_for_login_user(username=username, password=password)
         return get_event_loop().run_until_complete(coroutine)
 
-    def logout_user(self,) -> None:
+    def logout_user(
+        self,
+    ) -> None:
         coroutine = self._build_for_logout_user()
         return get_event_loop().run_until_complete(coroutine)
 

example/client/api_client.py

@@ -1,9 +1,8 @@
 from asyncio import get_event_loop
-from functools import lru_cache
 from typing import Any, Awaitable, Callable, Dict, Generic, Type, TypeVar, overload
 
-from httpx import AsyncClient, AsyncRequest, AsyncResponse
-from pydantic import ValidationError
+from httpx import AsyncClient, Request, Response
+from pydantic import ValidationError, parse_obj_as
 
 from example.client.api.pet_api import AsyncPetApi, SyncPetApi
 from example.client.api.store_api import AsyncStoreApi, SyncStoreApi
@@ -32,8 +31,8 @@ def __init__(self, client: ClientT):
 
 
 T = TypeVar("T")
-Send = Callable[[AsyncRequest], Awaitable[AsyncResponse]]
-MiddlewareT = Callable[[AsyncRequest, Send], Awaitable[AsyncResponse]]
+Send = Callable[[Request], Awaitable[Response]]
+MiddlewareT = Callable[[Request, Send], Awaitable[Response]]
 
 
 class ApiClient:
@@ -60,7 +59,7 @@ async def request(  # noqa F811
         if path_params is None:
             path_params = {}
         url = (self.host or "") + url.format(**path_params)
-        request = AsyncRequest(method, url, **kwargs)
+        request = Request(method, url, **kwargs)
         return await self.send(request, type_)
 
     @overload
@@ -77,16 +76,16 @@ def request_sync(self, *, type_: Any, **kwargs: Any) -> Any:  # noqa F811
         """
         return get_event_loop().run_until_complete(self.request(type_=type_, **kwargs))
 
-    async def send(self, request: AsyncRequest, type_: Type[T]) -> T:
+    async def send(self, request: Request, type_: Type[T]) -> T:
         response = await self.middleware(request, self.send_inner)
-        if response.status_code == 200:
+        if response.status_code in [200, 201]:
             try:
-                return parse_as_type(response.json(), type_)
+                return parse_obj_as(type_, response.json())
             except ValidationError as e:
                 raise ResponseHandlingException(e)
         raise UnexpectedResponse.for_response(response)
 
-    async def send_inner(self, request: AsyncRequest) -> AsyncResponse:
+    async def send_inner(self, request: Request) -> Response:
         try:
             response = await self._async_client.send(request)
         except Exception as e:
@@ -96,8 +95,8 @@ async def send_inner(self, request: AsyncRequest) -> AsyncResponse:
     def add_middleware(self, middleware: MiddlewareT) -> None:
         current_middleware = self.middleware
 
-        async def new_middleware(request: AsyncRequest, call_next: Send) -> AsyncResponse:
-            async def inner_send(request: AsyncRequest) -> AsyncResponse:
+        async def new_middleware(request: Request, call_next: Send) -> Response:
+            async def inner_send(request: Request) -> Response:
                 return await current_middleware(request, call_next)
 
             return await middleware(request, inner_send)
@@ -106,18 +105,5 @@ async def inner_send(request: AsyncRequest) -> AsyncResponse:
 
 
 class BaseMiddleware:
-    async def __call__(self, request: AsyncRequest, call_next: Send) -> AsyncResponse:
+    async def __call__(self, request: Request, call_next: Send) -> Response:
         return await call_next(request)
-
-
-@lru_cache(maxsize=None)
-def _get_parsing_type(type_: Any, source: str) -> Any:
-    from pydantic.main import create_model
-
-    type_name = getattr(type_, "__name__", str(type_))
-    return create_model(f"ParsingModel[{type_name}] (for {source})", obj=(type_, ...))
-
-
-def parse_as_type(obj: Any, type_: Type[T]) -> T:
-    model_type = _get_parsing_type(type_, source=parse_as_type.__name__)
-    return model_type(obj=obj).obj

example/client/auth.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 from fastapi.openapi.models import OAuthFlowPassword
-from httpx import AsyncRequest, AsyncResponse
+from httpx import Request, Response
 from pydantic import BaseModel
 
 from example.client.api_client import Send
@@ -55,7 +55,7 @@ def __init__(self, auth_state: AuthState, flow: OAuthFlowPassword) -> None:
         self.flow_client = PasswordFlowClient(flow)
 
     @staticmethod
-    def set_access_header(token: str, request: AsyncRequest, *, replace: bool) -> None:
+    def set_access_header(token: str, request: Request, *, replace: bool) -> None:
         key = "authorization"
         value = f"bearer {token}"
         if replace:
@@ -85,7 +85,7 @@ async def refresh(self) -> Optional[TokenSuccessResponse]:
                 return token_response
         return None
 
-    async def __call__(self, request: AsyncRequest, call_next: Send) -> AsyncResponse:
+    async def __call__(self, request: Request, call_next: Send) -> Response:
         if self.auth_state.is_expired():
             await self.refresh()
         access_token = self.auth_state.access_token

example/client/docs/ApiResponse.md

@@ -0,0 +1,12 @@
+# ApiResponse
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **int** |  | [optional] 
+**type** | **str** |  | [optional] 
+**message** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

example/client/docs/Category.md

@@ -0,0 +1,11 @@
+# Category
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**name** | **str** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

example/client/docs/Order.md

@@ -0,0 +1,15 @@
+# Order
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**pet_id** | **int** |  | [optional] 
+**quantity** | **int** |  | [optional] 
+**ship_date** | **datetime** |  | [optional] 
+**status** | **str** | Order Status | [optional] 
+**complete** | **bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

example/client/docs/Pet.md

@@ -0,0 +1,15 @@
+# Pet
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] 
+**category** | [**Category**](Category.md) |  | [optional] 
+**name** | **str** |  | 
+**photo_urls** | **List[str]** |  | 
+**tags** | [**List[Tag]**](Tag.md) |  | [optional] 
+**status** | **str** | pet status in the store | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+