omlish 0.0.0.dev394__tar.gz → 0.0.0.dev396__tar.gz

{omlish-0.0.0.dev394/omlish.egg-info → omlish-0.0.0.dev396}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev394
+Version: 0.0.0.dev396
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -30,7 +30,7 @@ Requires-Dist: psutil~=7.0; extra == "all"
 Requires-Dist: orjson~=3.11; extra == "all"
 Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: pyyaml~=6.0; extra == "all"
-Requires-Dist: cbor2~=5.6; extra == "all"
+Requires-Dist: cbor2~=5.7; extra == "all"
 Requires-Dist: cloudpickle~=3.1; extra == "all"
 Requires-Dist: httpx[http2]~=0.28; extra == "all"
 Requires-Dist: wrapt~=1.17; extra == "all"
@@ -73,7 +73,7 @@ Provides-Extra: formats
 Requires-Dist: orjson~=3.11; extra == "formats"
 Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: pyyaml~=6.0; extra == "formats"
-Requires-Dist: cbor2~=5.6; extra == "formats"
+Requires-Dist: cbor2~=5.7; extra == "formats"
 Requires-Dist: cloudpickle~=3.1; extra == "formats"
 Provides-Extra: http
 Requires-Dist: httpx[http2]~=0.28; extra == "http"

{omlish-0.0.0.dev394 → omlish-0.0.0.dev396}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev394'
-__revision__ = 'b3c8aa9fb0aa4cb4683cea8843b22615547cbf03'
+__version__ = '0.0.0.dev396'
+__revision__ = '00b57bae472acf724c5154303eaea5f0f847f129'
 
 
 #
@@ -69,7 +69,7 @@ class Project(ProjectBase):
 
             'pyyaml ~= 6.0',
 
-            'cbor2 ~= 5.6',
+            'cbor2 ~= 5.7',
 
             'cloudpickle ~= 3.1',
         ],

{omlish-0.0.0.dev394 → omlish-0.0.0.dev396}/omlish/collections/__init__.py

@@ -139,6 +139,10 @@ from .sorted.sorted import (  # noqa
     SortedMutableMapping,
 )
 
