🧑‍💻 Reorganize type modules..

Author: Raphael Krupinski

src/lapidary/runtime/__init__.py

@@ -1,7 +1,5 @@
 __all__ = (
-    'APIKeyAuth',
     'ClientBase',
-    'CookieApiKey',
     'ModelBase',
     'NamedAuth',
     'ParamStyle',
@@ -21,12 +19,11 @@
     'Query',
 )
 
-from .auth import APIKeyAuth, NamedAuth, SecurityRequirements
 from .client_base import ClientBase
 from .model import ModelBase
-from .model.api_key import CookieApiKey
 from .model.encode_param import ParamStyle
 from .model.params import RequestBody
 from .model.response_map import Responses
 from .operation import delete, get, head, patch, post, put, trace
 from .param import Cookie, Header, Path, Query
+from .types_ import NamedAuth, SecurityRequirements

src/lapidary/runtime/_httpx.py

@@ -3,3 +3,5 @@
 
 UseClientDefault: typing.TypeAlias = httpx._client.UseClientDefault  # pylint: disable=protected-access
 PrimitiveData: typing.TypeAlias = httpx._types.PrimitiveData  # pylint: disable=protected-access
+ParamValue: typing.TypeAlias = typing.Union[PrimitiveData, typing.Sequence[PrimitiveData]]
+AuthType: typing.TypeAlias = typing.Union[httpx.Auth, UseClientDefault, None]

src/lapidary/runtime/auth.py

@@ -1,51 +1,9 @@
 __all__ = [
-    'APIKeyAuth',
-    'AuthType',
-    'MultiAuth',
-    'NamedAuth',
-    'SecurityRequirements',
+    'CookieApiKey',
+    'HeaderApiKey',
+    'QueryApiKey',
 ]
 
-import abc
-import dataclasses as dc
+from httpx_auth import HeaderApiKey, QueryApiKey
 
-import httpx
-import httpx_auth
-import typing_extensions as typing
-
-from . import _httpx
 from .model.api_key import CookieApiKey
-
-AuthType: typing.TypeAlias = typing.Union[httpx.Auth, _httpx.UseClientDefault, None]
-MultiAuth: typing.TypeAlias = httpx_auth._authentication._MultiAuth  # pylint: disable=protected-access
-NamedAuth: typing.TypeAlias = tuple[str, httpx.Auth]
-SecurityRequirements: typing.TypeAlias = typing.Mapping[str, typing.Iterable[str]]
-
-
-@dc.dataclass
-class AuthFactory(abc.ABC):
-    security_name: str
-
-    @abc.abstractmethod
-    def __call__(self, body: object) -> NamedAuth:
-        pass
-
-
-APIKeyAuthLocation: typing.TypeAlias = typing.Literal['cookie', 'header', 'query']
-
-api_key_in: typing.Mapping[APIKeyAuthLocation, typing.Callable[[str, str], httpx.Auth]] = {
-    'cookie': CookieApiKey,
-    'header': httpx_auth.HeaderApiKey,
-    'query': httpx_auth.QueryApiKey,
-}
-
-
-@dc.dataclass
-class APIKeyAuth(AuthFactory):
-    in_: APIKeyAuthLocation
-    name: str
-    format: str
-
-    def __call__(self, body: object) -> NamedAuth:
-        typ = api_key_in[self.in_]
-        return self.security_name, typ(self.format.format(body=body), self.name)  # type: ignore[misc]

src/lapidary/runtime/client_base.py

@@ -6,10 +6,11 @@
 
 import httpx
 
-from .auth import AuthType, MultiAuth, NamedAuth, SecurityRequirements
+from ._httpx import AuthType
 from .model.op import OperationModel, get_operation_model
 from .model.request import RequestFactory
 from .request import build_request
+from .types_ import MultiAuth, NamedAuth, SecurityRequirements
 
 logger = logging.getLogger(__name__)
 

src/lapidary/runtime/model/params.py

@@ -6,8 +6,8 @@
 import pydantic
 import typing_extensions as typing
 
+from .._httpx import ParamValue
 from ..http_consts import CONTENT_TYPE, MIME_JSON
-from ..types_ import ParamValue
 from .encode_param import Encoder, ParamStyle, get_encode_fn
 
 if typing.TYPE_CHECKING:

src/lapidary/runtime/operation.py

@@ -4,7 +4,7 @@
 
 import typing_extensions as typing
 
-from . import SecurityRequirements
+from .types_ import SecurityRequirements
 
 if typing.TYPE_CHECKING:
     from .client_base import ClientBase

src/lapidary/runtime/param.py

@@ -3,9 +3,9 @@
 
 import typing_extensions as typing
 
+from ._httpx import ParamValue
 from .model.encode_param import ParamStyle
 from .model.params import Param
-from .types_ import ParamValue
 
 if typing.TYPE_CHECKING:
     from .model.request import RequestBuilder

src/lapidary/runtime/types_.py

@@ -1,6 +1,7 @@
+import httpx
+import httpx_auth
 import typing_extensions as typing
 
-from . import _httpx
-
-Serializer: typing.TypeAlias = typing.Callable[[typing.Any], typing.Union[str, bytes]]
-ParamValue: typing.TypeAlias = typing.Union[_httpx.PrimitiveData, typing.Sequence[_httpx.PrimitiveData]]
+MultiAuth: typing.TypeAlias = httpx_auth._authentication._MultiAuth  # pylint: disable=protected-access
+NamedAuth: typing.TypeAlias = tuple[str, httpx.Auth]
+SecurityRequirements: typing.TypeAlias = typing.Mapping[str, typing.Iterable[str]]