added some tests

Author: igorcoding

extapi/_meta.py

@@ -0,0 +1,3 @@
+import importlib.util
+
+has_open_telemetry = importlib.util.find_spec("opentelemetry") is not None

extapi/http/abc.py

@@ -30,7 +30,7 @@ async def execute(
         self,
         request: RequestData,
     ) -> Response[T]:
-        raise NotImplementedError
+        raise NotImplementedError  # pragma: no cover
 
     async def get(
         self,
@@ -160,7 +160,7 @@ async def need_retry(self, response: Response[T]) -> tuple[bool, float | None]:
 
 @runtime_checkable
 class Addon(Protocol[T]):
-    async def enrich(self, request: RequestData) -> None: ...
+    async def before_request(self, request: RequestData) -> None: ...
 
     async def process_response(
         self, request: RequestData, response: Response[T]

extapi/http/addons/auth.py

@@ -1,3 +1,4 @@
+from base64 import b64encode
 from collections.abc import Awaitable, Callable
 from typing import Generic, TypeVar
 
@@ -28,8 +29,9 @@ async def need_retry(self, response: Response[T]) -> tuple[bool, float | None]:
             return True, None
         return False, None
 
-    async def enrich(self, request: RequestData) -> None:
-        request.headers = request.headers or CIMultiDict()
+    async def before_request(self, request: RequestData) -> None:
+        if request.headers is None:
+            request.headers = CIMultiDict()
 
         token = await execute_sync_async(self._token_getter)
         request.headers["Authorization"] = f"Bearer {token}"
@@ -41,3 +43,30 @@ def __init__(self, token: str):
 
     async def need_retry(self, response: Response[T]) -> tuple[bool, float | None]:
         return False, None
+
+
+class StaticBasicAuthAddon(Addon[T], Retryable[T], Generic[T]):
+    __slots__ = ("_login", "_password")
+
+    def __init__(
+        self,
+        *,
+        login: str,
+        password: str,
+    ):
+        self._login = login
+        self._password = password
+        self.__header_value = "Basic " + self._generate_auth(
+            self._login, self._password
+        )
+
+    def _generate_auth(self, login: str, password: str) -> str:
+        return b64encode(f"{login}:{password}".encode("utf-8")).decode("utf-8")
+
+    async def need_retry(self, response: Response[T]) -> tuple[bool, float | None]:
+        return False, None
+
+    async def before_request(self, request: RequestData) -> None:
+        if request.headers is None:
+            request.headers = CIMultiDict()
+        request.headers["Authorization"] = self.__header_value

extapi/http/addons/headers.py

@@ -22,6 +22,6 @@ def __init__(
     ):
         self._adder = adder
 
-    async def enrich(self, request: RequestData) -> None:
+    async def before_request(self, request: RequestData) -> None:
         request.headers = request.headers or CIMultiDict()
         await execute_sync_async(self._adder, request.headers)

extapi/http/addons/log.py

@@ -12,7 +12,7 @@ class LoggingAddon(Addon[T], Generic[T]):
     def __init__(self):
         self._logger = logging.getLogger("extapi.http.addons.log")
 
-    async def enrich(self, request: RequestData) -> None:
+    async def before_request(self, request: RequestData) -> None:
         self._logger.debug("executing request %s %s", request.method, str(request.url))
 
     async def process_response(
@@ -61,7 +61,7 @@ def __init__(
         super().__init__()
         self._truncate_response_data = truncate_response_data
 
-    async def enrich(self, request: RequestData) -> None:
+    async def before_request(self, request: RequestData) -> None:
         json = request.json
         if json is not None:
             if isinstance(json, bytes):

extapi/http/addons/retry.py

@@ -1,9 +1,10 @@
-from typing import Generic
+from typing import Generic, TypeVar
 
 from extapi.http.abc import Retryable
-from extapi.http.executors.retry import T
 from extapi.http.types import Response
 
+T = TypeVar("T")
+
 
 class Retry5xxAddon(Retryable[T], Generic[T]):
     async def need_retry(self, response: Response[T]) -> tuple[bool, float | None]:

extapi/http/addons/status.py

@@ -14,8 +14,8 @@ def __init__(
     ):
         self._expected_statuses = set(expected_statuses)
 
-    async def enrich(self, request: RequestData) -> None:
-        return None
+    async def before_request(self, request: RequestData) -> None:
+        return None  # pragma: no cover
 
     async def process_response(
         self, request: RequestData, response: Response[T]

extapi/http/backends/aiohttp.py

@@ -3,7 +3,7 @@
 import aiohttp
 
 from extapi.http.abc import AbstractExecutor
-from extapi.http.types import RequestData, Response, Closable
+from extapi.http.types import Closable, RequestData, Response
 
 
 class AiohttpResponseWrap(Closable):

extapi/http/backends/httpx.py

@@ -7,7 +7,7 @@
 from yarl import URL
 
 from extapi.http.abc import AbstractExecutor
-from extapi.http.types import RequestData, Response, Closable
+from extapi.http.types import Closable, RequestData, Response
 
 
 class HttpxResponseWrap(Closable):

extapi/http/executors/limiters.py

@@ -1,11 +1,12 @@
 from typing import TypeVar
 
 from extapi.http.abc import AbstractExecutor
-from extapi.http.base import WrappedExecutor
 from extapi.http.types import RequestData, Response
 from extapi.limiters.concurrency.abc import ConcurrencyLimiter
 from extapi.limiters.rps.abc import RateLimiter
 
+from .wrapped import WrappedExecutor
+
 T = TypeVar("T")
 
 
@@ -39,5 +40,5 @@ def __init__(
         self._rate_limiter = rate_limiter
 
     async def execute(self, request: RequestData) -> Response[T]:
-        await self._rate_limiter.limit_rps()
+        await self._rate_limiter.rate_limit()
         return await super().execute(request)