omlish 0.0.0.dev88__py3-none-any.whl → 0.0.0.dev90__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev88'
-__revision__ = 'ccf0f3b0ac6cc9e9ca522c8c4a9c8e6a4151bd7b'
+__version__ = '0.0.0.dev90'
+__revision__ = 'ed1c5d0c10d318c251ce6e44e500d805bb6f059a'
 
 
 #

omlish/bootstrap/sys.py

@@ -22,14 +22,14 @@ from .base import SimpleBootstrap
 if ta.TYPE_CHECKING:
     from .. import libc
     from .. import logs
-    from .. import os as osu
     from ..formats import dotenv
+    from ..lite import pidfile
 
 else:
     libc = lang.proxy_import('..libc', __package__)
     logs = lang.proxy_import('..logs', __package__)
-    osu = lang.proxy_import('..os', __package__)
     dotenv = lang.proxy_import('..formats.dotenv', __package__)
+    pidfile = lang.proxy_import('..lite.pidfile', __package__)
 
 
 ##
@@ -317,7 +317,7 @@ class PidfileBootstrap(ContextBootstrap['PidfileBootstrap.Config']):
             yield
             return
 
-        with osu.Pidfile(self._config.path) as pf:
+        with pidfile.Pidfile(self._config.path) as pf:
             pf.write()
             yield
 

omlish/fnpairs.py

@@ -3,11 +3,10 @@ TODO:
  - objects
   - csv
   - csvloader
-  - cbor
-  - alt json backends
  - wrapped (wait for usecase)
- - streams
+ - streams / incremental
   - fileobj -> fileobj?
+ - swap zstandard for zstd
 
 Compression choice:
  - lzma if-available minimal-space

