omlish 0.0.0.dev431__py3-none-any.whl → 0.0.0.dev433__py3-none-any.whl

omlish/logs/standard.py

@@ -80,10 +80,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -104,11 +108,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #

omlish/logs/std/formatters.py

@@ -0,0 +1,25 @@
+import logging
+import typing as ta
+
+from ..formatters import LoggingContextFormatter
+from .records import LoggingContextLogRecord
+from .records import LogRecordLoggingContext
+
+
+##
+
+
+@ta.final
+class StdLoggingFormatter(logging.Formatter):
+    def __init__(self, ctx_formatter: LoggingContextFormatter) -> None:
+        super().__init__()
+
+        self._ctx_formatter = ctx_formatter
+
+    def format(self, rec: logging.LogRecord) -> str:
+        if isinstance(rec, LoggingContextLogRecord):
+            ctx = rec._logging_context  # noqa
+        else:
+            ctx = LogRecordLoggingContext(rec)
+
+        return self._ctx_formatter.format(ctx)

omlish/logs/std/records.py

@@ -11,6 +11,7 @@ import typing as ta
 
 from ...lite.abstract import Abstract
 from ..contexts import LoggingContext
+from ..contexts import LoggingContextInfoT
 from ..infos import LoggingContextInfo
 from ..infos import LoggingContextInfos
 from ..infos import LoggingExcInfoTuple
@@ -235,22 +236,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -356,8 +341,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -393,9 +393,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -548,16 +548,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -571,7 +566,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -581,13 +584,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -613,7 +616,56 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
+
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)

omlish/logs/typed/bindings.py

@@ -16,6 +16,7 @@ from ...lite.abstract import Abstract
 from .types import TYPED_LOGGER_VALUE_OR_PROVIDER_OR_ABSENT_TYPES
 from .types import TYPED_LOGGER_VALUE_OR_PROVIDER_TYPES
 from .types import DefaultTypedLoggerValue
+from .types import MultiTypedLoggerValue
 from .types import TypedLoggerConstFieldValue
 from .types import TypedLoggerField
 from .types import TypedLoggerFieldValue
@@ -92,6 +93,9 @@ class TypedLoggerBindings(Abstract):
         accept_value: ta.Callable[[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent], None]
         accept_values: ta.Callable[[ta.Iterable[ta.Tuple[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent]]], None]  # noqa
 
+        accept_multi_value: ta.Callable[[ta.Type[MultiTypedLoggerValue], MultiTypedLoggerValue], None]  # noqa
+        accept_multi_values: ta.Callable[[ta.Iterable[ta.Tuple[ta.Type[MultiTypedLoggerValue], MultiTypedLoggerValue]]], None]  # noqa
+
         accept_const_values: ta.Callable[[ta.Iterable[ta.Tuple[ta.Type[TypedLoggerValue], TypedLoggerValueOrAbsent]]], None]  # noqa
 
         accept_value_wrapping: ta.Callable[[ta.Union['TypedLoggerValueWrapper', 'FullTypedLoggerBindings._ValueWrappingState']], None]  # noqa
@@ -110,19 +114,11 @@ class FullTypedLoggerBindings(TypedLoggerBindings):
             self,
             *items: TypedLoggerBindingItem,
             override: bool = False,
+            override_multis: bool = False,
     ) -> None:
         kd: ta.Dict[str, TypedLoggerFieldValue] = {}
         dup_kd: ta.Dict[str, ta.List[TypedLoggerFieldValue]] = {}
 
-        vd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent] = {}
-        dup_vd: ta.Dict[ta.Type[TypedLoggerValue], ta.List[TypedLoggerValueOrProviderOrAbsent]] = {}
-
-        cvd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrAbsent] = {}
-
-        vwl: ta.List[ta.Union[TypedLoggerValueWrapper, FullTypedLoggerBindings._ValueWrappingState]] = []
-
-        vst: TypedLoggerBindings._Visitor
-
         if not override:
             def add_kd(kd_k: str, kd_v: TypedLoggerFieldValue) -> None:  # noqa
                 if kd_k in kd:
@@ -130,42 +126,71 @@ class FullTypedLoggerBindings(TypedLoggerBindings):
                 else:
                     kd[kd_k] = kd_v
 
+            def add_kds(it: 'ta.Iterable[ta.Tuple[str, TypedLoggerFieldValue]]') -> None:  # noqa
+                collections.deque(itertools.starmap(add_kd, it), maxlen=0)
+
+        else:
+            add_kd = kd.__setitem__  # type: ignore[assignment]
+            add_kds = kd.update  # type: ignore[assignment]
+
+        #
+
+        vd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent] = {}
+        dup_vd: ta.Dict[ta.Type[TypedLoggerValue], ta.List[TypedLoggerValueOrProviderOrAbsent]] = {}
+
+        if not override:
             def add_vd(vd_k: 'ta.Type[TypedLoggerValue]', vd_v: TypedLoggerValueOrProviderOrAbsent) -> None:  # noqa
                 if vd_k in vd:
                     dup_vd.setdefault(vd_k, []).append(vd_v)
                 else:
                     vd[vd_k] = vd_v
 
-            def add_kds(it: 'ta.Iterable[ta.Tuple[str, TypedLoggerFieldValue]]') -> None:  # noqa
-                collections.deque(itertools.starmap(add_kd, it), maxlen=0)
-
             def add_vds(it: 'ta.Iterable[ta.Tuple[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent]]') -> None:  # noqa
                 collections.deque(itertools.starmap(add_vd, it), maxlen=0)
 
-            vst = TypedLoggerBindings._Visitor(  # noqa
-                add_kd,
-                add_kds,
+        else:
+            add_vd = vd.__setitem__  # type: ignore[assignment]
+            add_vds = vd.update  # type: ignore[assignment]
 
-                add_vd,
-                add_vds,
+        #
 
-                cvd.update,
+        mvd: ta.Dict[ta.Type[MultiTypedLoggerValue], ta.List[MultiTypedLoggerValue]] = {}
 
-                vwl.append,
-            )
+        if override_multis:
+            def add_mvd(mvd_k: 'ta.Type[MultiTypedLoggerValue]', mvd_v: MultiTypedLoggerValue) -> None:  # noqa
+                try:
+                    mvd_l = mvd[mvd_k]
+                except KeyError:
+                    mvd_l = mvd[mvd_k] = []
+                mvd_l.append(mvd_v)
+
+            def add_mvds(it: 'ta.Iterable[ta.Tuple[ta.Type[MultiTypedLoggerValue], MultiTypedLoggerValue]]') -> None:
+                collections.deque(itertools.starmap(add_mvd, it), maxlen=0)
 
         else:
-            vst = TypedLoggerBindings._Visitor(  # noqa
-                kd.__setitem__,
-                kd.update,
+            add_mvd = mvd.__setitem__  # type: ignore[assignment]
+            add_mvds = mvd.update  # type: ignore[assignment]
+
+        #
 
-                vd.__setitem__,
-                vd.update,
+        cvd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrAbsent] = {}
 
-                cvd.update,
+        vwl: ta.List[ta.Union[TypedLoggerValueWrapper, FullTypedLoggerBindings._ValueWrappingState]] = []
 
-                vwl.append,
-            )
+        vst = TypedLoggerBindings._Visitor(  # noqa
+            add_kd,
+            add_kds,
+
+            add_vd,
+            add_vds,
+
+            add_mvd,
+            add_mvds,
+
+            cvd.update,
+
+            vwl.append,
+        )
 
         for o in items:
             o._typed_logger_visit_bindings(vst)  # noqa
@@ -288,18 +313,22 @@ class ChainTypedLoggerBindings(TypedLoggerBindings):
         kd: ta.Dict[str, TypedLoggerFieldValue] = {}
         dup_kd: ta.Dict[str, ta.List[TypedLoggerFieldValue]] = {}
 
