Layout refactor (#72)

* Layout refactor
* Add typing

Author: lovelydinosaur

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+.coverage
 .mypy_cache/
 __pycache__/
 dist/

scripts/unasync

@@ -5,6 +5,8 @@ unasync.unasync_files(
     fpath_list = [
         "src/ahttpx/__init__.py",
         "src/ahttpx/_client.py",
+        "src/ahttpx/_content.py",
+        "src/ahttpx/_headers.py",
         "src/ahttpx/_models.py",
         "src/ahttpx/_pool.py",
         "src/ahttpx/_urlparse.py",

src/ahttpx/__init__.py

@@ -1,7 +1,10 @@
 from ._client import *  # Client, open_client
-from ._models import *  # Content, File, Files, Form, Headers, HTML, JSON, MultiPart, Response, Request, Text
+from ._content import *  # Content, File, Files, Form, HTML, JSON, MultiPart, Text
+from ._headers import *  # Headers
+from ._models import *  # Response, Request
 from ._network import *  # NetworkBackend, NetworkStream, timeout
 from ._pool import *  # Connection, ConnectionPool, Transport, open_connection_pool, open_connection
+from ._server import *  # serve_http, serve_tcp
 from ._urls import *  # QueryParams, URL
 
 
@@ -32,12 +35,3 @@
     "QueryParams",
     "URL",
 ]
-
-
-# Modules names are deliberately private here.
-# We fix-up the public API space so that class `__repr__` properly reflects this...
-#
-# >>> httpx.Client
-# <class 'httpx.Client'>
-for attr in __all__:
-    setattr(locals()[attr], '__module__', 'httpx')

src/ahttpx/_client.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import contextlib
-from typing import AsyncIterable, AsyncIterator, Mapping
+import types
+import typing
 
 from ._models import Content, Headers, Response, Request
 from ._pool import Transport, open_connection_pool
@@ -15,7 +16,7 @@ def __init__(
         self,
         transport: Transport,
         url: URL | str | None = None,
-        headers: Headers | Mapping[str, str] | None = None,
+        headers: Headers | typing.Mapping[str, str] | None = None,
     ):
         if url is None:
             url = ""
@@ -31,8 +32,8 @@ def build_request(
         self,
         method: str,
         url: URL | str,
-        headers: Headers | Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
+        headers: Headers | typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
     ) -> Request:
         return Request(
             method=method,
@@ -45,8 +46,8 @@ async def request(
         self,
         method: str,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
     ) -> Response:
         request = self.build_request(method, url, headers=headers, content=content)
         async with self.via.send(request) as response:
@@ -58,48 +59,48 @@ async def stream(
         self,
         method: str,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
-    ) -> AsyncIterator[Response]:
+        headers: typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
+    ) -> typing.AsyncIterator[Response]:
         request = self.build_request(method, url, headers=headers, content=content)
         async with self.via.send(request) as response:
             yield response
 
     async def get(
         self,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
+        headers: typing.Mapping[str, str] | None = None,
     ):
         return await self.request("GET", url, headers=headers)
 
     async def post(
         self,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
     ):
         return await self.request("POST", url, headers=headers, content=content)
 
     async def put(
         self,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
     ):
         return await self.request("PUT", url, headers=headers, content=content)
 
     async def patch(
         self,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
-        content: Content | AsyncIterable[bytes] | bytes | None = None,
+        headers: typing.Mapping[str, str] | None = None,
+        content: Content | typing.AsyncIterable[bytes] | bytes | None = None,
     ):
         return await self.request("PATCH", url, headers=headers, content=content)
 
     async def delete(
         self,
         url: URL | str,
-        headers: Mapping[str, str] | None = None,
+        headers: typing.Mapping[str, str] | None = None,
     ):
         return await self.request("DELETE", url, headers=headers)
 
@@ -135,7 +136,7 @@ def build_redirect_request(self, request: Request, response: Response) -> Reques
         raise NotImplementedError()
 
     @contextlib.asynccontextmanager
-    async def send(self, request: Request) -> AsyncIterator[Response]:
+    async def send(self, request: Request) -> typing.AsyncIterator[Response]:
         while True:
             async with self._transport.send(request) as response:
                 if not self.is_redirect(response):
@@ -157,7 +158,7 @@ async def aclose(self):
 async def open_client(
     transport: Transport | None = None,
     url: URL | str | None = None,
-    headers: Headers | Mapping[str, str] | None = None,
+    headers: Headers | typing.Mapping[str, str] | None = None,
 ):
     if transport is None:
         transport = await open_connection_pool()