omlish/formats/json/cli/cli.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - -I/-Ogz, lz4, etc - fnpairs
+ - read from http
+"""
 import argparse
 import codecs
 import contextlib
@@ -11,6 +16,7 @@ import typing as ta
 from .... import check
 from .... import lang
 from .... import term
+from ....lite.io import DelimitingBuffer
 from ..render import JsonRenderer
 from ..stream.build import JsonObjectBuilder
 from ..stream.lex import JsonStreamLexer
@@ -45,7 +51,10 @@ def _main() -> None:
 
     parser.add_argument('--stream', action='store_true')
     parser.add_argument('--stream-build', action='store_true')
-    parser.add_argument('--stream-buffer-size', type=int, default=0x4000)
+
+    parser.add_argument('-l', '--lines', action='store_true')
+
+    parser.add_argument('--read-buffer-size', type=int, default=0x4000)
 
     parser.add_argument('-f', '--format')
 
@@ -58,7 +67,7 @@ def _main() -> None:
 
     parser.add_argument('-c', '--color', action='store_true')
 
-    parser.add_argument('-l', '--less', action='store_true')
+    parser.add_argument('-L', '--less', action='store_true')
 
     args = parser.parse_args()
 
@@ -175,7 +184,7 @@ def _main() -> None:
                     build = None
 
                 while True:
-                    buf = os.read(fd, args.stream_buffer_size)
+                    buf = os.read(fd, args.read_buffer_size)
 
                     for s in decoder.decode(buf, not buf):
                         n = 0
@@ -200,6 +209,16 @@ def _main() -> None:
                 if renderer is not None:
                     out.write('\n')
 
+        elif args.lines:
+            fd = in_file.fileno()
+            db = DelimitingBuffer()
+
+            while buf := os.read(fd, args.read_buffer_size):
+                for chunk in db.feed(buf):
+                    s = check.isinstance(chunk, bytes).decode('utf-8')
+                    v = fmt.load(io.StringIO(s))
+                    print(render_one(v), file=out)
+
         else:
             with io.TextIOWrapper(in_file) as tw:
                 v = fmt.load(tw)

omlish/lite/pidfile.py

@@ -0,0 +1,68 @@
+# ruff: noqa: UP007
+import fcntl
+import os
+import signal
+import typing as ta
+
+
+class Pidfile:
+    def __init__(self, path: str) -> None:
+        super().__init__()
+        self._path = path
+
+    _f: ta.TextIO
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self._path!r})'
+
+    def __enter__(self) -> 'Pidfile':
+        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
+        try:
+            os.set_inheritable(fd, True)
+            f = os.fdopen(fd, 'r+')
+        except Exception:
+            try:
+                os.close(fd)
+            except Exception:  # noqa
+                pass
+            raise
+        self._f = f
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self._f is not None:
+            self._f.close()
+            del self._f
+
+    def try_lock(self) -> bool:
+        try:
+            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
+            return True
+        except OSError:
+            return False
+
+    def ensure_locked(self) -> None:
+        if not self.try_lock():
+            raise RuntimeError('Could not get lock')
+
+    def write(self, pid: ta.Optional[int] = None) -> None:
+        self.ensure_locked()
+        if pid is None:
+            pid = os.getpid()
+        self._f.write(f'{pid}\n')
+        self._f.flush()
+
+    def clear(self) -> None:
+        self.ensure_locked()
+        self._f.seek(0)
+        self._f.truncate()
+
+    def read(self) -> int:
+        if self.try_lock():
+            raise RuntimeError('Got lock')
+        self._f.seek(0)
+        return int(self._f.read())
+
+    def kill(self, sig: int = signal.SIGTERM) -> None:
+        pid = self.read()
+        os.kill(pid, sig)  # FIXME: Still racy

omlish/os.py

@@ -1,9 +1,7 @@
 import contextlib
-import fcntl
 import os
 import resource
 import shutil
-import signal
 import tempfile
 import typing as ta
 
@@ -44,67 +42,6 @@ def tmp_file(
                 shutil.rmtree(f.name, ignore_errors=True)
 
 
-class Pidfile:
-    def __init__(self, path: str) -> None:
-        super().__init__()
-        self._path = path
-
-    _f: ta.TextIO
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self._path!r})'
-
-    def __enter__(self) -> ta.Self:
-        fd = os.open(self._path, os.O_RDWR | os.O_CREAT, 0o600)
-        try:
-            os.set_inheritable(fd, True)
-            f = os.fdopen(fd, 'r+')
-        except Exception:
-            try:
-                os.close(fd)
-            except Exception:  # noqa
-                pass
-            raise
-        self._f = f
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if self._f is not None:
-            self._f.close()
-            del self._f
-
-    def try_lock(self) -> bool:
-        try:
-            fcntl.flock(self._f, fcntl.LOCK_EX | fcntl.LOCK_NB)
-            return True
-        except OSError:
-            return False
-
-    def write(self, pid: int | None = None) -> None:
-        if not self.try_lock():
-            raise RuntimeError('Could not get lock')
-        if pid is None:
-            pid = os.getpid()
-        self._f.write(f'{pid}\n')
-        self._f.flush()
-
-    def clear(self) -> None:
-        if not self.try_lock():
-            raise RuntimeError('Could not get lock')
-        self._f.seek(0)
-        self._f.truncate()
-
-    def read(self) -> int:
-        if self.try_lock():
-            raise RuntimeError('Got lock')
-        self._f.seek(0)
-        return int(self._f.read())
-
-    def kill(self, sig: int = signal.SIGTERM) -> None:
-        pid = self.read()
-        os.kill(pid, sig)  # Still racy
-
-
 def touch(self, mode: int = 0o666, exist_ok: bool = True) -> None:
     if exist_ok:
         # First try to bump modification time

{omlish-0.0.0.dev88.dist-info → omlish-0.0.0.dev90.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev88
+Version: 0.0.0.dev90
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev88.dist-info → omlish-0.0.0.dev90.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=_pr15t5ifEAY1adRq4S8Fp21jhhRHPNo6mJlHz7_xBo,3345
+omlish/__about__.py,sha256=znvMoN-IBoaUZ4OXaaRoHANiPt5KtchQBS7qSqRRoLI,3345
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -8,14 +8,14 @@ omlish/check.py,sha256=rZFEn6IHiMq4KGCYxlUGcUCJP12pPPUs_-AG0aouPM8,10540
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
-omlish/fnpairs.py,sha256=Sl8CMFNyDS-1JYAjSWqnT5FmUm9Lj6o7FxSRo7g4jww,10875
+omlish/fnpairs.py,sha256=wHm1AUt-bwDCGnWrKrE2ppJav5OBm39lTyeHGaMTLBo,10885
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=RlU-y_dt2nRdvoo7Z3HsUELlBn3KuyI4qUnqLVbChRI,2450
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=8r7Ejyhttk9ruCfBkxNTrlzir5WPbDE2vmY7VPlceMA,15362
 omlish/matchfns.py,sha256=I1IlQGfEyk_AcFSy6ulVS3utC-uwyZM2YfUXYHc9Bw0,6152
 omlish/multiprocessing.py,sha256=QZT4C7I-uThCAjaEY3xgUYb-5GagUlnE4etN01LDyU4,5186
-omlish/os.py,sha256=vO1sZCzAhVxo46tDFLrD52q2KuMFWQwu5MPJgSsnliI,3107
+omlish/os.py,sha256=5nJ-a9JKSMoaZVZ1eOa5BAbfL7o7CF7ue_PyJwufnwY,1460
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/sync.py,sha256=AqwIfIuCMVHLwlJUa7dmaSjfA4sM5AYPCD5-nsz3XVQ,1516
 omlish/term.py,sha256=NEmxqAhicyInGtmFamZAizI2xdu819MzFYPEp0Fx97M,6111
@@ -93,7 +93,7 @@ omlish/bootstrap/diag.py,sha256=LADLhusbJ1tKxVD8-gmia1HShX1VeszRO1OApIQhSpI,5507
 omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
-omlish/bootstrap/sys.py,sha256=i6veZeE83wO0HTl9b6ykj_pEN05fqu0enoAv4sw5Ayc,8742
+omlish/bootstrap/sys.py,sha256=iLHUNIuIPv-k-Mc6aHj5sSET78olCVt7t0HquFDO4iQ,8762
 omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
 omlish/collections/_abc.py,sha256=sP7BpTVhx6s6C59mTFeosBi4rHOWC6tbFBYbxdZmvh0,2365
 omlish/collections/_io_abc.py,sha256=Cxs8KB1B_69rxpUYxI-MTsilAmNooJJn3w07DKqYKkE,1255
@@ -197,7 +197,7 @@ omlish/formats/json/backends/std.py,sha256=PM00Kh9ZR2XzollHMEvdo35Eml1N-zFfRW-LO
 omlish/formats/json/backends/ujson.py,sha256=BNJCU4kluGHdqTUKLJEuHhE2m2TmqR7HEN289S0Eokg,2278
 omlish/formats/json/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/json/cli/__main__.py,sha256=1wxxKZVkj_u7HCcewwMIbGuZj_Wph95yrUbm474Op9M,188
-omlish/formats/json/cli/cli.py,sha256=a_Ak3x8U1ulK2EkG4DQ4XbfsV_4gz5YAigv43Ah_XlY,5491
+omlish/formats/json/cli/cli.py,sha256=Ka-S-_L79HjaqbIi1SbGDywbYtEtoo673_DIG9m14jM,6027
 omlish/formats/json/cli/formats.py,sha256=tqEZKby4HeafGcaUs-m8B-2ZV12dRo40rzL-V99cp00,1714
 omlish/formats/json/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/json/stream/build.py,sha256=6deXBxTx1toFAPShz2Jo5OiXxH5Y4ppG8gDPRFoUgjA,2461
@@ -296,6 +296,7 @@ omlish/lite/io.py,sha256=lcpI1cS_Kn90tvYMg8ZWkSlYloS4RFqXCk-rKyclhdg,3148
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=vkFkSX0Izb2P-NNMqqNLSec0BzeLOtHoQWgdXwQuDPU,6007
 omlish/lite/marshal.py,sha256=kZtfIiFfmxEi8ZKne3fT0R8g8kLmJ-Q5nq4kOvwhiqk,8656
+omlish/lite/pidfile.py,sha256=ymcr6JhEt33caZMsay_auQI0Ok-OTc6qpn49Zena5KQ,1723
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
 omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
@@ -456,9 +457,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev88.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev88.dist-info/METADATA,sha256=_sR0eXqLj64VXjpIND0FJ_jFD56oVh9f7QXetS_XP0g,3987
-omlish-0.0.0.dev88.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev88.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev88.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev88.dist-info/RECORD,,
+omlish-0.0.0.dev90.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev90.dist-info/METADATA,sha256=uCP2bxca0LjGBfKIwCeIh1WdZI5H-s5zLynGvdIgQXk,3987
+omlish-0.0.0.dev90.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+omlish-0.0.0.dev90.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev90.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev90.dist-info/RECORD,,

{omlish-0.0.0.dev88.dist-info → omlish-0.0.0.dev90.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any