omlish 0.0.0.dev82__tar.gz → 0.0.0.dev84__tar.gz

{omlish-0.0.0.dev82/omlish.egg-info → omlish-0.0.0.dev84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev82
+Version: 0.0.0.dev84
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -40,7 +40,7 @@ Requires-Dist: aiomysql~=0.2; extra == "all"
 Requires-Dist: aiosqlite~=0.20; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.46; extra == "all"
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "all"
+Requires-Dist: sqlean.py~=3.45; extra == "all"
 Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
 Requires-Dist: anyio~=4.6; extra == "all"
@@ -86,7 +86,7 @@ Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
 Requires-Dist: aiosqlite~=0.20; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.46; extra == "sqldrivers"
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqldrivers"
+Requires-Dist: sqlean.py~=3.45; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.1; extra == "sqldrivers"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.0; extra == "testing"

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish/.manifests.json

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

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev82'
-__revision__ = '025f44593a2c0c59d06340e1d7dbcd15b1ab7684'
+__version__ = '0.0.0.dev84'
+__revision__ = 'b3347da7d48862b90c274893e4f9bfa477fecc70'
 
 
 #
@@ -101,7 +101,7 @@ class Project(ProjectBase):
 
             'apsw ~= 3.46',
 
-            'sqlean.py ~= 3.45; python_version < "3.13"',
+            'sqlean.py ~= 3.45',
 
             'duckdb ~= 1.1',
         ],

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish/dataclasses/impl/fields.py

@@ -35,7 +35,7 @@ def raise_field_validation_error(
         field: str,
         fn: ta.Callable,
         value: ta.Any,
-):
+) -> ta.NoReturn:
     raise FieldValidationError(
         obj,
         field,

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish/dataclasses/impl/init.py

@@ -23,6 +23,19 @@ from .utils import set_new_attribute
 MISSING = dc.MISSING
 
 
+##
+
+
+def raise_validation_error(
+        obj: ta.Any,
+        fn: ta.Callable,
+) -> ta.NoReturn:
+    raise ValidationError(obj, fn)
+
+
+##
+
+
 class InitFields(ta.NamedTuple):
     all: ta.Sequence[dc.Field]
     ordered: ta.Sequence[dc.Field]
@@ -57,6 +70,9 @@ def init_param(f: dc.Field) -> str:
     return f'{f.name}: __dataclass_type_{f.name}__{default}'  # noqa
 
 
+##
+
+
 class InitBuilder:
 
     def __init__(
@@ -100,7 +116,7 @@ class InitBuilder:
             '__dataclass_builtins_object__': object,
             '__dataclass_builtins_isinstance__': isinstance,
             '__dataclass_builtins_TypeError__': TypeError,
-            '__dataclass_ValidationError__': ValidationError,
+            '__dataclass_raise_validation_error__': raise_validation_error,
             '__dataclass_raise_field_validation_error__': raise_field_validation_error,
         })
 
@@ -128,7 +144,7 @@ class InitBuilder:
             locals[cn] = fn
             csig = inspect.signature(fn)
             cas = ', '.join(p.name for p in csig.parameters.values())
-            body_lines.append(f'if not {cn}({cas}): raise __dataclass_ValidationError__')
+            body_lines.append(f'if not {cn}({cas}): __dataclass_raise_validation_error__({self._self_name}, {cn})')
 
         inits = self._info.merged_metadata.get(Init, [])
         mro_dct = lang.build_mro_dict(self._info.cls)

{omlish-0.0.0.dev82/omlish/formats/json → omlish-0.0.0.dev84/omlish/formats/json/cli}/cli.py

@@ -1,13 +1,6 @@
-"""
-TODO:
- - xml - [{"att", {"el", {"cdata", ...
- - csv - dict if headers, array if not
-"""
 import argparse
 import codecs
 import contextlib
-import dataclasses as dc
-import enum
 import io
 import json
 import os
