omlish 0.0.0.dev467__tar.gz → 0.0.0.dev469__tar.gz

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

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

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

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev467'
-__revision__ = '6af5e3e662a690b664fc967f7c9d0b74ce820cce'
+__version__ = '0.0.0.dev469'
+__revision__ = 'efea836fe350fa24e6b724d30d414b2d87ee1341'
 
 
 #

omlish-0.0.0.dev469/omlish/asyncs/asyncio/sync.py

@@ -0,0 +1,43 @@
+# ruff: noqa: UP045
+# @omlish-lite
+import asyncio
+import typing as ta
+
+from ...sync import SyncBufferRelay
+from ..sync import AsyncBufferRelay
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@ta.final
+class AsyncioBufferRelay(AsyncBufferRelay[T]):
+    def __init__(
+            self,
+            *,
+            event: ta.Optional[asyncio.Event] = None,
+            loop: ta.Optional[ta.Any] = None,
+    ) -> None:
+        if event is None:
+            event = asyncio.Event()
+        self._event = event
+        if loop is None:
+            loop = asyncio.get_running_loop()
+        self._loop = loop
+
+        self._relay: SyncBufferRelay[T] = SyncBufferRelay(
+            wake_fn=lambda: loop.call_soon_threadsafe(event.set),  # type: ignore[arg-type]
+        )
+
+    def push(self, *vs: T) -> None:
+        self._relay.push(*vs)
+
+    def swap(self) -> ta.Sequence[T]:
+        return self._relay.swap()
+
+    async def wait(self) -> None:
+        await self._event.wait()
+        self._event.clear()

omlish-0.0.0.dev469/omlish/asyncs/sync.py

@@ -0,0 +1,25 @@
+# @omlish-lite
+import abc
+import typing as ta
+
+from ..lite.abstract import Abstract
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class AsyncBufferRelay(Abstract, ta.Generic[T]):
+    @abc.abstractmethod
+    def push(self, *vs: T) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def swap(self) -> ta.Sequence[T]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    async def wait(self) -> None:
+        raise NotImplementedError

{omlish-0.0.0.dev467 → omlish-0.0.0.dev469}/omlish/dataclasses/impl/api/classes/decorator.py

@@ -10,6 +10,7 @@ from ..... import lang
 from ...._internals import STD_FIELDS_ATTR
 from ...._internals import STD_PARAMS_ATTR
 from ....specs import ClassSpec
+from ....specs import ReprFn
 from ...processing.driving import drive_cls_processing
 from ...utils import class_decorator
 from ..fields.building import build_cls_std_fields
@@ -53,6 +54,7 @@ def dataclass(
 
         repr_id: bool | None = None,
         terse_repr: bool | None = None,
+        default_repr_fn: ReprFn | None = None,
 
         allow_redundant_decorator: bool | None = None,
 
@@ -158,6 +160,7 @@ def dataclass(
 
                 repr_id=repr_id,
                 terse_repr=terse_repr,
+                default_repr_fn=default_repr_fn,
 
                 allow_redundant_decorator=allow_redundant_decorator,
             ),

{omlish-0.0.0.dev467 → omlish-0.0.0.dev469}/omlish/dataclasses/impl/api/classes/make.py

@@ -4,6 +4,7 @@ import sys
 import types
 import typing as ta
 
+from ....specs import ReprFn
 from .decorator import dataclass
 
 
@@ -53,6 +54,7 @@ def make_dataclass(  # noqa
 
         repr_id: bool | None = None,
         terse_repr: bool | None = None,
+        default_repr_fn: ReprFn | None = None,
 
         allow_redundant_decorator: bool | None = None,
 
@@ -174,6 +176,7 @@ def make_dataclass(  # noqa
 
         repr_id=repr_id,
         terse_repr=terse_repr,
+        default_repr_fn=default_repr_fn,
 
         allow_redundant_decorator=allow_redundant_decorator,
     )

{omlish-0.0.0.dev467 → omlish-0.0.0.dev469}/omlish/dataclasses/impl/concerns/repr.py

@@ -32,6 +32,7 @@ class ReprPlan(Plan):
 
     id: bool = False
     terse: bool = False
+    default_fn: OpRef[ReprFn] | None = None
 
 
 @register_generator_type(ReprPlan)
@@ -66,11 +67,17 @@ class ReprGenerator(Generator[ReprPlan]):
                 fn=fnr,
             ))
 
