define the do_request return type

Author: huangsong

pydantic_client/clients/abstract_client.py

@@ -13,7 +13,7 @@ def __init__(self, config: ClientConfig):
     def get_session(self):
         return self.config.client_session
 
-    def do_request(self, request: HttpRequest) -> Any:
+    def do_request(self, request: HttpRequest) -> Dict[str, Any]:
         raise NotImplementedError
 
     def parse(self, request: HttpRequest) -> Dict[str, Any]:

pydantic_client/clients/aiohttp.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable
+from typing import Any, Callable, Dict
 
 from pydantic_client.clients.abstract_client import AbstractClient
 from pydantic_client.schema.http_request import HttpRequest
@@ -15,7 +15,7 @@ def get_session(self) -> Callable[[], ClientSession]:
         session = super().get_session()
         return lambda: ClientSession() if not session else session()
 
-    async def do_request(self, request: HttpRequest) -> Any:
+    async def do_request(self, request: HttpRequest) -> Dict[str, Any]:
         session_factory = self.get_session()
         s = session_factory()
         async with s as session:

pydantic_client/clients/httpx.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Dict
 
 from pydantic_client.clients.abstract_client import AbstractClient
 from pydantic_client.schema.http_request import HttpRequest
@@ -16,7 +16,7 @@ def get_session(self):
         return session if isinstance(session, AsyncClient) \
             else AsyncClient(http2=self.config.http2)
 
-    async def do_request(self, request: HttpRequest) -> Any:
+    async def do_request(self, request: HttpRequest) -> Dict[str, Any]:
         async with self.get_session() as session:
             try:
                 response = await session.request(**self.parse(request))

pydantic_client/clients/requests.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Dict
 
 from pydantic_client.clients.abstract_client import AbstractClient
 from pydantic_client.schema.http_request import HttpRequest
@@ -16,7 +16,7 @@ def get_session(self) -> Session:
         session = super().get_session()
         return session if isinstance(session, Session) else self.session
 
-    def do_request(self, request: HttpRequest) -> Any:
+    def do_request(self, request: HttpRequest) -> Dict[str, Any]:
         try:
             return self.get_session().request(**self.parse(request)).json()
         except BaseException as e:

pydantic_client/main.py

@@ -1,21 +1,27 @@
+import logging
+
 from pydantic_client.container import container
 from pydantic_client.schema.client_config import ClientConfig
 
+logger = logging.getLogger(__name__)
+
 
 class PydanticClientManager:
     def __init__(self):
-        # proto_class
+        # proto_class: protocol_object
         self.pydantic_clients = {}
-        # self.config = config
 
     def register(
         self,
         client_config: ClientConfig
     ):
         def wrapper(protocol_class):
-            web_client = client_config.get_client()(client_config)
+            web_client = client_config.get_client()
             protocol = protocol_class()
             container.bind_protocol(protocol, web_client)
+            if protocol_class in self.pydantic_clients:
+                logger.warning(
+                    f"protocol {protocol_class} already registered, will be overwritten")
             self.pydantic_clients[protocol_class] = protocol
             return protocol_class
 

pydantic_client/schema/client_config.py

@@ -28,13 +28,13 @@ class ClientConfig(BaseModel):
     def get_client(self):
         if self.client_type.value == "requests":
             from pydantic_client.clients import RequestsClient
-            return RequestsClient
+            return RequestsClient(self)
         elif self.client_type.value == "httpx":
             from pydantic_client.clients import HttpxClient
-            return HttpxClient
+            return HttpxClient(self)
         else:
             from pydantic_client.clients import AIOHttpClient
-            return AIOHttpClient
+            return AIOHttpClient(self)
 
     @classmethod
     def load_toml(cls, path: str):