@@ -15,33 +8,25 @@ import subprocess
 import sys
 import typing as ta
 
-from ... import check
-from ... import lang
-from ... import term
-from .render import JsonRenderer
-from .stream.build import JsonObjectBuilder
-from .stream.lex import JsonStreamLexer
-from .stream.parse import JsonStreamParser
-from .stream.render import StreamJsonRenderer
+from .... import check
+from .... import lang
+from .... import term
+from ..render import JsonRenderer
+from ..stream.build import JsonObjectBuilder
+from ..stream.lex import JsonStreamLexer
+from ..stream.parse import JsonStreamParser
+from ..stream.render import StreamJsonRenderer
+from .formats import FORMATS_BY_NAME
+from .formats import Formats
 
 
 if ta.TYPE_CHECKING:
-    import ast
-    import tomllib
-
-    import yaml
-
-    from .. import dotenv
-    from .. import props
-
+    from ....specs import jmespath
 else:
-    ast = lang.proxy_import('ast')
-    tomllib = lang.proxy_import('tomllib')
+    jmespath = lang.proxy_import('....specs.jmespath', __package__)
 
-    yaml = lang.proxy_import('yaml')
 
-    dotenv = lang.proxy_import('..dotenv', __package__)
-    props = lang.proxy_import('..props', __package__)
+##
 
 
 def term_color(o: ta.Any, state: JsonRenderer.State) -> tuple[str, str]:
@@ -53,29 +38,6 @@ def term_color(o: ta.Any, state: JsonRenderer.State) -> tuple[str, str]:
         return '', ''
 
 
-@dc.dataclass(frozen=True)
-class Format:
-    names: ta.Sequence[str]
-    load: ta.Callable[[ta.TextIO], ta.Any]
-
-
-class Formats(enum.Enum):
-    JSON = Format(['json'], json.load)
-    YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
-    TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))
-    ENV = Format(['env', 'dotenv'], lambda f: dotenv.dotenv_values(stream=f))
-    PROPS = Format(['properties', 'props'], lambda f: dict(props.Properties().load(f.read())))
-    PY = Format(['py', 'python', 'repr'], lambda f: ast.literal_eval(f.read()))
-
-
-FORMATS_BY_NAME: ta.Mapping[str, Format] = {
-    n: f
-    for e in Formats
-    for f in [e.value]
-    for n in f.names
-}
-
-
 def _main() -> None:
     parser = argparse.ArgumentParser()
 
@@ -87,6 +49,8 @@ def _main() -> None:
 
     parser.add_argument('-f', '--format')
 
+    parser.add_argument('-x', '--jmespath-expr')
+
     parser.add_argument('-z', '--compact', action='store_true')
     parser.add_argument('-p', '--pretty', action='store_true')
     parser.add_argument('-i', '--indent')
@@ -119,7 +83,15 @@ def _main() -> None:
         sort_keys=args.sort_keys,
     )
 
+    if args.jmespath_expr is not None:
+        jp_expr = jmespath.compile(args.jmespath_expr)
+    else:
+        jp_expr = None
+
     def render_one(v: ta.Any) -> str:
+        if jp_expr is not None:
+            v = jp_expr.search(v)
+
         if args.color:
             return JsonRenderer.render_str(
                 v,

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

@@ -0,0 +1,64 @@
+"""
+TODO:
+ - options lol - csv header, newline, etc
+"""
+import dataclasses as dc
+import enum
+import json
+import typing as ta
+
+from .... import lang
+
+
+if ta.TYPE_CHECKING:
+    import ast
+    import csv
+    import tomllib
+
+    import yaml
+
+    from ... import dotenv
+    from ... import props
+    from ... import xml
+
+else:
+    ast = lang.proxy_import('ast')
+    csv = lang.proxy_import('csv')
+    tomllib = lang.proxy_import('tomllib')
+
+    yaml = lang.proxy_import('yaml')
+
+    dotenv = lang.proxy_import('...dotenv', __package__)
+    props = lang.proxy_import('...props', __package__)
+    xml = lang.proxy_import('...xml', __package__)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Format:
+    names: ta.Sequence[str]
+    load: ta.Callable[[ta.TextIO], ta.Any]
+
+
+class Formats(enum.Enum):
+    JSON = Format(['json'], json.load)
+    YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
+    TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))
+    ENV = Format(['env', 'dotenv'], lambda f: dotenv.dotenv_values(stream=f))
+    PROPS = Format(['properties', 'props'], lambda f: dict(props.Properties().load(f.read())))
+    PY = Format(['py', 'python', 'repr'], lambda f: ast.literal_eval(f.read()))
+    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).as_dict())
+    CSV = Format(['csv'], lambda f: list(csv.DictReader(f)))
+    TSV = Format(['tsv'], lambda f: list(csv.DictReader(f, delimiter='\t')))
+    FLAT_CSV = Format(['fcsv'], lambda f: list(csv.reader(f)))
+    FLAT_TSV = Format(['ftsv'], lambda f: list(csv.reader(f, delimiter='\t')))
+
+
+FORMATS_BY_NAME: ta.Mapping[str, Format] = {
+    n: f
+    for e in Formats
+    for f in [e.value]
+    for n in f.names
+}

omlish-0.0.0.dev84/omlish/formats/json/stream/build.py

@@ -0,0 +1,109 @@
+import typing as ta
+
+from .lex import SCALAR_VALUE_TYPES
+from .parse import BeginArray
+from .parse import BeginObject
+from .parse import EndArray
+from .parse import EndObject
+from .parse import JsonStreamObject
+from .parse import JsonStreamParserEvent
+from .parse import Key
+
+
+##
+
+
+class JsonObjectBuilder:
+    def __init__(
+            self,
+            *,
+            yield_object_lists: bool = False,
+    ) -> None:
+        self._stack: list[JsonStreamObject | list | Key] = []
+        self._yield_object_lists = yield_object_lists
+
+    class StateError(Exception):
+        pass
+
+    def __enter__(self) -> ta.Self:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if exc_type is None:
+            self.close()
+
+    def close(self) -> None:
+        if self._stack:
+            raise self.StateError
+
+    def _emit_value(self, v):
+        if not (stk := self._stack):
+            return (v,)
+
+        tv = stk[-1]
+        if isinstance(tv, Key):
+            stk.pop()
+            if not stk:
+                raise self.StateError
+
+            tv2 = stk[-1]
+            if not isinstance(tv2, JsonStreamObject):
+                raise self.StateError
+
+            tv2.append((tv.key, v))
+            return ()
+
+        elif isinstance(tv, list):
+            tv.append(v)
+            return ()
+
+        else:
+            raise self.StateError
+
+    def __call__(self, e: JsonStreamParserEvent) -> ta.Any:
+        stk = self._stack
+
+        #
+
+        if isinstance(e, SCALAR_VALUE_TYPES):
+            return self._emit_value(e)
+
+        #
+
+        elif e is BeginObject:
+            stk.append(JsonStreamObject())
+            return ()
+
+        elif isinstance(e, Key):
+            if not stk or not isinstance(stk[-1], JsonStreamObject):
+                raise self.StateError
+
+            stk.append(e)
+            return ()
+
+        elif e is EndObject:
+            tv: ta.Any
+            if not stk or not isinstance(tv := stk.pop(), JsonStreamObject):
+                raise self.StateError
+
+            if not self._yield_object_lists:
+                tv = dict(tv)
+
+            return self._emit_value(tv)
+
+        #
+
+        elif e is BeginArray:
+            stk.append([])
+            return ()
+
+        elif e is EndArray:
+            if not stk or not isinstance(tv := stk.pop(), list):
+                raise self.StateError
+
+            return self._emit_value(tv)
+
+        #
+
+        else:
+            raise TypeError(e)