-        vd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent] = {}
-        dup_vd: ta.Dict[ta.Type[TypedLoggerValue], ta.List[TypedLoggerValueOrProviderOrAbsent]] = {}
-
-        pcv = dict(parent.const_value_map)
-        cvd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrAbsent] = {}
-
         def add_kd(kd_k: str, kd_v: TypedLoggerFieldValue) -> None:  # noqa
             if kd_k in kd:
                 dup_kd.setdefault(kd_k, []).append(kd_v)
             else:
                 kd[kd_k] = kd_v
 
+        def add_kds(it: 'ta.Iterable[ta.Tuple[str, TypedLoggerFieldValue]]') -> None:  # noqa
+            collections.deque(itertools.starmap(add_kd, it), maxlen=0)
+
+        #
+
+        vd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent] = {}
+        dup_vd: ta.Dict[ta.Type[TypedLoggerValue], ta.List[TypedLoggerValueOrProviderOrAbsent]] = {}
+
+        pcv = dict(parent.const_value_map)
+
         def add_vd(vd_k: 'ta.Type[TypedLoggerValue]', vd_v: TypedLoggerValueOrProviderOrAbsent) -> None:  # noqa
             if vd_k in vd:
                 dup_vd.setdefault(vd_k, []).append(vd_v)
@@ -307,12 +336,27 @@ class ChainTypedLoggerBindings(TypedLoggerBindings):
                 vd[vd_k] = vd_v
                 pcv.pop(vd_k, None)
 
-        def add_kds(it: 'ta.Iterable[ta.Tuple[str, TypedLoggerFieldValue]]') -> None:  # noqa
-            collections.deque(itertools.starmap(add_kd, it), maxlen=0)
-
         def add_vds(it: 'ta.Iterable[ta.Tuple[ta.Type[TypedLoggerValue], TypedLoggerValueOrProviderOrAbsent]]') -> None:  # noqa
             collections.deque(itertools.starmap(add_vd, it), maxlen=0)
 
+        #
+
+        mvd: ta.Dict[ta.Type[MultiTypedLoggerValue], ta.List[MultiTypedLoggerValue]] = {}
+
+        def add_mvd(mvd_k: 'ta.Type[MultiTypedLoggerValue]', mvd_v: MultiTypedLoggerValue) -> None:  # noqa
+            try:
+                mvd_l = mvd[mvd_k]
+            except KeyError:
+                mvd_l = mvd[mvd_k] = []
+            mvd_l.append(mvd_v)
+
+        def add_mvds(it: 'ta.Iterable[ta.Tuple[ta.Type[MultiTypedLoggerValue], MultiTypedLoggerValue]]') -> None:
+            collections.deque(itertools.starmap(add_mvd, it), maxlen=0)
+
+        #
+
+        cvd: ta.Dict[ta.Type[TypedLoggerValue], TypedLoggerValueOrAbsent] = {}
+
         def bad_type(*args, **kwargs):  # noqa
             raise ChainTypedLoggerBindingsUnhandledItemError
 
@@ -323,6 +367,9 @@ class ChainTypedLoggerBindings(TypedLoggerBindings):
             add_vd,
             add_vds,
 
+            add_mvd,
+            add_mvds,
+
             cvd.update,
 
             bad_type,

omlish/logs/typed/types.py

@@ -181,7 +181,6 @@ class TypedLoggerValue(Abstract, ta.Generic[T]):
     def _typed_logger_unwrap_field_value(self, ctx: 'TypedLoggerContext') -> UnwrappedTypedLoggerFieldValue:  # noqa
         return self._v
 
-    @ta.final
     def _typed_logger_visit_bindings(self, vst: 'TypedLoggerBindings._Visitor') -> None:  # noqa
         vst.accept_values(((type(self), self),))
         vst.accept_const_values(((type(self), self),))
