omlish 0.0.0.dev245__py3-none-any.whl → 0.0.0.dev246__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev245'
-__revision__ = 'c3979ac75a1b25b3c679bc0310afb6364c124c4c'
+__version__ = '0.0.0.dev246'
+__revision__ = '796628c78050f0ca988bfa17c2f5a5cad5ee9056'
 
 
 #

omlish/collections/__init__.py

@@ -63,7 +63,6 @@ from .mappings import (  # noqa
     DynamicTypeMap,
     guarded_map_update,
     multikey_dict,
-    yield_dict_init,
 )
 
 from .ordered import (  # noqa

omlish/collections/frozen.py

@@ -3,7 +3,7 @@ import collections.abc
 import itertools
 import typing as ta
 
-from .mappings import yield_dict_init
+from .. import lang
 
 
 T = ta.TypeVar('T')
@@ -27,7 +27,7 @@ class FrozenDict(ta.Mapping[K, V], Frozen):
         if len(args) > 1:
             raise TypeError(args)
         self._dct: dict[K, V] = {}
-        self._dct.update(yield_dict_init(*args, **kwargs))
+        self._dct.update(lang.yield_dict_init(*args, **kwargs))
 
     @property
     def debug(self) -> ta.Mapping[K, V]:

omlish/collections/hasheq.py

@@ -8,7 +8,6 @@ import dataclasses as dc
 import typing as ta
 
 from .. import lang
-from .mappings import yield_dict_init
 
 
 K = ta.TypeVar('K')
@@ -64,7 +63,7 @@ class HashEqMap(ta.MutableMapping[K, V]):
         self._dct: dict[int, list[HashEqMap._Node[K, V]]] = {}
         self._len = 0
 
-        for k, v in yield_dict_init(*args, **kwargs):
+        for k, v in lang.yield_dict_init(*args, **kwargs):
             self[k] = v
 
     def __len__(self) -> int:

omlish/collections/identity.py

@@ -4,7 +4,6 @@ import typing as ta
 import weakref
 
 from .. import lang
-from .mappings import yield_dict_init
 
 
 T = ta.TypeVar('T')
@@ -38,7 +37,7 @@ class IdentityKeyDict(ta.MutableMapping[K, V]):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__()
         self._dict: dict[int, tuple[K, V]] = {}
-        for k, v in yield_dict_init(*args, **kwargs):
+        for k, v in lang.yield_dict_init(*args, **kwargs):
             self[k] = v
 
     @property

omlish/collections/mappings.py

@@ -1,4 +1,3 @@
-import collections.abc
 import typing as ta
 import weakref
 
@@ -33,21 +32,6 @@ def guarded_map_update(
     return dst
 
 
-def yield_dict_init(*args, **kwargs) -> ta.Iterable[tuple[ta.Any, ta.Any]]:
-    if len(args) > 1:
-        raise TypeError
-    if args:
-        [src] = args
-        if isinstance(src, collections.abc.Mapping):
-            for k in src:
-                yield (k, src[k])
-        else:
-            for k, v in src:
-                yield (k, v)
-    for k, v in kwargs.items():
-        yield (k, v)
-
-
 class TypeMap(ta.Generic[T]):
     def __init__(self, items: ta.Iterable[T] = ()) -> None:
         super().__init__()

omlish/collections/sorted/sorted.py

@@ -2,7 +2,6 @@ import abc
 import typing as ta
 
 from ... import lang
-from ..mappings import yield_dict_init
 
 
 T = ta.TypeVar('T')
@@ -83,7 +82,7 @@ class SortedListDict(SortedMutableMapping[K, V]):
     def __init__(self, impl: SortedCollection, *args, **kwargs) -> None:
         super().__init__()
         self._impl = impl
-        for k, v in yield_dict_init(*args, **kwargs):
+        for k, v in lang.yield_dict_init(*args, **kwargs):
             self[k] = v
 
     @property

omlish/daemons/services.py

@@ -1,3 +1,10 @@
+"""
+TODO:
+ - jsonl pidfile
+  - time started
+  - code version / revision
+  - venv?
+"""
 import abc
 import threading
 import typing as ta

omlish/dataclasses/__init__.py

@@ -108,6 +108,9 @@ from .utils import (  # noqa
     update_fields,
     update_fields_metadata,
 
+    shallow_astuple,
+    shallow_asdict,
+
     deep_replace,
 
     iter_items,

omlish/dataclasses/utils.py

@@ -32,6 +32,9 @@ def fields_dict(cls_or_instance: ta.Any) -> dict[str, dc.Field]:
     return {f.name: f for f in dc.fields(cls_or_instance)}
 
 
+##
+
+
 class field_modifier:  # noqa
     def __init__(self, fn: ta.Callable[[dc.Field], dc.Field]) -> None:
         super().__init__()
@@ -112,6 +115,17 @@ def update_fields_metadata(
 ##
 
 
+def shallow_astuple(o: ta.Any) -> tuple[ta.Any, ...]:
+    return tuple(getattr(o, f.name) for f in dc.fields(o))
+
+
+def shallow_asdict(o: ta.Any) -> dict[str, ta.Any]:
+    return {f.name: getattr(o, f.name) for f in dc.fields(o)}
+
+
+##
+
+
 def deep_replace(o: T, *args: str | ta.Callable[[ta.Any], ta.Mapping[str, ta.Any]]) -> T:
     if not args:
         return o

omlish/http/handlers.py

@@ -79,6 +79,22 @@ class LoggingHttpHandler(HttpHandler_):
         return resp
 
 
+@dc.dataclass(frozen=True)
+class ExceptionLoggingHttpHandler(HttpHandler_):
+    handler: HttpHandler
+    log: logging.Logger
+    message: ta.Union[str, ta.Callable[[HttpHandlerRequest, BaseException], str]] = 'Error in http handler'
+
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        try:
+            return self.handler(req)
+        except Exception as e:  # noqa
+            if callable(msg := self.message):
+                msg = msg(req, e)
+            self.log.exception(msg)
+            raise
+
+
 ##
 
 

omlish/lang/__init__.py

@@ -1,5 +1,6 @@
 from .attrs import (  # noqa
     AttrOps,
+    DictAttrOps,
     STD_ATTR_OPS,
     StdAttrOps,
     TRANSIENT_ATTR_OPS,
@@ -76,6 +77,11 @@ from .cmp import (  # noqa
     cmp,
 )
 
+from .collections import (  # noqa
+    merge_dicts,
+    yield_dict_init,
+)
+
 from .contextmanagers import (  # noqa
     AsyncContextManager,
     ContextManaged,

omlish/lang/attrs.py

@@ -47,6 +47,35 @@ STD_ATTR_OPS = StdAttrOps()
 ##
 
 
+class DictAttrOps(AttrOps):
+    def __init__(self, dct: ta.MutableMapping[str, ta.Any] | None = None) -> None:
+        super().__init__()
+
+        if dct is None:
+            dct = {}
+        self._dct = dct
+
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
+        try:
+            return self._dct[name]
+        except KeyError:
+            if default is not AttrOps.NOT_SET:
+                return default
+            raise AttributeError(name) from None
+
+    def setattr(self, obj: ta.Any, name: str, value: ta.Any) -> None:
+        self._dct[name] = value
+
+    def delattr(self, obj: ta.Any, name: str) -> None:
+        try:
+            del self._dct[name]
+        except KeyError:
+            raise AttributeError(name) from None
+
+
+##
+
+
 class TransientDict(collections.abc.MutableMapping):
     def __init__(self) -> None:
         super().__init__()

omlish/lang/cached/function.py

@@ -6,6 +6,7 @@ TODO:
   - must support free functions (which have no instance nor owner)
   - 'staticmethod' or effective equiv - which must resolve to the shared instance
    - and must be transient?
+ - use __transient_dict__ to support common state nuking
 """
 import dataclasses as dc
 import functools

omlish/lang/collections.py

@@ -0,0 +1,50 @@
+import collections.abc
+import typing as ta
+
+
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+
+
+##
+
+
+def yield_dict_init(*args: ta.Any, **kwargs: ta.Any) -> ta.Iterable[tuple[ta.Any, ta.Any]]:
+    if len(args) > 1:
+        raise TypeError
+    if args:
+        [src] = args
+        if isinstance(src, collections.abc.Mapping):
+            for k in src:
+                yield (k, src[k])
+        else:
+            for k, v in src:
+                yield (k, v)
+    for k, v in kwargs.items():
+        yield (k, v)
+
+
+def merge_dicts(
+        *dcts: ta.Mapping[K, V],
+        pair_fn: ta.Callable[[K, V], tuple[K, V] | None] | None = None,
+        conflict_fn: ta.Callable[[K, V, V], tuple[K, V] | None] | None = None,
+) -> dict[K, V]:
+    out: dict[K, V] = {}
+
+    for d in dcts:
+        for k_v in d.items():
+            if pair_fn is not None and (k_v := pair_fn(*k_v)) is None:  # type: ignore[assignment]
+                continue
+
+            k, v = k_v
+            if k in out:
+                if conflict_fn is None:
+                    raise KeyError(k)
+
+                if (k_v := conflict_fn(k, out[k], v)) is None:  # type: ignore[assignment]
+                    continue
+                k, v = k_v
+
+            out[k] = v
+
+    return out

omlish/marshal/__init__.py

@@ -28,6 +28,16 @@ from .base import (  # noqa
     ReflectOverride,
 )
 
+from .composite.iterables import (  # noqa
+    IterableMarshaler,
+    IterableUnmarshaler,
+)
+
+from .composite.wrapped import (  # noqa
+    WrappedMarshaler,
+    WrappedUnmarshaler,
+)
+
 from .exceptions import (  # noqa
     ForbiddenTypeError,
     MarshalError,
@@ -49,6 +59,14 @@ from .naming import (  # noqa
     translate_name,
 )
 
+from .objects.dataclasses import (  # noqa
+    AbstractDataclassFactory,
+    DataclassMarshalerFactory,
+    DataclassUnmarshalerFactory,
+    get_dataclass_field_infos,
+    get_dataclass_metadata,
+)
+
 from .objects.helpers import (  # noqa
     update_field_metadata,
     update_fields_metadata,
@@ -75,14 +93,18 @@ from .objects.unmarshal import (  # noqa
 )
 
 from .polymorphism.marshal import (  # noqa
+    PolymorphismMarshaler,
     PolymorphismMarshalerFactory,
     make_polymorphism_marshaler,
 )
 
 from .polymorphism.metadata import (  # noqa
+    FieldTypeTagging,
     Impl,
     Impls,
     Polymorphism,
+    TypeTagging,
+    WrapperTypeTagging,
     polymorphism_from_subclasses,
 )
 
@@ -97,6 +119,7 @@ from .polymorphism.unions import (  # noqa
 )
 
 from .polymorphism.unmarshal import (  # noqa
+    PolymorphismUnmarshaler,
     PolymorphismUnmarshalerFactory,
     make_polymorphism_unmarshaler,
 )

omlish/marshal/composite/wrapped.py

@@ -0,0 +1,26 @@
+import dataclasses as dc
+import typing as ta
+
+from ..base import MarshalContext
+from ..base import Marshaler
+from ..base import UnmarshalContext
+from ..base import Unmarshaler
+from ..values import Value
+
+
+@dc.dataclass(frozen=True)
+class WrappedMarshaler(Marshaler):
+    wrapper: ta.Callable[[MarshalContext, ta.Any], ta.Any]
+    m: Marshaler
+
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        return self.m.marshal(ctx, self.wrapper(ctx, o))
+
+
+@dc.dataclass(frozen=True)
+class WrappedUnmarshaler(Unmarshaler):
+    unwrapper: ta.Callable[[UnmarshalContext, ta.Any], ta.Any]
+    u: Unmarshaler
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        return self.unwrapper(ctx, self.u.unmarshal(ctx, v))

omlish/marshal/objects/dataclasses.py

@@ -41,12 +41,16 @@ def get_dataclass_metadata(ty: type) -> ObjectMetadata:
     ) or ObjectMetadata()
 
 
-def get_field_infos(
+def get_dataclass_field_infos(
         ty: type,
-        opts: col.TypeMap[Option] = col.TypeMap(),
+        opts: col.TypeMap[Option] | None = None,
 ) -> FieldInfos:
+    if opts is None:
+        opts = col.TypeMap()
+
     dc_md = get_dataclass_metadata(ty)
     dc_naming = dc_md.field_naming or opts.get(Naming)
+    dc_rf = dc.reflect(ty)
 
     fi_defaults = {
         k: v
@@ -62,18 +66,24 @@ def get_field_infos(
     type_hints = ta.get_type_hints(ty)
 
     ret: list[FieldInfo] = []
-    for field in dc.fields(ty):
+    for field in dc_rf.fields.values():
         if (f_naming := field.metadata.get(Naming, dc_naming)) is not None:
             um_name = translate_name(field.name, f_naming)
         else:
             um_name = field.name
 
+        f_ty: ta.Any
+        if (cpx := dc_rf.cls_params_extras) is not None and cpx.generic_init:
+            f_ty = dc_rf.generic_replaced_field_annotations[field.name]
+        else:
+            f_ty = type_hints[field.name]
+
         fi_kw = dict(fi_defaults)
         fo_kw = dict(fo_defaults)
 
         fi_kw.update(
             name=field.name,
-            type=type_hints[field.name],
+            type=f_ty,
             metadata=FieldMetadata(),
 
             marshal_name=um_name,
@@ -158,7 +168,22 @@ def _make_field_obj(ctx, ty, obj, fac):
 ##
 
 
-class DataclassMarshalerFactory(MarshalerFactory):
+class AbstractDataclassFactory(lang.Abstract):
+    def _get_metadata(self, ty: type) -> ObjectMetadata:
+        return get_dataclass_metadata(ty)
+
+    def _get_field_infos(
+            self,
+            ty: type,
+            opts: col.TypeMap[Option] | None = None,
+    ) -> FieldInfos:
+        return get_dataclass_field_infos(ty, opts)
+
+
+##
+
+
+class DataclassMarshalerFactory(AbstractDataclassFactory, MarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
@@ -167,8 +192,8 @@ class DataclassMarshalerFactory(MarshalerFactory):
         check.state(dc.is_dataclass(ty))
         check.state(not lang.is_abstract_class(ty))
 
-        dc_md = get_dataclass_metadata(ty)
-        fis = get_field_infos(ty, ctx.options)
+        dc_md = self._get_metadata(ty)
+        fis = self._get_field_infos(ty, ctx.options)
 
         fields = [
             (fi, _make_field_obj(ctx, fi.type, fi.metadata.marshaler, fi.metadata.marshaler_factory))
@@ -185,7 +210,7 @@ class DataclassMarshalerFactory(MarshalerFactory):
 ##
 
 
-class DataclassUnmarshalerFactory(UnmarshalerFactory):
+class DataclassUnmarshalerFactory(AbstractDataclassFactory, UnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
         return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
 
@@ -194,8 +219,8 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
         check.state(dc.is_dataclass(ty))
         check.state(not lang.is_abstract_class(ty))
 
-        dc_md = get_dataclass_metadata(ty)
-        fis = get_field_infos(ty, ctx.options)
+        dc_md = self._get_metadata(ty)
+        fis = self._get_field_infos(ty, ctx.options)
 
         d: dict[str, tuple[FieldInfo, Unmarshaler]] = {}
         defaults: dict[str, ta.Any] = {}
@@ -213,7 +238,7 @@ class DataclassUnmarshalerFactory(UnmarshalerFactory):
                     raise Exception(f'Embedded fields cannot have specials: {e_ty}')
 
                 embeds[fi.name] = e_ty
-                for e_fi in get_field_infos(e_ty, ctx.options):
+                for e_fi in self._get_field_infos(e_ty, ctx.options):
                     e_ns = add_field(e_fi, prefixes=[p + ep for p in prefixes for ep in fi.unmarshal_names])
                     embeds_by_unmarshal_name.update({e_f: (fi.name, e_fi.name) for e_f in e_ns})
                     ret.extend(e_ns)

omlish/marshal/objects/namedtuples.py

@@ -22,7 +22,7 @@ from .unmarshal import ObjectUnmarshaler
 ##
 
 
-def _is_named_tuple(rty: rfl.Type) -> bool:
+def _is_namedtuple(rty: rfl.Type) -> bool:
     return (
         isinstance(rty, type) and
         issubclass(rty, tuple) and
@@ -30,11 +30,11 @@ def _is_named_tuple(rty: rfl.Type) -> bool:
     )
 
 
-def get_field_infos(
+def get_namedtuple_field_infos(
         ty: type,
         opts: col.TypeMap[Option] = col.TypeMap(),
 ) -> FieldInfos:
-    check.arg(_is_named_tuple(ty), ty)
+    check.arg(_is_namedtuple(ty), ty)
 
     sig = inspect.signature(ty)
 
@@ -57,14 +57,14 @@ def get_field_infos(
 
 class NamedtupleMarshalerFactory(MarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return _is_named_tuple(rty)
+        return _is_namedtuple(rty)
 
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
-        check.state(_is_named_tuple(rty))
+        check.state(_is_namedtuple(rty))
         ty = check.isinstance(rty, type)
         check.state(not lang.is_abstract_class(ty))
 
-        fis = get_field_infos(ty, ctx.options)
+        fis = get_namedtuple_field_infos(ty, ctx.options)
 
         fields = [
             (fi, ctx.make(fi.type))
@@ -81,14 +81,14 @@ class NamedtupleMarshalerFactory(MarshalerFactory):
 
 class NamedtupleUnmarshalerFactory(UnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return _is_named_tuple(rty)
+        return _is_namedtuple(rty)
 
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
-        check.state(_is_named_tuple(rty))
+        check.state(_is_namedtuple(rty))
         ty = check.isinstance(rty, type)
         check.state(not lang.is_abstract_class(ty))
 
-        fis = get_field_infos(ty, ctx.options)
+        fis = get_namedtuple_field_infos(ty, ctx.options)
 
         d: dict[str, tuple[FieldInfo, Unmarshaler]] = {}
         defaults: dict[str, ta.Any] = {}

omlish/marshal/polymorphism/marshal.py

@@ -1,7 +1,9 @@
+import abc
 import dataclasses as dc
 import typing as ta
 
 from ... import check
+from ... import lang
 from ... import reflect as rfl
 from ..base import MarshalContext
 from ..base import Marshaler
@@ -17,20 +19,32 @@ from .metadata import WrapperTypeTagging
 ##
 
 
+class PolymorphismMarshaler(Marshaler, lang.Abstract):
+    @abc.abstractmethod
+    def get_impls(self) -> ta.Mapping[type, tuple[str, Marshaler]]:
+        raise NotImplementedError
+
+
 @dc.dataclass(frozen=True)
-class WrapperPolymorphismMarshaler(Marshaler):
+class WrapperPolymorphismMarshaler(PolymorphismMarshaler):
     m: ta.Mapping[type, tuple[str, Marshaler]]
 
+    def get_impls(self) -> ta.Mapping[type, tuple[str, Marshaler]]:
+        return self.m
+
     def marshal(self, ctx: MarshalContext, o: ta.Any | None) -> Value:
         tag, m = self.m[type(o)]
         return {tag: m.marshal(ctx, o)}
 
 
 @dc.dataclass(frozen=True)
-class FieldPolymorphismMarshaler(Marshaler):
+class FieldPolymorphismMarshaler(PolymorphismMarshaler):
     m: ta.Mapping[type, tuple[str, Marshaler]]
     tf: str
 
+    def get_impls(self) -> ta.Mapping[type, tuple[str, Marshaler]]:
+        return self.m
+
     def marshal(self, ctx: MarshalContext, o: ta.Any | None) -> Value:
         tag, m = self.m[type(o)]
         return {self.tf: tag, **m.marshal(ctx, o)}  # type: ignore

omlish/marshal/polymorphism/unmarshal.py

@@ -1,8 +1,10 @@
+import abc
 import collections.abc
 import dataclasses as dc
 import typing as ta
 
 from ... import check
+from ... import lang
 from ... import reflect as rfl
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
@@ -18,10 +20,19 @@ from .metadata import WrapperTypeTagging
 ##
 
 
+class PolymorphismUnmarshaler(Unmarshaler, lang.Abstract):
+    @abc.abstractmethod
+    def get_impls(self) -> ta.Mapping[str, Unmarshaler]:
+        raise NotImplementedError
+
+
 @dc.dataclass(frozen=True)
-class WrapperPolymorphismUnmarshaler(Unmarshaler):
+class WrapperPolymorphismUnmarshaler(PolymorphismUnmarshaler):
     m: ta.Mapping[str, Unmarshaler]
 
+    def get_impls(self) -> ta.Mapping[str, Unmarshaler]:
+        return self.m
+
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any | None:
         ma = check.isinstance(v, collections.abc.Mapping)
         [(tag, iv)] = ma.items()
@@ -30,10 +41,13 @@ class WrapperPolymorphismUnmarshaler(Unmarshaler):
 
 
 @dc.dataclass(frozen=True)
-class FieldPolymorphismUnmarshaler(Unmarshaler):
+class FieldPolymorphismUnmarshaler(PolymorphismUnmarshaler):
     m: ta.Mapping[str, Unmarshaler]
     tf: str
 
+    def get_impls(self) -> ta.Mapping[str, Unmarshaler]:
+        return self.m
+
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any | None:
         ma = dict(check.isinstance(v, collections.abc.Mapping))
         tag = ma.pop(self.tf)

omlish/os/pidfiles/pidfile.py

@@ -3,6 +3,7 @@
 """
 TODO:
  - 'json pids', with code version? '.json.pid'? '.jpid'?
+  - json*L* pidfiles - first line is bare int, following may be json - now `head -n1 foo.pid` not cat
 """
 import fcntl
 import os
@@ -152,7 +153,12 @@ class Pidfile:
 
     #
 
-    def write(self, pid: ta.Optional[int] = None) -> None:
+    def write(
+            self,
+            pid: ta.Optional[int] = None,
+            *,
+            suffix: ta.Optional[str] = None,
+    ) -> None:
         self.acquire_lock()
 
         if pid is None:
@@ -160,7 +166,11 @@ class Pidfile:
 
         self._f.seek(0)
         self._f.truncate()
-        self._f.write(f'{pid}\n')
+        self._f.write('\n'.join([
+            str(pid),
+            *([suffix] if suffix is not None else []),
+            '',
+        ]))
         self._f.flush()
 
     def clear(self) -> None:
@@ -171,14 +181,20 @@ class Pidfile:
 
     #
 
-    def read(self) -> ta.Optional[int]:
+    def read_raw(self) -> ta.Optional[str]:
         self.ensure_cannot_lock()
 
         self._f.seek(0)
         buf = self._f.read()
         if not buf:
             return None
-        return int(buf)
+        return buf
+
+    def read(self) -> ta.Optional[int]:
+        buf = self.read_raw()
+        if not buf:
+            return None
+        return int(buf.splitlines()[0].strip())
 
     def kill(self, sig: int = signal.SIGTERM) -> None:
         if (pid := self.read()) is None:

omlish/os/signals.py

@@ -1,9 +1,13 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
 import signal
+import typing as ta
 
 
-def parse_signal(s: str) -> int:
+def parse_signal(s: ta.Union[int, str]) -> int:
+    if isinstance(s, int):
+        return s
+
     try:
         return int(s)
     except ValueError:

{omlish-0.0.0.dev245.dist-info → omlish-0.0.0.dev246.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev245
+Version: 0.0.0.dev246
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev245.dist-info → omlish-0.0.0.dev246.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=vQTAIvR8OblSq-uP2GUfnbei0RnmAnM5j0T1-OToh9E,8253
-omlish/__about__.py,sha256=igneh_Z18EcRdtPlDRmK5tHmRK3NpxQPFoUopKrrNtw,3380
+omlish/__about__.py,sha256=FBmEuLfID7wGs4KGaP2kpxM0kLF3oWiG6kw4s45Nwk8,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -136,14 +136,14 @@ omlish/codecs/funcs.py,sha256=p4imNt7TobyZVXWC-WhntHVu9KfJrO4QwdtPRh-cVOk,850
 omlish/codecs/registry.py,sha256=2FnO5YP7ui1LzkguwESY0MP3WIdwgPTIJTM_4RyTOEg,3896
 omlish/codecs/standard.py,sha256=eiZ4u9ep0XrA4Z_D1zJI0vmWyuN8HLrX4Se_r_Cq_ZM,60
 omlish/codecs/text.py,sha256=JzrdwMpQPo2NBBg3K1EZszzQy5vEWmd82SIerJd4yeQ,5723
-omlish/collections/__init__.py,sha256=umpclbTE3wsSflMrKmYEiGmWFhiukfJxvBWgtYMZ8mk,2161
+omlish/collections/__init__.py,sha256=fAGCii4OttPRee9q4AD-IfQpdsmoCdgPwYUMPgnJwCs,2140
 omlish/collections/abc.py,sha256=sP7BpTVhx6s6C59mTFeosBi4rHOWC6tbFBYbxdZmvh0,2365
 omlish/collections/coerce.py,sha256=g68ROb_-5HgH-vI8612mU2S0FZ8-wp2ZHK5_Zy_kVC0,7037
 omlish/collections/exceptions.py,sha256=shcS-NCnEUudF8qC_SmO2TQyjivKlS4TDjaz_faqQ0c,44
-omlish/collections/frozen.py,sha256=mxhd8pw5zIXUiRHiBVZWYCYT7wYDVG3tAY5PNU-WH-I,4150
-omlish/collections/hasheq.py,sha256=XcOCE6f2lXizDCOXxSX6vJv-rLcpDo2OWCYIKGSWuic,3697
-omlish/collections/identity.py,sha256=SwnUE5D3v9RBjATDE1LUr_vO3Rb2NHcmTK64GZIcsO8,2720
-omlish/collections/mappings.py,sha256=YunNPyADrpitZGTJcXV0k4bmJddj1avDvEavz0coJWU,3203
+omlish/collections/frozen.py,sha256=jQppK1pyQ3e_aAvw8OEKfnr7b0OB4RI5Qr1g9xXTZaQ,4137
+omlish/collections/hasheq.py,sha256=SQdVICLZWKkYu4vUXrfmWBXO3i-jx01iM9IInDWkKfU,3664
+omlish/collections/identity.py,sha256=BTXn3r3ZprHluIl1DIXC9BYCmjak0BWhN7L6SxXo9ws,2687
+omlish/collections/mappings.py,sha256=fCHQatlAstiZkWZiyIlOw637Yep7ce79EPPbJcWHHUA,2784
 omlish/collections/ordered.py,sha256=tUAl99XHbSbzn7Hdh99jUBl27NcC2J7ZTI67slTMe5M,2333
 omlish/collections/ranked.py,sha256=rg6DL36oOUiG5JQEAkGnT8b6f9mSndQlIovtt8GQj_w,2229
 omlish/collections/unmodifiable.py,sha256=-zys__n6L7liWzhmHAIvfxprq7cUE5HoR3foGvXc_7I,4748
@@ -158,7 +158,7 @@ omlish/collections/persistent/treap.py,sha256=A09ZPacGyJlyRB-Wi4TNj3tE0w-RpFNliP
 omlish/collections/persistent/treapmap.py,sha256=TxOM-ZRF5PK2xe5wRIhESNt7DGh9b_MeZfE7HLkCOs4,5804
 omlish/collections/sorted/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/collections/sorted/skiplist.py,sha256=eU_cYQVnT-EZxv_dN9PYQZdOP0km5usEcOQRiJKL7Rw,5986
-omlish/collections/sorted/sorted.py,sha256=3dl3MD3soVP9j2m4lnDZFYA9fho6Ic1MpMpYePZTW-0,3353
+omlish/collections/sorted/sorted.py,sha256=euHJan3FqTYSCJGsVcYYRV-yhAAQ5_htnjymnNoVHRE,3319
 omlish/concurrent/__init__.py,sha256=9p-s8MvBEYDqHIoYU3OYoe-Nni22QdkW7nhZGEukJTM,197
 omlish/concurrent/executors.py,sha256=FYKCDYYuj-OgMa8quLsA47SfFNX3KDJvRENVk8NDsrA,1292
 omlish/concurrent/futures.py,sha256=J2s9wYURUskqRJiBbAR0PNEAp1pXbIMYldOVBTQduQY,4239
@@ -183,13 +183,13 @@ omlish/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/daemons/daemon.py,sha256=3Wkvu8M_EaCKSpKI5UN5OayRXV0oVdF62tBss9_hlr0,3479
 omlish/daemons/launching.py,sha256=sNOYW939IGI4ZlLQ0bKxzXj6EyeOiwV7Upqhd5XfoHc,3747
 omlish/daemons/reparent.py,sha256=7uJ9oPGt9Ud7uA8bDl_SHcuqjcsmXa3kkjp9jf29wOw,585
-omlish/daemons/services.py,sha256=jIlGWhiWoqQlm_OFeffkSs9jjr-icDF1-I-SNMEgg9Y,3406
+omlish/daemons/services.py,sha256=YYp2SMkJ71WgzOcYSXjWHeAyKKxu3j1dfuJvWkl0Dgw,3492
 omlish/daemons/spawning.py,sha256=psR73zOYjMKTqNpx1bMib8uU9wAZz62tw5TaWHrTdyY,5337
 omlish/daemons/targets.py,sha256=00KmtlknMhQ5PyyVAhWl3rpeTMPym0GxvHHq6mYPZ7c,3051
 omlish/daemons/waiting.py,sha256=RfgD1L33QQVbD2431dkKZGE4w6DUcGvYeRXXi8puAP4,1676
-omlish/dataclasses/__init__.py,sha256=b7EZCIfHnEHCHWwgD3YXxkdsU-uYd9iD4hM36RgpI1g,1598
+omlish/dataclasses/__init__.py,sha256=9YNCTSCKvNxy0rwxrlh-Sx0qCdn69ROxdDOnmNuKrH0,1640
 omlish/dataclasses/static.py,sha256=6pZG2iTR9NN8pKm-5ukDABnaVlTKFOzMwkg-rbxURoo,7691
-omlish/dataclasses/utils.py,sha256=QWsHxVisS-MUCqh89JQsRdCLgdBVeC6EYK6jRwO9akU,3631
+omlish/dataclasses/utils.py,sha256=BTXYyH0enSEP5kWxMnPTJ8_UPd7h4wF2RVPITNC8H4M,3872
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=zqGBC5gSbjJxaqG_zS1LL1PX-zAfhIua8UqOE4IwO2k,789
 omlish/dataclasses/impl/api.py,sha256=RhU4f50GVdn-dxilia8NA3F7VIm2R5z78pFfpIVXPRQ,6635
@@ -320,7 +320,7 @@ omlish/http/consts.py,sha256=7BJ4D1MdIvqBcepkgCfBFHolgTwbOlqsOEiee_IjxOA,2289
 omlish/http/cookies.py,sha256=uuOYlHR6e2SC3GM41V0aozK10nef9tYg83Scqpn5-HM,6351
 omlish/http/dates.py,sha256=Otgp8wRxPgNGyzx8LFowu1vC4EKJYARCiAwLFncpfHM,2875
 omlish/http/encodings.py,sha256=w2WoKajpaZnQH8j-IBvk5ZFL2O2pAU_iBvZnkocaTlw,164
-omlish/http/handlers.py,sha256=l6JLDuK9XhYvF1IudnPz5hWTZW1dXRjUBSO4Uyck0LE,3365
+omlish/http/handlers.py,sha256=ub0TiDCjFIVCUQZZZuDEB3tzJx6T6l_AMRl4s0ZrNy4,3896
 omlish/http/headers.py,sha256=ZMmjrEiYjzo0YTGyK0YsvjdwUazktGqzVVYorY4fd44,5081
 omlish/http/json.py,sha256=9XwAsl4966Mxrv-1ytyCqhcE6lbBJw-0_tFZzGszgHE,7440
 omlish/http/jwt.py,sha256=6Rigk1WrJ059DY4jDIKnxjnChWb7aFdermj2AI2DSvk,4346
@@ -399,10 +399,11 @@ omlish/iterators/iterators.py,sha256=ghI4dO6WPyyFOLTIIMaHQ_IOy2xXaFpGPqveZ5YGIBU
 omlish/iterators/recipes.py,sha256=53mkexitMhkwXQZbL6DrhpT0WePQ_56uXd5Jaw3DfzI,467
 omlish/iterators/tools.py,sha256=Pi4ybXytUXVZ3xwK89xpPImQfYYId9p1vIFQvVqVLqA,2551
 omlish/iterators/unique.py,sha256=0jAX3kwzVfRNhe0Tmh7kVP_Q2WBIn8POo_O-rgFV0rQ,1390
-omlish/lang/__init__.py,sha256=0LNdzzVTKiDEmjCzT9wUPbimcAu21KYe-EwD4xDgtRM,4592
-omlish/lang/attrs.py,sha256=vGYdGnS7ZAbSz0ZSZkkZKHCK1tKoNjZY0JdzFraHiUw,3105
+omlish/lang/__init__.py,sha256=7QEQKrw1ojkB3kwFQrh-p7EH-UQI7sMemtxNX2OTTJI,4685
+omlish/lang/attrs.py,sha256=fofCKN0X8TMu1yGqHpLpNLih9r9HWl3D3Vn3b6O791w,3891
 omlish/lang/clsdct.py,sha256=sJYadm-fwzti-gsi98knR5qQUxriBmOqQE_qz3RopNk,1743
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
+omlish/lang/collections.py,sha256=I0x5BI_cjTbL-uunoKFWA_RfNEz3gyuPkYIajdTH1CA,1236
 omlish/lang/contextmanagers.py,sha256=UPH6daYwSP9cH5AfSVsJyEHk1UURMGhVPM5ZRhp_Hvw,7576
 omlish/lang/datetimes.py,sha256=ehI_DhQRM-bDxAavnp470XcekbbXc4Gdw9y1KpHDJT0,223
 omlish/lang/descriptors.py,sha256=mZ2h9zJ__MMpw8hByjRbAiONcwfVb6GD0btNnVi8C5w,6573
@@ -419,7 +420,7 @@ omlish/lang/strings.py,sha256=egdv8PxLNG40-5V93agP5j2rBUDIsahCx048zV7uEbU,4690
 omlish/lang/sys.py,sha256=UoZz_PJYVKLQAKqYxxn-LHz1okK_38I__maZgnXMcxU,406
 omlish/lang/typing.py,sha256=Zdad9Zv0sa-hIaUXPrzPidT7sDVpRcussAI7D-j-I1c,3296
 omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/lang/cached/function.py,sha256=k3jRNuDtFh9Mk97oonC7nq5XRros2qmRJVWviMFrx74,8728
+omlish/lang/cached/function.py,sha256=5pS3FCTxOradeMsrKg7JbXHsWhqdaa2C34apkXkwqqU,8785
 omlish/lang/cached/property.py,sha256=kzbao_35PlszdK_9oJBWrMmFFlVK_Xhx7YczHhTJ6cc,2764
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/classes/abstract.py,sha256=bIcuAetV_aChhpSURypmjjcqP07xi20uVYPKh1kvQNU,3710
@@ -476,7 +477,7 @@ omlish/manifests/base.py,sha256=D1WvJYcBR_njkc0gpALpFCWh1h3agb9qgqphnbbPlm4,935
 omlish/manifests/load.py,sha256=9mdsS3egmSX9pymO-m-y2Fhs4p6ruOdbsYaKT1-1Hwg,6655
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
 omlish/manifests/types.py,sha256=IOt9dOe0r8okCHSL82ryi3sn4VZ6AT80g_QQR6oZtCE,306
-omlish/marshal/__init__.py,sha256=00D3S6qwUld1TUWd67hVHuNcrj3c_FAFSkCVXgGWT-s,2607
+omlish/marshal/__init__.py,sha256=8jKG43_yJzX6MP0RMUJeLUn-BnWiMXDjpKH5-DnAIT4,3109
 omlish/marshal/base.py,sha256=s1wQRPG2Y6kH0qQXoL3d60ldYaVTqLuFs0NdbYXwAGg,6842
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
@@ -493,18 +494,19 @@ omlish/marshal/composite/mappings.py,sha256=92oAqYzzTdRNhFDtmukpJd8anoi3pt2nX5Xh
 omlish/marshal/composite/maybes.py,sha256=4rxTv769Uk4gQGAnE6urVnMscF1vhcnwqP_lm5QzSoM,2211
 omlish/marshal/composite/newtypes.py,sha256=lYCacdR2BlLWMT1kc8o08UjsmJ6aYlAHkrzG8BozWCM,849
 omlish/marshal/composite/optionals.py,sha256=iQgSrb9Xyb_IP81YREAZ0xKYXImLgMILGLBnYL2lFWw,1508
+omlish/marshal/composite/wrapped.py,sha256=F0pMC2WtJaPnOmzLT1FKFo9Tkzy1XbdBm9iROyp-myw,745
 omlish/marshal/objects/__init__.py,sha256=F4wej8L_tedC8ETYxAnmKfdPR9TjsqIus9Z3nZofYuc,182
-omlish/marshal/objects/dataclasses.py,sha256=Fo15maLrWICq4H3YlZpa0PjnJTC4eqG1IF0C-88qCKs,7780
+omlish/marshal/objects/dataclasses.py,sha256=sz2GhOEL0wPQj1sNrH0dRN7MefiI72iaDPXIrdtgA64,8491
 omlish/marshal/objects/helpers.py,sha256=85GZp4h3Yo0GYGmnZpKgNxkWnSk8h2R21nfDLU2DtM0,1110
 omlish/marshal/objects/marshal.py,sha256=rdZsDWKgLBZxV0ZQlwHTJv9iUg0lC57trJHBOFKvuLo,2636
 omlish/marshal/objects/metadata.py,sha256=QVD7DRhXbLda_Edgpc3OD1xT9fthmeaaj6l_nTE1PMM,3307
-omlish/marshal/objects/namedtuples.py,sha256=ENWyiYZhTwDRqUkkWrHeNcoHGEo5GW634jMuBUc3654,2815
+omlish/marshal/objects/namedtuples.py,sha256=nW3IA21PJ7D62_orr2qxnRt794N1TcFqwOO2rPOglmw,2842
 omlish/marshal/objects/unmarshal.py,sha256=-83sSgL6WX6C3JfXZr64ZLYi3SsJC9kyiGAbEQbVHQI,3620
 omlish/marshal/polymorphism/__init__.py,sha256=e2UTrSL0qp7w_1vkdxDWd7sXlWhep2KPV49-BB64ma8,130
-omlish/marshal/polymorphism/marshal.py,sha256=Lraih0Dhkcwu6Bb6QkrYOWoMIubh46VQkXxJQWisA8Y,1827
+omlish/marshal/polymorphism/marshal.py,sha256=A-fhr4adRDbis3GwGp2fefwT68YT3A4HyogQbMCH69E,2248
 omlish/marshal/polymorphism/metadata.py,sha256=hbXqkYKXhfJeMllzI0Ubeeqbq201khVN8uprgVhMpHM,3046
 omlish/marshal/polymorphism/unions.py,sha256=YwsK9T3okGiHj88LTFNdUvuH7VkCsD-aTnZseKzhpdA,4350
-omlish/marshal/polymorphism/unmarshal.py,sha256=gdWTgpl4hXBqac1gHmg_23VMb7x42CE2x-3oRpCaLwU,2047
+omlish/marshal/polymorphism/unmarshal.py,sha256=NnNQrJv85tQGkhC4MfvCTOBw7SXRbNNQOlTBXLiup4A,2439
 omlish/marshal/singular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/marshal/singular/base64.py,sha256=gQIkFN60lNEuSiu3MDQFoHwMZTtzDbrBRtNpFZ2HXew,1098
 omlish/marshal/singular/datetimes.py,sha256=1PDVFF6TGkGxGUno8TaFGRof0DQUookYf_X2Nl8T4V0,3723
@@ -534,7 +536,7 @@ omlish/os/journald.py,sha256=2nI8Res1poXkbLc31--MPUlzYMESnCcPUkIxDOCjZW0,3903
 omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
 omlish/os/mangle.py,sha256=M0v-SDt4TMnL68I45GekQrUaXkTIILXIlPdqRxKBTKM,524
 omlish/os/paths.py,sha256=hqPiyg_eYaRoIVPdAeX4oeLEV4Kpln_XsH0tHvbOf8Q,844
-omlish/os/signals.py,sha256=FtzkovLb58N3vNdfxflUeXWFCqqKzseCjk5kBdWT-ds,267
+omlish/os/signals.py,sha256=_ycu36jyOAfm1YnEOoEql6w3R5sJ-3pk94NEOvXeGHo,347
 omlish/os/sizes.py,sha256=ohkALLvqSqBX4iR-7DMKJ4pfOCRdZXV8htH4QywUNM0,152
 omlish/os/temp.py,sha256=P97KiVeNB7rfGn4tlgU5ro86JUxAsiphLMlxsjQgfB0,1198
 omlish/os/deathpacts/__init__.py,sha256=IFJkHVWff-VhBbQX38th1RlmjUF2ptKh5TPIzP9Ei2M,229
@@ -545,7 +547,7 @@ omlish/os/pidfiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 omlish/os/pidfiles/__main__.py,sha256=AF8TwjK4xgHVnoLAP9dIWgKvT0vGhHJlfDW0tKZ7tx4,200
 omlish/os/pidfiles/cli.py,sha256=2SSsP4O3VdpsDIMAkWgWSjh_YNIPzCD9l5LNN2qrIjo,2074
 omlish/os/pidfiles/manager.py,sha256=qSEwNaWT1KOAnU0KxliwvU_uowme5jyf1FyIPsGwnTY,2391
-omlish/os/pidfiles/pidfile.py,sha256=nU3ONJydi3dPfmLl56DOXR7viJ4TAI8eL-iwR2XoB6s,3899
+omlish/os/pidfiles/pidfile.py,sha256=v0p5NTW8tFv1frCBzgjRkXnljsw8PQ1exfc7kjZJ5L8,4359
 omlish/os/pidfiles/pinning.py,sha256=v9RlJ4BnJZcaZZXiiRqbmzLluaSOkeeEb_WrbKEClBQ,6643
 omlish/reflect/__init__.py,sha256=Er2yBHibVO16hFNA1szQF2_f43Y3HRCBWtS-fjsOIYc,798
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
@@ -732,9 +734,9 @@ omlish/text/mangle.py,sha256=kfzFLfvepH-chl1P89_mdc5vC4FSqyPA2aVtgzuB8IY,1133
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=JkNZpyR2tv2CNcTaWJJhpQ9E4F0yPR8P_YfDbZfMtwQ,6182
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev245.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev245.dist-info/METADATA,sha256=JjIb3VY1vdwMkndkHrbTmD72X00OMiCJVwBpn07rc88,4176
-omlish-0.0.0.dev245.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-omlish-0.0.0.dev245.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev245.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev245.dist-info/RECORD,,
+omlish-0.0.0.dev246.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev246.dist-info/METADATA,sha256=da_rz6vvTRxwUkKvXh0ZlBAklAosQv_ZvmsnuiTE_E8,4176
+omlish-0.0.0.dev246.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+omlish-0.0.0.dev246.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev246.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev246.dist-info/RECORD,,