omlish 0.0.0.dev315__py3-none-any.whl → 0.0.0.dev316__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev315'
-__revision__ = '9f4bb119f0561532694288dd8bb808ce67ebb43d'
+__version__ = '0.0.0.dev316'
+__revision__ = 'c32f4122c29baf0486a328e8d6e54beb8c47b3fc'
 
 
 #

omlish/formats/json/encoding.py

@@ -1,6 +1,9 @@
 import json
 
 
+##
+
+
 detect_encoding = json.detect_encoding
 
 

omlish/formats/json/literals.py

@@ -15,6 +15,7 @@
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# https://github.com/simplejson/simplejson/blob/6932004966ab70ef47250a2b3152acd8c904e6b5/simplejson/encoder.py
 # https://github.com/simplejson/simplejson/blob/6932004966ab70ef47250a2b3152acd8c904e6b5/simplejson/scanner.py
 import json
 import re
@@ -25,6 +26,75 @@ import typing as ta
 ##
 
 
+_ESCAPE_PAT = re.compile(r'[\x00-\x1f\\"]')
+_ESCAPE_ASCII_PAT = re.compile(r'([\\"]|[^\ -~])')
+
+_ESCAPE_DCT = {
+    **{
+        chr(i): f'\\u{i:04x}'
+        for i in range(0x20)
+    },
+    '\\': '\\\\',
+    '"': '\\"',
+    '\b': '\\b',
+    '\f': '\\f',
+    '\n': '\\n',
+    '\r': '\\r',
+    '\t': '\\t',
+}
+
+
+def _convert_to_string(s: str | bytes) -> str:
+    if isinstance(s, bytes):
+        return str(s, 'utf-8')
+
+    elif type(s) is not str:
+        # Convert a str subclass instance to exact str. Raise a TypeError otherwise.
+        return str.__str__(s)
+
+    else:
+        return s
+
+
+def encode_string(s: str | bytes, q: str = '"') -> str:
+    """Return a JSON representation of a Python string"""
+
+    s = _convert_to_string(s)
+
+    def replace(m):
+        return _ESCAPE_DCT[m.group(0)]
+
+    return q + _ESCAPE_PAT.sub(replace, s) + q
+
+
+def encode_string_ascii(s: str | bytes, q: str = '"') -> str:
+    """Return an ASCII-only JSON representation of a Python string"""
+
+    s = _convert_to_string(s)
+
+    def replace(m):
+        s = m.group(0)
+
+        try:
+            return _ESCAPE_DCT[s]
+
+        except KeyError:
+            n = ord(s)
+            if n < 0x10000:
+                return f'\\u{n:04x}'
+
+            # surrogate pair
+            n -= 0x10000
+            s1 = 0xD800 | ((n >> 10) & 0x3FF)
+            s2 = 0xDC00 | (n & 0x3FF)
+            return f'\\u{s1:04x}\\u{s2:04x}'
+
+    return q + str(_ESCAPE_ASCII_PAT.sub(replace, s)) + q
+
+
+##
+
+
 _FOUR_DIGIT_HEX_PAT = re.compile(r'^[0-9a-fA-F]{4}$')
 
 
