omlish 0.0.0.dev88__tar.gz → 0.0.0.dev90__tar.gz

{omlish-0.0.0.dev88/omlish.egg-info → omlish-0.0.0.dev90}/PKG-INFO

@@ -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 → omlish-0.0.0.dev90}/omlish/__about__.py

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

{omlish-0.0.0.dev88 → omlish-0.0.0.dev90}/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-0.0.0.dev88 → omlish-0.0.0.dev90}/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-0.0.0.dev88 → omlish-0.0.0.dev90}/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-0.0.0.dev90/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-0.0.0.dev90/omlish/os.py

@@ -0,0 +1,59 @@
+import contextlib
+import os
+import resource
+import shutil
+import tempfile
+import typing as ta
+
+
+PAGE_SIZE = resource.getpagesize()
+
+
+def round_to_page_size(sz: int) -> int:
+    sz += PAGE_SIZE - 1
+    return sz - (sz % PAGE_SIZE)
+
+
+@contextlib.contextmanager
+def tmp_dir(
+        root_dir: str | None = None,
+        cleanup: bool = True,
+        **kwargs: ta.Any,
+) -> ta.Iterator[str]:
+    path = tempfile.mkdtemp(dir=root_dir, **kwargs)
+    try:
+        yield path
+    finally:
+        if cleanup:
+            shutil.rmtree(path, ignore_errors=True)
+
+
+@contextlib.contextmanager
+def tmp_file(
+        root_dir: str | None = None,
+        cleanup: bool = True,
+        **kwargs: ta.Any,
+) -> ta.Iterator[tempfile._TemporaryFileWrapper]:  # noqa
+    with tempfile.NamedTemporaryFile(dir=root_dir, delete=False, **kwargs) as f:
+        try:
+            yield f
+        finally:
+            if cleanup:
+                shutil.rmtree(f.name, ignore_errors=True)
+
+
+def touch(self, mode: int = 0o666, exist_ok: bool = True) -> None:
+    if exist_ok:
+        # First try to bump modification time
+        # Implementation note: GNU touch uses the UTIME_NOW option of the utimensat() / futimens() functions.
+        try:
+            os.utime(self, None)
+        except OSError:
+            pass
+        else:
+            return
+    flags = os.O_CREAT | os.O_WRONLY
+    if not exist_ok:
+        flags |= os.O_EXCL
+    fd = os.open(self, flags, mode)
+    os.close(fd)

{omlish-0.0.0.dev88 → omlish-0.0.0.dev90/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev90}/omlish.egg-info/SOURCES.txt

@@ -306,6 +306,7 @@ omlish/lite/io.py
 omlish/lite/json.py
 omlish/lite/logs.py
 omlish/lite/marshal.py
+omlish/lite/pidfile.py
 omlish/lite/reflect.py
 omlish/lite/runtime.py
 omlish/lite/secrets.py

{omlish-0.0.0.dev88 → omlish-0.0.0.dev90}/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.dev88'
+version = '0.0.0.dev90'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',

omlish-0.0.0.dev88/omlish/os.py

@@ -1,122 +0,0 @@
-import contextlib
-import fcntl
-import os
-import resource
-import shutil
-import signal
-import tempfile
-import typing as ta
-
-
-PAGE_SIZE = resource.getpagesize()
-
-
-def round_to_page_size(sz: int) -> int:
-    sz += PAGE_SIZE - 1
-    return sz - (sz % PAGE_SIZE)
-
-
-@contextlib.contextmanager
-def tmp_dir(
-        root_dir: str | None = None,
-        cleanup: bool = True,
-        **kwargs: ta.Any,
-) -> ta.Iterator[str]:
-    path = tempfile.mkdtemp(dir=root_dir, **kwargs)
-    try:
-        yield path
-    finally:
-        if cleanup:
-            shutil.rmtree(path, ignore_errors=True)
-
-
-@contextlib.contextmanager
-def tmp_file(
-        root_dir: str | None = None,
-        cleanup: bool = True,
-        **kwargs: ta.Any,
-) -> ta.Iterator[tempfile._TemporaryFileWrapper]:  # noqa
-    with tempfile.NamedTemporaryFile(dir=root_dir, delete=False, **kwargs) as f:
-        try:
-            yield f
-        finally:
-            if cleanup:
-                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
-        # Implementation note: GNU touch uses the UTIME_NOW option of the utimensat() / futimens() functions.
-        try:
-            os.utime(self, None)
-        except OSError:
-            pass
-        else:
-            return
-    flags = os.O_CREAT | os.O_WRONLY
-    if not exist_ok:
-        flags |= os.O_EXCL
-    fd = os.open(self, flags, mode)
-    os.close(fd)