omlish 0.0.0.dev355__tar.gz → 0.0.0.dev357__tar.gz

{omlish-0.0.0.dev355/omlish.egg-info → omlish-0.0.0.dev357}/PKG-INFO

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

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev355'
-__revision__ = 'd1e14d2e7ff6236c8b506824030a3e92dd99b929'
+__version__ = '0.0.0.dev357'
+__revision__ = '054a97a942279987561a25a0f485105760c9401d'
 
 
 #

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/asyncs/asyncio/subprocesses.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 import asyncio.base_subprocess
 import asyncio.subprocess

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/asyncs/bluelet/core.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 # Based on bluelet ( https://github.com/sampsyo/bluelet ) by Adrian Sampson, original license:
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/asyncs/bluelet/events.py

@@ -12,7 +12,7 @@ import typing as ta
 
 R = ta.TypeVar('R')
 
-BlueletEventT = ta.TypeVar('BlueletEventT', bound='BlueletEvent')  # ta.TypeAlias
+BlueletEventT = ta.TypeVar('BlueletEventT', bound='BlueletEvent')
 
 BlueletWaitable = ta.Union[int, 'BlueletHasFileno']  # ta.TypeAlias
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/codecs/base.py

@@ -37,11 +37,11 @@ class EagerCodec(lang.Abstract, ta.Generic[I, O]):
 
 class IncrementalCodec(lang.Abstract, ta.Generic[I, O]):
     @abc.abstractmethod
-    def encode_incremental(self) -> ta.Generator[O | None, I, None]:
+    def encode_incremental(self) -> ta.Generator[O | None, I]:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def decode_incremental(self) -> ta.Generator[I | None, O, None]:
+    def decode_incremental(self) -> ta.Generator[I | None, O]:
         raise NotImplementedError
 
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/codecs/text.py

@@ -88,7 +88,7 @@ class TextEncodingComboCodec(ComboCodec[str, bytes]):
         i, _ = self._info.decode(o, self._opts.errors)
         return i
 
-    def encode_incremental(self) -> ta.Generator[bytes | None, str, None]:
+    def encode_incremental(self) -> ta.Generator[bytes | None, str]:
         x = self._info.incrementalencoder(self._opts.errors)
         i = yield None
         while True:
@@ -99,7 +99,7 @@ class TextEncodingComboCodec(ComboCodec[str, bytes]):
         o = x.encode(i, final=True)
         yield o
 
-    def decode_incremental(self) -> ta.Generator[str | None, bytes, None]:
+    def decode_incremental(self) -> ta.Generator[str | None, bytes]:
         x = self._info.incrementaldecoder(self._opts.errors)
         i = yield None
         while True:

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/concurrent/executors.py

@@ -37,7 +37,7 @@ def new_executor(
         *,
         immediate_exceptions: bool = False,
         **kwargs: ta.Any,
-) -> ta.Generator[cf.Executor, None, None]:
+) -> ta.Generator[cf.Executor]:
     if max_workers == 0:
         yield ImmediateExecutor(
             immediate_exceptions=immediate_exceptions,

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/formats/json/literals.py

@@ -121,26 +121,6 @@ def encode_string(
     ])
 
 
-def encode_string_ascii(
-        s: str | bytes,
-        q: str | None = None,
-        *,
-        lq: str | None = None,
-        rq: str | None = None,
-        escape_map: ta.Mapping[str, str] | None = None,
-) -> str:
-    """Return an ASCII-only JSON representation of a Python string."""
-
-    return encode_string(
-        s,
-        q,
-        lq=lq,
-        rq=rq,
-        escape_map=escape_map,
-        ensure_ascii=True,
-    )
-
-
 ##
 
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/formats/json/stream/parsing.py

@@ -58,7 +58,7 @@ class JsonStreamParserEvents(lang.Namespace):
 ##
 
 