@@ -233,6 +232,22 @@ class DefaultTypedLoggerValue(TypedLoggerValue[T], Abstract):
         return (cls.default_provider().provide_value(ctx),)
 
 
+class MultiTypedLoggerValue(TypedLoggerValue[T], Abstract):
+    """
+    Note: There is no DefaultMultiTypedLoggerValue.
+    """
+
+    @classmethod
+    @abc.abstractmethod
+    def merge_values(cls, *values: T) -> T:
+        raise NotImplementedError
+
+    #
+
+    def _typed_logger_visit_bindings(self, vst: 'TypedLoggerBindings._Visitor') -> None:  # noqa
+        vst.accept_multi_values(((type(self), self),))
+
+
 ##
 
 

omlish/marshal/__init__.py

@@ -32,7 +32,7 @@ _dc.init_package(
 from .. import lang as _lang  # noqa
 
 
-with _lang.auto_proxy_init(globals()) as _api_cap:
+with _lang.auto_proxy_init(globals()):
     ##
 
     from .base.configs import (  # noqa

omlish/typedvalues/__init__.py

@@ -1,7 +1,7 @@
 from .. import lang as _lang
 
 
-with _lang.auto_proxy_init(globals()) as _api_cap:
+with _lang.auto_proxy_init(globals()):
     ##
 
     from .accessor import (  # noqa

{omlish-0.0.0.dev431.dist-info → omlish-0.0.0.dev433.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev431
+Version: 0.0.0.dev433
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -18,7 +18,7 @@ Provides-Extra: all
 Requires-Dist: anyio~=4.10; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: greenlet~=3.2; extra == "all"
-Requires-Dist: trio~=0.30; extra == "all"
+Requires-Dist: trio~=0.31; extra == "all"
 Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.4; extra == "all"
 Requires-Dist: python-snappy~=0.7; extra == "all"
@@ -58,7 +58,7 @@ Provides-Extra: async
 Requires-Dist: anyio~=4.10; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
 Requires-Dist: greenlet~=3.2; extra == "async"
-Requires-Dist: trio~=0.30; extra == "async"
+Requires-Dist: trio~=0.31; extra == "async"
 Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compress
 Requires-Dist: lz4~=4.4; extra == "compress"

{omlish-0.0.0.dev431.dist-info → omlish-0.0.0.dev433.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=97GWFEknID3F3E0pQg-motu-qzosiRJoPv7G2fgbbpI,3575
+omlish/__about__.py,sha256=Zv_1p0fhbJrF6QKOgRP0K5IQT7b_xpYlyQIa4fTot7w,3575
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -415,7 +415,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=M16LXrJhMdsz5ea2qH0vws30ZvhQuQSCVFSLpRf_gTg,2096
 omlish/iterators/unique.py,sha256=BSE-eanva8byFCJi09Nt2zzTsVr8LnTqY1PIInGYRs0,1396
-omlish/lang/__init__.py,sha256=Ty5DkVFyGztlpYVEcEP1yTvLbflRFTo6IThN8dPMnbI,10096
+omlish/lang/__init__.py,sha256=lgRNRbIwj0FAU6PH4MMU9fqP5A1NI9wcHHWK8LjFyBg,10222
 omlish/lang/asyncs.py,sha256=rfpLE2ZacVKGYB9DSFuMBurQzkPRjB1qljcS3sIuSsw,1767
 omlish/lang/attrstorage.py,sha256=UUnoENCMQF3twBfxBcIKa5mpXsAxWnNYDayhU8xgmpU,5224
 omlish/lang/casing.py,sha256=3_c7cxQOc4z_YezaU2B4NCTAsPh_kDL4wUTK5kZU6kg,4675
@@ -439,7 +439,7 @@ omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
 omlish/lang/params.py,sha256=sfbNoGrKCsAtubFufj_uh_WKshIgA8fqJ4PmLH1PH00,6639
 omlish/lang/recursion.py,sha256=1VfSqzKO-8Is3t9LKw0W4jwPfE0aBS70EUlbUxAx4eE,1900
 omlish/lang/resolving.py,sha256=nMosn-rcYjI8t6b35oICDyPw6t6-HvWj5jMdkfn1jfA,1612
-omlish/lang/resources.py,sha256=QtuybNgdw5e2QL3jtKi-5ENH98JemsMRi21A40tYrzA,2844
+omlish/lang/resources.py,sha256=awfh33Uxkd9Ho-5Z3d9CPWQE3gjktV0XWM6XbdG0ejA,2845
 omlish/lang/strings.py,sha256=TY-v0iGu6BxEKb99YS-VmIJqc-sTAqMv7mCDJQALMnI,4550
 omlish/lang/sys.py,sha256=KPe1UOXk1VxlOYt_aLmhN0KqsA4wnP-4nm4WEwO49pw,411
 omlish/lang/typing.py,sha256=ZN4t8oGSSknf_T1HbfqVQ7Y9OOZ1RkikYihNxdBlTFQ,3733
@@ -455,9 +455,11 @@ omlish/lang/classes/restrict.py,sha256=CUyvLpMYiQwTjpzo5sdG_lQxdeEIq2z2xSVNrsI9K
 omlish/lang/classes/simple.py,sha256=3AJSs-plVg2flq4SC6I39LxP0nBaB241puv3D5YCP5I,2973
 omlish/lang/classes/virtual.py,sha256=J4y-uiv1RaP2rfFeptXqQ1a4MRek0TMlAFFraO_lzhs,3397
 omlish/lang/imports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/lang/imports/capture.py,sha256=hy9hgUmY1e9ElS6NfMuFdm-uY4hdnzQ7uBvuUVW4i-Y,15078
 omlish/lang/imports/conditional.py,sha256=R-E47QD95mMonPImWlrde3rnJrFKCCkYz71c94W05sc,1006
-omlish/lang/imports/lazy.py,sha256=Fhtb5tSAttff6G2pZdF8bh__GZlqJWHaMKtA8KubuX4,1479
-omlish/lang/imports/proxyinit.py,sha256=VrCnc4XNfwiJU18GNc3tFGxHSx5QxgyAfqyuJiCH66Y,19721
+omlish/lang/imports/lazy.py,sha256=Eefs9hkj5surMdwgxX_Q3BOqPcox10v0sKT5rKIQknc,808
+omlish/lang/imports/proxy.py,sha256=6c4L-njdAOsGrhi-gdv_R3nHBEiPS7BWHaBU7-YOBfk,1553
+omlish/lang/imports/proxyinit.py,sha256=W7_FxDxe4aAQLUxNF1U6-2JROwK75HgRGEGidDKB-t0,4400
 omlish/lang/imports/resolving.py,sha256=DeRarn35Fryg5JhVhy8wbiC9lvr58AnllI9B_reswUE,2085
 omlish/lang/imports/traversal.py,sha256=pbFQIa880NGjSfcLsno2vE_G41_CLwDHb-7gWg2J3BI,2855
 omlish/lifecycles/__init__.py,sha256=zOuvV4pErPwxcKUSgshmME2Duw9GrjwckpNmW3FPKng,810
@@ -497,29 +499,31 @@ omlish/lite/types.py,sha256=QM9whf55r7TmmQBRApIWSlyVKsl1p_jcut_YheyZMFY,146
 omlish/lite/typing.py,sha256=m2CyJTz2OVOCPRvp-0UuEx7oleZgXqs3rYXijE0bTsA,1280
 omlish/lite/wrappers.py,sha256=d00Ls2kFHuogKd5wEBaU65VNCN10YXIZtiwu1mbMpmA,530
 omlish/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/logs/all.py,sha256=l_MrBOWT2WGEfCq6uD44N-dJJmoRrdtk3A_fmsRh3SE,1561
+omlish/logs/all.py,sha256=GqST35bRnHgpGmQXvtHih7kLaw5DcFgB32uxPGAsgSI,1717
 omlish/logs/base.py,sha256=Z1hfwYS2LgMJxFIyHiOvYa2meu2MH3kQDkhaWRNzt0M,5698
-omlish/logs/contexts.py,sha256=w4f_Ok_TmnaARIm-JSzwvHTbXriMLi13l62YKf2lbeE,4442
+omlish/logs/contexts.py,sha256=qMX-BrOKmYIBOXIlSntKJT9mcsRryTqfcTFp9K1GJmE,4836
+omlish/logs/formatters.py,sha256=g8oGfP_ok0nrW9opIIh5LqcQTmdufWFGO-9pRKX4m3Q,242
 omlish/logs/infos.py,sha256=Nr2SbyI978vP5BTiVZsXUBdy2k0CUiwggcW-wewJHmo,11560
 omlish/logs/levels.py,sha256=Eze-k_LPgFzbNMnG10F2bRKfL3veQpIxiegvN5rGeWM,2909
 omlish/logs/modules.py,sha256=wZ_PNCYhAaEdnGE5k0JvChcqn9nhtEpmwuH74Bwn5gg,266
 omlish/logs/protocols.py,sha256=e_zizD3pQdYlU6bg3xGB3_ARUTcoHUfar_uLjCo-SPw,961
-omlish/logs/standard.py,sha256=ppho-wDecGxUiRXOdCIlblmrQhqXZ0oQOGayy8N53XY,3237
+omlish/logs/standard.py,sha256=btp0YOUb3AsANG0D1rqGK-z25O4HN7p1PJj9ecJ80WI,3323
 omlish/logs/utils.py,sha256=fKvP342qBmE8wwTgUQ8Tf0-ATVhCm90UYBQt2pk0044,1883
 omlish/logs/warnings.py,sha256=xyhDgiPy1p8Kp5D9sb_NZiBnQ26SUppaHqC27dtQzok,67
 omlish/logs/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/logs/std/configs.py,sha256=aDQahqBJXJpmQBaxXVK5S2xi_I_nrLLcCLTq6Q2K6EQ,1037
 omlish/logs/std/filters.py,sha256=Z8tHOvBRiP-OYm2z5cwY-lYXRimNgferEARMwvwx5Pw,380
+omlish/logs/std/formatters.py,sha256=mORjx6kPQ-nYvek0Lyg1PZh0vtSYr6Vk-UJtRNW9_8k,645
 omlish/logs/std/handlers.py,sha256=uTWOT6oayBUEftKmJ8yo89ZP4plv5eQ8Lbcmt-IGl8c,469
 omlish/logs/std/json.py,sha256=QJ5lywLsRsPyVno2nk2kOw-Z1z3bfrDiZzqcRUdWUMY,1382
 omlish/logs/std/loggers.py,sha256=hJIEC5BGaDOxgikTYKJ_qA_moS4CcHLMDAVKFDDKdHo,1144
 omlish/logs/std/noisy.py,sha256=hWpbseerZqlHdEPEajDTSmcRhx8LmmNAxz_7GBZAO9s,353
 omlish/logs/std/proxy.py,sha256=9MVV5kbj9nwl3KZGtrYCIb5XTpv33f33zZ7P_B58fX0,2394
-omlish/logs/std/records.py,sha256=dgTc46fnYNckjJ8J0KLdInAc56BW45xN85Rr-0LFxCE,24224
+omlish/logs/std/records.py,sha256=oI3eVPzoCNPRiEh2hA8BDKp1vM3uetYecek1AB0B3UA,25426
 omlish/logs/typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/logs/typed/bindings.py,sha256=H_B-3LTGFlBIWYDJ8rei1VMfInE8KrBwRo3bJ_BgFj8,18184
+omlish/logs/typed/bindings.py,sha256=7F6zPZKJ0cclg58xIMMrOG-vLv1KJ5dsXGwg9glSZFg,19919
 omlish/logs/typed/contexts.py,sha256=MU1RqHtmYbnxoLfLhMZbTbRd-WfYEyeVo7_3VnG3rY0,4027
-omlish/logs/typed/types.py,sha256=DQKDT2v4bG1Cgv_LrhvTIHWBAIODs9b8E5jNI4jTRpU,14442
+omlish/logs/typed/types.py,sha256=VTxsDN7qN9-WnwxOBI7OFH1taOuLscTpm3t8edJpNik,14838
 omlish/logs/typed/values.py,sha256=s8x-P6tYq-BrhoA98Z5tfi70Tl1hHhcxOd1qao_h6ps,3278
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/manifests/base.py,sha256=wW-De-pU3cef-0vGsgo-ypftDwc3tCBxhRAzPtrdark,918
@@ -527,7 +531,7 @@ omlish/manifests/globals.py,sha256=kVqQ-fT4kc7xWzLHoI731GviitFPv2v2yqw-p7t7Exs,2
 omlish/manifests/loading.py,sha256=s6KnhdFQCsI2i0Rus1sMU0so2v8dUBnk59BJkSnxGt8,17514
 omlish/manifests/static.py,sha256=9BaPBLkuzxHmg5A-5k9BjjBFINCdmFOIu06dMFgCfz4,497
 omlish/manifests/types.py,sha256=NeOGuIVrcbqjCDbQ3MnCxxHAgHnw0CkWJsBzo230PWE,453
-omlish/marshal/__init__.py,sha256=cdRll_tPZaTBIY0yLejCXZdZB3fUVkIoDMb8aESLkl8,5981
+omlish/marshal/__init__.py,sha256=_QPYoxtmqfd2szwSuPtbIU8RwTIh_5gTJm--yvVWMcY,5969
 omlish/marshal/globals.py,sha256=Q6G18hcUwUDDNnpyRPnR5Tn_XZpZCSIEXo09nYSOaNU,2236
 omlish/marshal/naming.py,sha256=Mk5YrbES836_KflNNRoc5Ajd96iMYLQIMERKx1KpT4g,865
 omlish/marshal/standard.py,sha256=6L4FK7QVgVFAf2jkTQlCvN-15DWK49VCNlNwCBea3-8,6674
@@ -880,7 +884,7 @@ omlish/text/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B
 omlish/text/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=zbcPEDWsdj7GAemtu0x8nwMqpIu2C_5iInSwn6mMWlE,9142
-omlish/typedvalues/__init__.py,sha256=F3cUtl4Cm1StZxRBkFIRjuw3wPjEch8HdQZVG3a9AyU,948
+omlish/typedvalues/__init__.py,sha256=dQpM8VaON8S7dUv1LBwhyBDjUVo7EW475a9DpnDQz1E,936
 omlish/typedvalues/accessor.py,sha256=2PQVoFrrCTOcZACAQ28GOvF9xhKyKz27GMSfS0xq5Pc,3184
 omlish/typedvalues/collection.py,sha256=CK4Vk9kJqAt2V8o6I4zGyv2u9DKov12uSvsGdqEd2Ws,5793
 omlish/typedvalues/consumer.py,sha256=lDOE-O_sgGbOvbcBg2g5ZRaV2WixnuEYxFsJBaj18oU,4690
@@ -890,9 +894,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev431.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev431.dist-info/METADATA,sha256=aD7Uh6H4jnPflXmcY4m60rgjHwCO4L4QARCK8oMQDgQ,19243
-omlish-0.0.0.dev431.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev431.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev431.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev431.dist-info/RECORD,,
+omlish-0.0.0.dev433.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev433.dist-info/METADATA,sha256=a9lNv9FCJuo46oSrJsrL-E9-E4739mvReWcPY-T9BtM,19243
+omlish-0.0.0.dev433.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev433.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev433.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev433.dist-info/RECORD,,