omlish 0.0.0.dev235__tar.gz → 0.0.0.dev236__tar.gz

{omlish-0.0.0.dev235/omlish.egg-info → omlish-0.0.0.dev236}/PKG-INFO

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

{omlish-0.0.0.dev235 → omlish-0.0.0.dev236}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev235'
-__revision__ = '4afeb0f0acadfd7890e6e6309be41fe7e65c3185'
+__version__ = '0.0.0.dev236'
+__revision__ = '492e9f7254561d4c5576a6df3dfb94fdf94d9f7a'
 
 
 #

{omlish-0.0.0.dev235 → omlish-0.0.0.dev236}/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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
@@ -37,6 +38,10 @@ log = logging.getLogger(__name__)
 
 
 class Daemon:
+    """
+    Instances of these should most likely be effectively singletons, but that's up to the user.
+    """
+
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:
         target: Target
@@ -85,7 +90,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,14 +101,23 @@ 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.)
 
     #

omlish-0.0.0.dev236/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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-0.0.0.dev236/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-0.0.0.dev235 → omlish-0.0.0.dev236}/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 → omlish-0.0.0.dev236/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev235 → omlish-0.0.0.dev236}/omlish.egg-info/SOURCES.txt

@@ -471,6 +471,7 @@ omlish/logs/standard.py
 omlish/logs/timing.py
 omlish/logs/utils.py
 omlish/manifests/__init__.py
+omlish/manifests/base.py
 omlish/manifests/load.py
 omlish/manifests/types.py
 omlish/marshal/__init__.py
@@ -529,6 +530,7 @@ omlish/os/files.py
 omlish/os/forkhooks.py
 omlish/os/journald.py
 omlish/os/linux.py
+omlish/os/mangle.py
 omlish/os/paths.py
 omlish/os/signals.py
 omlish/os/sizes.py

{omlish-0.0.0.dev235 → omlish-0.0.0.dev236}/pyproject.toml

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