@@ -86,7 +156,7 @@ def parse_string(
         prev_end = end
         end = chunk.end()
         content, terminator = chunk.groups()
-        # Content is contains zero or more unescaped string characters
+        # Content contains zero or more unescaped string characters
         if content:
             chunks.append(content)
 

omlish/formats/json/rendering.py

@@ -12,12 +12,13 @@ from .types import Scalar
 
 I = ta.TypeVar('I')
 
-MULTILINE_SEPARATORS = consts.Separators(',', ': ')
-
 
 ##
 
 
+MULTILINE_SEPARATORS = consts.Separators(',', ': ')
+
+
 class AbstractJsonRenderer(lang.Abstract, ta.Generic[I]):
     class State(enum.Enum):
         VALUE = enum.auto()

omlish/http/coro/server.py

@@ -56,8 +56,7 @@ import abc
 import dataclasses as dc
 import email.utils
 import html
-import http.client
-import http.server
+import http
 import io
 import textwrap
 import time

omlish/lang/__init__.py

@@ -225,13 +225,6 @@ from .iterables import (  # noqa
     take,
 )
 
-from .maybes import (  # noqa
-    Maybe,
-    empty,
-    just,
-    maybe,
-)
-
 from .objects import (  # noqa
     Identity,
     SimpleProxy,
@@ -341,6 +334,13 @@ from ..lite.imports import (  # noqa
     import_module_attr,
 )
 
+from ..lite.maybes import (  # noqa
+    Maybe,
+)
+
+empty = Maybe.empty
+just = Maybe.just
+
 from ..lite.reprs import (  # noqa
     AttrRepr,
     attr_repr,

omlish/lang/generators.py

@@ -2,10 +2,8 @@ import abc
 import functools
 import typing as ta
 
+from ..lite.maybes import Maybe
 from .classes.restrict import Abstract
-from .maybes import Maybe
-from .maybes import empty
-from .maybes import just
 
 
 T = ta.TypeVar('T')
@@ -203,7 +201,7 @@ class GeneratorMappedIterator(ta.Generic[O, I, R]):
 
         self._g = g
         self._it = it
-        self._value: Maybe[R] = empty()
+        self._value: Maybe[R] = Maybe.empty()
 
     @property
     def g(self) -> ta.Generator[O, I, R]:
@@ -225,7 +223,7 @@ class GeneratorMappedIterator(ta.Generic[O, I, R]):
         try:
             o = self._g.send(i)
         except StopIteration as e:
-            self._value = just(e.value)
+            self._value = Maybe.just(e.value)
             raise StopIteration from e
         return o
 

omlish/lang/params.py

@@ -7,12 +7,10 @@ import enum
 import inspect
 import typing as ta
 
+from ..lite.maybes import Maybe
 from .classes.abstract import Abstract
 from .classes.restrict import Final
 from .classes.restrict import Sealed
-from .maybes import Maybe
-from .maybes import empty
-from .maybes import just
 
 
 T = ta.TypeVar('T')
@@ -25,7 +23,7 @@ T = ta.TypeVar('T')
 class Param(Sealed, Abstract):
     name: str
 
-    annotation: Maybe = empty()
+    annotation: Maybe = Maybe.empty()
 
     prefix: ta.ClassVar[str] = ''
 
@@ -57,7 +55,7 @@ class KwargsParam(VarParam, Final):
 
 @dc.dataclass(frozen=True, unsafe_hash=True)
 class ValParam(Param):
-    default: Maybe = empty()
+    default: Maybe = Maybe.empty()
 
 
 @dc.dataclass(frozen=True, unsafe_hash=True)
@@ -83,9 +81,9 @@ class ParamSeparator(enum.Enum):
 
 def _inspect_empty_to_maybe(o: T) -> Maybe[T]:
     if o is inspect.Parameter.empty:
-        return empty()
+        return Maybe.empty()
     else:
-        return just(o)
+        return Maybe.just(o)
 
 
 class ParamSpec(ta.Sequence[Param], Final):
@@ -119,8 +117,8 @@ class ParamSpec(ta.Sequence[Param], Final):
             if i < offset:
                 continue
 
-            ann = _inspect_empty_to_maybe(ip.annotation) if not strip_annotations else empty()
-            dfl = _inspect_empty_to_maybe(ip.default) if not strip_defaults else empty()
+            ann = _inspect_empty_to_maybe(ip.annotation) if not strip_annotations else Maybe.empty()
+            dfl = _inspect_empty_to_maybe(ip.default) if not strip_defaults else Maybe.empty()
 
             if ip.kind == inspect.Parameter.POSITIONAL_ONLY:
                 ps.append(PosOnlyParam(ip.name, ann, dfl))

omlish/lite/maybes.py

@@ -1,15 +1,23 @@
+# ruff: noqa: UP007
 import abc
 import functools
 import typing as ta
 
 
 T = ta.TypeVar('T')
+U = ta.TypeVar('U')
 
 
 ##
 
 
+@functools.total_ordering
 class Maybe(ta.Generic[T]):
+    class ValueNotPresentError(BaseException):
+        pass
+
+    #
+
     @property
     @abc.abstractmethod
     def present(self) -> bool:
@@ -19,9 +27,102 @@ class Maybe(ta.Generic[T]):
     def must(self) -> T:
         raise NotImplementedError
 
+    #
+
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __hash__(self) -> int:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __eq__(self, other) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __lt__(self, other) -> bool:
+        raise NotImplementedError
+
+    #
+
+    @ta.final
+    def __ne__(self, other):
+        return not (self == other)
+
+    @ta.final
+    def __iter__(self) -> ta.Iterator[T]:
+        if self.present:
+            yield self.must()
+
+    @ta.final
+    def __bool__(self) -> ta.NoReturn:
+        raise TypeError
+
+    #
+
+    @ta.final
+    def if_present(self, consumer: ta.Callable[[T], None]) -> None:
+        if self.present:
+            consumer(self.must())
+
+    @ta.final
+    def filter(self, predicate: ta.Callable[[T], bool]) -> 'Maybe[T]':
+        if self.present and predicate(self.must()):
+            return self
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def map(self, mapper: ta.Callable[[T], U]) -> 'Maybe[U]':
+        if self.present:
+            return Maybe.just(mapper(self.must()))
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def flat_map(self, mapper: ta.Callable[[T], 'Maybe[U]']) -> 'Maybe[U]':
+        if self.present:
+            if not isinstance(v := mapper(self.must()), Maybe):
+                raise TypeError(v)
+            return v
+        else:
+            return Maybe.empty()
+
+    @ta.final
+    def or_else(self, other: ta.Union[T, U]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return other
+
+    @ta.final
+    def or_else_get(self, supplier: ta.Callable[[], ta.Union[T, U]]) -> ta.Union[T, U]:
+        if self.present:
+            return self.must()
+        else:
+            return supplier()
+
+    @ta.final
+    def or_else_raise(self, exception_supplier: ta.Callable[[], Exception]) -> T:
+        if self.present:
+            return self.must()
+        else:
+            raise exception_supplier()
+
+    #
+
+    @classmethod
+    def of_optional(cls, v: ta.Optional[T]) -> 'Maybe[T]':
+        if v is not None:
+            return cls.just(v)
+        else:
+            return cls.empty()
+
     @classmethod
     def just(cls, v: T) -> 'Maybe[T]':
-        return tuple.__new__(_Maybe, (v,))  # noqa
+        return _JustMaybe(v)
 
     _empty: ta.ClassVar['Maybe']
 
@@ -30,33 +131,76 @@ class Maybe(ta.Generic[T]):
         return Maybe._empty
 
 
-class _Maybe(Maybe[T], tuple):
-    __slots__ = ()
+##
 
-    def __init_subclass__(cls, **kwargs):
-        raise TypeError
+
+class _Maybe(Maybe[T], abc.ABC):
+    def __lt__(self, other):
+        if not isinstance(other, _Maybe):
+            return NotImplemented
+        sp = self.present
+        op = other.present
+        if self.present and other.present:
+            return self.must() < other.must()
+        else:
+            return op and not sp
+
+
+class _JustMaybe(_Maybe[T]):
+    __slots__ = ('_v', '_hash')
+
+    def __init__(self, v: T) -> None:
+        super().__init__()
+
+        self._v = v
 
     @property
     def present(self) -> bool:
-        return bool(self)
+        return True
 
     def must(self) -> T:
-        if not self:
-            raise ValueError
-        return self[0]
+        return self._v
 
+    #
 
-Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
+    def __repr__(self) -> str:
+        return f'just({self._v!r})'
 
+    def __hash__(self) -> int:
+        try:
+            return self._hash  # type: ignore[has-type]
+        except AttributeError:
+            pass
+        h = self._hash = hash((_JustMaybe, self._v))
+        return h
 
-##
+    def __eq__(self, other):
+        return (
+            self.__class__ is other.__class__ and
+            self._v == other._v  # noqa
+        )
+
+
+class _EmptyMaybe(_Maybe[T]):
+    __slots__ = ()
+
+    @property
+    def present(self) -> bool:
+        return False
+
+    def must(self) -> T:
+        raise Maybe.ValueNotPresentError
+
+    #
+
+    def __repr__(self) -> str:
+        return 'empty()'
 
+    def __hash__(self) -> int:
+        return hash(_EmptyMaybe)
 
-@functools.singledispatch
-def as_maybe(obj: ta.Any) -> Maybe:
-    raise TypeError(obj)
+    def __eq__(self, other):
+        return self.__class__ is other.__class__
 
 
-@as_maybe.register
-def _(obj: Maybe) -> Maybe:
-    return obj
+Maybe._empty = _EmptyMaybe()  # noqa

omlish/logs/callers.py

@@ -7,6 +7,9 @@ import types
 import typing as ta
 
 
+##
+
+
 class LoggingCaller(ta.NamedTuple):
     filename: str
     lineno: int

omlish/logs/color.py

@@ -6,6 +6,9 @@ from ..term import codes as tc
 from .standard import StandardLogFormatter
 
 
+##
+
+
 class ColorLogFormatter(StandardLogFormatter):
     LEVEL_COLORS: ta.Mapping[int, tc.SGRs.FG] = {
         logging.WARNING: tc.SGRs.FG.BRIGHT_YELLOW,

omlish/logs/filters.py

@@ -4,7 +4,14 @@ import logging
 import threading
 
 
+##
+
+
 class TidLogFilter(logging.Filter):
     def filter(self, record):
-        record.tid = threading.get_native_id()
+        # FIXME: handle better - missing from wasm and cosmos
+        if hasattr(threading, 'get_native_id'):
+            record.tid = threading.get_native_id()
+        else:
+            record.tid = '?'
         return True

omlish/logs/handlers.py

@@ -4,6 +4,9 @@ import logging
 import typing as ta
 
 
+##
+
+
 class ListHandler(logging.Handler):
     def __init__(self) -> None:
         super().__init__()

omlish/logs/json.py

@@ -10,6 +10,9 @@ import typing as ta
 from ..lite.json import json_dumps_compact
 
 
+##
+
+
 class JsonLogFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,

omlish/logs/noisy.py

@@ -1,6 +1,9 @@
 import logging
 
 
+##
+
+
 NOISY_LOGGERS: set[str] = {
     'boto3.resources.action',
     'datadog.dogstatsd',

omlish/logs/proxy.py

@@ -3,6 +3,9 @@
 import logging
 
 
+##
+
+
 class ProxyLogFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying

omlish/logs/utils.py

@@ -2,6 +2,9 @@ import functools
 import logging
 
 
+##
+
+
 _log = logging.getLogger(__name__)
 
 

{omlish-0.0.0.dev315.dist-info → omlish-0.0.0.dev316.dist-info}/METADATA

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

{omlish-0.0.0.dev315.dist-info → omlish-0.0.0.dev316.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=LDFOlaYknirgV_RjbBKwDWTdloPE5HH2GlmJgG9phI4,3478
+omlish/__about__.py,sha256=Lteg-7hW9bBGPlLc6vR48ef4x6Ods9p5RyKlY5-teWw,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -262,10 +262,10 @@ omlish/formats/ini/sections.py,sha256=7wYyZdVTQbMPFpjQEACKJfAEPzUBrogINsrvFgxJoZ
 omlish/formats/json/__init__.py,sha256=HXFv4VDTBhx0k5U4JYWZqxziBwzJoPX51QK3xIboT8U,786
 omlish/formats/json/codecs.py,sha256=E5KErfqsgGZq763ixXLT3qysbk5MIsypT92xG5aSaIs,796
 omlish/formats/json/consts.py,sha256=A0cTAGGLyjo-gcYIQrL4JIaardI0yPMhQoNmh42BaRg,387
-omlish/formats/json/encoding.py,sha256=O4iIWle7W_-RwpOvJNlqOfkbnDyiQHexV5Za4hlrFzw,497
+omlish/formats/json/encoding.py,sha256=iwoYyJePibgvRDZ6e9b2OlXmOBJEczquRNoiffVf3hE,502
 omlish/formats/json/json.py,sha256=Mdqv2vdMi7gp96eV0BIYH5UdWpjWfsh-tSMZeywG-08,331
-omlish/formats/json/literals.py,sha256=6ptwZyfTXodEtAjDnUhsx6XU3KRZWWYWKYtZ8T7rzsQ,5625
-omlish/formats/json/rendering.py,sha256=r6J5YKSzcxPg_RiG5idGqJ-AIZozJQ_Awj6W_oSGRjk,4555
+omlish/formats/json/literals.py,sha256=NMMBhP43cX2mfpiFsMysQWhbSBc0Ux-zegiah62cSmE,7198
+omlish/formats/json/rendering.py,sha256=rWDIiGvLQ0GkCyOKsPywFSo3FdYJ-pCHyrX6MCqitRs,4556
 omlish/formats/json/types.py,sha256=ueO9-uOU2eVWowJf0LH1fHFLjZ6fTIZyq9qybcLQaiQ,147
 omlish/formats/json/backends/__init__.py,sha256=gnaNDCxy_KmmPUPDnjxO5_WjuWxLGbI9FYWx8ZJuQUU,97
 omlish/formats/json/backends/base.py,sha256=WqtyoM82pyM0NyqpPwndrebr1bUVU1QlpmVQNrcAO8c,1114
@@ -335,7 +335,7 @@ omlish/http/clients/httpx.py,sha256=Grl9_sG7QNIZj8HqaU7XduAsBDyfXl36RjbYQzQqal0,
 omlish/http/clients/urllib.py,sha256=DVKFPLQzANiZmwnlbFw5pWs5ZPLLvvgCb3UInvCSqPE,2701
 omlish/http/coro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/http/coro/fdio.py,sha256=bd9K4EYVWbXV3e3npDPXI9DuDAruJiyDmrgFpgNcjzY,4035
-omlish/http/coro/server.py,sha256=30FTcJG8kuFeThf0HJYpTzMZN-giLTBP7wr5Wl3b9X0,18285
+omlish/http/coro/server.py,sha256=r8qfVLn-wdB_GI0n41NjhHg72JU5K8-JZgU-KhuVoDs,18259
 omlish/http/coro/simple.py,sha256=inWA_ss6Nz5Rqmy4dL9_SGah4anYoDecDTRQqVIGYeY,3200
 omlish/http/coro/sockets.py,sha256=rtpZZ-XCOfC5tXr4Fmo1HSn-8f5nxfIOlJaPUkQeDyU,1654
 omlish/inject/__init__.py,sha256=pY-A8Q4v08-Xa4a-XdZ3lSFC3OwCO2T9HhesB67Q4tQ,1895
@@ -402,7 +402,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=7T9vv39wNkm9jb0LOpzQ1eMxtoMbltMCU554FqTZ4eY,5908
+omlish/lang/__init__.py,sha256=Zs5YE5F7rq2cdEqK2e6QuamTQGGwLaM0OP_RNOmcT1A,5921
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -413,13 +413,12 @@ omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
 omlish/lang/functions.py,sha256=75JhKRNhe2iDeqN7yCdLTw_q5k1VFpdphypqb4yy2I0,6298
-omlish/lang/generators.py,sha256=yd3ebG2LlA3XQImP8rplt6tSToXwMxhlGRGCkdJ87ME,5230
+omlish/lang/generators.py,sha256=a4D5HU_mySs2T2z3xCmE_s3t4QJkj0YRrK4-hhpGd0A,5197
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
 omlish/lang/iterables.py,sha256=StoGp9yaP3njdLKHoWYcEevO3eE8SHEPYl5_avZob24,2149
-omlish/lang/maybes.py,sha256=pb1YrxmpXy-hWKmWR89GxXqZq1MoUD1uuTaTX30peh0,3697
 omlish/lang/objects.py,sha256=nbxBHfQHVw0OG4qeSTP2GvIiFIcH2tbbitY8y-mYPPo,5959
 omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
-omlish/lang/params.py,sha256=QmNVBfJsfxjDG5ilDPgHV7sK4UwRztkSQdLTo0umb8I,6648
+omlish/lang/params.py,sha256=sfbNoGrKCsAtubFufj_uh_WKshIgA8fqJ4PmLH1PH00,6639
 omlish/lang/recursion.py,sha256=1VfSqzKO-8Is3t9LKw0W4jwPfE0aBS70EUlbUxAx4eE,1900
 omlish/lang/resolving.py,sha256=ei9LDyJexsMMHB9z8diUkNmynWhd_da7h7TqrMYM6lA,1611
 omlish/lang/resources.py,sha256=WKkAddC3ctMK1bvGw-elGe8ZxAj2IaUTKVSu2nfgHTo,2839
@@ -453,7 +452,7 @@ omlish/lite/inject.py,sha256=-tTsOqqef-Ix5Tgl2DP_JAsNWJQDFUptERl3lk14Uzs,29007
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=4DCbLoimLwJakihpvMjJ_kpc7v9aZQY8P3-gkoqEGUE,18471
-omlish/lite/maybes.py,sha256=I7b2dJFkDll4B_QDlI6iKJG8fy91L6_Tj_s5eB3KI7Q,1013
+omlish/lite/maybes.py,sha256=00UUjtI29-gQD3sjgogIqxl74iD395GqdDQB-k0nxm8,4363
 omlish/lite/pycharm.py,sha256=pUOJevrPClSqTCEOkQBO11LKX2003tfDcp18a03QFrc,1163
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
 omlish/lite/reprs.py,sha256=QI5VBtvq_TW1TojWL25c04QfOABLi8Smt5jc5J-bArc,2008
@@ -468,18 +467,18 @@ omlish/lite/typing.py,sha256=U3-JaEnkDSYxK4tsu_MzUn3RP6qALBe5FXQXpD-licE,1090
 omlish/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/logs/abc.py,sha256=ho4ABKYMKX-V7g4sp1BByuOLzslYzLlQ0MESmjEpT-o,8005
 omlish/logs/all.py,sha256=Er2NIcDvlMpuAcRr9b_uMHeoERU7I6lu5oLrDGRdV0U,728
-omlish/logs/callers.py,sha256=W0BdEtuGkQ0JM-FCsXQIBQCsNUbIsbDrtCaJy9DStk4,1143
-omlish/logs/color.py,sha256=CM-ceoPXs0j5_klnZDJkFCFRgHOToFzJyLjC6LsnPEk,665
+omlish/logs/callers.py,sha256=aCAT-B161IB211x5CGMYGbzzrNut7xWGYJ_E1rZpan0,1148
+omlish/logs/color.py,sha256=u1-6ulsxTWMPyeKu-pCQyF5_ljuEeuG4FG7i6DTzHe0,670
 omlish/logs/configs.py,sha256=XOc8rWxfPpPMxJESVD2mLCUoLtbQnGnZwvYhhqe7DD8,772
-omlish/logs/filters.py,sha256=2noFRyBez3y519fpfsDSt1vo8wX-85b8sMXZi5o_xyE,208
-omlish/logs/handlers.py,sha256=zgSnKQA5q9Fu7T0Nkd7twog9H1Wg9-bDCzz4_F1TOBo,319
-omlish/logs/json.py,sha256=zyqMWpZY3lk4WRk4wgmataBomGX9S3iDsydiM1sS-lI,1366
-omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
+omlish/logs/filters.py,sha256=rNmRtoAktUT-CG__hgqW-8aSdR9ocby4pUmP1wKf4Vk,370
+omlish/logs/handlers.py,sha256=wymFmRO8fcBePyfir9U4FIHzWuyW0D_HwEQAiIQLwAk,324
+omlish/logs/json.py,sha256=muekHkKmGIqq_wr-tV94WwXjNFtUBbFeRdni-JhrCkA,1371
+omlish/logs/noisy.py,sha256=hWpbseerZqlHdEPEajDTSmcRhx8LmmNAxz_7GBZAO9s,353
 omlish/logs/protocol.py,sha256=dfAR0_5kLEAkx0nhuWBhWMTVjWjhEl2uL-MxejrW1lk,4732
-omlish/logs/proxy.py,sha256=A-ROPUUAlF397qTbEqhel6YhQMstNuXL3Xmts7w9dAo,2347
+omlish/logs/proxy.py,sha256=hypbn_x-lGJChP6iHPN3ZkyEA9rw1tbAnGd4aAuc0fk,2352
 omlish/logs/standard.py,sha256=FbKdF2Z4Na5i2TNwKn0avLJXyICe2JKsPufjvKCHGn0,3162
 omlish/logs/timing.py,sha256=XrFUHIPT4EHDujLKbGs9fGFMmoM3NEP8xPRaESJr7bQ,1513
-omlish/logs/utils.py,sha256=mzHrZ9ji75p5A8qR29eUr05CBAHMb8J753MSkID_VaQ,393
+omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/manifests/base.py,sha256=D1WvJYcBR_njkc0gpALpFCWh1h3agb9qgqphnbbPlm4,935
 omlish/manifests/load.py,sha256=9mdsS3egmSX9pymO-m-y2Fhs4p6ruOdbsYaKT1-1Hwg,6655
@@ -853,9 +852,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev315.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev315.dist-info/METADATA,sha256=Ork2jAan-wlGr9Z5xsOAkIrAD3jNAWqjaz6nKg7XiUs,4416
-omlish-0.0.0.dev315.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-omlish-0.0.0.dev315.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev315.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev315.dist-info/RECORD,,
+omlish-0.0.0.dev316.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev316.dist-info/METADATA,sha256=-NOxa8LncyL8kMJ9KG9rdMF4oCf60aY1fALrI0TCdMg,4416
+omlish-0.0.0.dev316.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+omlish-0.0.0.dev316.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev316.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev316.dist-info/RECORD,,

omlish/lang/maybes.py

@@ -1,157 +0,0 @@
-import abc
-import typing as ta
-
-from ..lite.maybes import Maybe as _LiteMaybe
-from ..lite.maybes import as_maybe as _as_lite_maybe
-
-
-T = ta.TypeVar('T')
-U = ta.TypeVar('U')
-
-
-##
-
-
-class ValueNotPresentException(BaseException):
-    pass
-
-
-class Maybe(abc.ABC, ta.Generic[T]):
-    @property
-    @abc.abstractmethod
-    def present(self) -> bool:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def must(self) -> T:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def __call__(self) -> T:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def __iter__(self) -> ta.Iterator[T]:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def __getitem__(self, item: int) -> T:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def if_present(self, consumer: ta.Callable[[T], None]) -> None:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def filter(self, predicate: ta.Callable[[T], bool]) -> 'Maybe[T]':
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def map(self, mapper: ta.Callable[[T], U]) -> 'Maybe[U]':
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def flat_map(self, mapper: ta.Callable[[T], 'Maybe[U]']) -> 'Maybe[U]':
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def or_else(self, other: T | U) -> T | U:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def or_else_get(self, supplier: ta.Callable[[], U]) -> T | U:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def or_else_raise(self, exception_supplier: ta.Callable[[], Exception]) -> T:
-        raise NotImplementedError
-
-
-class _Maybe(Maybe[T], tuple):
-    __slots__ = ()
-
-    def __init_subclass__(cls, **kwargs):
-        raise TypeError
-
-    @property
-    def present(self) -> bool:
-        return bool(self)
-
-    def must(self) -> T:
-        if not self:
-            raise ValueNotPresentException
-        return self[0]
-
-    __call__ = must
-
-    def __iter__(self) -> ta.Iterator[T]:
-        raise TypeError
-
-    locals()['__iter__'] = tuple.__iter__
-
-    def __getitem__(self, item: int) -> T:  # type: ignore
-        raise TypeError
-
-    locals()['__getitem__'] = tuple.__getitem__
-
-    def if_present(self, consumer: ta.Callable[[T], None]) -> None:
-        if self:
-            consumer(self[0])
-
-    def filter(self, predicate: ta.Callable[[T], bool]) -> Maybe[T]:
-        return self if self and predicate(self[0]) else _empty
-
-    def map(self, mapper: ta.Callable[[T], U]) -> Maybe[U]:
-        if self:
-            return just(mapper(self[0]))
-        return _empty  # noqa
-
-    def flat_map(self, mapper: ta.Callable[[T], Maybe[U]]) -> Maybe[U]:
-        if self:
-            value = mapper(self[0])
-            if not isinstance(value, Maybe):
-                raise TypeError(value)
-            return value
-        return _empty  # noqa
-
-    def or_else(self, other: T | U) -> T | U:
-        return self.must() if self else other
-
-    def or_else_get(self, supplier: ta.Callable[[], T | U]) -> T | U:
-        return self.must() if self else supplier()
-
-    def or_else_raise(self, exception_supplier: ta.Callable[[], Exception]) -> T:
-        if self:
-            return self.must()
-        raise exception_supplier()
-
-
-#
-
-
-def just(v: T) -> Maybe[T]:
-    return tuple.__new__(_Maybe, (v,))  # noqa
-
-
-_empty = tuple.__new__(_Maybe, ())
-
-
-def empty() -> Maybe[T]:
-    return _empty  # noqa
-
-
-def maybe(o: T | None) -> Maybe[T]:
-    if o is None:
-        return _empty  # noqa
-    return just(o)
-
-
-##
-
-
-@_as_lite_maybe.register
-def _(obj: Maybe) -> _LiteMaybe:
-    if obj.present:
-        return _LiteMaybe.just(obj.must())
-    else:
-        return _LiteMaybe.empty()