omlish-0.0.0.dev84/omlish/formats/xml.py

@@ -0,0 +1,63 @@
+"""
+TODO:
+ - lxml abstraction
+ - stuff from ommlx/wiki
+"""
+import typing as ta
+
+from .. import dataclasses as dc
+from .. import lang
+
+
+if ta.TYPE_CHECKING:
+    import xml.etree.ElementTree as ET
+else:
+    ET = lang.proxy_import('xml.etree.ElementTree')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class SimpleElement:
+    tag: str
+    attributes: ta.Mapping[str, str] | None = dc.xfield(default=None, repr_fn=dc.truthy_repr)
+    body: ta.Sequence[ta.Union['SimpleElement', str]] | None = dc.xfield(default=None, repr_fn=dc.truthy_repr)
+
+    def as_dict(self) -> dict[str, ta.Any]:
+        dct: dict[str, ta.Any] = {'tag': self.tag}
+        if self.attributes:
+            dct['attributes'] = self.attributes
+        if self.body:
+            dct['body'] = [
+                c.as_dict() if isinstance(c, SimpleElement) else c
+                for c in self.body
+            ]
+        return dct
+
+
+def build_simple_element(element: 'ET.Element') -> SimpleElement:
+    atts = {}
+    for name, value in element.attrib.items():
+        atts[name] = value  # noqa
+
+    body: list[SimpleElement | str] = []
+
+    if element.text and (s := element.text.strip()):
+        body.append(s)
+
+    for child in element:
+        body.append(build_simple_element(child))
+
+        if child.tail and (s := child.tail.strip()):
+            body.append(s)
+
+    return SimpleElement(
+        element.tag,
+        atts,
+        body,
+    )
+
+
+def parse_tree(s: str) -> 'ET.ElementTree':
+    return ET.ElementTree(ET.fromstring(s.strip()))  # noqa

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev82
+Version: 0.0.0.dev84
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -40,7 +40,7 @@ Requires-Dist: aiomysql~=0.2; extra == "all"
 Requires-Dist: aiosqlite~=0.20; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.46; extra == "all"
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "all"
+Requires-Dist: sqlean.py~=3.45; extra == "all"
 Requires-Dist: duckdb~=1.1; extra == "all"
 Requires-Dist: pytest~=8.0; extra == "all"
 Requires-Dist: anyio~=4.6; extra == "all"
@@ -86,7 +86,7 @@ Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
 Requires-Dist: aiosqlite~=0.20; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.46; extra == "sqldrivers"
-Requires-Dist: sqlean.py~=3.45; python_version < "3.13" and extra == "sqldrivers"
+Requires-Dist: sqlean.py~=3.45; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.1; extra == "sqldrivers"
 Provides-Extra: testing
 Requires-Dist: pytest~=8.0; extra == "testing"

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish.egg-info/SOURCES.txt

@@ -191,10 +191,9 @@ omlish/docker/manifests.py
 omlish/formats/__init__.py
 omlish/formats/dotenv.py
 omlish/formats/props.py
+omlish/formats/xml.py
 omlish/formats/yaml.py
 omlish/formats/json/__init__.py
-omlish/formats/json/__main__.py
-omlish/formats/json/cli.py
 omlish/formats/json/consts.py
 omlish/formats/json/encoding.py
 omlish/formats/json/json.py
@@ -206,6 +205,10 @@ 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/stream/__init__.py
 omlish/formats/json/stream/build.py
 omlish/formats/json/stream/lex.py

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/omlish.egg-info/requires.txt

@@ -27,12 +27,10 @@ aiomysql~=0.2
 aiosqlite~=0.20
 asyncpg~=0.30
 apsw~=3.46
+sqlean.py~=3.45
 duckdb~=1.1
 pytest~=8.0
 
-[all:python_version < "3.13"]
-sqlean.py~=3.45
-
 [async]
 anyio~=4.6
 sniffio~=1.3