+        drf: OpRef | None = None
+        if ctx.cs.default_repr_fn is not None:
+            drf = OpRef(f'repr.default_fn')
+            orm[drf] = ctx.cs.default_repr_fn
+
         return PlanResult(
             ReprPlan(
                 fields=tuple(rfs),
                 id=ctx.cs.repr_id,
                 terse=ctx.cs.terse_repr,
+                default_fn=drf,
             ),
             orm,
         )
@@ -85,10 +92,16 @@ class ReprGenerator(Generator[ReprPlan]):
             if not (pl.terse and not f.kw_only):
                 pfx = f'{f.name}='
 
+            fn: OpRef[ReprFn] | None = None
             if f.fn is not None:
-                ors.add(f.fn)
+                fn = f.fn
+            elif pl.default_fn is not None:
+                fn = pl.default_fn
+
+            if fn is not None:
+                ors.add(fn)
                 part_lines.extend([
-                    f'    if (s := {f.fn.ident()}(self.{f.name})) is not None:',
+                    f'    if (s := {fn.ident()}(self.{f.name})) is not None:',
                     f'        parts.append(f"{pfx}{{s}}")',
                 ])
             else:

{omlish-0.0.0.dev467 → omlish-0.0.0.dev469}/omlish/dataclasses/specs.py

@@ -216,6 +216,7 @@ class ClassSpec(_SpecBase, lang.Final):
 
     repr_id: bool = False
     terse_repr: bool = False
+    default_repr_fn: ReprFn | None = None
 
     allow_redundant_decorator: bool = False
 

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

@@ -4,6 +4,16 @@ from .. import lang as _lang
 with _lang.auto_proxy_init(globals()):
     ##
 