-def yield_parser_events(obj: ta.Any) -> ta.Generator[JsonStreamParserEvent, None, None]:
+def yield_parser_events(obj: ta.Any) -> ta.Generator[JsonStreamParserEvent]:
     if isinstance(obj, SCALAR_VALUE_TYPES):
         yield obj  # type: ignore
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/formats/json/stream/rendering.py

@@ -36,7 +36,7 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
             self,
             o: ta.Any,
             state: AbstractJsonRenderer.State = AbstractJsonRenderer.State.VALUE,
-    ) -> ta.Generator[str, None, None]:
+    ) -> ta.Generator[str]:
         if self._style is not None:
             pre, post = self._style(o, state)
             yield pre
@@ -52,7 +52,7 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
         if post:
             yield post
 
-    def _render(self, e: JsonStreamParserEvent) -> ta.Generator[str, None, None]:
+    def _render(self, e: JsonStreamParserEvent) -> ta.Generator[str]:
         if self._need_delimit:
             yield self._delimiter
             self._need_delimit = False
@@ -124,7 +124,7 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
         else:
             raise TypeError(e)
 
-    def render(self, events: ta.Iterable[JsonStreamParserEvent]) -> ta.Generator[str, None, None]:
+    def render(self, events: ta.Iterable[JsonStreamParserEvent]) -> ta.Generator[str]:
         for e in events:
             yield from self._render(e)
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/formats/json5/rendering.py

@@ -3,7 +3,6 @@ import typing as ta
 from ..json import Scalar
 from ..json.literals import ESCAPE_MAP
 from ..json.literals import encode_string
-from ..json.literals import encode_string_ascii
 from ..json.rendering import JsonRenderer
 from ..json.rendering import JsonRendererOut
 
@@ -35,15 +34,12 @@ class Json5Renderer(JsonRenderer):
                 isinstance(o, str) and
                 '\n' in o
         ):