@@ -86,10 +84,8 @@ aiomysql~=0.2
 aiosqlite~=0.20
 asyncpg~=0.30
 apsw~=3.46
-duckdb~=1.1
-
-[sqldrivers:python_version < "3.13"]
 sqlean.py~=3.45
+duckdb~=1.1
 
 [testing]
 pytest~=8.0

{omlish-0.0.0.dev82 → omlish-0.0.0.dev84}/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.dev82'
+version = '0.0.0.dev84'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -51,7 +51,7 @@ all = [
     'aiosqlite ~= 0.20',
     'asyncpg ~= 0.30',
     'apsw ~= 3.46',
-    'sqlean.py ~= 3.45; python_version < "3.13"',
+    'sqlean.py ~= 3.45',
     'duckdb ~= 1.1',
     'pytest ~= 8.0',
     'anyio ~= 4.6',
@@ -106,7 +106,7 @@ sqldrivers = [
     'aiosqlite ~= 0.20',
     'asyncpg ~= 0.30',
     'apsw ~= 3.46',
-    'sqlean.py ~= 3.45; python_version < "3.13"',
+    'sqlean.py ~= 3.45',
     'duckdb ~= 1.1',
 ]
 testing = [

omlish-0.0.0.dev82/omlish/formats/json/stream/build.py

@@ -1,113 +0,0 @@
-import typing as ta
-
-from ....genmachine import GenMachine
-from .lex import SCALAR_VALUE_TYPES
-from .parse import BeginArray
-from .parse import BeginObject
-from .parse import EndArray
-from .parse import EndObject
-from .parse import JsonStreamObject
-from .parse import JsonStreamParserEvent
-from .parse import Key
-
-
-##
-
-
-class JsonObjectBuilder(GenMachine[JsonStreamParserEvent, ta.Any]):
-    def __init__(
-            self,
-            *,
-            yield_object_lists: bool = False,
-    ) -> None:
-        self._stack: list[JsonStreamObject | list | Key] = []
-        self._yield_object_lists = yield_object_lists
-
-        super().__init__(self._do())
-
-    def _do(self):
-        stk = self._stack
-
-        def emit_value(v):
-            if not stk:
-                return (v,)
-
-            tv = stk[-1]
-            if isinstance(tv, Key):
-                stk.pop()
-                if not stk:
-                    raise self.StateError
-
-                tv2 = stk[-1]
-                if not isinstance(tv2, JsonStreamObject):
-                    raise self.StateError
-
-                tv2.append((tv.key, v))
-                return ()
-
-            elif isinstance(tv, list):
-                tv.append(v)
-                return ()
-
-            else:
-                raise self.StateError
-
-        while True:
-            try:
-                e = yield None
-            except GeneratorExit:
-                if stk:
-                    raise self.StateError from None
-                else:
-                    raise
-
-            #
-
-            if isinstance(e, SCALAR_VALUE_TYPES):
-                if t := emit_value(e):
-                    yield t
-                continue
-
-            #
-
-            elif e is BeginObject:
-                stk.append(JsonStreamObject())
-                continue
-
-            elif isinstance(e, Key):
-                if not stk or not isinstance(stk[-1], JsonStreamObject):
-                    raise self.StateError
-
-                stk.append(e)
-                continue
-
-            elif e is EndObject:
-                tv: ta.Any
-                if not stk or not isinstance(tv := stk.pop(), JsonStreamObject):
-                    raise self.StateError
-
-                if not self._yield_object_lists:
-                    tv = dict(tv)
-
-                if t := emit_value(tv):
-                    yield t
-                continue
-
-            #
-
-            elif e is BeginArray:
-                stk.append([])
-                continue
-
-            elif e is EndArray:
-                if not stk or not isinstance(tv := stk.pop(), list):
-                    raise self.StateError
-
-                if t := emit_value(tv):
-                    yield t
-                continue
-
-            #
-
-            else:
-                raise TypeError(e)