+from .trie import (  # noqa
+    Trie,
+)
+
 from .unmodifiable import (  # noqa
     Unmodifiable,
     UnmodifiableMapping,

omlish-0.0.0.dev396/omlish/collections/trie.py

@@ -0,0 +1,156 @@
+import typing as ta
+
+
+K = ta.TypeVar('K')
+V = ta.TypeVar('V')
+K2 = ta.TypeVar('K2')
+V2 = ta.TypeVar('V2')
+
+
+##
+
+
+class Trie(ta.MutableMapping[ta.Sequence[K], V], ta.Generic[K, V]):
+    class Node(ta.Generic[K2, V2]):
+        def __init__(self) -> None:
+            self._children: dict[K2, Trie.Node[K2, V2]] = {}
+
+        _value: V2
+
+        def __init_subclass__(cls, **kwargs):
+            raise TypeError
+
+        @property
+        def has_value(self) -> bool:
+            try:
+                self._value  # noqa
+            except AttributeError:
+                return False
+            else:
+                return True
+
+        @property
+        def value(self) -> V2:
+            return self._value
+
+        @property
+        def children(self) -> ta.Mapping[K2, 'Trie.Node[K2, V2]']:
+            return self._children
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._len = 0
+        self._root: Trie.Node[K, V] = Trie.Node()
+
+    @property
+    def root(self) -> Node[K, V]:
+        return self._root
+
+    def __len__(self) -> int:
+        return self._len
+
+    def get_node(self, k: ta.Iterable[K]) -> Node[K, V]:
+        cur = self._root
+        for x in k:
+            cur = cur._children[x]  # noqa
+        return cur
+
+    def __getitem__(self, k: ta.Iterable[K]) -> V:
+        try:
+            node = self.get_node(k)
+        except KeyError:
+            raise KeyError(k) from None
+
+        try:
+            return node.value
+        except AttributeError:
+            raise KeyError(k) from None
+
+    def __setitem__(self, k: ta.Iterable[K], v: V) -> None:
+        cur = self._root
+        for x in k:
+            try:
+                cur = cur._children[x]  # noqa
+            except KeyError:
+                nxt: Trie.Node[K, V] = Trie.Node()
+                cur._children[x] = nxt  # noqa
+                cur = nxt
+
+        try:
+            cur._value  # noqa
+        except AttributeError:
+            self._len += 1
+        cur._value = v  # noqa
+
+    def __delitem__(self, k: ta.Iterable[K]) -> None:
+        stack: list[tuple[K, Trie.Node[K, V]]] = []
+        cur = self._root
+        for x in k:
+            stack.append((x, cur))
+            cur = cur._children[x]  # noqa
+
+        try:
+            del cur._value  # noqa
+        except AttributeError:
+            raise KeyError(k) from None
+
+        self._len -= 1
+        for x, parent in reversed(stack):
+            if cur.has_value or cur._children:  # noqa
+                break
+            del parent._children[x]  # noqa
+            cur = parent
+
+    def iter_nodes(
+            self,
+            *,
+            share_key: bool = False,
+            root: ta.Optional['Trie.Node[K, V]'] = None,
+            sort_children: bool | ta.Callable[[list[tuple[K, Node[K, V]]]], None] = False,
+    ) -> ta.Iterator[tuple[ta.Sequence[K], Node[K, V]]]:
+        if root is None:
+            root = self._root
+
+        ic: ta.Callable[[ta.Mapping[K, Trie.Node[K, V]]], ta.Iterator[tuple[K, Trie.Node[K, V]]]]
+        if sort_children is True:
+            ic = lambda cd: iter(sorted(cd.items(), key=lambda t: t[0]))  # type: ignore
+        elif sort_children is False:
+            ic = lambda cd: iter(cd.items())
+        else:
+            def ic(cd):
+                il = list(cd.items())
+                sort_children(il)
+                return iter(il)
+
+        key: list[K] = []
+        stack: list[tuple[Trie.Node[K, V], ta.Iterator[tuple[K, Trie.Node[K, V]]]]] = []
+
+        stack.append((root, ic(root._children)))  # noqa
+        yield (key if share_key else tuple(key), root)
+
+        while stack:
+            node, it = stack[-1]
+
+            try:
+                k, c = next(it)
+            except StopIteration:
+                stack.pop()
+                if stack:
+                    key.pop()
+                continue
+            key.append(k)
+
+            stack.append((c, ic(c._children)))  # noqa
+            yield (key if share_key else tuple(key), c)
+
+    def iter_items(self, **kwargs: ta.Any) -> ta.Iterator[tuple[ta.Sequence[K], V]]:
+        for k, node in self.iter_nodes(**kwargs):
+            try:
+                yield (k, node._value)  # noqa
+            except AttributeError:
+                pass
+
+    def __iter__(self) -> ta.Iterator[ta.Sequence[K]]:
+        for k, _ in self.iter_items():
+            yield k

{omlish-0.0.0.dev394 → omlish-0.0.0.dev396}/omlish/dataclasses/__init__.py

@@ -22,7 +22,7 @@ from dataclasses import (  # noqa
     replace,
 )
 
-from .api import (  # noqa
+from .impl.api import (  # noqa
     dataclass as xdataclass,
 
     make_dataclass as xmake_dataclass,
@@ -30,15 +30,15 @@ from .api import (  # noqa
     field as xfield,
 )
 
+from .impl.concerns.replace import (  # noqa
+    replace as xreplace,
+)
+
 from .tools.as_ import (  # noqa
     asdict,
     astuple,
 )
 
-from .concerns.replace import (  # noqa
-    replace as xreplace,
-)
-
 
 ##
 # globals hack
@@ -54,7 +54,7 @@ globals()['replace'] = xreplace
 ##
 # additional interface
 
-from .api import (  # noqa
+from .impl.api import (  # noqa
     append_class_metadata,
     extra_class_params,
     init,

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/classes/conversion.py

@@ -1,9 +1,9 @@
 import typing as ta
 
-from .... import check
-from ...internals import StdParams
-from ...specs import ClassSpec
-from ...specs import FieldSpec
+from ..... import check
+from ...._internals import StdParams
+from ....specs import ClassSpec
+from ....specs import FieldSpec
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/classes/decorator.py

@@ -5,12 +5,12 @@ TODO:
 import inspect
 import typing as ta
 
-from .... import check
-from .... import lang
-from ...internals import STD_FIELDS_ATTR
-from ...internals import STD_PARAMS_ATTR
+from ..... import check
+from ..... import lang
+from ...._internals import STD_FIELDS_ATTR
+from ...._internals import STD_PARAMS_ATTR
+from ....specs import ClassSpec
 from ...processing.driving import drive_cls_processing
-from ...specs import ClassSpec
 from ...utils import class_decorator
 from ..fields.building import build_cls_std_fields
 from ..fields.conversion import std_field_to_field_spec

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/classes/metadata.py

@@ -1,10 +1,10 @@
 import dataclasses as dc
 import typing as ta
 
-from .... import check
-from .... import lang
-from ....lite.dataclasses import is_immediate_dataclass
-from ...specs import InitFn
+from ..... import check
+from ..... import lang
+from .....lite.dataclasses import is_immediate_dataclass
+from ....specs import InitFn
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/classes/params.py

@@ -1,9 +1,9 @@
 import typing as ta
 
-from .... import check
-from ...internals import STD_PARAMS_ATTR
-from ...internals import StdParams
-from ...specs import ClassSpec
+from ..... import check
+from ...._internals import STD_PARAMS_ATTR
+from ...._internals import StdParams
+from ....specs import ClassSpec
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/fields/building.py

@@ -2,13 +2,13 @@ import dataclasses as dc
 import types
 import typing as ta
 
-from .... import check
-from ...inspect import get_cls_annotations
-from ...internals import STD_FIELDS_ATTR
-from ...internals import StdFieldType
-from ...internals import std_is_classvar
-from ...internals import std_is_initvar
-from ...internals import std_is_kw_only
+from ..... import check
+from ...._internals import STD_FIELDS_ATTR
+from ...._internals import StdFieldType
+from ...._internals import std_is_classvar
+from ...._internals import std_is_initvar
+from ...._internals import std_is_kw_only
+from ....inspect import get_cls_annotations
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/fields/constructor.py

@@ -2,10 +2,10 @@ import collections
 import dataclasses as dc
 import typing as ta
 
-from .... import lang
-from ...specs import CoerceFn
-from ...specs import ReprFn
-from ...specs import ValidateFn
+from ..... import lang
+from ....specs import CoerceFn
+from ....specs import ReprFn
+from ....specs import ValidateFn
 from .metadata import _ExtraFieldParamsMetadata
 from .metadata import extra_field_params
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/fields/conversion.py

@@ -1,14 +1,14 @@
 import dataclasses as dc
 import typing as ta
 
-from .... import check
-from .... import lang
-from ...debug import DEBUG
-from ...internals import StdFieldType
-from ...internals import std_field_type
-from ...specs import DefaultFactory
-from ...specs import FieldSpec
-from ...specs import FieldType
+from ..... import check
+from ..... import lang
+from ...._internals import StdFieldType
+from ...._internals import std_field_type
+from ....debug import DEBUG
+from ....specs import DefaultFactory
+from ....specs import FieldSpec
+from ....specs import FieldType
 from .metadata import _ExtraFieldParamsMetadata
 from .metadata import set_field_spec_metadata
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/api/fields/metadata.py

@@ -1,11 +1,11 @@
 import dataclasses as dc
 import typing as ta
 
-from .... import check
-from .... import lang
-from ...debug import DEBUG
-from ...specs import FieldSpec
-from ...tools.modifiers import field_modifier
+from ..... import check
+from ..... import lang
+from ....debug import DEBUG
+from ....specs import FieldSpec
+from ....tools.modifiers import field_modifier
 from ...utils import chain_mapping_proxy
 
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/copy.py

@@ -1,6 +1,7 @@
 import dataclasses as dc
 import typing as ta
 
+from ...specs import FieldType
 from ..generation.base import Generator
 from ..generation.base import Plan
 from ..generation.base import PlanResult
@@ -10,7 +11,6 @@ from ..generation.ops import Op
 from ..generation.registry import register_generator_type
 from ..generation.utils import build_attr_kwargs_body_src_lines
 from ..processing.base import ProcessingContext
-from ..specs import FieldType
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/fields.py

@@ -1,18 +1,18 @@
 import dataclasses as dc
 import typing as ta
 
-from ... import check
-from ..debug import DEBUG
+from .... import check
+from ..._internals import STD_FIELDS_ATTR
+from ...debug import DEBUG
+from ...inspect import FieldsInspection
+from ...specs import FieldSpec
+from ...specs import FieldType
 from ..generation.idents import IDENT_PREFIX
-from ..inspect import FieldsInspection
-from ..internals import STD_FIELDS_ATTR
 from ..processing.base import ProcessingContext
 from ..processing.base import Processor
 from ..processing.priority import ProcessorPriority
 from ..processing.registry import register_processing_context_item_factory
 from ..processing.registry import register_processor_type
-from ..specs import FieldSpec
-from ..specs import FieldType
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/frozen.py

@@ -7,7 +7,9 @@ import dataclasses as dc
 import typing as ta
 import weakref
 
-from ... import check
+from .... import check
+from ..._internals import STD_FIELDS_ATTR
+from ..._internals import STD_PARAMS_ATTR
 from ..generation.base import Generator
 from ..generation.base import Plan
 from ..generation.base import PlanResult
@@ -17,8 +19,6 @@ from ..generation.idents import IDENT_PREFIX
 from ..generation.ops import AddMethodOp
 from ..generation.ops import Op
 from ..generation.registry import register_generator_type
-from ..internals import STD_FIELDS_ATTR
-from ..internals import STD_PARAMS_ATTR
 from ..processing.base import ProcessingContext
 
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/hash.py

@@ -1,7 +1,7 @@
 import dataclasses as dc
 import typing as ta
 
-from ... import check
+from .... import check
 from ..generation.base import Generator
 from ..generation.base import Plan
 from ..generation.base import PlanResult

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/init.py

@@ -7,7 +7,15 @@ import dataclasses as dc
 import itertools
 import typing as ta
 
-from ... import check
+from .... import check
+from ..._internals import STD_POST_INIT_NAME
+from ...inspect import FieldsInspection
+from ...specs import CoerceFn
+from ...specs import DefaultFactory
+from ...specs import FieldSpec
+from ...specs import FieldType
+from ...specs import InitFn
+from ...specs import ValidateFn
 from ..generation.base import Generator
 from ..generation.base import Plan
 from ..generation.base import PlanResult
@@ -24,15 +32,7 @@ from ..generation.ops import OpRef
 from ..generation.ops import Ref
 from ..generation.registry import register_generator_type
 from ..generation.utils import SetattrSrcBuilder
-from ..inspect import FieldsInspection
-from ..internals import STD_POST_INIT_NAME
 from ..processing.base import ProcessingContext
-from ..specs import CoerceFn
-from ..specs import DefaultFactory
-from ..specs import FieldSpec
-from ..specs import FieldType
-from ..specs import InitFn
-from ..specs import ValidateFn
 from .fields import InitFields
 from .mro import MroDict
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/matchargs.py

@@ -1,4 +1,4 @@
-from ... import check
+from .... import check
 from ..processing.base import Processor
 from ..processing.priority import ProcessorPriority
 from ..processing.registry import register_processor_type

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/mro.py

@@ -1,6 +1,6 @@
 import typing as ta
 
-from ... import lang
+from .... import lang
 from ..processing.base import ProcessingContext
 from ..processing.registry import register_processing_context_item_factory
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/params.py

@@ -1,5 +1,5 @@
-from ... import check
-from ..internals import STD_PARAMS_ATTR
+from .... import check
+from ..._internals import STD_PARAMS_ATTR
 from ..processing.base import Processor
 from ..processing.priority import ProcessorPriority
 from ..processing.registry import register_processor_type

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/replace.py

@@ -1,10 +1,10 @@
 import dataclasses as dc
 import typing as ta
 
-from ..internals import STD_FIELDS_ATTR
-from ..internals import StdFieldType
-from ..internals import std_field_type
-from ..internals import std_is_dataclass_instance
+from ..._internals import STD_FIELDS_ATTR
+from ..._internals import StdFieldType
+from ..._internals import std_field_type
+from ..._internals import std_is_dataclass_instance
 from ..processing.base import Processor
 from ..processing.priority import ProcessorPriority
 from ..processing.registry import register_processor_type

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/concerns/repr.py

@@ -1,6 +1,9 @@
 import dataclasses as dc
 import typing as ta
 
+from ...specs import FieldSpec
+from ...specs import FieldType
+from ...specs import ReprFn
 from ..generation.base import Generator
 from ..generation.base import Plan
 from ..generation.base import PlanResult
@@ -11,9 +14,6 @@ from ..generation.ops import OpRef
 from ..generation.ops import Ref
 from ..generation.registry import register_generator_type
 from ..processing.base import ProcessingContext
-from ..specs import FieldSpec
-from ..specs import FieldType
-from ..specs import ReprFn
 from .fields import InitFields
 
 

omlish-0.0.0.dev396/omlish/dataclasses/impl/configs.py

@@ -0,0 +1,12 @@
+import dataclasses as dc
+
+
+##
+
+
+PACKAGE_CONFIG_FILE_NAME = '.dataclasses.json'
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class PackageConfig:
+    codegen: bool = False

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/generation/compilation.py

@@ -6,7 +6,7 @@ import abc
 import dataclasses as dc
 import typing as ta
 
-from ... import check
+from .... import check
 from ..utils import repr_round_trip_value
 from .globals import FN_GLOBAL_IMPORTS
 from .globals import FN_GLOBALS

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/generation/execution.py

@@ -7,7 +7,7 @@ import sys
 import types
 import typing as ta
 
-from ... import lang
+from .... import lang
 from ..utils import repr_round_trip_value
 from .globals import FN_GLOBAL_VALUES
 from .globals import FnGlobal

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/generation/globals.py

@@ -3,9 +3,9 @@ import reprlib
 import types
 import typing as ta
 
-from ..errors import FieldFnValidationError
-from ..errors import FieldTypeValidationError
-from ..errors import FnValidationError
+from ...errors import FieldFnValidationError
+from ...errors import FieldTypeValidationError
+from ...errors import FnValidationError
 from .idents import IDENT_PREFIX
 
 

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/generation/mangling.py

@@ -1,4 +1,4 @@
-from ...text.mangle import StringMangler
+from ....text.mangle import StringMangler
 
 
 ##

{omlish-0.0.0.dev394/omlish/dataclasses → omlish-0.0.0.dev396/omlish/dataclasses/impl}/generation/plans.py

@@ -6,7 +6,7 @@ import dataclasses as dc
 import re
 import typing as ta
 
-from ... import lang
+from .... import lang
 from .base import Plan