omlish 0.0.0.dev235__py3-none-any.whl → 0.0.0.dev237__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev235'
-__revision__ = '4afeb0f0acadfd7890e6e6309be41fe7e65c3185'
+__version__ = '0.0.0.dev237'
+__revision__ = 'e8c58292f1ec88727fd832f6496545435d992e9d'
 
 
 #

omlish/argparse/all.py

@@ -4,6 +4,7 @@ import argparse
 from .cli import (  # noqa
     ArgparseArg as Arg,
     argparse_arg as arg,
+    argparse_arg_ as arg_,
 
     ArgparseCmdFn as CmdFn,
     ArgparseCmd as Cmd,

omlish/argparse/cli.py

@@ -1,6 +1,9 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
 """
+FIXME:
+ - exit_on_error lol
+
 TODO:
  - default command
  - auto match all underscores to hyphens
@@ -44,6 +47,10 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
     return ArgparseArg(args, kwargs)
 
 
+def argparse_arg_(*args, **kwargs) -> ta.Any:
+    return argparse_arg(*args, **kwargs)
+
+
 #
 
 

omlish/codecs/base.py

@@ -12,6 +12,7 @@ from .. import dataclasses as dc
 from .. import lang
 from .. import reflect as rfl
 from ..funcs import pairs as fps
+from ..manifests.base import ModAttrManifest
 
 
 I = ta.TypeVar('I')
@@ -87,9 +88,7 @@ class Codec:
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class LazyLoadedCodec:
-    mod_name: str
-    attr_name: str
+class LazyLoadedCodec(ModAttrManifest):
     name: str
     aliases: ta.Collection[str] | None = None
 

omlish/codecs/registry.py

@@ -1,5 +1,4 @@
 import contextlib
-import importlib
 import threading
 import typing as ta
 
@@ -74,8 +73,7 @@ class CodecRegistry:
             codec_or_lazy = self._by_name[name]
 
             if isinstance(codec_or_lazy, LazyLoadedCodec):
-                mod = importlib.import_module(codec_or_lazy.mod_name)
-                codec = check.isinstance(getattr(mod, codec_or_lazy.attr_name), Codec)
+                codec = check.isinstance(codec_or_lazy.load(), Codec)
                 self._by_name[name] = codec
                 self._post_load(codec)
             else:

omlish/configs/classes.py

@@ -1,53 +1,31 @@
 import typing as ta
-import weakref
 
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
 
 
-class Config(
-    dc.Data,
-    lang.Abstract,
-    frozen=True,
-    reorder=True,
-    confer=frozenset([
-        'frozen',
-        'reorder',
-        'confer',
-    ]),
-):
-    pass
+ConfigurableConfigT = ta.TypeVar('ConfigurableConfigT', bound='Configurable.Config')
 
 
-ConfigT = ta.TypeVar('ConfigT', bound='Config')
+class Configurable(ta.Generic[ConfigurableConfigT], lang.Abstract):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Config:
+        """Does not use any dc metaclasses to preserve typechecking."""
 
-_CONFIG_CLS_MAP: ta.MutableMapping[type[Config], type['Configurable']] = weakref.WeakValueDictionary()
-
-
-class Configurable(ta.Generic[ConfigT], lang.Abstract):
-
-    # FIXME: https://github.com/python/mypy/issues/5144
-    Config: ta.ClassVar[type[ConfigT]]  # type: ignore  # noqa
+        configurable_cls: ta.ClassVar[type['Configurable']]
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
-        cfg_cls = check.issubclass(cls.__dict__['Config'], Config)
-        check.not_in(cfg_cls, _CONFIG_CLS_MAP)
-        _CONFIG_CLS_MAP[cfg_cls] = cls
+        if not lang.is_abstract_class(cls):
+            check.in_('Config', cls.__dict__)
+            cfg_cls = check.issubclass(cls.Config, Configurable.Config)
+            check.not_in('configurable_cls', cfg_cls.__dict__)
+            check.state(dc.is_immediate_dataclass(cfg_cls))
+            cfg_cls.configurable_cls = cls
 
-    def __init__(self, config: ConfigT) -> None:
+    def __init__(self, config: ConfigurableConfigT) -> None:
         super().__init__()
 
-        self._config: ConfigT = check.isinstance(config, self.Config)
-
-
-def get_impl(cfg: type[Config] | Config) -> type[Configurable]:
-    if isinstance(cfg, type):
-        cfg_cls = check.issubclass(cfg, Config)  # noqa
-    elif isinstance(cfg, Config):
-        cfg_cls = type(cfg)
-    else:
-        raise TypeError(cfg)
-    return _CONFIG_CLS_MAP[cfg_cls]
+        self._config: ConfigurableConfigT = check.isinstance(config, self.Config)  # type: ignore[assignment]

omlish/configs/processing/all.py

@@ -13,6 +13,10 @@ from .matching import (  # noqa
     matched_config_rewrite as matched_rewrite,
 )
 
+from .merging import (  # noqa
+    merge_configs as merge,
+)
+
 from .names import (  # noqa
     build_config_named_children as build_named_children,
 )

omlish/configs/processing/merging.py

@@ -0,0 +1,33 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - smarter merging than just dumb dict-squashing
+"""
+import typing as ta
+
+from ..types import ConfigMap
+
+
+##
+
+
+def merge_configs(*ms: ConfigMap) -> ConfigMap:
+    def rec(o, i):
+        for k, v in i.items():
+            try:
+                e = o[k]
+            except KeyError:
+                o[k] = v
+            else:
+                if isinstance(e, ta.Mapping) and isinstance(v, ta.Mapping):
+                    rec(e, v)  # noqa
+                else:
+                    if isinstance(v, ta.Mapping):
+                        v = dict(v)
+                    o[k] = v
+
+    o: dict = {}
+    for i in ms:
+        rec(o, i)
+    return o

omlish/configs/shadow.py

@@ -0,0 +1,92 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - cascading?
+ - caching?
+ - purging?
+ - wishlist: piecewise config parts, unmarshal, registered via manifests
+"""
+import abc
+import os.path
+import typing as ta
+
+from ..lite.check import check
+from ..os.mangle import mangle_path
+from .formats import DEFAULT_CONFIG_LOADERS
+from .formats import ConfigLoader
+
+
+ShadowConfig = ta.Mapping[str, ta.Any]  # ta.TypeAlias
+
+
+##
+
+
+class ShadowConfigs(abc.ABC):
+    @abc.abstractmethod
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        raise NotImplementedError
+
+
+class FileShadowConfigs(ShadowConfigs, abc.ABC):
+    @abc.abstractmethod
+    def get_shadow_config_file_path(self, path: str) -> str:
+        raise NotImplementedError
+
+
+##
+
+
+class NopShadowConfigs(ShadowConfigs):
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        return None
+
+
+##
+
+
+class MangledFilesShadowConfigs(FileShadowConfigs):
+    def __init__(
+            self,
+            path: str,
+            *,
+            create: bool = False,
+            ext: str = 'yml',
+            loader: ta.Optional[ConfigLoader] = None,
+    ) -> None:  # noqa
+        super().__init__()
+
+        check.arg(not ext.startswith('.'))
+        check.non_empty_str(ext)
+
+        if loader is None:
+            for dl in DEFAULT_CONFIG_LOADERS:
+                if dl.match_file(f'.{ext}'):
+                    loader = dl
+                    break
+            else:
+                raise KeyError(ext)
+
+        self._path = path
+        self._create = create
+        self._ext = ext
+        self._loader = loader
+
+    def get_shadow_config_file_path(self, path: str) -> str:
+        mangled = '.'.join([mangle_path(os.path.abspath(path)), self._ext])
+        return os.path.abspath(os.path.join(self._path, mangled))
+
+    def get_shadow_config(self, path: str) -> ta.Optional[ShadowConfig]:
+        file_path = self.get_shadow_config_file_path(path)
+
+        if self._create:
+            os.makedirs(self._path, exist_ok=True)
+
+        try:
+            with open(file_path) as f:
+                content = f.read()
+        except FileNotFoundError:
+            return None
+
+        return self._loader.load_str(content).as_map()

omlish/daemons/daemon.py

@@ -15,6 +15,7 @@ TODO:
  - timebomb
  - pickle protocol, revision / venv check, multiprocessing manager support
 """
+import itertools
 import logging
 import os.path
 import time
@@ -39,8 +40,7 @@ log = logging.getLogger(__name__)
 class Daemon:
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:
-        target: Target
-        spawning: Spawning
+        spawning: Spawning | None = None
 
         #
 
@@ -63,11 +63,20 @@ class Daemon:
         def __post_init__(self) -> None:
             check.isinstance(self.pid_file, (str, None))
 
-    def __init__(self, config: Config) -> None:
+    def __init__(
+            self,
+            target: Target,
+            config: Config = Config(),
+    ) -> None:
         super().__init__()
 
+        self._target = target
         self._config = config
 
+    @property
+    def target(self) -> Target:
+        return self._target
+
     @property
     def config(self) -> Config:
         return self._config
@@ -85,7 +94,7 @@ class Daemon:
             inheritable=False,
         )
 
