omlish 0.0.0.dev467__tar.gz → 0.0.0.dev468__tar.gz

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

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

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

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

{omlish-0.0.0.dev467 → omlish-0.0.0.dev468}/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.dev468}/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.dev468}/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.dev468}/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.dev468}/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,10 @@ with _lang.auto_proxy_init(globals()):
 
     from .clients.default import (  # noqa
         client,
-
         request,
+
+        async_client,
+        async_request,
     )
 
     from .clients.httpx import (  # noqa

omlish-0.0.0.dev468/omlish/http/clients/default.py

@@ -0,0 +1,146 @@
+import abc
+import typing as ta
+
+from ... import lang
+from ..headers import CanHttpHeaders
+from .asyncs import AsyncHttpClient
+from .base import HttpRequest
+from .base import HttpResponse
+from .sync import HttpClient
+
+
+with lang.auto_proxy_import(globals()):
+    from . import httpx as _httpx
+    from . import urllib as _urllib
+
+
+C = ta.TypeVar('C')
+R = ta.TypeVar('R')
+
+
+##
+
+
+class _DefaultRequester(lang.Abstract, ta.Generic[C, R]):
+    def __call__(
+            self,
+            url: str,
+            method: str | None = None,
+            *,
+            headers: CanHttpHeaders | None = None,
+            data: bytes | str | None = None,
+
+            timeout_s: float | None = None,
+
+            check: bool = False,
+            client: C | None = None,  # noqa
+
+            **kwargs: ta.Any,
+    ) -> R:
+        req = HttpRequest(
+            url,
+            method=method,
+
+            headers=headers,
+            data=data,
+
+            timeout_s=timeout_s,
+
+            **kwargs,
+        )
+
+        return self._do(
+            req,
+            check=check,
+            client=client,
+        )
+
+    @abc.abstractmethod
+    def _do(
+            self,
+            req: HttpRequest,
+            *,
+            check: bool = False,
+            client: C | None = None,  # noqa
+    ) -> R:
+        raise NotImplementedError
+
+
+##
+
+
+def _default_client() -> HttpClient:
+    return _urllib.UrllibHttpClient()
+
+
+def client() -> HttpClient:
+    return _default_client()
+
+
+#
+
+
+class _SyncDefaultRequester(_DefaultRequester[HttpClient, HttpResponse]):
+    def _do(
+            self,
+            req: HttpRequest,
+            *,
+            check: bool = False,
+            client: HttpClient | None = None,  # noqa
+    ) -> HttpResponse:
+        def do(cli: HttpClient) -> HttpResponse:  # noqa
+            return cli.request(
+                req,
+
+                check=check,
+            )
+
+        if client is not None:
+            return do(client)
+
+        else:
+            with _default_client() as cli:
+                return do(cli)
+
+
+request = _SyncDefaultRequester()
+
+
+##
+
+
+def _default_async_client() -> AsyncHttpClient:
+    return _httpx.HttpxAsyncHttpClient()
+
+
+def async_client() -> AsyncHttpClient:
+    return _default_async_client()
+
+
+#
+
+
+class _AsyncDefaultRequester(_DefaultRequester[AsyncHttpClient, ta.Awaitable[HttpResponse]]):
+    async def _do(
+            self,
+            req: HttpRequest,
+            *,
+            check: bool = False,
+            client: AsyncHttpClient | None = None,  # noqa
+    ) -> HttpResponse:
+        async def do(cli: AsyncHttpClient) -> HttpResponse:  # noqa
+            return await cli.request(
+                req,
+
+                check=check,
+            )
+
+        if client is not None:
+            return await do(client)
+
+        else:
+            async with _default_async_client() as cli:
+                return await do(cli)
+
+
+async_request = _AsyncDefaultRequester()

{omlish-0.0.0.dev467 → omlish-0.0.0.dev468}/omlish/http/clients/httpx.py

@@ -2,12 +2,16 @@
 TODO:
  - standardize following redirects
 """
+import contextlib
 import functools
+import io
 import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
 from ..headers import HttpHeaders
+from .asyncs import AsyncHttpClient
+from .asyncs import AsyncStreamHttpResponse
 from .base import HttpClientError
 from .base import HttpRequest
 from .sync import HttpClient
@@ -29,6 +33,7 @@ class HttpxHttpClient(HttpClient):
         it: ta.Iterator[bytes]
 
         def read(self, /, n: int = -1) -> bytes:
+            # FIXME: lol n
             if n < 0:
                 return b''.join(self.it)
             else:
@@ -70,3 +75,56 @@ class HttpxHttpClient(HttpClient):
         except Exception:
             resp_close()
             raise
+
+
+##
+
+
+class HttpxAsyncHttpClient(AsyncHttpClient):
+    @dc.dataclass(frozen=True)
+    class _StreamAdapter:
+        it: ta.AsyncIterator[bytes]
+
+        async def read(self, /, n: int = -1) -> bytes:
+            # FIXME: lol n
+            if n < 0:
+                buf = io.BytesIO()
+                async for chunk in self.it:
+                    buf.write(chunk)
+                return buf.getvalue()
+            else:
+                try:
+                    return await anext(self.it)
+                except StopIteration:
+                    return b''
+
+    async def _stream_request(self, req: HttpRequest) -> AsyncStreamHttpResponse:
+        es = contextlib.AsyncExitStack()
+
+        try:
+            client = await es.enter_async_context(httpx.AsyncClient())
+
+            resp = await es.enter_async_context(client.stream(
+                method=req.method_or_default,
+                url=req.url,
+                headers=req.headers_ or None,  # type: ignore
+                content=req.data,
+                timeout=req.timeout_s,
+            ))
+
+            return AsyncStreamHttpResponse(
+                status=resp.status_code,
+                headers=HttpHeaders(resp.headers.raw),
+                request=req,
+                underlying=resp,
+                stream=self._StreamAdapter(resp.aiter_bytes()),
+                _closer=es.aclose,
+            )
+
+        except httpx.HTTPError as e:
+            await es.aclose()
+            raise HttpClientError from e
+
+        except Exception:
+            await es.aclose()
+            raise

{omlish-0.0.0.dev467 → omlish-0.0.0.dev468}/omlish/sync.py

@@ -141,6 +141,45 @@ class ConditionDeque(ta.Generic[T]):
 ##
 
 
+class BufferRelay(ta.Generic[T]):
+    def __init__(
+            self,
+            *,
+            wake_fn: ta.Callable[[], None],
+    ) -> None:
+        super().__init__()
+
+        self._wake_fn = wake_fn
+
+        self._lock = threading.Lock()
+        self._buffer: BufferRelay._Buffer = BufferRelay._Buffer()
+
+    class _Buffer:
+        def __init__(self) -> None:
+            self.lst: list = []
+            self.age = 0
+
+        def __repr__(self) -> str:
+            return f'{self.__class__.__qualname__}({self.lst!r}, age={self.age!r})'
+
+    def push(self, *vs: T) -> None:
+        with self._lock:
+            buf = self._buffer
+            needs_wake = not buf.age
+            buf.lst.extend(vs)
+            buf.age += 1
+        if needs_wake:
+            self._wake_fn()
+
+    def swap(self) -> ta.Sequence[T]:
+        with self._lock:
+            buf, self._buffer = self._buffer, BufferRelay._Buffer()
+        return buf.lst
+
+
+##
+
+
 class CountDownLatch:
     def __init__(self, count: int) -> None:
         super().__init__()

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

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

{omlish-0.0.0.dev467 → omlish-0.0.0.dev468}/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.dev467'
+version = '0.0.0.dev468'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',

omlish-0.0.0.dev467/omlish/http/clients/default.py

@@ -1,60 +0,0 @@
-import typing as ta
-
-from ..headers import CanHttpHeaders
-from .base import HttpRequest
-from .base import HttpResponse
-from .sync import HttpClient
-from .urllib import UrllibHttpClient
-
-
-##
-
-
-def _default_client() -> HttpClient:
-    return UrllibHttpClient()
-
-
-def client() -> HttpClient:
-    return _default_client()
-
-
-def request(
-        url: str,
-        method: str | None = None,
-        *,
-        headers: CanHttpHeaders | None = None,
-        data: bytes | str | None = None,
-
-        timeout_s: float | None = None,
-
-        check: bool = False,
-
-        client: HttpClient | None = None,  # noqa
-
-        **kwargs: ta.Any,
-) -> HttpResponse:
-    req = HttpRequest(
-        url,
-        method=method,
-
-        headers=headers,
-        data=data,
-
-        timeout_s=timeout_s,
-
-        **kwargs,
-    )
-
-    def do(cli: HttpClient) -> HttpResponse:
-        return cli.request(
-            req,
-
-            check=check,
-        )
-
-    if client is not None:
-        return do(client)
-
-    else:
-        with _default_client() as cli:
-            return do(cli)