omlish 0.0.0.dev19__py3-none-any.whl → 0.0.0.dev20__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev19'
-__revision__ = '509bb451054d2d955e55cbcf1f271a9166a904eb'
+__version__ = '0.0.0.dev20'
+__revision__ = '56a3421b375112818e306f2c17d467c7aac1d26b'
 
 
 #
@@ -88,7 +88,7 @@ class Project(ProjectBase):
         'sqlx': [
             'sqlean.py ~= 3.45; python_version < "3.13"',
 
-            'duckdb ~= 1.0',
+            'duckdb ~= 1.1',
         ],
 
         'testing': [

omlish/asyncs/anyio.py

@@ -23,6 +23,7 @@ async def killer(shutdown: anyio.Event, sleep_s: float) -> None:
     shutdown.set()
 
 """  # noqa
+import dataclasses as dc
 import signal
 import typing as ta
 
@@ -44,6 +45,12 @@ StapledByteStream: ta.TypeAlias = anyio.streams.stapled.StapledByteStream
 StapledObjectStream: ta.TypeAlias = anyio.streams.stapled.StapledObjectStream
 
 
+@dc.dataclass(eq=False)
+class MemoryStapledObjectStream(StapledObjectStream[T]):
+    send_stream: MemoryObjectSendStream[T]
+    receive_stream: MemoryObjectReceiveStream[T]
+
+
 ##
 
 
@@ -143,8 +150,8 @@ def split_memory_object_streams(
     return tup
 
 
-def create_stapled_memory_object_stream(max_buffer_size: float = 0) -> StapledObjectStream:
-    return StapledObjectStream(*anyio.create_memory_object_stream(max_buffer_size))
+def create_stapled_memory_object_stream(max_buffer_size: float = 0) -> MemoryStapledObjectStream:
+    return MemoryStapledObjectStream(*anyio.create_memory_object_stream(max_buffer_size))
 
 
 # FIXME: https://github.com/python/mypy/issues/15238
@@ -158,9 +165,9 @@ def create_memory_object_stream[T](max_buffer_size: float = 0) -> tuple[
 
 def staple_memory_object_stream(
         *args: anyio.create_memory_object_stream[T],
-) -> StapledObjectStream[T]:
+) -> MemoryStapledObjectStream[T]:
     send, receive = args
-    return StapledObjectStream(
+    return MemoryStapledObjectStream(
         check.isinstance(send, MemoryObjectSendStream),  # type: ignore
         check.isinstance(receive, MemoryObjectReceiveStream),  # type: ignore
     )
@@ -168,9 +175,9 @@ def staple_memory_object_stream(
 
 # FIXME: https://github.com/python/mypy/issues/15238
 # FIXME: https://youtrack.jetbrains.com/issues?q=tag:%20%7BPEP%20695%7D
-def staple_memory_object_stream2[T](max_buffer_size: float = 0) -> StapledObjectStream[T]:
+def staple_memory_object_stream2[T](max_buffer_size: float = 0) -> MemoryStapledObjectStream[T]:
     send, receive = anyio.create_memory_object_stream[T](max_buffer_size)
-    return StapledObjectStream(
+    return MemoryStapledObjectStream(
         check.isinstance(send, MemoryObjectSendStream),  # type: ignore
         check.isinstance(receive, MemoryObjectReceiveStream),  # type: ignore
     )

omlish/dataclasses/__init__.py

@@ -96,4 +96,6 @@ from .utils import (  # noqa
     opt_repr,
     update_field_extras,
     update_field_metadata,
+    update_fields,
+    update_fields_metadata,
 )

omlish/dataclasses/impl/metadata.py

@@ -70,5 +70,6 @@ class Init(lang.Marker):
     pass
 
 
-def init(fn: ta.Callable[..., None]) -> None:
+def init(fn: ta.Callable):
     _append_cls_md(Init, fn)
+    return fn

omlish/dataclasses/utils.py

@@ -12,6 +12,9 @@ from .impl.params import get_field_extras
 T = ta.TypeVar('T')
 
 
+#
+
+
 def maybe_post_init(sup: ta.Any) -> bool:
     try:
         fn = sup.__post_init__
@@ -21,10 +24,16 @@ def maybe_post_init(sup: ta.Any) -> bool:
     return True
 
 
+#
+
+
 def opt_repr(o: ta.Any) -> str | None:
     return repr(o) if o is not None else None
 
 
+#
+
+
 class field_modifier:  # noqa
     def __init__(self, fn: ta.Callable[[dc.Field], dc.Field]) -> None:
         super().__init__()
@@ -58,6 +67,42 @@ def update_field_extras(f: dc.Field, *, unless_non_default: bool = False, **kwar
     })
 
 
+def update_fields(
+        fn: ta.Callable[[str, dc.Field], dc.Field],
+        fields: ta.Iterable[str] | None = None,
+) -> ta.Callable[[type[T]], type[T]]:
+    def inner(cls):
+        if fields is None:
+            for a, v in list(cls.__dict__.items()):
+                if isinstance(v, dc.Field):
+                    setattr(cls, a, fn(a, v))
+
+        else:
+            for a in fields:
+                v = cls.__dict__[a]
+                if not isinstance(v, dc.Field):
+                    v = dc.field(default=v)
+                setattr(cls, a, fn(a, v))
+
+        return cls
+
+    check.not_isinstance(fields, str)
+    return inner
+
+
+def update_fields_metadata(
+        nmd: ta.Mapping,
+        fields: ta.Iterable[str] | None = None,
+) -> ta.Callable[[type[T]], type[T]]:
+    def inner(a: str, f: dc.Field) -> dc.Field:
+        return update_field_metadata(f, nmd)
+
+    return update_fields(inner, fields)
+
+
+#
+
+
 def deep_replace(o: T, *args: str | ta.Callable[[ta.Any], ta.Mapping[str, ta.Any]]) -> T:
     if not args:
         return o

omlish/fnpairs.py

@@ -449,7 +449,7 @@ class Toml(ObjectStr_):
 #
 
 
-@_register_extension('cpkl')
+@_register_extension('clpkl')
 @dc.dataclass(frozen=True)
 class Cloudpickle(ObjectBytes_):
     protocol: int | None = None

omlish/formats/json.py

@@ -13,6 +13,7 @@ from .. import lang
 if ta.TYPE_CHECKING:
     import orjson as _orjson
     import ujson as _ujson
+
 else:
     _orjson = lang.proxy_import('orjson')
     _ujson = lang.proxy_import('ujson')

omlish/lang/descriptors.py

@@ -125,11 +125,13 @@ class _decorator_descriptor:  # noqa
 
         def __get__(self, instance, owner=None):
             fn = self._fn.__get__(instance, owner)
+
             if self._md or instance is not None:
                 @functools.wraps(fn)
                 def inner(*args, **kwargs):
                     return self._wrapper(fn, *args, **kwargs)
                 return inner
+
             else:
                 @functools.wraps(fn)
                 def outer(this, *args, **kwargs):

omlish/lite/logs.py

@@ -69,8 +69,8 @@ class JsonLogFormatter(logging.Formatter):
 STANDARD_LOG_FORMAT_PARTS = [
     ('asctime', '%(asctime)-15s'),
     ('process', 'pid=%(process)-6s'),
-    ('thread', 'tid=%(thread)-10x'),
-    ('levelname', '%(levelname)-8s'),
+    ('thread', 'tid=%(thread)x'),
+    ('levelname', '%(levelname)s'),
     ('name', '%(name)s'),
     ('separator', '::'),
     ('message', '%(message)s'),

omlish/marshal/__init__.py

@@ -48,6 +48,10 @@ from .global_ import (  # noqa
     unmarshal,
 )
 
+from .helpers import (  # noqa
+    update_fields_metadata,
+)
+
 from .objects import (  # noqa
     FieldMetadata,
     ObjectMetadata,

omlish/marshal/dataclasses.py

@@ -31,10 +31,19 @@ def get_dataclass_metadata(ty: type) -> ObjectMetadata:
     ) or ObjectMetadata()
 
 
-def get_field_infos(ty: type, opts: col.TypeMap[Option] = col.TypeMap()) -> ta.Sequence[FieldInfo]:
+def get_field_infos(
+        ty: type,
+        opts: col.TypeMap[Option] = col.TypeMap(),
+) -> ta.Sequence[FieldInfo]:
     dc_md = get_dataclass_metadata(ty)
     dc_naming = dc_md.field_naming or opts.get(Naming)
 
+    fi_defaults = {
+        k: v
+        for k, v in dc.asdict(dc_md.field_defaults).items()
+        if v is not None
+    }
+
     type_hints = ta.get_type_hints(ty)
 
     ret: list[FieldInfo] = []
@@ -44,7 +53,8 @@ def get_field_infos(ty: type, opts: col.TypeMap[Option] = col.TypeMap()) -> ta.S
         else:
             um_name = field.name
 
-        kw = dict(
+        kw = dict(fi_defaults)
+        kw.update(
             name=field.name,
             type=type_hints[field.name],
             metadata=FieldMetadata(),
@@ -54,7 +64,10 @@ def get_field_infos(ty: type, opts: col.TypeMap[Option] = col.TypeMap()) -> ta.S
         )
 
         if (fmd := field.metadata.get(FieldMetadata)) is not None:
-            kw.update(metadata=fmd)
+            kw.update(
+                metadata=fmd,
+                omit_if=fmd.omit_if,
+            )
 
             if fmd.name is not None:
                 kw.update(

omlish/marshal/helpers.py

@@ -0,0 +1,22 @@
+import typing as ta
+
+from .. import dataclasses as dc
+from .objects import FieldMetadata
+
+
+T = ta.TypeVar('T')
+
+
+def update_fields_metadata(
+        fields: ta.Iterable[str] | None = None,
+        **kwargs: ta.Any,
+) -> ta.Callable[[type[T]], type[T]]:
+    def inner(a: str, f: dc.Field) -> dc.Field:
+        return dc.update_field_metadata(f, {
+            FieldMetadata: dc.replace(
+                f.metadata.get(FieldMetadata, FieldMetadata()),
+                **kwargs,
+            ),
+        })
+
+    return dc.update_fields(inner, fields)

omlish/marshal/objects.py

@@ -22,18 +22,13 @@ from .values import Value
 ##
 
 
-@dc.dataclass(frozen=True)
-class ObjectMetadata:
-    field_naming: Naming | None = None
-
-    unknown_field: str | None = None
-
-
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class FieldMetadata:
     name: str | None = None
     alts: ta.Iterable[str] | None = None
 
+    omit_if: ta.Callable[[ta.Any], bool] | None = None
+
     marshaler: Marshaler | None = None
     marshaler_factory: MarshalerFactory | None = None
 
@@ -41,18 +36,30 @@ class FieldMetadata:
     unmarshaler_factory: UnmarshalerFactory | None = None
 
 
+@dc.dataclass(frozen=True, kw_only=True)
+class ObjectMetadata:
+    field_naming: Naming | None = None
+
+    unknown_field: str | None = None
+
+    field_defaults: FieldMetadata = FieldMetadata()
+
+
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class FieldInfo:
     name: str
     type: ta.Any
-    metadata: FieldMetadata
 
     marshal_name: str
     unmarshal_names: ta.Sequence[str]
 
+    metadata: FieldMetadata = FieldMetadata()
+
+    omit_if: ta.Callable[[ta.Any], bool] | None = None
+
 
 ##
 
@@ -63,15 +70,20 @@ class ObjectMarshaler(Marshaler):
     unknown_field: str | None = None
 
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        ret = {
-            fi.marshal_name: m.marshal(ctx, getattr(o, fi.name))
-            for fi, m in self.fields
-        }
+        ret = {}
+        for fi, m in self.fields:
+            v = getattr(o, fi.name)
+            if fi.omit_if is not None and fi.omit_if(v):
+                continue
+            ret[fi.marshal_name] = m.marshal(ctx, v)
+
         if self.unknown_field is not None:
             if (ukf := getattr(o, self.unknown_field)):
                 if (dks := set(ret) & set(ukf)):
                     raise KeyError(f'Unknown field keys duplicate fields: {dks!r}')
+
             ret.update(ukf)  # FIXME: marshal?
+
         return ret
 
 
@@ -89,18 +101,25 @@ class ObjectUnmarshaler(Unmarshaler):
         u: ta.Any
         kw: dict[str, ta.Any] = {}
         ukf: dict[str, ta.Any] | None = None
+
         if self.unknown_field is not None:
             kw[self.unknown_field] = ukf = {}
+
         for k, mv in ma.items():
             ks = check.isinstance(k, str)
+
             try:
                 fi, u = self.fields_by_unmarshal_name[ks]
+
             except KeyError:
                 if ukf is not None:
                     ukf[ks] = mv  # FIXME: unmarshal?
                     continue
                 raise
+
             if fi.name in kw:
                 raise KeyError(f'Duplicate keys for field {fi.name!r}: {ks!r}')
+
             kw[fi.name] = u.unmarshal(ctx, mv)
+
         return self.cls(**kw)

omlish/multiprocessing.py

@@ -9,6 +9,7 @@ import time
 import typing as ta
 
 from . import check
+from . import lang
 from . import libc
 
 
@@ -18,6 +19,32 @@ T = ta.TypeVar('T')
 ##
 
 
+@ta.runtime_checkable
+class ValueProxy(ta.Protocol[T]):
+    # value = property(get, set)
+
+    def get(self) -> T:
+        ...
+
+    def set(self, value: T) -> None:
+        ...
+
+
+@dc.dataclass()
+@lang.protocol_check(ValueProxy)
+class DummyValueProxy(ValueProxy[T]):
+    value: T
+
+    def get(self) -> T:
+        return self.value
+
+    def set(self, value: T) -> None:
+        self.value = value
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SpawnExtras:
     fds: ta.AbstractSet[int] | None = None
@@ -75,6 +102,11 @@ class Deathpact(abc.ABC):
         raise NotImplementedError
 
 
+class NopDeathpact(Deathpact):
+    def poll(self) -> None:
+        pass
+
+
 #
 
 

omlish/specs/jsonschema/keywords/__init__.py

@@ -0,0 +1,42 @@
+from .base import (  # noqa
+    Keyword,
+    Keywords,
+)
+
+from .core import (  # noqa
+    CoreKeyword,
+    Id,
+    Ref,
+    SchemaKeyword,
+)
+
+from .metadata import (  # noqa
+    Description,
+    MetadataKeyword,
+    Title,
+)
+
+from .parse import (  # noqa
+    parse_keyword,
+    parse_keywords,
+)
+
+from .render import (  # noqa
+    render_keyword,
+    render_keywords,
+)
+
+from .validation import (  # noqa
+    ExclusiveMaximum,
+    ExclusiveMinimum,
+    Items,
+    MaxItems,
+    Maximum,
+    MinItems,
+    Minimum,
+    Properties,
+    Required,
+    Type,
+    UniqueItems,
+    ValidationKeyword,
+)

omlish/specs/jsonschema/keywords/base.py

@@ -0,0 +1,86 @@
+import operator
+import typing as ta
+
+from omlish import cached
+from omlish import check
+from omlish import collections as col
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+KeywordT = ta.TypeVar('KeywordT', bound='Keyword')
+
+
+##
+
+
+class Keyword(lang.Abstract, lang.PackageSealed):
+    tag: ta.ClassVar[str]
+
+    def __init_subclass__(cls, *, tag: str | None = None, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+        check.not_in('tag', dir(cls))
+        if not lang.is_abstract_class(cls):
+            check.issubclass(cls, lang.Final)
+            cls.tag = check.non_empty_str(tag)
+        else:
+            check.none(tag)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Keywords(lang.Final):
+    lst: ta.Sequence[Keyword]
+
+    @cached.property
+    @dc.init
+    def by_type(self) -> ta.Mapping[type[Keyword], Keyword]:
+        return col.unique_map_by(type, self.lst, strict=True)  # noqa
+
+    @cached.property
+    @dc.init
+    def by_tag(self) -> ta.Mapping[str, Keyword]:
+        return col.unique_map_by(operator.attrgetter('tag'), self.lst, strict=True)  # noqa
+
+    def __getitem__(self, item: type[KeywordT] | str) -> KeywordT:
+        if isinstance(item, type):
+            return self.by_type[item]  # noqa
+        elif isinstance(item, str):
+            return self.by_tag[item]
+        else:
+            raise TypeError(item)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class BooleanKeyword(Keyword, lang.Abstract):
+    b: bool
+
+
+@dc.dataclass(frozen=True)
+class NumberKeyword(Keyword, lang.Abstract):
+    n: int | float
+
+
+@dc.dataclass(frozen=True)
+class StrKeyword(Keyword, lang.Abstract):
+    s: str
+
+
+@dc.dataclass(frozen=True)
+class StrOrStrsKeyword(Keyword, lang.Abstract):
+    ss: str | ta.Sequence[str]
+
+
+@dc.dataclass(frozen=True)
+class KeywordsKeyword(Keyword, lang.Abstract):
+    kw: Keywords
+
+
+@dc.dataclass(frozen=True)
+class StrToKeywordsKeyword(Keyword, lang.Abstract):
+    m: ta.Mapping[str, Keywords]

omlish/specs/jsonschema/keywords/core.py

@@ -0,0 +1,26 @@
+from omlish import lang
+
+from .base import Keyword
+from .base import StrKeyword
+
+
+##
+
+
+class CoreKeyword(Keyword, lang.Abstract):
+    pass
+
+
+##
+
+
+class Id(StrKeyword, CoreKeyword, lang.Final, tag='$id'):
+    pass
+
+
+class SchemaKeyword(StrKeyword, CoreKeyword, lang.Final, tag='$schema'):
+    pass
+
+
+class Ref(StrKeyword, CoreKeyword, lang.Final, tag='$ref'):
+    pass

omlish/specs/jsonschema/keywords/metadata.py

@@ -0,0 +1,22 @@
+from omlish import lang
+
+from .base import Keyword
+from .base import StrKeyword
+
+
+##
+
+
+class MetadataKeyword(Keyword, lang.Abstract):
+    pass
+
+
+##
+
+
+class Title(StrKeyword, MetadataKeyword, lang.Final, tag='title'):
+    pass
+
+
+class Description(StrKeyword, MetadataKeyword, lang.Final, tag='description'):
+    pass

omlish/specs/jsonschema/keywords/parse.py

@@ -0,0 +1,69 @@
+import operator
+import typing as ta
+
+from omlish import check
+from omlish import collections as col
+from omlish import lang
+
+from . import core  # noqa
+from . import metadata  # noqa
+from . import validation  # noqa
+from .base import BooleanKeyword
+from .base import Keyword
+from .base import Keywords
+from .base import KeywordsKeyword
+from .base import NumberKeyword
+from .base import StrKeyword
+from .base import StrOrStrsKeyword
+from .base import StrToKeywordsKeyword
+
+
+KeywordT = ta.TypeVar('KeywordT', bound=Keyword)
+
+
+##
+
+
+KEYWORD_TYPES_BY_TAG: ta.Mapping[str, type[Keyword]] = col.unique_map_by(  # noqa
+    operator.attrgetter('tag'),
+    (cls for cls in lang.deep_subclasses(Keyword) if not lang.is_abstract_class(cls)),
+    strict=True,
+)
+
+
+def parse_keyword(cls: type[KeywordT], v: ta.Any) -> KeywordT:
+    if issubclass(cls, BooleanKeyword):
+        return cls(check.isinstance(v, bool))  # type: ignore
+
+    elif issubclass(cls, NumberKeyword):
+        return cls(check.isinstance(v, (int, float)))  # type: ignore
+
+    elif issubclass(cls, StrKeyword):
+        return cls(check.isinstance(v, str))  # type: ignore
+
+    elif issubclass(cls, StrOrStrsKeyword):
+        ss: str | ta.Sequence[str]
+        if isinstance(v, str):
+            ss = v
+        elif isinstance(v, ta.Iterable):
+            ss = col.seq_of(check.of_isinstance(str))(v)
+        else:
+            raise TypeError(v)
+        return cls(ss)  # type: ignore
+
+    elif issubclass(cls, KeywordsKeyword):
+        return cls(parse_keywords(v))  # type: ignore
+
+    elif issubclass(cls, StrToKeywordsKeyword):
+        return cls({k: parse_keywords(mv) for k, mv in v.items()})  # type: ignore
+
+    else:
+        raise TypeError(cls)
+
+
+def parse_keywords(dct: ta.Mapping[str, ta.Any]) -> Keywords:
+    lst: list[Keyword] = []
+    for k, v in dct.items():
+        cls = KEYWORD_TYPES_BY_TAG[k]
+        lst.append(parse_keyword(cls, v))
+    return Keywords(lst)

omlish/specs/jsonschema/keywords/render.py

@@ -0,0 +1,47 @@
+import typing as ta
+
+from .base import BooleanKeyword
+from .base import Keyword
+from .base import Keywords
+from .base import KeywordsKeyword
+from .base import NumberKeyword
+from .base import StrKeyword
+from .base import StrOrStrsKeyword
+from .base import StrToKeywordsKeyword
+
+
+def render_keyword(kw: Keyword) -> dict[str, ta.Any]:
+    if isinstance(kw, BooleanKeyword):
+        return {kw.tag: kw.b}
+
+    elif isinstance(kw, NumberKeyword):
+        return {kw.tag: kw.n}
+
+    elif isinstance(kw, StrKeyword):
+        return {kw.tag: kw.s}
+
+    elif isinstance(kw, StrOrStrsKeyword):
+        if isinstance(kw.ss, str):
+            return {kw.tag: kw.ss}
+        else:
+            return {kw.tag: list(kw.ss)}
+
+    elif isinstance(kw, KeywordsKeyword):
+        return {kw.tag: render_keywords(kw.kw)}
+
+    elif isinstance(kw, StrToKeywordsKeyword):
+        return {kw.tag: {k: render_keywords(v) for k, v in kw.m.items()}}
+
+    else:
+        raise TypeError(kw)
+
+
+def render_keywords(kws: Keywords) -> dict[str, ta.Any]:
+    dct: dict[str, ta.Any] = {}
+    for kw in kws.lst:
+        kwd = render_keyword(kw)
+        [(tag, val)] = kwd.items()
+        if tag in dct:
+            raise KeyError(tag)
+        dct[tag] = val
+    return dct

omlish/specs/jsonschema/keywords/validation.py

@@ -0,0 +1,68 @@
+from omlish import lang
+
+from .base import BooleanKeyword
+from .base import Keyword
+from .base import KeywordsKeyword
+from .base import NumberKeyword
+from .base import StrOrStrsKeyword
+from .base import StrToKeywordsKeyword
+
+
+##
+
+
+class ValidationKeyword(Keyword, lang.Abstract):
+    pass
+
+
+##
+
+
+class Type(StrOrStrsKeyword, ValidationKeyword, lang.Final, tag='type'):
+    pass
+
+
+class Items(KeywordsKeyword, ValidationKeyword, lang.Final, tag='items'):
+    pass
+
+
+class Required(StrOrStrsKeyword, ValidationKeyword, lang.Final, tag='required'):
+    pass
+
+
+class Properties(StrToKeywordsKeyword, ValidationKeyword, lang.Final, tag='properties'):
+    pass
+
+
+##
+
+
+class MaxItems(NumberKeyword, ValidationKeyword, lang.Final, tag='maxItems'):
+    pass
+
+
+class MinItems(NumberKeyword, ValidationKeyword, lang.Final, tag='minItems'):
+    pass
+
+
+class UniqueItems(BooleanKeyword, ValidationKeyword, lang.Final, tag='uniqueItems'):
+    pass
+
+
+#
+
+
+class Maximum(NumberKeyword, ValidationKeyword, lang.Final, tag='maximum'):
+    pass
+
+
+class ExclusiveMaximum(NumberKeyword, ValidationKeyword, lang.Final, tag='exclusiveMaximum'):
+    pass
+
+
+class Minimum(NumberKeyword, ValidationKeyword, lang.Final, tag='minimum'):
+    pass
+
+
+class ExclusiveMinimum(NumberKeyword, ValidationKeyword, lang.Final, tag='exclusiveMinimum'):
+    pass

omlish/specs/jsonschema/types.py

@@ -0,0 +1,10 @@
+import enum
+
+
+class JsonType(enum.Enum):
+    NULL = enum.auto()
+    BOOLEAN = enum.auto()
+    OBJECT = enum.auto()
+    ARRAY = enum.auto()
+    NUMBER = enum.auto()
+    STRING = enum.auto()

{omlish-0.0.0.dev19.dist-info → omlish-0.0.0.dev20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev19
+Version: 0.0.0.dev20
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -31,7 +31,7 @@ Requires-Dist: pg8000 ~=1.31 ; extra == 'all'
 Requires-Dist: pymysql ~=1.1 ; extra == 'all'
 Requires-Dist: aiomysql ~=0.2 ; extra == 'all'
 Requires-Dist: aiosqlite ~=0.20 ; extra == 'all'
-Requires-Dist: duckdb ~=1.0 ; extra == 'all'
+Requires-Dist: duckdb ~=1.1 ; extra == 'all'
 Requires-Dist: pytest ~=8.0 ; extra == 'all'
 Requires-Dist: greenlet ~=3.0 ; (python_version < "3.13") and extra == 'all'
 Requires-Dist: trio-asyncio ~=0.15 ; (python_version < "3.13") and extra == 'all'
@@ -73,7 +73,7 @@ Requires-Dist: sqlalchemy[asyncio] ~=2.0 ; (python_version < "3.13") and extra =
 Requires-Dist: asyncpg ~=0.29 ; (python_version < "3.13") and extra == 'sql'
 Requires-Dist: sqlalchemy ~=2.0 ; (python_version ~= "3.13") and extra == 'sql'
 Provides-Extra: sqlx
-Requires-Dist: duckdb ~=1.0 ; extra == 'sqlx'
+Requires-Dist: duckdb ~=1.1 ; extra == 'sqlx'
 Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'sqlx'
 Provides-Extra: testing
 Requires-Dist: pytest ~=8.0 ; extra == 'testing'

{omlish-0.0.0.dev19.dist-info → omlish-0.0.0.dev20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omlish/__about__.py,sha256=kx3qJfIi26XfEn1ZQ0smsjstKTHlUyhhgu2INCz-Mw4,2451
+omlish/__about__.py,sha256=aaPwsrPbNAl3zQVkQ9n1ZeBGXbeIaqkXe-qJK-YhMn4,2451
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=QRQmX9G0-L_nATkFtGHvpd4qrpYzKATdjuFLbBqzJPM,6224
 omlish/c3.py,sha256=W5EwYx9Por3rWYLkKUitJ6OoRMLLgVTfLTyroOz41Y0,8047
@@ -9,19 +9,19 @@ omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
 omlish/docker.py,sha256=5WyXJyFwqIJJ11QWwPIjHjDHnsaOVZszZAjyTvg3xew,4693
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
-omlish/fnpairs.py,sha256=tKX991ICOtBgWJrZsuSVryzVOmNkCobwUXyk4uNpsCY,10600
+omlish/fnpairs.py,sha256=hVuLqQFdRNNze3FYH2cAQO3GC7nK5yQP_GWPUSbL7nE,10601
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=u0481imCiTFqP_e-v9g0pD-0WD249j5vYzhtn-fnNkY,15308
 omlish/matchfns.py,sha256=o2evI7q0CAMHR8RQ_Jks6L0UoNpEDltnLjOiamJDtmU,6155
 omlish/math.py,sha256=AVqp5Y8yxKA-wO0BgrzaxA0Ga3PZiCXnYcwivMneC-0,3804
-omlish/multiprocessing.py,sha256=J5ywVOl6TcWXCzgmnNUrD-gaXLZd9ozLTqfz66jiCfs,4685
+omlish/multiprocessing.py,sha256=Jbcr71p_HlsM5rIFl9obzSv9TCusPhxciwpBXLTYpmc,5179
 omlish/os.py,sha256=cz4nL2ujaxH_-XRq3JUD8af8mSe1JXGPIoXP9XAEd0M,2607
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
 omlish/stats.py,sha256=uqjN-focDVssFZMagj22HqmyJ1TBO4Wt-XnHp8-EtVw,9927
 omlish/sync.py,sha256=AqwIfIuCMVHLwlJUa7dmaSjfA4sM5AYPCD5-nsz3XVQ,1516
 omlish/term.py,sha256=NEmxqAhicyInGtmFamZAizI2xdu819MzFYPEp0Fx97M,6111
 omlish/asyncs/__init__.py,sha256=uUz9ziKh4_QrgmdhKFMgq6j7mFbiZd3LiogguDCQsGI,587
-omlish/asyncs/anyio.py,sha256=6AruTkEXa3e4G1jgxfkYE36dQu8ihbh13u4up7OUW5k,7788
+omlish/asyncs/anyio.py,sha256=Hqdi1iCopKoaAWGx-AYTRLEwnavLWx1esfJISK1IVF0,8024
 omlish/asyncs/asyncio.py,sha256=JfM59QgB3asgEbrps0zoVbNjWD4kL2XdsEkRMEIoFos,971
 omlish/asyncs/asyncs.py,sha256=Tf7ZodTGepkM7HAuFcDNh9lLzzrMw6rELWvopGmFkh4,2035
 omlish/asyncs/bridge.py,sha256=AabrRVz5k75dTB59M70DWkl6JrLusjhpvsaj5jld9io,8151
@@ -60,8 +60,8 @@ omlish/configs/__init__.py,sha256=3uh09ezodTwkMI0nRmAMP0eEuJ_0VdF-LYyNmPjHiCE,77
 omlish/configs/classes.py,sha256=GLbB8xKjHjjoUQRCUQm3nEjM8z1qNTx9gPV7ODSt5dg,1317
 omlish/configs/flattening.py,sha256=AOlRpBHm449MxwMp3CiIRGunStOC1DUNs1f3CLou0wc,4731
 omlish/configs/strings.py,sha256=0brx1duL85r1GpfbNvbHcSvH4jWzutwuvMFXda9NeI0,2651
-omlish/dataclasses/__init__.py,sha256=FMR2hCAsOxRTjT2asnuyEGkA4OXI7J3N8Wy7cyPiogs,1247
-omlish/dataclasses/utils.py,sha256=G1nSlvdwsb9SV1AsJRfXrCO0sAnqMcj7LjGdVSWi2AA,1852
+omlish/dataclasses/__init__.py,sha256=pnIEFM-2aWoN9yLLThAzVJUT7YzdGaAcfqWUVGF9WDk,1294
+omlish/dataclasses/utils.py,sha256=G5kRFc6QPNQLdehsdH-2m6Fjba_k1OFjx72zSHtfccI,2781
 omlish/dataclasses/impl/__init__.py,sha256=rQJRcE9fVsGEvRUOZ18r4DE0xiLbSRjspyJRXgbLS3I,348
 omlish/dataclasses/impl/api.py,sha256=NOuw5dlwztG5AA_gwdF2PJAqvouMdbUf1Si80G26qAY,6244
 omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX0,2598
@@ -75,7 +75,7 @@ omlish/dataclasses/impl/init.py,sha256=yw9iInFHaR_TFWRzsryr8vgStHMQwqubL-s7pY5k1
 omlish/dataclasses/impl/internals.py,sha256=LTCqGT8AhyGTWwioGrBpTJzDzPvAtizQKb0NBNKcNs0,2989
 omlish/dataclasses/impl/main.py,sha256=vAVdqb4cgvyssA7rCFl9i2D0MAffX45YtQbGQ2te5_c,5189
 omlish/dataclasses/impl/metaclass.py,sha256=dlQEIN9MHBirll7Nx3StpzxYxXjrqxJ-QsorMcCNt7w,2828
-omlish/dataclasses/impl/metadata.py,sha256=HGqAtMcP422X4kPx93btcxE-n4guBFm6-N-S4nobgk4,1407
+omlish/dataclasses/impl/metadata.py,sha256=binwdG0cyKdGEypRKYTbcDyH_be4aTaSnVnK2V5rwB8,1402
 omlish/dataclasses/impl/order.py,sha256=zWvWDkSTym8cc7vO1cLHqcBhhjOlucHOCUVJcdh4jt0,1369
 omlish/dataclasses/impl/params.py,sha256=M-xg9IeFftVy795oqlp7Yw8jE-7wG2K4vaFhXHKmL1k,2538
 omlish/dataclasses/impl/processing.py,sha256=iUvaNwRAt8rQsLIIkvRye5rfk6xhgR35EbcdwZCZec8,366
@@ -103,7 +103,7 @@ omlish/dispatch/functions.py,sha256=S8ElsLi6DKxTdtFGigWaF0vAquwy2sK-3f4iRLaYq70,
 omlish/dispatch/methods.py,sha256=XHjwwC9Gn4iDWxbyLAcbdSwRgVaq-8Bnn5cAwf5oZdA,5403
 omlish/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/dotenv.py,sha256=UjZl3gac-0U24sDjCCGMcCqO1UCWG2Zs8PZ4JdAg2YE,17348
-omlish/formats/json.py,sha256=SgPpt-j0yLQDJaw_TkF471G2NrJPiTkhl8_Src81HGg,1016
+omlish/formats/json.py,sha256=61XG6rveb3SSXmYrKvUmRdaVDyMD6C-7yVqXBBMu8t8,1017
 omlish/formats/props.py,sha256=diYjZDsG1s50ImJhkpeinMwjr8952nIVI-0gYhBIvCY,18897
 omlish/formats/yaml.py,sha256=5gvH-e9fVn6C-xpcagnrtM0bSLOsuk3sAQT-aaE4PD4,6653
 omlish/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -159,7 +159,7 @@ omlish/lang/cached.py,sha256=0gjdxVELu69oRQ3kqSV3cGIHg6Nf4pcCIIRTEU52tCc,7607
 omlish/lang/clsdct.py,sha256=LXwLCULeI_8Np-7-pZkyNAHpUZLcQiBEQiHwKYQ0WRo,1742
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
 omlish/lang/contextmanagers.py,sha256=C6FU_1ftMvp_Zbz9ixf_HsCSYQot_TZ7mpZBJEBc3Xc,8333
-omlish/lang/descriptors.py,sha256=taJzRU-lKszfaIH847UEE9Kb_krhCqPGYdu7CTBXr5Q,5900
+omlish/lang/descriptors.py,sha256=J0oRWys9smHp9UYeearBATA7u-6t5pDnQgPfWiXN3B4,5902
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=T4nPl46EHHGjMkz3FTRjsVhS9Y8HKcwM0jROU6_-Rv0,3619
 omlish/lang/imports.py,sha256=04ugFC8NI5sbL7NH4V0r0q_nFsP_AMkHLz697CVkMtQ,6274
@@ -189,7 +189,7 @@ omlish/lite/cached.py,sha256=dUm647FbIsoxWT23XUFM51F7i-C2Buxr5b5zzgbCtQI,546
 omlish/lite/check.py,sha256=DR3Zj-7o4Y7pNheln68nN_BdX9zaotGQ2y8v97GDiWQ,535
 omlish/lite/contextmanagers.py,sha256=HnQJiyrOmSvTL22XRJrFl5CLpCyHD9fsntEUAr9G-60,427
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
-omlish/lite/logs.py,sha256=Sd5Uw_napxHpq4S-8OYgRdMYqECL7OWicQXsfCjdEuo,2646
+omlish/lite/logs.py,sha256=qgP0pNjkoG5gjQ6xuXM7qpsLwZX3WbS7WaZlDqQKry4,2641
 omlish/lite/marshal.py,sha256=5uwri-KzPiktnbYORkGXcJ4kulZvp_nS4MxPsU1Y-G0,8608
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
@@ -202,23 +202,24 @@ omlish/logs/configs.py,sha256=VfZjhyA4CeMYNhlsv5oD2IZ6Iv4d_lbUgZzcnLAkxNA,1052
 omlish/logs/formatters.py,sha256=AFs9C6-qrFkgXZ0nL39wih_LGck1Tc79alvGyibBdQo,720
 omlish/logs/noisy.py,sha256=8JORjI1dH38yU2MddM54OB6qt32Xozfocdb88vY4wro,335
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
-omlish/marshal/__init__.py,sha256=ggU_UVW-CyXZnsaGwx-Cxj4PUAY0QsXmaXVLFO8T4rQ,1453
+omlish/marshal/__init__.py,sha256=Co5UUlCyd3eDToQTOvTURmCICKzuULnR5B6ylgb2nFM,1515
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
 omlish/marshal/base.py,sha256=EIgrqsQ1OQ4mVUMuDH5zRBCwJpn8ijVS98Nmoka_Mrs,6025
 omlish/marshal/base64.py,sha256=Q3ibujdhgFgDaeHahSe7WdcqvOyalWigwUlV-U-2ckQ,1018
-omlish/marshal/dataclasses.py,sha256=PMAwBblcmCNVifDul0Vl09saBZ3BYEOIOJABZ2zc4Bg,3667
+omlish/marshal/dataclasses.py,sha256=cqHfzkQe7T-A_eAx-xZm6AIOZLnqE-alMUXMtRTYxuI,3910
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
 omlish/marshal/enums.py,sha256=-0fKutBbyz8ygEaA0_P_8IOJrI9jMGigmnPbutV9Bg4,1464
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=UV2Svjok-lTWsRqKGh-CeuAhvlohw9uJe7ZLyoKMvTM,2968
 omlish/marshal/forbidden.py,sha256=BNshzm4lN5O8sUZ1YvxrSYq3WPklq9NMQCRZ7RC3DLM,865
 omlish/marshal/global_.py,sha256=8XCjPcIjA65StESshzNfQiSyuckVaEiiWROmC3qk0mo,1117
+omlish/marshal/helpers.py,sha256=L9U40zeo4pKsNtohKaLHHiGz-aitOFQI1Xwii1ZsLOE,545
 omlish/marshal/iterables.py,sha256=6I_ZdJemLSQtJ4J5NrB9wi-eyxiJZS61HzHXp1yeiX8,2592
 omlish/marshal/mappings.py,sha256=zhLtyot7tzQtBNj7C4RBxjMELxA5r2q2Mth8Br7xkFs,2803
 omlish/marshal/maybes.py,sha256=tKkVsJATERgbVcEfBnsHBK_2_LCQIVyBzca-cA-9KH0,2112
 omlish/marshal/naming.py,sha256=UCviMAXTTUpW1lyAGymybGP2rFUAW44P1X0zrIVbvi4,464
 omlish/marshal/numbers.py,sha256=oY_yMNJEnJhjfLh89gpPXvKqeUyhQcaTcQB6ecyHiG8,1704
-omlish/marshal/objects.py,sha256=JD7GBY1hYUyRpCufpxDAwgII98ewzGDct2IF0HxgFN0,2767
+omlish/marshal/objects.py,sha256=T3prlm0HESpOLXHWcdsYekfmythJRZQOvaoL0is8J_o,3097
 omlish/marshal/optionals.py,sha256=r0XB5rqfasvgZJNrKYd6Unq2U4nHt3JURi26j0dYHlw,1499
 omlish/marshal/polymorphism.py,sha256=gyvNYUAkmQVhWrcXBLzXINxqx6RHyulf9n16Iv38PFI,5597
 omlish/marshal/primitives.py,sha256=-gLR_RTPTM8YP6t6PL5sNM1lAtwcZDHc9lxkimoQ9jw,1097
@@ -239,6 +240,19 @@ omlish/secrets/openssl.py,sha256=nAA_wxk86G92B7027AoAlAiFliMjxLVs7xlaOAFGayE,622
 omlish/secrets/passwords.py,sha256=3r-vEK6Gp6aq4L5Csnd06QnrjO9xfzHJP-g_7I9W_ao,4101
 omlish/secrets/secrets.py,sha256=hFN82uYiBVx8YSE86leWNxb4IRp3qdwZPOi4w04h8u0,6855
 omlish/secrets/subprocesses.py,sha256=EcnKlHHtnUMHGrBWXDfu8tv28wlgZx4P4GOiuPW9Vo8,1105
+omlish/specs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/specs/jsonschema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/specs/jsonschema/types.py,sha256=aJrZq2oqjmbGa32YnWyGFPbEyNfm0YO9ixNy7qU-snE,189
+omlish/specs/jsonschema/keywords/__init__.py,sha256=Zt2g1BXd654uU2AQ5P7_-x2Wrtf6cNbP9mxI1wGN4wo,596
+omlish/specs/jsonschema/keywords/base.py,sha256=HA4OvsdvAl4o5JgJI_tuaHBGURjxT5QeFN6_ja5Z5xQ,1957
+omlish/specs/jsonschema/keywords/core.py,sha256=irJ5Rreg9hTeXu3FovSdzhFb3vUly-hYQVYflEgST3g,368
+omlish/specs/jsonschema/keywords/metadata.py,sha256=55jlunXosdcM1IQ256KfUIEwFzDPah448ZOeQhJE1c8,316
+omlish/specs/jsonschema/keywords/parse.py,sha256=3XzHE5gN6usVUMw2DrvbNZrGDYdM8EefVyfQ0cEMKEA,1936
+omlish/specs/jsonschema/keywords/render.py,sha256=enGkw1S8Zxfn1IBkKqZTK81yG21MVKk54B8rqiTY30c,1236
+omlish/specs/jsonschema/keywords/validation.py,sha256=ghewVUSG5qPYnmexy1Ylc-XouiQXobsXLYvkaGgZLqg,1322
+omlish/specs/jsonschema/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/specs/jsonschema/schemas/draft202012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/specs/jsonschema/schemas/draft202012/vocabularies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/sql/__init__.py,sha256=pLv2EQmAwcGXN0Y3AE8K5JjyN_4GaHRMHyExaDFm5yU,181
 omlish/sql/_abc.py,sha256=HLhnnLZ7l0r_N99I-RCqJe6VHth-9iluU7cR-7-5jfs,1519
 omlish/sql/asyncs.py,sha256=Wye3dwh7oZEGYz2Y4DZQSHtW4xjI2AH5qjW-BSS2IfU,3688
@@ -271,8 +285,8 @@ 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=KGgo0wHOIMVMZtDso-rhSWKAcAkYAH2IGpg9tULabu8,6505
-omlish-0.0.0.dev19.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev19.dist-info/METADATA,sha256=WKLfItwNq64Fe1ej7iTmG2WBv0VczhZNwn_9mAVyTPY,3718
-omlish-0.0.0.dev19.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-omlish-0.0.0.dev19.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev19.dist-info/RECORD,,
+omlish-0.0.0.dev20.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev20.dist-info/METADATA,sha256=BBHZ7D3ieK9P1cgSW23jGabeqRXDnzccCc8Tsby0J5Y,3718
+omlish-0.0.0.dev20.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+omlish-0.0.0.dev20.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev20.dist-info/RECORD,,