-    def is_running(self) -> bool:
+    def is_pidfile_locked(self) -> bool:
         check.state(self.has_pidfile)
 
         if not os.path.isfile(check.non_empty_str(self._config.pid_file)):
@@ -96,22 +105,31 @@ class Daemon:
 
     #
 
-    def wait_sync(self, timeout: lang.TimeoutLike = lang.Timeout.Default) -> None:
+    def wait_sync(
+            self,
+            timeout: lang.TimeoutLike = lang.Timeout.Default,
+            *,
+            max_tries: int | None = None,
+    ) -> None:
         if self._config.wait is None:
             return
 
         timeout = lang.Timeout.of(timeout, self._config.wait_timeout)
         waiter = waiter_for(self._config.wait)
-        while not waiter.do_wait():
+        for i in itertools.count():
+            if max_tries is not None and i >= max_tries:
+                raise TimeoutError
             timeout()
+            if waiter.do_wait():
+                break
             time.sleep(self._config.wait_sleep_s or 0.)
 
     #
 
     def launch_no_wait(self) -> None:
         launcher = Launcher(
-            target=self._config.target,
-            spawning=self._config.spawning,
+            target=self._target,
+            spawning=check.not_none(self._config.spawning),
 
             pid_file=self._config.pid_file,
             reparent_process=self._config.reparent_process,

omlish/daemons/services.py

@@ -0,0 +1,34 @@
+import abc
+import typing as ta
+
+from .. import check
+from .. import lang
+from ..configs.classes import Configurable
+
+
+ServiceConfigT = ta.TypeVar('ServiceConfigT', bound='Service.Config')
+
+
+##
+
+
+class Service(Configurable[ServiceConfigT], lang.Abstract):
+    class Config(Configurable.Config, lang.Abstract):
+        pass
+
+    @classmethod
+    def from_config(cls, config: Config) -> 'Service':
+        return check.isinstance(config.configurable_cls(config), cls)
+
+    #
+
+    @abc.abstractmethod
+    def _run(self) -> None:
+        raise NotImplementedError
+
+    def run(self) -> None:
+        self._run()
+
+    @classmethod
+    def run_config(cls, config: Config) -> None:
+        return cls.from_config(config).run()

omlish/daemons/targets.py

@@ -6,6 +6,7 @@ import typing as ta
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
+from .services import Service
 
 
 if ta.TYPE_CHECKING:
@@ -18,7 +19,22 @@ else:
 
 
 class Target(dc.Case):
-    pass
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'Target':
+        if isinstance(obj, Target):
+            return obj
+
+        elif isinstance(obj, str):
+            return NameTarget(obj)
+
+        elif callable(obj):
+            return FnTarget(obj)
+
+        elif isinstance(obj, Service.Config):
+            return ServiceConfigTarget(obj)
+
+        else:
+            raise TypeError(obj)
 
 
 class TargetRunner(abc.ABC):
@@ -36,14 +52,18 @@ def target_runner_for(target: Target) -> TargetRunner:
 
 
 class FnTarget(Target):
-    fn: ta.Callable[[], None]
+    fn: ta.Callable[[], ta.Any]
 
 
 class FnTargetRunner(TargetRunner, dc.Frozen):
     target: FnTarget
 
     def run(self) -> None:
-        self.target.fn()
+        obj = self.target.fn()
+        if obj is not None:
+            tgt = Target.of(obj)
+            tr = target_runner_for(tgt)
+            tr.run()
 
 
 @target_runner_for.register
@@ -57,6 +77,23 @@ def _(target: FnTarget) -> FnTargetRunner:
 class NameTarget(Target):
     name: str
 
+    @classmethod
+    def for_obj(
+            cls,
+            obj: ta.Any,
+            *,
+            globals: ta.Mapping[str, ta.Any] | None = None,  # noqa
+            no_module_name_lookup: bool = False,
+    ) -> 'NameTarget':
+        if globals is None:
+            globals = obj.__globals__  # noqa
+        if not no_module_name_lookup:
+            mn = lang.get_real_module_name(globals)
+        else:
+            mn = globals['__name__']
+        qn = obj.__qualname__
+        return NameTarget('.'.join([mn, qn]))
+
 
 class NameTargetRunner(TargetRunner, dc.Frozen):
     target: NameTarget
@@ -67,7 +104,14 @@ class NameTargetRunner(TargetRunner, dc.Frozen):
             runpy._run_module_as_main(name)  # type: ignore  # noqa
         else:
             obj = lang.import_attr(self.target.name)
-            obj()
+            tgt = Target.of(obj)
+            tr = target_runner_for(tgt)
+            tr.run()
+
+
+@target_runner_for.register
+def _(target: NameTarget) -> NameTargetRunner:
+    return NameTargetRunner(target)
 
 
 ##
@@ -76,14 +120,38 @@ class NameTargetRunner(TargetRunner, dc.Frozen):
 class ExecTarget(Target):
     cmd: ta.Sequence[str] = dc.xfield(coerce=check.of_not_isinstance(str))
 
+    cwd: str | None = None
+
 
 class ExecTargetRunner(TargetRunner, dc.Frozen):
     target: ExecTarget
 
     def run(self) -> None:
+        if (cwd := self.target.cwd) is not None:
+            os.chdir(os.path.expanduser(cwd))
+
         os.execl(*self.target.cmd)
 
 
 @target_runner_for.register
 def _(target: ExecTarget) -> ExecTargetRunner:
     return ExecTargetRunner(target)
+
+
+##
+
+
+class ServiceConfigTarget(Target):
+    cfg: Service.Config
+
+
+class ServiceConfigTargetRunner(TargetRunner, dc.Frozen):
+    target: ServiceConfigTarget
+
+    def run(self) -> None:
+        Service.run_config(self.target.cfg)
+
+
+@target_runner_for.register
+def _(target: ServiceConfigTarget) -> ServiceConfigTargetRunner:
+    return ServiceConfigTargetRunner(target)

omlish/lang/__init__.py

@@ -135,6 +135,7 @@ from .generators import (  # noqa
 
 from .imports import (  # noqa
     can_import,
+    get_real_module_name,
     import_all,
     import_attr,
     import_module,

omlish/lang/imports.py

@@ -384,3 +384,18 @@ def proxy_init(
             raise Exception(f'Wrong init name: {pi.name_package=} != {init_name_package=}')
 
     pi.add(package, attrs)
+
+
+##
+
+
+def get_real_module_name(globals: ta.Mapping[str, ta.Any]) -> str:  # noqa
+    module = sys.modules[globals['__name__']]
+
+    if module.__spec__ and module.__spec__.name:
+        return module.__spec__.name
+
+    if module.__package__:
+        return module.__package__
+
+    raise RuntimeError("Can't determine real module name")

omlish/manifests/base.py

@@ -0,0 +1,39 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import typing as ta
+
+
+NameAliasesManifestT = ta.TypeVar('NameAliasesManifestT', bound='NameAliasesManifest')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ModAttrManifest:
+    mod_name: str
+    attr_name: str
+
+    def load(self) -> ta.Any:
+        importlib = __import__('importlib')
+        mod = importlib.import_module(self.mod_name)
+        return getattr(mod, self.attr_name)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class NameAliasesManifest:
+    name: str
+    aliases: ta.Optional[ta.Collection[str]] = None
+
+    @classmethod
+    def build_name_dict(cls, objs: ta.Iterable[NameAliasesManifestT]) -> ta.Dict[str, NameAliasesManifestT]:
+        dct: ta.Dict[str, NameAliasesManifestT] = {}
+        for o in objs:
+            for n in (o.name, *(o.aliases or ())):
+                if n in dct:
+                    raise KeyError(n)
+                dct[n] = o
+        return dct

omlish/manifests/load.py

@@ -196,11 +196,11 @@ class ManifestLoader:
 
     def discover_pkgs(self) -> ta.Sequence[str]:
         # This is a fat dep so do it late.
-        import importlib.metadata
+        importlib_metadata = __import__('importlib.metadata').metadata
 
         return [
             ep.value
-            for ep in importlib.metadata.entry_points(group=self.ENTRY_POINT_GROUP)
+            for ep in importlib_metadata.entry_points(group=self.ENTRY_POINT_GROUP)
         ]
 
     def scan_pkg_root(self, root: str) -> ta.Sequence[str]:

omlish/os/filemodes.py

@@ -77,6 +77,48 @@ class FileMode:
             )
         )
 
+    @classmethod
+    def from_flags(cls, i: int) -> 'FileMode':
+        if i & os.O_RDWR:
+            i &= ~os.O_RDWR
+            read = write = True
+        elif i & os.O_WRONLY:
+            i &= ~os.O_WRONLY
+            write = True
+            read = False
+        else:
+            read = True
+            write = False
+
+        create = False
+        if i & os.O_CREAT:
+            i &= ~os.O_CREAT
+            create = True
+
+        exists: str | None = None
+        if i & os.O_TRUNC:
+            i &= ~os.O_TRUNC
+            exists = check.replacing_none(exists, 'truncate')
+        if i & os.O_EXCL:
+            i &= ~os.O_EXCL
+            exists = check.replacing_none(exists, 'fail')
+        if i & os.O_APPEND:
+            i &= ~os.O_APPEND
+            exists = check.replacing_none(exists, 'append')
+        if exists is None:
+            exists = 'beginning'
+
+        if i:
+            raise ValueError(i)
+
+        return FileMode(
+            read=read,
+            write=write,
+            create=create,
+            exists=exists,  # type: ignore
+            binary=True,
+        )
+
     #
 
     def render(self) -> str:

omlish/os/mangle.py

@@ -0,0 +1,25 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+
+
+#
+
+
+def mangle_path(path: str) -> str:
+    if not path.startswith('/'):
+        raise ValueError('Only absolute Unix paths are supported')
+    return (
+        path
+        .replace('_', '__')
+        .replace('/', '_')
+    )
+
+
+def unmangle_path(mangled: str) -> str:
+    if '/' in mangled:
+        raise ValueError("Mangled paths should not contain '/'")
+    return (
+        mangled
+        .replace('_', '/')
+        .replace('//', '_')
+    )

omlish/os/pidfiles/pidfile.py

@@ -2,15 +2,7 @@
 # @omlish-lite
 """
 TODO:
- - reliable pid retrieval
-  - contents are *ignored*, just advisory
-  - check double-check:
-   - 1) get pid of flock holder
-   - 2) get pidfd to that
-   - 3) recheck current pid of flock holder == that pid
-  - racy as to if it's a different actual process as initial check, just with same pid, but due to 'identity' / semantic
-    meaning of the named pidfile the processes are considered equivalent
-  - read_checked(), contextmanager
+ - 'json pids', with code version? '.json.pid'? '.jpid'?
 """
 import fcntl
 import os

{omlish-0.0.0.dev235.dist-info → omlish-0.0.0.dev237.dist-info}/METADATA

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

{omlish-0.0.0.dev235.dist-info → omlish-0.0.0.dev237.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=vQTAIvR8OblSq-uP2GUfnbei0RnmAnM5j0T1-OToh9E,8253
-omlish/__about__.py,sha256=mOMhMeHgYWv96pndE14EVx-D5bReVhtSMXcqy2QLvnE,3380
+omlish/__about__.py,sha256=0tS5CFbCYIp6LwAIjSNK3lhW-DW7VWodegiD0bAa7U8,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -86,8 +86,8 @@ omlish/antlr/_runtime/xpath/XPath.py,sha256=KSL1SH3VAeRDZCe4dAD7xmUdfk-j434ypZKR
 omlish/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B2W6ie4ivtWLvlgymM,3509
 omlish/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 omlish/argparse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/argparse/all.py,sha256=2qhVgFTq3w_tJ_okEnw_D-2k4jlJD7EcM5hNEow6M2M,1030
-omlish/argparse/cli.py,sha256=nMn4D2Oce2HNGGVuc_EtJuNSqoIfNdzWd_eKFBSfxEs,8586
+omlish/argparse/all.py,sha256=NeeMM5MIebY7XDAHaCxUzeesEoUYwsf5i9PrBUcO1cI,1057
+omlish/argparse/cli.py,sha256=vVLlhJPt0PKaNfIBrXTzz9cHyy2dFEY8hlQ3GvtKbwc,8704
 omlish/asyncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/asyncs/all.py,sha256=uUz9ziKh4_QrgmdhKFMgq6j7mFbiZd3LiogguDCQsGI,587
 omlish/asyncs/anyio.py,sha256=gfpx-D8QGmUfhnQxHEaHXcAP8zSMQjcGw4COFTGNnHI,8021
@@ -127,11 +127,11 @@ omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
 omlish/bootstrap/sys.py,sha256=0F0uThMsYdjqUtzrYHr4Xsh_MjscxgWl149i_3tDOqo,8787
 omlish/codecs/__init__.py,sha256=-FDwRJFGagg-fZyQ8wup4GPuR6gHpmaChzthlykn-kY,876
-omlish/codecs/base.py,sha256=uFrDvP7SZdeBbpuUzGHvyOdFNAmhjkBG2cVaVydRsjw,2221
+omlish/codecs/base.py,sha256=FLWf5jgxuyZk-7jH0oC5RzJ5Ls5FLxP0hAowrBVEvqo,2246
 omlish/codecs/bytes.py,sha256=jlZ87OmZ52HhQDNyL87R3OIviK2qV5iU2jZYOTOLWjk,2157
 omlish/codecs/chain.py,sha256=DrBi5vbaFfObfoppo6alwOmyW2XbrH2051cjExwr2Gs,527
 omlish/codecs/funcs.py,sha256=p4imNt7TobyZVXWC-WhntHVu9KfJrO4QwdtPRh-cVOk,850
-omlish/codecs/registry.py,sha256=yDkDpRJXD7owFCa4b0R4MMf3Le6KxknNBewjSrehepw,4000
+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=ddzZS3C2rvDo65hspO9KlFsrinElxPWvYEgVyBUZdb0,2164
@@ -163,24 +163,27 @@ omlish/concurrent/futures.py,sha256=J2s9wYURUskqRJiBbAR0PNEAp1pXbIMYldOVBTQduQY,
 omlish/concurrent/threadlets.py,sha256=JfirbTDJgy9Ouokz_VmHeAAPS7cih8qMUJrN-owwXD4,2423
 omlish/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/configs/all.py,sha256=kziwjzUBkf8AT0w7Pq7JX2jtkQVOQ5R1wJyn6hfTN5k,1055
-omlish/configs/classes.py,sha256=GLbB8xKjHjjoUQRCUQm3nEjM8z1qNTx9gPV7ODSt5dg,1317
+omlish/configs/classes.py,sha256=oCCkGzokn807mAlpRVe9F_JKZo8x6JcIVmo2sBsm7T8,1080
 omlish/configs/formats.py,sha256=RJw4Rzp7vlTd5YyAvpAoruQnk45v8dGPtPWwqH7aYyE,5301
 omlish/configs/nginx.py,sha256=XuX9yyb0_MwkJ8esKiMS9gFkqHUPza_uCprhnWykNy8,2051
+omlish/configs/shadow.py,sha256=-R5nbevC4pFgqDPYOCCIqNcusgXsMWlRIUOEG0HBoJg,2228
 omlish/configs/types.py,sha256=t5_32MVRSKxbxor1hl1wRGKYm75F6Atisd_RYsN5ELU,103
 omlish/configs/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/configs/processing/all.py,sha256=roIQ7EZJXSzsyUxNHNJaZsXcD2jdT46Ly1XXfG8xEcI,722
+omlish/configs/processing/all.py,sha256=L23FOGn24As3jcB3B11R7PcHWXbYjkItrNq5ZEylPjA,784
 omlish/configs/processing/flattening.py,sha256=1duZH5zbrGuoYqaJco5LN5qx6e76QP5pHbIyItkQsFY,5021
 omlish/configs/processing/inheritance.py,sha256=lFD8eWRE0cG0Z3-eCu7pMsP2skWhUNaoAtWi9fNfn8k,1218
 omlish/configs/processing/matching.py,sha256=R64RxpPB1uX5Ztvvk2dQ2xi_xwlaxkxQgZwtDVR9spY,1514
+omlish/configs/processing/merging.py,sha256=PqpxHLaC6XKetsewS_x0Bh-uXoI2ukZfIKFUAAN5dkg,691
 omlish/configs/processing/names.py,sha256=weHmaTclzgM9lUn3aBtw-kwZ3mc2N-CZlFg3Kd_UsKo,1093
 omlish/configs/processing/rewriting.py,sha256=v7PfHtuTn5v_5Y6Au7oMN2Z0nxAMy1iYyO5CXnTvZhs,4226
 omlish/configs/processing/strings.py,sha256=qFS2oh6z02IaM_q4lTKLdufzkJqAJ6J-Qjrz5S-QJoM,826
 omlish/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/daemons/daemon.py,sha256=lnMgGrPeZ3pjhuXPU-7DX2XGEdNG0kP6HAejCQPSGtk,2976
+omlish/daemons/daemon.py,sha256=ykdbCPbpxKrdZVZc892SnedTdftTAYt_YdDpYchKcUE,3410
 omlish/daemons/launching.py,sha256=mhtkuAO16STcznUl3rrX9pacfrKbPQRCP2AllKL4B70,3664
 omlish/daemons/reparent.py,sha256=UaG2X6VJHJPOlUwHPNRH3aWGgF0Fg771jjO9IRPLlyY,280
+omlish/daemons/services.py,sha256=XRmYBYNLUumnxaXCr2B7ScNEUlM8oM5FSS0bdWheDNs,719
 omlish/daemons/spawning.py,sha256=cx00xeqSrfhlFbjCtKqaBHvMuHwB9hdjuKNHzAAo_dw,4030
-omlish/daemons/targets.py,sha256=scq6BYgzi0H2apfgD74U0D8_msQuYAel3Qiij74YWVo,1501
+omlish/daemons/targets.py,sha256=L2BRWsv473X7dE4H7afA8TgTiaevCuZPab9Olh-AKUc,3248
 omlish/daemons/waiting.py,sha256=RfgD1L33QQVbD2431dkKZGE4w6DUcGvYeRXXi8puAP4,1676
 omlish/dataclasses/__init__.py,sha256=D7I6ZJjEFeLN2re8oOZ_7JKWiG2plrPnaUFq3iEXYmQ,1553
 omlish/dataclasses/utils.py,sha256=N2seT8cJtfOv-41D7F3E-q4us-FCTQmnxxPv3dt1OcI,3796
@@ -392,7 +395,7 @@ 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=bE8ra_QM5M4k8v3qFtreTjQswaZClIOaqXt9fE43MD0,4079
+omlish/lang/__init__.py,sha256=rS9JPXiHchs2_9QG7JCx9pbsYpgpe3ANUumDBb8hSFA,4105
 omlish/lang/cached.py,sha256=tQaqMu1LID0q4NSTk5vPXsgxIBWSFAmjs5AhQoEHoCQ,7833
 omlish/lang/clsdct.py,sha256=sJYadm-fwzti-gsi98knR5qQUxriBmOqQE_qz3RopNk,1743
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -402,7 +405,7 @@ omlish/lang/descriptors.py,sha256=njkYDS1gn5p4-3v1jr-s_srauC7tvvt571RjE7Q4LXE,66
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=0ql9EXA_gEEhvUVzMJCjVhEnVtHecsLKmfmAXuQqeGY,4388
 omlish/lang/generators.py,sha256=5LX17j-Ej3QXhwBgZvRTm_dq3n9veC4IOUcVmvSu2vU,5243
-omlish/lang/imports.py,sha256=FMPz1lIDmuoapM88uabXeZbeJX1uCT8pkHeukC3X4qc,10129
+omlish/lang/imports.py,sha256=nKPTHVW5gUpT_Ok8QsPyj7b-ToE7nWN2ev9MsI4pRCA,10465
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
 omlish/lang/maybes.py,sha256=dAgrUoAhCgyrHRqa73CkaGnpXwGc-o9n-NIThrNXnbU,3416
 omlish/lang/objects.py,sha256=65XsD7UtblRdNe2ID1-brn_QvRkJhBIk5nyZWcQNeqU,4574
@@ -461,7 +464,8 @@ omlish/logs/standard.py,sha256=FbKdF2Z4Na5i2TNwKn0avLJXyICe2JKsPufjvKCHGn0,3162
 omlish/logs/timing.py,sha256=XrFUHIPT4EHDujLKbGs9fGFMmoM3NEP8xPRaESJr7bQ,1513
 omlish/logs/utils.py,sha256=mzHrZ9ji75p5A8qR29eUr05CBAHMb8J753MSkID_VaQ,393
 omlish/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omlish/manifests/load.py,sha256=u84sAHhDgHefTDK8S50W5czRnqfwm0obqiOzNBCBP9Q,6603
+omlish/manifests/base.py,sha256=1LGglMh7UUU7JWIqPH_JfIm6czGETibpScEqKI5mSMg,920
+omlish/manifests/load.py,sha256=0ZjtsYL2EIKYd_MF3brKTPYdRZmtWdwomx2cFjjFV2M,6640
 omlish/manifests/types.py,sha256=d8bv5tknCJqclRfxCpao_8XxHo2yofhLpVHQTB-MfNw,260
 omlish/marshal/__init__.py,sha256=00D3S6qwUld1TUWd67hVHuNcrj3c_FAFSkCVXgGWT-s,2607
 omlish/marshal/base.py,sha256=tJ4iNuD7cW2GpGMznOhkAf2hugqp2pF2em0FaQcekrk,6740
@@ -514,11 +518,12 @@ omlish/os/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/os/atomics.py,sha256=KhWNeh4mzU3M-TF0v8uR6hUqMfZJW42MeyIK9Jl6R0k,5246
 omlish/os/deathsig.py,sha256=hk9Yq2kyDdI-cI7OQH7mOfpRbOKzY_TfPKEqgrjVYbA,641
 omlish/os/fcntl.py,sha256=riQf9iEEEIC28lJp8ud06MU56w2XJHJ9nBFtck_hdhc,1501
-omlish/os/filemodes.py,sha256=njxd9cQChKSi_5-oiAG9OJOzj8CvnyedWWheOWM0uHA,3476
+omlish/os/filemodes.py,sha256=eVT60kokup40-N31r2acHJ2ip3d9HmqY8jCGIsKpKqc,4576
 omlish/os/files.py,sha256=WJ_42vsZIZukQURN3TTccp-n74ZNhbux_ps3TLbHj18,1106
 omlish/os/forkhooks.py,sha256=yjodOvs90ClXskv5oBIJbHn0Y7dzajLmZmOpRMKbyxM,5656
 omlish/os/journald.py,sha256=2nI8Res1poXkbLc31--MPUlzYMESnCcPUkIxDOCjZW0,3903
 omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
+omlish/os/mangle.py,sha256=dRp5uBxPuM6g52GnxuBoJUdUKW3CVVRr2ZwvQPHHxnA,489
 omlish/os/paths.py,sha256=hqPiyg_eYaRoIVPdAeX4oeLEV4Kpln_XsH0tHvbOf8Q,844
 omlish/os/signals.py,sha256=FtzkovLb58N3vNdfxflUeXWFCqqKzseCjk5kBdWT-ds,267
 omlish/os/sizes.py,sha256=ohkALLvqSqBX4iR-7DMKJ4pfOCRdZXV8htH4QywUNM0,152
@@ -531,7 +536,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=yy14NCjvsCdXzlJjZzkw4vbzjt_FXEaUS5SbYT3dGY0,4277
+omlish/os/pidfiles/pidfile.py,sha256=nU3ONJydi3dPfmLl56DOXR7viJ4TAI8eL-iwR2XoB6s,3899
 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
@@ -706,9 +711,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 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.dev235.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev235.dist-info/METADATA,sha256=kGZm_s1Kmw1dsPChxxw0LPa1lbSL07NPMdgVyf8AnUs,4176
-omlish-0.0.0.dev235.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev235.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev235.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev235.dist-info/RECORD,,
+omlish-0.0.0.dev237.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev237.dist-info/METADATA,sha256=xNNscWsZ6ZOLDE0vOj3YCOrR50thYq82_KawDOui9OA,4176
+omlish-0.0.0.dev237.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev237.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev237.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev237.dist-info/RECORD,,