+    from .clients.asyncs import (  # noqa
+        AsyncStreamHttpResponse,
+
+        async_close_response,
+        async_closing_response,
+        async_read_response,
+
+        AsyncHttpClient,
+    )
+
     from .clients.base import (  # noqa
         DEFAULT_ENCODING,
 
@@ -20,8 +30,14 @@ with _lang.auto_proxy_init(globals()):
 
     from .clients.default import (  # noqa
         client,
+        manage_client,
 
         request,
+
+        async_client,
+        manage_async_client,
+
+        async_request,
     )
 
     from .clients.httpx import (  # noqa

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

@@ -3,13 +3,15 @@
 import abc
 import contextlib
 import dataclasses as dc
+import io
 import typing as ta
 
 from ...lite.abstract import Abstract
-from ...lite.dataclasses import dataclass_maybe_post_init
 from ...lite.dataclasses import dataclass_shallow_asdict
+from .base import BaseHttpClient
 from .base import BaseHttpResponse
 from .base import BaseHttpResponseT
+from .base import HttpClientContext
 from .base import HttpRequest
 from .base import HttpResponse
 from .base import HttpStatusError
@@ -26,21 +28,26 @@ AsyncHttpClientT = ta.TypeVar('AsyncHttpClientT', bound='AsyncHttpClient')
 @dc.dataclass(frozen=True)  # kw_only=True
 class AsyncStreamHttpResponse(BaseHttpResponse):
     class Stream(ta.Protocol):
-        def read(self, /, n: int = -1) -> ta.Awaitable[bytes]: ...
+        def read1(self, /, n: int = -1) -> ta.Awaitable[bytes]: ...
 
     @ta.final
     class _NullStream:
-        def read(self, /, n: int = -1) -> ta.Awaitable[bytes]:
+        def read1(self, /, n: int = -1) -> ta.Awaitable[bytes]:
             raise TypeError
 
     stream: Stream = _NullStream()
 
-    _closer: ta.Optional[ta.Callable[[], ta.Awaitable[None]]] = None
+    @property
+    def has_data(self) -> bool:
+        return not isinstance(self.stream, AsyncStreamHttpResponse._NullStream)
+
+    async def read_all(self) -> bytes:
+        buf = io.BytesIO()
+        while (b := await self.stream.read1()):
+            buf.write(b)
+        return buf.getvalue()
 
-    def __post_init__(self) -> None:
-        dataclass_maybe_post_init(super())
-        if isinstance(self.stream, AsyncStreamHttpResponse._NullStream):
-            raise TypeError(self.stream)
+    _closer: ta.Optional[ta.Callable[[], ta.Awaitable[None]]] = None
 
     async def __aenter__(self: AsyncStreamHttpResponseT) -> AsyncStreamHttpResponseT:
         return self
@@ -50,7 +57,7 @@ class AsyncStreamHttpResponse(BaseHttpResponse):
 
     async def close(self) -> None:
         if (c := self._closer) is not None:
-            c()
+            await c()
 
 
 #
@@ -88,10 +95,9 @@ async def async_read_response(resp: BaseHttpResponse) -> HttpResponse:
         return resp
 
     elif isinstance(resp, AsyncStreamHttpResponse):
-        data = await resp.stream.read()
         return HttpResponse(**{
             **{k: v for k, v in dataclass_shallow_asdict(resp).items() if k not in ('stream', '_closer')},
-            'data': data,
+            **({'data': await resp.read_all()} if resp.has_data else {}),
         })
 
     else:
@@ -101,7 +107,7 @@ async def async_read_response(resp: BaseHttpResponse) -> HttpResponse:
 ##
 
 
-class AsyncHttpClient(Abstract):
+class AsyncHttpClient(BaseHttpClient, Abstract):
     async def __aenter__(self: AsyncHttpClientT) -> AsyncHttpClientT:
         return self
 
@@ -112,10 +118,12 @@ class AsyncHttpClient(Abstract):
             self,
             req: HttpRequest,
             *,
+            context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> HttpResponse:
         async with async_closing_response(await self.stream_request(
                 req,
+                context=context,
                 check=check,
         )) as resp:
             return await async_read_response(resp)
@@ -124,9 +132,13 @@ class AsyncHttpClient(Abstract):
             self,
             req: HttpRequest,
             *,
+            context: ta.Optional[HttpClientContext] = None,
             check: bool = False,
     ) -> AsyncStreamHttpResponse:
-        resp = await self._stream_request(req)
+        if context is None:
+            context = HttpClientContext()
+
+        resp = await self._stream_request(context, req)
 
         try:
             if check and not resp.is_success:
@@ -143,5 +155,5 @@ class AsyncHttpClient(Abstract):
         return resp
 
     @abc.abstractmethod
-    def _stream_request(self, req: HttpRequest) -> ta.Awaitable[AsyncStreamHttpResponse]:
+    def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> ta.Awaitable[AsyncStreamHttpResponse]:
         raise NotImplementedError

{omlish-0.0.0.dev467 → omlish-0.0.0.dev469}/omlish/http/clients/base.py

@@ -119,12 +119,28 @@ class HttpResponse(BaseHttpResponse):
 ##
 
 
+@ta.final
+class HttpClientContext:
+    def __init__(self) -> None:
+        self._dct: dict = {}
+
+
+##
+
+
 class HttpClientError(Exception):
     @property
     def cause(self) -> ta.Optional[BaseException]:
         return self.__cause__
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass()
 class HttpStatusError(HttpClientError):
     response: HttpResponse
+
+
+##
+
+
+class BaseHttpClient(Abstract):
+    pass

omlish-0.0.0.dev469/omlish/http/clients/coro/sync.py

@@ -0,0 +1,170 @@
+# @omlish-lite
+# ruff: noqa: UP045
+import errno
+import socket
+import typing as ta
+import urllib.parse
+
+from ....lite.check import check
+from ...coro.client.connection import CoroHttpClientConnection
+from ...coro.client.response import CoroHttpClientResponse
+from ...coro.io import CoroHttpIo
+from ...headers import HttpHeaders
+from ...urls import unparse_url_request_path
+from ..base import HttpClientContext
+from ..base import HttpClientError
+from ..base import HttpRequest
+from ..sync import HttpClient
+from ..sync import StreamHttpResponse
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class CoroHttpClient(HttpClient):
+    class _Connection:
+        def __init__(self, req: HttpRequest) -> None:
+            super().__init__()
+
+            self._req = req
+            self._ups = urllib.parse.urlparse(req.url)
+
+            self._ssl = self._ups.scheme == 'https'
+
+        _cc: ta.Optional[CoroHttpClientConnection] = None
+        _resp: ta.Optional[CoroHttpClientResponse] = None
+
+        _sock: ta.Optional[socket.socket] = None
+        _sock_file: ta.Optional[ta.BinaryIO] = None
+
+        _ssl_context: ta.Any = None
+
+        #
+
+        def _create_https_context(self, http_version: int) -> ta.Any:
+            # https://github.com/python/cpython/blob/a7160912274003672dc116d918260c0a81551c21/Lib/http/client.py#L809
+            import ssl
+
+            # Function also used by urllib.request to be able to set the check_hostname attribute on a context object.
+            context = ssl.create_default_context()
+
+            # Send ALPN extension to indicate HTTP/1.1 protocol.
+            if http_version == 11:
+                context.set_alpn_protocols(['http/1.1'])
+
+            # Enable PHA for TLS 1.3 connections if available.
+            if context.post_handshake_auth is not None:
+                context.post_handshake_auth = True
+
+            return context
+
+        #
+
+        def setup(self) -> StreamHttpResponse:
+            check.none(self._sock)
+            check.none(self._ssl_context)
+
+            self._cc = cc = CoroHttpClientConnection(
+                check.not_none(self._ups.hostname),
+                default_port=CoroHttpClientConnection.HTTPS_PORT if self._ssl else CoroHttpClientConnection.HTTP_PORT,
+            )
+
+            if self._ssl:
+                self._ssl_context = self._create_https_context(self._cc.http_version)
+
+            try:
+                self._run_coro(cc.connect())
+
+                self._run_coro(cc.request(
+                    self._req.method or 'GET',
+                    unparse_url_request_path(self._ups) or '/',
+                    self._req.data,
+                    hh.single_str_dct if (hh := self._req.headers_) is not None else {},
+                ))
+
+                self._resp = resp = self._run_coro(cc.get_response())
+
+                return StreamHttpResponse(
+                    status=resp._state.status,  # noqa
+                    headers=HttpHeaders(resp._state.headers.items()),  # noqa
+                    request=self._req,
+                    underlying=self,
+                    stream=self,
+                    _closer=self.close,
+                )
+
+            except Exception:
+                self.close()
+                raise
+
+        def _run_coro(self, g: ta.Generator[ta.Any, ta.Any, T]) -> T:
+            i = None
+
+            while True:
+                try:
+                    o = g.send(i)
+                except StopIteration as e:
+                    return e.value
+
+                try:
+                    i = self._handle_io(o)
+                except OSError as e:
+                    raise HttpClientError from e
+
+        def _handle_io(self, o: CoroHttpIo.Io) -> ta.Any:
+            if isinstance(o, CoroHttpIo.ConnectIo):
+                check.none(self._sock)
+                self._sock = socket.create_connection(*o.args, **(o.kwargs or {}))
+
+                if self._ssl_context is not None:
+                    self._sock = self._ssl_context.wrap_socket(
+                        self._sock,
+                        server_hostname=check.not_none(o.server_hostname),
+                    )
+
+                # Might fail in OSs that don't implement TCP_NODELAY
+                try:
+                    self._sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+                except OSError as e:
+                    if e.errno != errno.ENOPROTOOPT:
+                        raise
+
+                self._sock_file = self._sock.makefile('rb')
+
+                return None
+
+            elif isinstance(o, CoroHttpIo.CloseIo):
+                check.not_none(self._sock).close()
+                return None
+
+            elif isinstance(o, CoroHttpIo.WriteIo):
+                check.not_none(self._sock).sendall(o.data)
+                return None
+
+            elif isinstance(o, CoroHttpIo.ReadIo):
+                if (sz := o.sz) is not None:
+                    return check.not_none(self._sock_file).read(sz)
+                else:
+                    return check.not_none(self._sock_file).read()
+
+            elif isinstance(o, CoroHttpIo.ReadLineIo):
+                return check.not_none(self._sock_file).readline(o.sz)
+
+            else:
+                raise TypeError(o)
+
+        def read1(self, /, n: int = -1) -> bytes:
+            return self._run_coro(check.not_none(self._resp).read(n if n >= 0 else None))
+
+        def close(self) -> None:
+            if self._resp is not None:
+                self._resp.close()
+            if self._sock is not None:
+                self._sock.close()
+
+    def _stream_request(self, ctx: HttpClientContext, req: HttpRequest) -> StreamHttpResponse:
+        conn = CoroHttpClient._Connection(req)
+        return conn.setup()