omlish 0.0.0.dev134__tar.gz → 0.0.0.dev136__tar.gz

{omlish-0.0.0.dev134/omlish.egg-info → omlish-0.0.0.dev136}/PKG-INFO

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

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/.manifests.json

@@ -23,18 +23,6 @@
       }
     }
   },
-  {
-    "module": ".formats.json.cli.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omlish/formats/json/cli/__main__.py",
-    "line": 1,
-    "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "json",
-        "mod_name": "omlish.formats.json.cli.__main__"
-      }
-    }
-  },
   {
     "module": ".secrets.pwgen",
     "attr": "_CLI_MODULE",

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev134'
-__revision__ = '2ce79daa2fabaed83f01745229d814bc8aeb7628'
+__version__ = '0.0.0.dev136'
+__revision__ = '345b1984bd3c96dc1b3ed4db8402e21d989f38ee'
 
 
 #

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/formats/json/stream/lex.py

@@ -11,7 +11,7 @@ import re
 import typing as ta
 
 from .... import check
-from ....genmachine import GenMachine
+from ....funcs.genmachine import GenMachine
 
 
 ##

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/formats/json/stream/parse.py

@@ -1,7 +1,7 @@
 import typing as ta
 
 from .... import lang
-from ....genmachine import GenMachine
+from ....funcs.genmachine import GenMachine
 from .lex import SCALAR_VALUE_TYPES
 from .lex import VALUE_TOKEN_KINDS
 from .lex import ScalarValue

omlish-0.0.0.dev134/omlish/matchfns.py → omlish-0.0.0.dev136/omlish/funcs/match.py

@@ -8,7 +8,7 @@ import abc
 import dataclasses as dc
 import typing as ta
 
-from . import lang
+from .. import lang
 
 
 T = ta.TypeVar('T')

omlish-0.0.0.dev134/omlish/fnpairs.py → omlish-0.0.0.dev136/omlish/funcs/pairs.py

@@ -20,7 +20,7 @@ import codecs
 import dataclasses as dc
 import typing as ta
 
-from . import lang
+from .. import lang
 
 
 if ta.TYPE_CHECKING:
@@ -39,7 +39,7 @@ if ta.TYPE_CHECKING:
     import yaml as _yaml
     import zstandard as _zstandard
 
-    from .formats import json as _json
+    from ..formats import json as _json
 
 else:
     _bz2 = lang.proxy_import('bz2')
@@ -57,7 +57,7 @@ else:
     _yaml = lang.proxy_import('yaml')
     _zstandard = lang.proxy_import('zstandard')
 
-    _json = lang.proxy_import('.formats.json', __package__)
+    _json = lang.proxy_import('..formats.json', __package__)
 
 
 ##

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/http/sessions.py

@@ -8,9 +8,9 @@ import time
 import typing as ta
 import zlib
 
-from .. import fnpairs as fpa
 from .. import lang
 from .. import secrets as sec
+from ..funcs import pairs as fpa
 from .cookies import dump_cookie
 from .cookies import parse_cookie
 from .json import JSON_TAGGER

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/lite/fdio/corohttp.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 import socket
 import typing as ta
 
@@ -22,6 +23,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
             *,
             read_size: int = 0x10000,
             write_size: int = 0x10000,
+            log_handler: ta.Optional[ta.Callable[[CoroHttpServer, CoroHttpServer.AnyLogIo], None]] = None,
     ) -> None:
         check_state(not sock.getblocking())
 
@@ -30,6 +32,7 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
         self._handler = handler
         self._read_size = read_size
         self._write_size = write_size
+        self._log_handler = log_handler
 
         self._read_buf = ReadableListBuffer()
         self._write_buf: IncrementalWriteBuffer | None = None
@@ -64,7 +67,8 @@ class CoroHttpServerConnectionFdIoHandler(SocketFdIoHandler):
                     break
 
             if isinstance(o, CoroHttpServer.AnyLogIo):
