omlish 0.0.0.dev469__tar.gz → 0.0.0.dev470__tar.gz

{omlish-0.0.0.dev469/omlish.egg-info → omlish-0.0.0.dev470}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev469
+Version: 0.0.0.dev470
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev469'
-__revision__ = 'efea836fe350fa24e6b724d30d414b2d87ee1341'
+__version__ = '0.0.0.dev470'
+__revision__ = '967906fd30a40d061ede9f7aeda9dad0ec608508'
 
 
 #

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/http/all.py

@@ -7,16 +7,15 @@ with _lang.auto_proxy_init(globals()):
     from .clients.asyncs import (  # noqa
         AsyncStreamHttpResponse,
 
-        async_close_response,
-        async_closing_response,
-        async_read_response,
+        async_close_http_client_response,
+        async_closing_http_client_response,
+        async_read_http_client_response,
 
         AsyncHttpClient,
     )
 
     from .clients.base import (  # noqa
         DEFAULT_ENCODING,
-
         is_success_status,
 
         HttpRequest,
@@ -24,8 +23,12 @@ with _lang.auto_proxy_init(globals()):
         BaseHttpResponse,
         HttpResponse,
 
+        HttpClientContext,
+
         HttpClientError,
         HttpStatusError,
+
+        BaseHttpClient,
     )
 
     from .clients.default import (  # noqa
@@ -42,18 +45,35 @@ with _lang.auto_proxy_init(globals()):
 
     from .clients.httpx import (  # noqa
         HttpxHttpClient,
+
+        HttpxAsyncHttpClient,
+    )
+
+    from .clients.middleware import (  # noqa
+        HttpClientMiddleware,
+        AbstractMiddlewareHttpClient,
+
+        MiddlewareHttpClient,
+        MiddlewareAsyncHttpClient,
+
+        TooManyRedirectsHttpClientError,
+        RedirectHandlingHttpClientMiddleware,
     )
 
     from .clients.sync import (  # noqa
         StreamHttpResponse,
 
-        close_response,
-        closing_response,
-        read_response,
+        close_http_client_response,
+        closing_http_client_response,
+        read_http_client_response,
 
         HttpClient,
     )
 
+    from .clients.syncasync import (  # noqa
+        SyncAsyncHttpClient,
+    )
+
     from .clients.urllib import (  # noqa
         UrllibHttpClient,
     )

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/http/clients/asyncs.py

@@ -57,13 +57,13 @@ class AsyncStreamHttpResponse(BaseHttpResponse):
 
     async def close(self) -> None:
         if (c := self._closer) is not None:
-            await c()
+            await c()  # noqa
 
 
 #
 
 
-async def async_close_response(resp: BaseHttpResponse) -> None:
+async def async_close_http_client_response(resp: BaseHttpResponse) -> None:
     if isinstance(resp, HttpResponse):
         pass
 
@@ -75,7 +75,7 @@ async def async_close_response(resp: BaseHttpResponse) -> None:
 
 
 @contextlib.asynccontextmanager
-async def async_closing_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[BaseHttpResponseT, None]:
+async def async_closing_http_client_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[BaseHttpResponseT, None]:
     if isinstance(resp, HttpResponse):
         yield resp
         return
@@ -90,7 +90,7 @@ async def async_closing_response(resp: BaseHttpResponseT) -> ta.AsyncGenerator[B
         raise TypeError(resp)
 
 
-async def async_read_response(resp: BaseHttpResponse) -> HttpResponse:
+async def async_read_http_client_response(resp: BaseHttpResponse) -> HttpResponse:
     if isinstance(resp, HttpResponse):
         return resp
 
@@ -121,12 +121,12 @@ class AsyncHttpClient(BaseHttpClient, Abstract):
             context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> HttpResponse:
-        async with async_closing_response(await self.stream_request(
+        async with async_closing_http_client_response(await self.stream_request(
                 req,
                 context=context,
                 check=check,
         )) as resp:
-            return await async_read_response(resp)
+            return await async_read_http_client_response(resp)
 
     async def stream_request(
             self,
@@ -146,10 +146,10 @@ class AsyncHttpClient(BaseHttpClient, Abstract):
                     cause = resp.underlying
                 else:
                     cause = None
-                raise HttpStatusError(await async_read_response(resp)) from cause  # noqa
+                raise HttpStatusError(await async_read_http_client_response(resp)) from cause  # noqa
 
         except Exception:
-            await async_close_response(resp)
+            await async_close_http_client_response(resp)
             raise
 
         return resp

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/http/clients/middleware.py

@@ -23,7 +23,7 @@ from .base import HttpClientError
 from .base import HttpRequest
 from .sync import HttpClient
 from .sync import StreamHttpResponse
-from .sync import close_response
+from .sync import close_http_client_response
 
 
 BaseHttpClientT = ta.TypeVar('BaseHttpClientT', bound=BaseHttpClient)
@@ -84,6 +84,9 @@ class AbstractMiddlewareHttpClient(Abstract, ta.Generic[BaseHttpClientT]):
         return resp
 
 
+#
+
+
 class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient):
     def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> StreamHttpResponse:
         while True:
@@ -95,7 +98,7 @@ class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient)
                 out = self._process_response(ctx, req, resp)
 
                 if isinstance(out, HttpRequest):
-                    close_response(resp)
+                    close_http_client_response(resp)
                     req = out
                     continue
 
@@ -106,7 +109,7 @@ class MiddlewareHttpClient(AbstractMiddlewareHttpClient[HttpClient], HttpClient)
                     raise TypeError(out)  # noqa
 
             except Exception:
-                close_response(resp)
+                close_http_client_response(resp)
                 raise
 
         raise RuntimeError

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/http/clients/sync.py

@@ -57,13 +57,13 @@ class StreamHttpResponse(BaseHttpResponse):
 
     def close(self) -> None:
         if (c := self._closer) is not None:
-            c()
+            c()  # noqa
 
 
 #
 
 
-def close_response(resp: BaseHttpResponse) -> None:
+def close_http_client_response(resp: BaseHttpResponse) -> None:
     if isinstance(resp, HttpResponse):
         pass
 
@@ -75,7 +75,7 @@ def close_response(resp: BaseHttpResponse) -> None:
 
 
 @contextlib.contextmanager
-def closing_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
+def closing_http_client_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
     if isinstance(resp, HttpResponse):
         yield resp
         return
@@ -88,7 +88,7 @@ def closing_response(resp: BaseHttpResponseT) -> ta.Iterator[BaseHttpResponseT]:
         raise TypeError(resp)
 
 
-def read_response(resp: BaseHttpResponse) -> HttpResponse:
+def read_http_client_response(resp: BaseHttpResponse) -> HttpResponse:
     if isinstance(resp, HttpResponse):
         return resp
 
@@ -119,12 +119,12 @@ class HttpClient(BaseHttpClient, Abstract):
             context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> HttpResponse:
-        with closing_response(self.stream_request(
+        with closing_http_client_response(self.stream_request(
                 req,
                 context=context,
                 check=check,
         )) as resp:
-            return read_response(resp)
+            return read_http_client_response(resp)
 
     def stream_request(
             self,
@@ -144,10 +144,10 @@ class HttpClient(BaseHttpClient, Abstract):
                     cause = resp.underlying
                 else:
                     cause = None
-                raise HttpStatusError(read_response(resp)) from cause  # noqa
+                raise HttpStatusError(read_http_client_response(resp)) from cause  # noqa
 
         except Exception:
-            close_response(resp)
+            close_http_client_response(resp)
             raise
 
         return resp

omlish-0.0.0.dev470/omlish/http/clients/syncasync.py

@@ -0,0 +1,43 @@
+# ruff: noqa: UP043 UP045
+# @omlish-lite
+import dataclasses as dc
+
+from .asyncs import AsyncHttpClient
+from .asyncs import AsyncStreamHttpResponse
+from .base import HttpClientContext
+from .base import HttpRequest
+from .sync import HttpClient
+from .sync import StreamHttpResponse
+
+
+##
+
+
+class SyncAsyncHttpClient(AsyncHttpClient):
+    def __init__(self, client: HttpClient) -> None:
+        super().__init__()
+
+        self._client = client
+
+    @dc.dataclass(frozen=True)
+    class _StreamAdapter:
+        ul: StreamHttpResponse
+
+        async def read1(self, /, n: int = -1) -> bytes:
+            return self.ul.stream.read1(n)
+
+        async def close(self) -> None:
+            self.ul.close()
+
+    async def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> AsyncStreamHttpResponse:
+        resp = self._client.stream_request(req, context=ctx)
+        return AsyncStreamHttpResponse(
+            status=resp.status,
+            headers=resp.headers,
+            request=req,
+            underlying=resp,
+            **(dict(  # type: ignore
+                stream=(adapter := self._StreamAdapter(resp)),
+                _closer=adapter.close,
+            ) if resp.has_data else {}),
+        )

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish/inject/impl/inspect.py

@@ -75,6 +75,7 @@ def build_kwargs_target(
         skip_args: int = 0,
         skip_kwargs: ta.Iterable[str] | None = None,
         raw_optional: bool = False,
+        non_strict: bool = False,
 ) -> KwargsTarget:
     if isinstance(obj, KwargsTarget):
         return obj
@@ -93,11 +94,15 @@ def build_kwargs_target(
             continue
 
         if p.annotation is inspect.Signature.empty:
+            if non_strict:
+                continue
             if p.default is not inspect.Parameter.empty:
                 raise KeyError(f'{obj}, {p.name}')
             continue
 
         if p.kind not in (inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY):
+            if non_strict:
+                continue
             raise TypeError(sig)
 
         ann = p.annotation
@@ -122,7 +127,8 @@ def build_kwargs_target(
             k = dc.replace(k, tag=pt)
 
         if k in seen:
-            raise ConflictingKeyError(k)
+            if not non_strict:
+                raise ConflictingKeyError(k)
         seen.add(k)
 
         kws.append(Kwarg(

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev469
+Version: 0.0.0.dev470
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/omlish.egg-info/SOURCES.txt

@@ -340,6 +340,7 @@ omlish/http/clients/executor.py
 omlish/http/clients/httpx.py
 omlish/http/clients/middleware.py
 omlish/http/clients/sync.py
+omlish/http/clients/syncasync.py
 omlish/http/clients/urllib.py
 omlish/http/clients/coro/__init__.py
 omlish/http/clients/coro/sync.py

{omlish-0.0.0.dev469 → omlish-0.0.0.dev470}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev469'
+version = '0.0.0.dev470'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',