sotkalib 0.0.5__py3-none-any.whl → 0.0.5.post2__py3-none-any.whl

sotkalib/http/client_session.py

@@ -107,16 +107,21 @@ class RequestContext:
 type Next[T] = Callable[[RequestContext], Awaitable[T]]
 type Middleware[T, R] = Callable[[RequestContext, Next[T]], Awaitable[R]]
 
-type ExcArgFunc = Callable[..., tuple[Sequence[Any], Mapping[str, Any] | None]]
-type StatArgFunc = Callable[..., Any]
+type ExcArgFunc = Callable[[RequestContext], tuple[Sequence[Any], Mapping[str, Any] | None]]
+type StatArgFunc = Callable[[RequestContext], tuple[Sequence[Any], Mapping[str, Any] | None]]
 
 
-async def default_stat_arg_func(resp: aiohttp.ClientResponse) -> tuple[Sequence[Any], None]:
+async def default_stat_arg_func(ctx: RequestContext) -> tuple[Sequence[Any], None]:
+	resp = ctx.response
+	if resp is None:
+		return (), None
 	return (f"[{resp.status}]; {await resp.text()=}",), None
 
 
-def default_exc_arg_func(exc: Exception, attempt: int, url: str, method: str, **kw) -> tuple[Sequence[Any], None]:
-	return (f"exception {type(exc)}: ({exc=}) {attempt=}; {url=} {method=} {kw=}",), None
+def default_exc_arg_func(ctx: RequestContext) -> tuple[Sequence[Any], None]:
+	exc = ctx.last_error
+	msg = f"exception {type(exc)}: ({exc=}) attempt={ctx.attempt}; url={ctx.url} method={ctx.method}"
+	return (msg,), None
 
 
 class StatusSettings(BaseModel):
@@ -171,11 +176,6 @@ class ClientSettings(BaseModel):
 	use_cookies_from_response: bool = Field(default=False)
 
 
-# ============================================================================
-# SSL Context
-# ============================================================================
-
-
 def _make_ssl_context(disable_tls13: bool = False) -> ssl.SSLContext:
 	ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
 	ctx.load_default_certs()
@@ -199,11 +199,6 @@ def _make_ssl_context(disable_tls13: bool = False) -> ssl.SSLContext:
 	return ctx
 
 
-# ============================================================================
-# HTTP Session
-# ============================================================================
-
-
 class HTTPSession[R = aiohttp.ClientResponse | None]:
 	config: ClientSettings
 	_session: aiohttp.ClientSession | None
@@ -253,20 +248,16 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 			await self._session.close()
 
 	def _build_pipeline(self) -> Next[R]:
-		"""Build the middleware pipeline with the core request at the end."""
-
 		async def core_request(ctx: RequestContext) -> aiohttp.ClientResponse | None:
-			"""The innermost handler that actually makes the HTTP request."""
 			return await self._execute_request(ctx)
 
 		pipeline: Next[Any] = core_request
 		for middleware in reversed(self._middlewares):
-			pipeline = (lambda mw, nxt: lambda c: mw(c, nxt))(middleware, pipeline)
+			pipeline = (lambda mw, nxt: lambda c: mw(c, nxt))(middleware, pipeline)  # noqa: PLC3002
 
 		return pipeline
 
 	async def _execute_request(self, ctx: RequestContext) -> aiohttp.ClientResponse | None:
-		"""Execute the actual HTTP request and handle status codes."""
 		if self._session is None:
 			raise RuntimeError("HTTPSession must be used as async context manager")
 
@@ -280,7 +271,6 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 		ctx: RequestContext,
 		response: aiohttp.ClientResponse,
 	) -> aiohttp.ClientResponse | None:
-		"""Handle HTTP status codes according to settings."""
 		status = response.status
 		settings = self.config.status_settings
 
@@ -294,7 +284,7 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 
 		if HTTPStatus(status) in settings.to_raise:
 			exc_cls = settings.exc_to_raise
-			args, kwargs = await settings.args_for_exc_func(response)
+			args, kwargs = settings.args_for_exc_func(ctx)
 			if kwargs is None:
 				raise exc_cls(*args)
 			raise exc_cls(*args, **kwargs)
@@ -304,9 +294,7 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 
 		return response
 
-
 	async def _request_with_retry(self, ctx: RequestContext) -> R:
-		"""Execute request with retry logic."""
 		ctx.started_at = time.monotonic()
 		ctx.max_attempts = self.config.maximum_retries + 1
 
@@ -357,14 +345,11 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 		await asyncio.sleep(delay)
 
 	async def _handle_to_raise(self, ctx: RequestContext, e: Exception) -> None:
