Merge pull request #73 from ponytailer/simple-client-code

abstract client code

Author: ponytailer

README.md

@@ -70,9 +70,11 @@ client.change_book(1, request_headers={"Authorization": "Bearer abcdefg"})
 
 ```
 
-And see the examples to get more examples.
+And see the examples.
 
-# change log
+
+<details>
+<summary> Change Log </summary>
 
 ### v1.0.0: refactor all the code, to be simple. remove the group client.
 
@@ -96,3 +98,4 @@ client_config = ClientConfig(
 
 
 ```
+</details>

pydantic_client/clients/abstract_client.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Tuple
+from typing import Any, Dict
 
 from pydantic_client.schema.client_config import ClientConfig
 from pydantic_client.schema.http_request import HttpRequest
@@ -16,13 +16,16 @@ def get_session(self):
     def do_request(self, request: HttpRequest) -> Any:
         raise NotImplementedError
 
-    @staticmethod
-    def parse_request(request: HttpRequest) -> Tuple[Dict, Dict]:
+    def parse(self, request: HttpRequest) -> Dict[str, Any]:
         if request.data:
             data, json = request.data, None
         else:
             data, json = None, request.json_body
-        return data, json
+        headers = request.request_headers if request.request_headers \
+            else self.config.headers
+        url = self.base_url + request.url
+        return dict(url=url, data=data, json=json, headers=headers,
+                    method=request.method, timeout=self.config.timeout)
 
     @classmethod
     def from_toml(cls, toml_config: ClientConfig):

pydantic_client/clients/aiohttp.py

@@ -16,23 +16,11 @@ def get_session(self) -> Callable[[], ClientSession]:
         return lambda: ClientSession() if not session else session()
 
     async def do_request(self, request: HttpRequest) -> Any:
-        data, json = self.parse_request(request)
-        headers = request.request_headers if request.request_headers \
-            else self.config.headers
-
         session_factory = self.get_session()
         s = session_factory()
         async with s as session:
             try:
-                req = session.request(
-                    url=self.base_url + request.url,
-                    method=request.method,
-                    json=json,
-                    data=data,
-                    headers=headers,
-                    timeout=self.config.timeout
-                )
-
+                req = session.request(**self.parse(request))
                 async with req as resp:
                     resp.raise_for_status()
                     if resp.status == 200:

pydantic_client/clients/httpx.py

@@ -13,25 +13,13 @@ class HttpxClient(AbstractClient):
 
     def get_session(self):
         session = super().get_session()
-        if session and isinstance(session, AsyncClient):
-            return session
-        return AsyncClient(http2=self.config.http2)
+        return session if isinstance(session, AsyncClient) \
+            else AsyncClient(http2=self.config.http2)
 
     async def do_request(self, request: HttpRequest) -> Any:
-        data, json = self.parse_request(request)
-        headers = request.request_headers if request.request_headers \
-            else self.config.headers
-
         async with self.get_session() as session:
             try:
-                response = await session.request(
-                    url=self.base_url + request.url,
-                    method=request.method,
-                    json=json,
-                    data=data,
-                    headers=headers,
-                    timeout=self.config.timeout
-                )
+                response = await session.request(**self.parse(request))
                 response.raise_for_status()
                 if response.is_success:
                     return response.json()

pydantic_client/clients/requests.py

@@ -14,23 +14,10 @@ class RequestsClient(AbstractClient):
 
     def get_session(self) -> Session:
         session = super().get_session()
-        if session and isinstance(session, Session):
-            return session
-        return self.session
+        return session if isinstance(session, Session) else self.session
 
     def do_request(self, request: HttpRequest) -> Any:
-        data, json = self.parse_request(request)
-        headers = request.request_headers if request.request_headers \
-            else self.config.headers
-
         try:
-            return self.get_session().request(
-                url=self.base_url + request.url,
-                method=request.method,
-                json=json,
-                data=data,
-                headers=headers,
-                timeout=self.config.timeout,
-            ).json()
+            return self.get_session().request(**self.parse(request)).json()
         except BaseException as e:
             raise e