-            kw: dict = dict(
-                escape_map=MULTILINE_STRINGS_ESCAPE_MAP,
+            return encode_string(
+                o,
                 lq='"\\\n',
+                escape_map=MULTILINE_STRINGS_ESCAPE_MAP,
+                ensure_ascii=self._ensure_ascii,
             )
 
-            if self._ensure_ascii:
-                return encode_string_ascii(o, **kw)
-            else:
-                return encode_string(o, **kw)
-
         else:
             return super()._format_scalar(o)

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/graphs/trees.py

@@ -17,7 +17,7 @@ T = ta.TypeVar('T')
 NodeT = ta.TypeVar('NodeT')
 
 NodeWalker: ta.TypeAlias = ta.Callable[[NodeT], ta.Iterable[NodeT]]
-NodeGenerator: ta.TypeAlias = ta.Generator[NodeT, None, None]
+NodeGenerator: ta.TypeAlias = ta.Generator[NodeT]
 
 
 ##

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/http/coro/server.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 # PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 # --------------------------------------------

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/inject/elements.py

@@ -24,7 +24,7 @@ class Elements(lang.Final):
     es: ta.Collection[Element] | None = None
     cs: ta.Collection['Elements'] | None = None
 
-    def __iter__(self) -> ta.Generator[Element, None, None]:
+    def __iter__(self) -> ta.Generator[Element]:
         if self.es:
             yield from self.es
         if self.cs:

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/inject/impl/injector.py

@@ -149,7 +149,7 @@ class InjectorImpl(Injector, lang.Final):
             pass
 
     @contextlib.contextmanager
-    def _current_request(self) -> ta.Generator[_Request, None, None]:
+    def _current_request(self) -> ta.Generator[_Request]:
         if (cr := self.__cur_req) is not None:
             yield cr
             return

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/inject/impl/scopes.py

@@ -155,7 +155,7 @@ class SeededScopeImpl(ScopeImpl):
             self._ssi = check.isinstance(self._ii.get_scope_impl(self._ss), SeededScopeImpl)
 
         @contextlib.contextmanager
-        def __call__(self, seeds: ta.Mapping[Key, ta.Any]) -> ta.Generator[None, None, None]:
+        def __call__(self, seeds: ta.Mapping[Key, ta.Any]) -> ta.Generator[None]:
             try:
                 if self._ssi._st is not None:  # noqa
                     raise ScopeAlreadyOpenError(self._ss)

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/inject/managed.py

@@ -26,7 +26,7 @@ T = ta.TypeVar('T')
 
 
 @contextlib.contextmanager
-def create_managed_injector(*args: Elemental) -> ta.Generator[Injector, None, None]:
+def create_managed_injector(*args: Elemental) -> ta.Generator[Injector]:
     i = create_injector(
         bind(contextlib.ExitStack, singleton=True, eager=True),
         *args,
@@ -60,7 +60,7 @@ def make_managed_provider(
 
 
 @contextlib.asynccontextmanager
-async def create_async_managed_injector(*args: Elemental) -> ta.AsyncGenerator[Injector, None]:
+async def create_async_managed_injector(*args: Elemental) -> ta.AsyncGenerator[Injector]:
     i = await _asyncs.s_to_a(create_injector)(
         bind(contextlib.AsyncExitStack, singleton=True, eager=True),
         *args,

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/inject/scopes.py

@@ -90,6 +90,6 @@ def enter_seeded_scope(
         i: injector_.Injector,
         ss: SeededScope,
         keys: ta.Mapping[Key, ta.Any],
-) -> ta.Generator[None, None, None]:
+) -> ta.Generator[None]:
     with i.provide(Key(SeededScope.Manager, tag=ss))(keys):
         yield

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/io/buffers.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 import io
 import typing as ta

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/io/compress/codecs.py

@@ -28,10 +28,10 @@ class CompressionEagerCodec(codecs.EagerCodec[bytes, bytes]):
 class CompressionIncrementalCodec(codecs.IncrementalCodec[bytes, bytes]):
     compression: IncrementalCompression
 
-    def encode_incremental(self) -> ta.Generator[bytes | None, bytes, None]:
+    def encode_incremental(self) -> ta.Generator[bytes | None, bytes]:
         return self.compression.compress_incremental()
 
-    def decode_incremental(self) -> ta.Generator[bytes | None, bytes, None]:
+    def decode_incremental(self) -> ta.Generator[bytes | None, bytes]:
         return buffer_bytes_stepped_reader_coro(self.compression.decompress_incremental())
 
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/io/compress/gzip.py

@@ -121,7 +121,7 @@ class IncrementalGzipCompressor:
         self._level = level
         self._mtime = mtime
 
-    def _write_gzip_header(self) -> ta.Generator[bytes, None, None]:
+    def _write_gzip_header(self) -> ta.Generator[bytes]:
         check.none((yield b'\037\213'))  # magic header
         check.none((yield b'\010'))  # compression method
 
@@ -267,7 +267,7 @@ class IncrementalGzipDecompressor:
             rdr: PrependableBytesCoroReader,
             crc: int,
             stream_size: int,
-    ) -> ta.Generator[int | None, bytes, None]:
+    ) -> ta.Generator[int | None, bytes]:
         # We've read to the end of the file.
         # We check that the computed CRC and size of the uncompressed data matches the stored values. Note that the size
         # stored is the true file size mod 2**32.

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/io/coro/stepped.py

@@ -196,7 +196,7 @@ def buffer_bytes_stepped_reader_coro(g: BytesSteppedReaderCoro) -> BytesSteppedC
 
 
 @lang.autostart
-def iterable_bytes_stepped_coro(g: BytesSteppedCoro) -> ta.Generator[ta.Iterator[bytes], bytes, None]:
+def iterable_bytes_stepped_coro(g: BytesSteppedCoro) -> ta.Generator[ta.Iterator[bytes], bytes]:
     i: bytes | None = check.isinstance((yield None), bytes)  # type: ignore[misc]
     eof = False
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/lite/contextmanagers.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP007 UP045
+# ruff: noqa: UP007 UP043 UP045
 import contextlib
 import functools
 import sys

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/lite/inject.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import contextlib
 import contextvars

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/marshal/__init__.py

@@ -143,6 +143,11 @@ from .polymorphism.unmarshal import (  # noqa
     make_polymorphism_unmarshaler,
 )
 
+from .singular.base64 import (  # noqa
+    BASE64_MARSHALER_FACTORY,
+    BASE64_UNMARSHALER_FACTORY,
+)
+
 from .singular.primitives import (  # noqa
     PRIMITIVE_TYPES,
 )

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/marshal/base.py

@@ -102,6 +102,9 @@ from .registries import RegistryItem
 from .values import Value
 
 
+T = ta.TypeVar('T')
+
+
 ##
 
 
@@ -382,6 +385,9 @@ class MarshalContext(BaseContext, lang.Final):
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 
+    def marshal(self, obj: ta.Any, ty: ta.Any | None = None) -> Value:
+        return self.make(ty if ty is not None else type(obj)).marshal(self, obj)
+
 
 @dc.dataclass(frozen=True)
 class UnmarshalContext(BaseContext, lang.Final):
@@ -394,6 +400,17 @@ class UnmarshalContext(BaseContext, lang.Final):
         except mfs.MatchGuardError:
             raise UnhandledTypeError(rty)  # noqa
 
+    @ta.overload
+    def unmarshal(self, v: Value, ty: type[T]) -> T:
+        ...
+
+    @ta.overload
+    def unmarshal(self, v: Value, ty: ta.Any) -> ta.Any:
+        ...
+
+    def unmarshal(self, v, ty):
+        return self.make(ty).unmarshal(self, v)
+
 
 ##
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/marshal/global_.py

@@ -30,8 +30,11 @@ def global_marshaler_factory() -> MarshalerFactory:
 
 
 def marshal(obj: ta.Any, ty: ta.Any | None = None, **kwargs: ta.Any) -> Value:
-    mc = MarshalContext(GLOBAL_REGISTRY, factory=global_marshaler_factory(), **kwargs)
-    return mc.make(ty if ty is not None else type(obj)).marshal(mc, obj)
+    return MarshalContext(
+        GLOBAL_REGISTRY,
+        factory=global_marshaler_factory(),
+        **kwargs,
+    ).marshal(obj, ty)
 
 
 ##
@@ -53,8 +56,11 @@ def unmarshal(v: Value, ty: ta.Any, **kwargs: ta.Any) -> ta.Any:
 
 
 def unmarshal(v, ty, **kwargs):
-    uc = UnmarshalContext(GLOBAL_REGISTRY, factory=global_unmarshaler_factory(), **kwargs)
-    return uc.make(ty).unmarshal(uc, v)
+    return UnmarshalContext(
+        GLOBAL_REGISTRY,
+        factory=global_unmarshaler_factory(),
+        **kwargs,
+    ).unmarshal(v, ty)
 
 
 ##

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/marshal/standard.py

@@ -1,3 +1,5 @@
+import typing as ta
+
 from .base import MarshalerFactory
 from .base import MultiMarshalerFactory
 from .base import MultiUnmarshalerFactory
@@ -26,8 +28,6 @@ from .objects.namedtuples import NamedtupleMarshalerFactory
 from .objects.namedtuples import NamedtupleUnmarshalerFactory
 from .polymorphism.unions import PrimitiveUnionMarshalerFactory
 from .polymorphism.unions import PrimitiveUnionUnmarshalerFactory
-from .singular.base64 import BASE64_MARSHALER_FACTORY
-from .singular.base64 import BASE64_UNMARSHALER_FACTORY
 from .singular.datetimes import DATETIME_MARSHALER_FACTORY
 from .singular.datetimes import DATETIME_UNMARSHALER_FACTORY
 from .singular.enums import EnumMarshalerFactory
@@ -56,7 +56,6 @@ STANDARD_MARSHALER_FACTORIES: list[MarshalerFactory] = [
     LiteralMarshalerFactory(),
     NUMBERS_MARSHALER_FACTORY,
     UUID_MARSHALER_FACTORY,
-    BASE64_MARSHALER_FACTORY,
     DATETIME_MARSHALER_FACTORY,
     MaybeMarshalerFactory(),
     MappingMarshalerFactory(),
@@ -66,12 +65,18 @@ STANDARD_MARSHALER_FACTORIES: list[MarshalerFactory] = [
 ]
 
 
-def new_standard_marshaler_factory() -> MarshalerFactory:
+def new_standard_marshaler_factory(
+        *,
+        first: ta.Iterable[MarshalerFactory] | None = None,
+        last: ta.Iterable[MarshalerFactory] | None = None,
+) -> MarshalerFactory:
     return TypeCacheMarshalerFactory(
         RecursiveMarshalerFactory(
-            MultiMarshalerFactory(
-                list(STANDARD_MARSHALER_FACTORIES),
-            ),
+            MultiMarshalerFactory([
+                *(first if first is not None else []),
+                *STANDARD_MARSHALER_FACTORIES,
+                *(last if last is not None else []),
+            ]),
         ),
     )
 
@@ -90,7 +95,6 @@ STANDARD_UNMARSHALER_FACTORIES: list[UnmarshalerFactory] = [
     LiteralUnmarshalerFactory(),
     NUMBERS_UNMARSHALER_FACTORY,
     UUID_UNMARSHALER_FACTORY,
-    BASE64_UNMARSHALER_FACTORY,
     DATETIME_UNMARSHALER_FACTORY,
     MaybeUnmarshalerFactory(),
     MappingUnmarshalerFactory(),
@@ -100,12 +104,18 @@ STANDARD_UNMARSHALER_FACTORIES: list[UnmarshalerFactory] = [
 ]
 
 
-def new_standard_unmarshaler_factory() -> UnmarshalerFactory:
+def new_standard_unmarshaler_factory(
+        *,
+        first: ta.Iterable[UnmarshalerFactory] | None = None,
+        last: ta.Iterable[UnmarshalerFactory] | None = None,
+) -> UnmarshalerFactory:
     return TypeCacheUnmarshalerFactory(
         RecursiveUnmarshalerFactory(
-            MultiUnmarshalerFactory(
-                list(STANDARD_UNMARSHALER_FACTORIES),
-            ),
+            MultiUnmarshalerFactory([
+                *(first if first is not None else []),
+                *STANDARD_UNMARSHALER_FACTORIES,
+                *(last if last is not None else []),
+            ]),
         ),
     )
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/specs/jmespath/lexer.py

@@ -48,7 +48,7 @@ class Lexer:
         self._enable_legacy_literals = False
         self._current: str | None = None
 
-    def tokenize(self, expression: str, options: Options | None = None) -> ta.Generator[Token, None, None]:
+    def tokenize(self, expression: str, options: Options | None = None) -> ta.Generator[Token]:
         if options is not None:
             self._enable_legacy_literals = options.enable_legacy_literals
 

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/term/progressbar.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 import sys
 import time

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/omlish/testing/pytest/inject/harness.py

@@ -65,7 +65,7 @@ class Harness:
     ##
 
     @contextlib.contextmanager
-    def activate(self) -> ta.Generator[ta.Self, None, None]:
+    def activate(self) -> ta.Generator[ta.Self]:
         check.none(self._inj)
         check.not_in(self, _ACTIVE_HARNESSES)
         _ACTIVE_HARNESSES.add(self)
@@ -107,7 +107,7 @@ class Harness:
             self,
             pytest_scope: PytestScope,
             request: pytest.FixtureRequest,
-    ) -> ta.Generator[None, None, None]:
+    ) -> ta.Generator[None]:
         ss = _SCOPES_BY_PYTEST_SCOPE[pytest_scope]
         with inj.enter_seeded_scope(check.not_none(self._inj), ss, {
             inj.Key(pytest.FixtureRequest, tag=pytest_scope): request,

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev355 → omlish-0.0.0.dev357}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.13'
-version = '0.0.0.dev355'
+version = '0.0.0.dev357'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',