-		"""Handle exceptions that should be re-raised (possibly wrapped)."""
 		exc_cls = self.config.exception_settings.exc_to_raise
 		if exc_cls is None:
 			raise e
 
-		args, kwargs = self.config.exception_settings.args_for_exc_func(
-			e, ctx.attempt, ctx.url, ctx.method, **ctx.to_request_kwargs()
-		)
+		args, kwargs = self.config.exception_settings.args_for_exc_func(ctx)
 		if kwargs is None:
 			raise exc_cls(*args) from e
 		raise exc_cls(*args, **kwargs) from e
@@ -439,6 +424,8 @@ class HTTPSession[R = aiohttp.ClientResponse | None]:
 
 def merge_tuples[T](t1: tuple[T, ...], t2: tuple[T, ...]) -> tuple[T, ...]:
 	return t1 + t2
+
+
 # ============================================================================
 # Legacy compatibility aliases
 # ============================================================================

sotkalib/log/factory.py

@@ -1,10 +1,6 @@
 from functools import lru_cache
-from typing import TYPE_CHECKING
 
-from loguru import logger
-
-if TYPE_CHECKING:
-	from loguru import Logger
+from loguru import Logger, logger
 
 
 @lru_cache

{sotkalib-0.0.5.dist-info → sotkalib-0.0.5.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sotkalib
-Version: 0.0.5
+Version: 0.0.5.post2
 Summary: 
 Author: alexey
 Author-email: alexey <me@pyrorhythm.dev>

{sotkalib-0.0.5.dist-info → sotkalib-0.0.5.post2.dist-info}/RECORD

@@ -11,15 +11,15 @@ sotkalib/exceptions/handlers/__init__.py,sha256=Pz1akT2x3SaRsPezNPYnCoTcejxy4n4_
 sotkalib/exceptions/handlers/args_incl_error.py,sha256=rYiBximsXVw1YDUBbdsqeqsfTWxshyX4EdISXWYkPDE,533
 sotkalib/exceptions/handlers/core.py,sha256=5fhusoxBhUz59TaVWobplBvD-sbkZKBnmmu-fcSyRk4,836
 sotkalib/http/__init__.py,sha256=TGjBT5pgmNuBO1TpXU_YqSfXdWsGTEHpGO8Qwf2x2w4,457
-sotkalib/http/client_session.py,sha256=LI1D0i7vezQhYRbSnlUq3q654JcEXZSL9TT_VLBz-ZI,13578
+sotkalib/http/client_session.py,sha256=pIbTYbP8NT9ZGnuTi7LI7nE-UvxPx2G8RCgiEpNpMCA,12928
 sotkalib/log/__init__.py,sha256=xrBx--c8QU5xkb3_n61LuqF8ySUaxlQkHCxHyH_D8aE,58
-sotkalib/log/factory.py,sha256=oyvHOum8jwLGr_XC0c44VIVLzWQQqHSbQOnf85bP9Co,303
+sotkalib/log/factory.py,sha256=DuPFRiUpr58oq39mM2tJqzGvdm3_kWMN_Zoue8nA1A8,232
 sotkalib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sotkalib/redis/__init__.py,sha256=-0ZXD-cC-Xi6RmAvnrAgU-8Z6g4l88XmXf3kvIgBD9k,154
 sotkalib/redis/client.py,sha256=0TWe-gYqFiuCjqimCQrVrnTHSM0EROIoJL36M3qwOtQ,1118
 sotkalib/redis/lock.py,sha256=nEZjIyXmgq3vH-Urs8qXC_N8lmXNho00SaTZ7wJIEIo,2528
 sotkalib/sqla/__init__.py,sha256=n-I_hoRS-N7XN02yYCTtw6Dh4BBSQRmolS19tEB2KMM,87
 sotkalib/sqla/db.py,sha256=6ZckKQ8kmRlYrwCAzKidc_JNPwqp38tSGEy3XMGnv08,3376
-sotkalib-0.0.5.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
-sotkalib-0.0.5.dist-info/METADATA,sha256=0iajfVojpZXymiZhrv_vWzgPVENv36UaAB1KLumy30g,386
-sotkalib-0.0.5.dist-info/RECORD,,
+sotkalib-0.0.5.post2.dist-info/WHEEL,sha256=5DEXXimM34_d4Gx1AuF9ysMr1_maoEtGKjaILM3s4w4,80
+sotkalib-0.0.5.post2.dist-info/METADATA,sha256=z5SkZ9uP11_trWClPxs7qs1j9k3nl-uZ_A_J3Fs57hA,392
+sotkalib-0.0.5.post2.dist-info/RECORD,,