-                print(o)
+                if self._log_handler is not None:
+                    self._log_handler(self._coro_srv, o)
                 o = None
 
             elif isinstance(o, CoroHttpServer.ReadIo):

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/lite/marshal.py

@@ -165,6 +165,13 @@ class PolymorphicObjMarshaler(ObjMarshaler):
     impls_by_ty: ta.Mapping[type, Impl]
     impls_by_tag: ta.Mapping[str, Impl]
 
+    @classmethod
+    def of(cls, impls: ta.Iterable[Impl]) -> 'PolymorphicObjMarshaler':
+        return cls(
+            {i.ty: i for i in impls},
+            {i.tag: i for i in impls},
+        )
+
     def marshal(self, o: ta.Any) -> ta.Any:
         impl = self.impls_by_ty[type(o)]
         return {impl.tag: impl.m.marshal(o)}
@@ -252,7 +259,7 @@ def _make_obj_marshaler(
 ) -> ObjMarshaler:
     if isinstance(ty, type):
         if abc.ABC in ty.__bases__:
-            impls = [  # type: ignore
+            return PolymorphicObjMarshaler.of([  # type: ignore
                 PolymorphicObjMarshaler.Impl(
                     ity,
                     ity.__qualname__,
@@ -260,11 +267,7 @@ def _make_obj_marshaler(
                 )
                 for ity in deep_subclasses(ty)
                 if abc.ABC not in ity.__bases__
-            ]
-            return PolymorphicObjMarshaler(
-                {i.ty: i for i in impls},
-                {i.tag: i for i in impls},
-            )
+            ])
 
         if issubclass(ty, enum.Enum):
             return EnumObjMarshaler(ty)

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/base.py

@@ -89,8 +89,8 @@ from .. import check
 from .. import collections as col
 from .. import dataclasses as dc
 from .. import lang
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .exceptions import UnhandledTypeError
 from .factories import RecursiveTypeFactory
 from .factories import TypeCacheFactory

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/factories.py

@@ -3,8 +3,8 @@ import threading
 import typing as ta
 
 from .. import check
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 
 
 R = ta.TypeVar('R')

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/forbidden.py

@@ -1,8 +1,8 @@
 import dataclasses as dc
 import typing as ta
 
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .base import MarshalContext
 from .base import Marshaler
 from .base import UnmarshalContext

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/iterables.py

@@ -8,8 +8,8 @@ import functools
 import typing as ta
 
 from .. import check
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactoryMatchClass

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/mappings.py

@@ -3,8 +3,8 @@ import dataclasses as dc
 import typing as ta
 
 from .. import check
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactoryMatchClass

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/maybes.py

@@ -7,8 +7,8 @@ import typing as ta
 
 from .. import check
 from .. import lang
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactoryMatchClass

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/standard.py

@@ -1,4 +1,4 @@
-from .. import matchfns as mfs
+from ..funcs import match as mfs
 from .any import ANY_MARSHALER_FACTORY
 from .any import ANY_UNMARSHALER_FACTORY
 from .base import MarshalerFactory

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/marshal/unions.py

@@ -4,8 +4,8 @@ from .. import cached
 from .. import check
 from .. import dataclasses as dc
 from .. import lang
-from .. import matchfns as mfs
 from .. import reflect as rfl
+from ..funcs import match as mfs
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactory

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/secrets/pwhash.py

@@ -28,7 +28,7 @@ import secrets
 
 
 SALT_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-DEFAULT_PBKDF2_ITERATIONS = 600000
+DEFAULT_PBKDF2_ITERATIONS = 600_000
 
 
 def gen_salt(length: int) -> str:

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/secrets/subprocesses.py

@@ -32,7 +32,9 @@ def pipe_fd_subprocess_file_input(buf: bytes) -> ta.Iterator[SubprocessFileInput
     try:
         if hasattr(fcntl, 'F_SETPIPE_SZ'):
             fcntl.fcntl(wfd, fcntl.F_SETPIPE_SZ, max(len(buf), 0x1000))
-        os.write(wfd, buf)
+        n = os.write(wfd, buf)
+        if n != len(buf):
+            raise OSError(f'Failed to write data to pipe: {n=} {len(buf)=}')
         os.close(wfd)
         closed_wfd = True
         yield SubprocessFileInput(f'/dev/fd/{rfd}', [rfd])

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/specs/jsonrpc/marshal.py

@@ -4,8 +4,8 @@ from ... import check
 from ... import dataclasses as dc
 from ... import lang
 from ... import marshal as msh
-from ... import matchfns as mfs
 from ... import reflect as rfl
+from ...funcs import match as mfs
 from .types import NotSpecified
 
 

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish/specs/openapi/marshal.py

@@ -4,8 +4,8 @@ from ... import check
 from ... import dataclasses as dc
 from ... import lang
 from ... import marshal as msh
-from ... import matchfns as mfs
 from ... import reflect as rfl
+from ...funcs import match as mfs
 from .openapi import Reference
 
 

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev134 → omlish-0.0.0.dev136}/omlish.egg-info/SOURCES.txt

@@ -12,12 +12,8 @@ omlish/check.py
 omlish/datetimes.py
 omlish/defs.py
 omlish/dynamic.py
-omlish/fnpairs.py
-omlish/fnpipes.py
-omlish/genmachine.py
 omlish/iterators.py
 omlish/libc.py
-omlish/matchfns.py
 omlish/multiprocessing.py
 omlish/os.py
 omlish/runmodule.py
@@ -206,19 +202,16 @@ omlish/formats/json/backends/jiter.py
 omlish/formats/json/backends/orjson.py
 omlish/formats/json/backends/std.py
 omlish/formats/json/backends/ujson.py
-omlish/formats/json/cli/__init__.py
-omlish/formats/json/cli/__main__.py
-omlish/formats/json/cli/cli.py
-omlish/formats/json/cli/formats.py
-omlish/formats/json/cli/io.py
-omlish/formats/json/cli/parsing.py
-omlish/formats/json/cli/processing.py
-omlish/formats/json/cli/rendering.py
 omlish/formats/json/stream/__init__.py
 omlish/formats/json/stream/build.py
 omlish/formats/json/stream/lex.py
 omlish/formats/json/stream/parse.py
 omlish/formats/json/stream/render.py
+omlish/funcs/__init__.py
+omlish/funcs/genmachine.py
+omlish/funcs/match.py
+omlish/funcs/pairs.py
+omlish/funcs/pipes.py
 omlish/graphs/__init__.py
 omlish/graphs/dags.py
 omlish/graphs/domination.py

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

omlish-0.0.0.dev134/omlish/formats/json/cli/__main__.py

@@ -1,11 +0,0 @@
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'json',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    from .cli import _main
-
-    _main()

omlish-0.0.0.dev134/omlish/formats/json/cli/cli.py

@@ -1,298 +0,0 @@
-"""
-TODO:
- - read from http
- - jmespath output flat, unquoted strs like jq '.[]'
-
-==
-
-jq Command options:
-  -n, --null-input          use `null` as the single input value;
-  -R, --raw-input           read each line as string instead of JSON;
-  -s, --slurp               read all inputs into an array and use it as the single input value;
-  -c, --compact-output      compact instead of pretty-printed output;
-  -r, --raw-output          output strings without escapes and quotes;
-      --raw-output0         implies -r and output NUL after each output;
-  -j, --join-output         implies -r and output without newline after each output;
-  -a, --ascii-output        output strings by only ASCII characters using escape sequences;
-  -S, --sort-keys           sort keys of each object on output;
-  -C, --color-output        colorize JSON output;
-  -M, --monochrome-output   disable colored output;
-      --tab                 use tabs for indentation;
-      --indent n            use n spaces for indentation (max 7 spaces);
-      --unbuffered          flush output stream after each output;
-      --stream              parse the input value in streaming fashion;
-      --stream-errors       implies --stream and report parse error as an array;
-      --seq                 parse input/output as application/json-seq;
-  -f, --from-file file      load filter from the file;
-  -L directory              search modules from the directory;
-      --arg name value      set $name to the string value;
-      --argjson name value  set $name to the JSON value;
-      --slurpfile name file set $name to an array of JSON values read from the file;
-      --rawfile name file   set $name to string contents of file;
-      --args                consume remaining arguments as positional string values;
-      --jsonargs            consume remaining arguments as positional JSON values;
-  -e, --exit-status         set exit status code based on the output;
-  -V, --version             show the version;
-  --build-configuration     show jq's build configuration;
-  -h, --help                show the help;
-  --                        terminates argument processing;
-"""
-import argparse
-import contextlib
-import dataclasses as dc
-import io
-import os
-import subprocess
-import sys
-import typing as ta
-
-from .... import check
-from .... import fnpipes as fp
-from .... import lang
-from .formats import FORMATS_BY_NAME
-from .formats import Format
-from .formats import Formats
-from .parsing import DelimitingParser
-from .parsing import EagerParser
-from .parsing import StreamBuilder
-from .parsing import StreamParser
-from .processing import ProcessingOptions
-from .processing import Processor
-from .rendering import EagerRenderer
-from .rendering import RenderingOptions
-from .rendering import StreamRenderer
-
-
-T = ta.TypeVar('T')
-U = ta.TypeVar('U')
-
-
-def _build_args_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('file', nargs='?')
-
-    parser.add_argument('--stream', action='store_true')
-    parser.add_argument('--stream-build', action='store_true')
-
-    parser.add_argument('-l', '--lines', action='store_true')
-
-    parser.add_argument('--read-buffer-size', type=int, default=0x4000)
-
-    parser.add_argument('-f', '--format')
-
-    parser.add_argument('-x', '--jmespath-expr')
-    parser.add_argument('-F', '--flat', action='store_true')
-
-    parser.add_argument('-z', '--compact', action='store_true')
-    parser.add_argument('-p', '--pretty', action='store_true')
-    parser.add_argument('-i', '--indent')
-    parser.add_argument('-s', '--sort-keys', action='store_true')
-    parser.add_argument('-R', '--raw', action='store_true')
-    parser.add_argument('-U', '--unicode', action='store_true')
-    parser.add_argument('-c', '--color', action='store_true')
-
-    parser.add_argument('-L', '--less', action='store_true')
-
-    return parser
-
-
-def _parse_args(args: ta.Any = None) -> ta.Any:
-    return _build_args_parser().parse_args(args)
-
-
-@dc.dataclass(frozen=True, kw_only=True)
-class RunConfiguration:
-    format: Format
-    processing: ProcessingOptions
-    rendering: RenderingOptions
-
-
-def _process_args(args: ta.Any) -> RunConfiguration:
-    fmt_name = args.format
-    if fmt_name is None:
-        if args.file is not None:
-            ext = args.file.rpartition('.')[2]
-            if ext in FORMATS_BY_NAME:
-                fmt_name = ext
-    if fmt_name is None:
-        fmt_name = 'json'
-    format = FORMATS_BY_NAME[fmt_name]  # noqa
-
-    if args.stream:
-        check.arg(format is Formats.JSON.value)
-
-    #
-
-    processing = ProcessingOptions(
-        jmespath_expr=args.jmespath_expr,
-        flat=args.flat,
-    )
-
-    #
-
-    separators = None
-    if args.compact:
-        separators = (',', ':')
-
-    indent = None
-    if args.pretty:
-        indent = 2
-    if args.indent:
-        try:
-            indent = int(args.indent)
-        except ValueError:
-            indent = args.indent
-
-    rendering = RenderingOptions(
-        indent=indent,
-        separators=separators,
-        sort_keys=args.sort_keys,
-        raw=args.raw,
-        unicode=args.unicode,
-        color=args.color,
-    )
-
-    #
-
-    return RunConfiguration(
-        format=format,
-        processing=processing,
-        rendering=rendering,
-    )
-
-
-def _main() -> None:
-    args = _parse_args()
-
-    #
-
-    cfg = _process_args(args)
-
-    #
-
-    with contextlib.ExitStack() as es:
-        if args.file is None:
-            in_file = sys.stdin.buffer
-
-        else:
-            in_file = es.enter_context(open(args.file, 'rb'))
-
-        def yield_input() -> ta.Generator[bytes, None, None]:
-            fd = check.isinstance(in_file.fileno(), int)
-
-            while True:
-                buf = os.read(fd, args.read_buffer_size)
-
-                yield buf
-
-                if not buf:
-                    break
-
-        #
-
-        if args.less:
-            less = subprocess.Popen(
-                [
-                    'less',
-                    *(['-R'] if cfg.rendering.color else []),
-                ],
-                stdin=subprocess.PIPE,
-                encoding='utf-8',
-            )
-            out = check.not_none(less.stdin)
-
-            def close_less() -> None:
-                out.close()
-                less.wait()
-
-            es.enter_context(lang.defer(close_less))  # noqa
-
-        else:
-            out = sys.stdout
-
-        #
-
-        parser: ta.Any
-        renderer: ta.Any
-
-        if args.stream:
-            with contextlib.ExitStack() as es2:
-                parser = es2.enter_context(StreamParser())
-
-                def flush_output(
-                        fn: ta.Callable[[T], ta.Iterable[U]],
-                        i: T,
-                ) -> ta.Generator[U, None, None]:
-                    n = 0
-                    for o in fn(i):
-                        yield o
-                        n += 1
-                    if n:
-                        out.flush()
-
-                pipeline: ta.Any
-
-                if args.stream_build:
-                    builder: StreamBuilder = es2.enter_context(StreamBuilder())
-                    processor = Processor(cfg.processing)
-                    renderer = EagerRenderer(cfg.rendering)
-                    trailing_newline = False
-
-                    def append_newlines(
-                            fn: ta.Callable[[T], ta.Iterable[str]],
-                            i: T,
-                    ) -> ta.Generator[str, None, None]:
-                        yield from fn(i)
-                        yield '\n'
-
-                    pipeline = lambda v: (renderer.render(v),)  # Any -> [str]  # noqa
-                    pipeline = fp.bind(append_newlines, pipeline)  # Any -> [str]
-                    pipeline = fp.bind(lang.flatmap, pipeline)  # [Any] -> [str]
-                    pipeline = fp.pipe(fp.bind(lang.flatmap, processor.process), pipeline)  # [Any] -> [str]
-                    pipeline = fp.pipe(fp.bind(lang.flatmap, builder.build), pipeline)  # [JsonStreamParserEvent] -> [str]  # noqa
-                    pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
-
-                else:
-                    renderer = StreamRenderer(cfg.rendering)
-                    trailing_newline = True
-
-                    pipeline = renderer.render  # JsonStreamParserEvent -> [str]
-                    pipeline = fp.bind(lang.flatmap, pipeline)  # [JsonStreamParserEvent] -> [str]
-                    pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
-
-                pipeline = fp.bind(flush_output, pipeline)  # bytes -> [str]
-
-                for buf in yield_input():
-                    for s in pipeline(buf):
-                        print(s, file=out, end='')
-
-                if trailing_newline:
-                    print(file=out)
-
-        elif args.lines:
-            parser = DelimitingParser(cfg.format)
-            processor = Processor(cfg.processing)
-            renderer = EagerRenderer(cfg.rendering)
-
-            for buf in yield_input():
-                for v in parser.parse(buf):
-                    for e in processor.process(v):
-                        s = renderer.render(e)
-                        print(s, file=out)
-
-        else:
-            parser = EagerParser(cfg.format)
-            processor = Processor(cfg.processing)
-            renderer = EagerRenderer(cfg.rendering)
-
-            with io.TextIOWrapper(in_file) as tf:
-                v = parser.parse(tf)
-
-            for e in processor.process(v):
-                s = renderer.render(e)
-                print(s, file=out)
-
-
-if __name__ == '__main__':
-    _main()