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

omlish/__about__.py

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

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/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/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/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.dev236.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev236.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=LvhY-W_-OyVINq69cnzbsy9yqgwd-YJ0WXl4tSRUHDI,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
@@ -176,7 +176,7 @@ omlish/configs/processing/names.py,sha256=weHmaTclzgM9lUn3aBtw-kwZ3mc2N-CZlFg3Kd
 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=CfcWdJB6HrGccHAKW_L2weZK84B6FlZER2zMsfqMVog,3348
 omlish/daemons/launching.py,sha256=mhtkuAO16STcznUl3rrX9pacfrKbPQRCP2AllKL4B70,3664
 omlish/daemons/reparent.py,sha256=UaG2X6VJHJPOlUwHPNRH3aWGgF0Fg771jjO9IRPLlyY,280
 omlish/daemons/spawning.py,sha256=cx00xeqSrfhlFbjCtKqaBHvMuHwB9hdjuKNHzAAo_dw,4030
@@ -461,7 +461,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
@@ -519,6 +520,7 @@ 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 +533,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 +708,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.dev236.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev236.dist-info/METADATA,sha256=lXce_EjsToJ0ULgvK8E_0UWQaRWN4nb30AkWMyseA5I,4176
+omlish-0.0.0.dev236.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev236.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev236.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev236.dist-info/RECORD,,