omlish 0.0.0.dev282__tar.gz → 0.0.0.dev283__tar.gz

{omlish-0.0.0.dev282/omlish.egg-info → omlish-0.0.0.dev283}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev282
+Version: 0.0.0.dev283
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev282'
-__revision__ = '7838e4a0dc1a1434797f27f330d5d3efdd410927'
+__version__ = '0.0.0.dev283'
+__revision__ = 'cb2339041915213e0f3c8ffacbb6339c5606f479'
 
 
 #

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/collections/__init__.py

@@ -31,7 +31,7 @@ from .coerce import (  # noqa
     seq_or_none,
 )
 
-from .exceptions import (  # noqa
+from .errors import (  # noqa
     DuplicateKeyError,
 )
 

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/collections/mappings.py

@@ -23,6 +23,9 @@ def multikey_dict(dct: ta.Mapping[ta.Iterable[K] | K, V], *, deep: bool = False)
     return ret
 
 
+##
+
+
 def guarded_map_update(
         dst: ta.MutableMapping[ta.Any, ta.Any],
         *srcs: ta.Mapping[ta.Any, ta.Any],
@@ -35,6 +38,9 @@ def guarded_map_update(
     return dst
 
 
+##
+
+
 class TypeMap(ta.Generic[T]):
     def __init__(self, items: ta.Iterable[T] = ()) -> None:
         super().__init__()
@@ -99,6 +105,9 @@ class DynamicTypeMap(ta.Generic[V]):
             return ret
 
 
+##
+
+
 class MissingDict(dict[K, V]):
     def __init__(self, missing_fn: ta.Callable[[K], V]) -> None:
         if not callable(missing_fn):

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/collections/utils.py

@@ -1,7 +1,7 @@
 import typing as ta
 
 from .. import lang
-from .exceptions import DuplicateKeyError
+from .errors import DuplicateKeyError
 from .identity import IdentityKeyDict
 from .identity import IdentitySet
 
@@ -30,6 +30,9 @@ def partition(items: ta.Iterable[T], pred: ta.Callable[[T], bool]) -> PartitionR
     return PartitionResult(t, f)
 
 
+##
+
+
 def unique(
         it: ta.Iterable[T],
         *,
@@ -52,6 +55,9 @@ def unique(
     return ret
 
 
+##
+
+
 def make_map(
         kvs: ta.Iterable[tuple[K, V]],
         *,
@@ -82,6 +88,9 @@ def make_map_by(
     )
 
 
+##
+
+
 def multi_map(kvs: ta.Iterable[tuple[K, V]], *, identity: bool = False) -> ta.MutableMapping[K, list[V]]:
     d: ta.MutableMapping[K, list[V]] = IdentityKeyDict() if identity else {}
     l: list[V]

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/dataclasses/__init__.py

@@ -65,7 +65,7 @@ globals()['make_dataclass'] = xmake_dataclass
 ##
 
 
-from .impl.exceptions import (  # noqa
+from .impl.errors import (  # noqa
     FieldValidationError,
     ValidationError,
 )

omlish-0.0.0.dev282/omlish/dataclasses/impl/exceptions.py → omlish-0.0.0.dev283/omlish/dataclasses/impl/errors.py

@@ -2,6 +2,9 @@ import types
 import typing as ta
 
 
+##
+
+
 class ValidationError(Exception):
     pass
 

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/dataclasses/impl/fields.py

@@ -8,7 +8,7 @@ import typing as ta
 
 from ... import check as check_
 from ... import lang
-from .exceptions import FieldValidationError
+from .errors import FieldValidationError
 from .internals import FIELDS_ATTR
 from .internals import FieldType
 from .internals import is_classvar

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/dataclasses/impl/init.py

@@ -3,7 +3,7 @@ import inspect
 import typing as ta
 
 from ... import lang
-from .exceptions import ValidationError
+from .errors import ValidationError
 from .fields import field_init
 from .fields import field_type
 from .fields import has_default

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/inject/__init__.py

@@ -21,7 +21,7 @@ from .elements import (  # noqa
     as_elements,
 )
 
-from .exceptions import (  # noqa
+from .errors import (  # noqa
     BaseKeyError,
     ConflictingKeyError,
     CyclicDependencyError,

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/inject/impl/elements.py

@@ -29,8 +29,8 @@ from ..bindings import Binding
 from ..eagers import Eager
 from ..elements import Element
 from ..elements import Elements
-from ..exceptions import ConflictingKeyError
-from ..exceptions import UnboundKeyError
+from ..errors import ConflictingKeyError
+from ..errors import UnboundKeyError
 from ..keys import Key
 from ..listeners import ProvisionListenerBinding
 from ..multis import MapBinding

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/inject/impl/injector.py

@@ -23,8 +23,8 @@ import weakref
 from ... import check
 from ... import lang
 from ..elements import Elements
-from ..exceptions import CyclicDependencyError
-from ..exceptions import UnboundKeyError
+from ..errors import CyclicDependencyError
+from ..errors import UnboundKeyError
 from ..injector import Injector
 from ..inspect import KwargsTarget
 from ..keys import Key

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/inject/impl/inspect.py

@@ -12,7 +12,7 @@ import weakref
 
 from ... import check
 from ... import reflect as rfl
-from ..exceptions import ConflictingKeyError
+from ..errors import ConflictingKeyError
 from ..inspect import Kwarg
 from ..inspect import KwargsTarget
 from ..keys import Key

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/inject/impl/scopes.py

@@ -15,8 +15,8 @@ from ... import lang
 from ..bindings import Binding
 from ..elements import Elements
 from ..elements import as_elements
-from ..exceptions import ScopeAlreadyOpenError
-from ..exceptions import ScopeNotOpenError
+from ..errors import ScopeAlreadyOpenError
+from ..errors import ScopeNotOpenError
 from ..injector import Injector
 from ..keys import Key
 from ..providers import FnProvider

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/lang/__init__.py

@@ -122,8 +122,8 @@ from .descriptors import (  # noqa
     update_wrapper,
 )
 
-from .exceptions import (  # noqa
-    Unreachable,
+from .enums import (  # noqa
+    enum_name_repr,
 )
 
 from .functions import (  # noqa
@@ -201,6 +201,7 @@ from .maybes import (  # noqa
 )
 
 from .objects import (  # noqa
+    AttrRepr,
     SimpleProxy,
     anon_object,
     arg_repr,

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/lang/comparison.py

@@ -8,6 +8,9 @@ def cmp(l: ta.Any, r: ta.Any) -> int:
     return int(l > r) - int(l < r)
 
 
+##
+
+
 class InfinityType:
     def __repr__(self) -> str:
         return 'Infinity'

omlish-0.0.0.dev283/omlish/lang/enums.py

@@ -0,0 +1,8 @@
+import typing as ta
+
+
+##
+
+
+def enum_name_repr(e: ta.Any) -> str:
+    return f'{e.__class__.__name__}.{e.name}'

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/lang/objects.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - reprlib / recur guard (merge w/ defs.py)
+"""
+import dataclasses as dc
 import types
 import typing as ta
 import weakref
@@ -11,21 +16,45 @@ T = ta.TypeVar('T')
 ##
 
 
-def attr_repr(
-        obj: ta.Any,
-        *attrs: str,
-        with_module: bool = False,
-        use_qualname: bool = False,
-        with_id: bool = False,
-) -> str:
-    return (
-        f'{obj.__class__.__module__ + "." if with_module else ""}'
-        f'{obj.__class__.__qualname__ if use_qualname else obj.__class__.__name__}'
-        f'{("@" + hex(id(obj))[2:]) if with_id else ""}'
-        f'('
-        f'{", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)}'
-        f')'
-    )
+@dc.dataclass(frozen=True)
+class AttrRepr:
+    attrs: ta.Sequence[str]
+
+    _: dc.KW_ONLY
+
+    with_module: bool = False
+    use_qualname: bool = False
+    with_id: bool = False
+    value_filter: ta.Callable[[ta.Any], bool] | None = None
+
+    @classmethod
+    def of(cls, *attrs: str, **kwargs: ta.Any) -> 'AttrRepr':
+        return cls(attrs, **kwargs)
+
+    def __call__(self, obj: ta.Any) -> str:
+        vs = ', '.join(
+            f'{attr}={v!r}'
+            for attr in self.attrs
+            for v in [getattr(obj, attr)]
+            if self.value_filter is None or self.value_filter(v)
+        )
+        return (
+            f'{obj.__class__.__module__ + "." if self.with_module else ""}'
+            f'{obj.__class__.__qualname__ if self.use_qualname else obj.__class__.__name__}'
+            f'{("@" + hex(id(obj))[2:]) if self.with_id else ""}'
+            f'({vs})'
+        )
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        def __repr__(other):  # noqa
+            return self(other)
+        return __repr__.__get__(instance, owner)
+
+
+def attr_repr(obj: ta.Any, *attrs: str, **kwargs: ta.Any) -> str:
+    return AttrRepr(attrs, **kwargs)(obj)
 
 
 def arg_repr(*args: ta.Any, **kwargs: ta.Any) -> str:

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/marshal/__init__.py

@@ -50,7 +50,7 @@ from .composite.wrapped import (  # noqa
     WrappedUnmarshaler,
 )
 
-from .exceptions import (  # noqa
+from .errors import (  # noqa
     ForbiddenTypeError,
     MarshalError,
     UnhandledTypeError,

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/marshal/base.py

@@ -92,7 +92,7 @@ from .. import dataclasses as dc
 from .. import lang
 from .. import reflect as rfl
 from ..funcs import match as mfs
-from .exceptions import UnhandledTypeError
+from .errors import UnhandledTypeError
 from .factories import RecursiveTypeFactory
 from .factories import TypeCacheFactory
 from .factories import TypeMapFactory

omlish-0.0.0.dev282/omlish/marshal/exceptions.py → omlish-0.0.0.dev283/omlish/marshal/errors.py

@@ -1,6 +1,9 @@
 from .. import reflect as rfl
 
 
+##
+
+
 class MarshalError(Exception):
     pass
 

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/marshal/trivial/forbidden.py

@@ -9,7 +9,7 @@ from ..base import SimpleMarshalerFactory
 from ..base import SimpleUnmarshalerFactory
 from ..base import UnmarshalContext
 from ..base import Unmarshaler
-from ..exceptions import ForbiddenTypeError
+from ..errors import ForbiddenTypeError
 
 
 C = ta.TypeVar('C')

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/__init__.py

@@ -27,7 +27,7 @@ See:
  - https://github.com/jmespath-community/jmespath.spec/discussions?discussions_q=label%3Ajep-candidate
  - https://github.com/jmespath-community/jmespath.spec/discussions/97
 """  # noqa
-from . import exceptions  # noqa
+from . import errors  # noqa
 from . import functions  # noqa
 from . import lexer  # noqa
 from . import parser  # noqa

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/cli.py

@@ -5,11 +5,11 @@ import typing as ta
 
 from ...formats import json
 from .ast import Node
-from .exceptions import ArityError
-from .exceptions import JmespathTypeError
-from .exceptions import JmespathValueError
-from .exceptions import ParseError
-from .exceptions import UnknownFunctionError
+from .errors import ArityError
+from .errors import JmespathTypeError
+from .errors import JmespathValueError
+from .errors import ParseError
+from .errors import UnknownFunctionError
 from .parser import compile  # noqa
 from .parser import search
 from .visitor import node_type

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/functions.py

@@ -5,12 +5,12 @@ import math
 import re
 import typing as ta
 
-from .exceptions import ArityError
-from .exceptions import JmespathError
-from .exceptions import JmespathTypeError
-from .exceptions import JmespathValueError
-from .exceptions import UnknownFunctionError
-from .exceptions import VariadicArityError
+from .errors import ArityError
+from .errors import JmespathError
+from .errors import JmespathTypeError
+from .errors import JmespathValueError
+from .errors import UnknownFunctionError
+from .errors import VariadicArityError
 
 
 T = ta.TypeVar('T')

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/lexer.py

@@ -4,8 +4,8 @@ import typing as ta
 import warnings
 
 from ... import check
-from .exceptions import EmptyExpressionError
-from .exceptions import LexerError
+from .errors import EmptyExpressionError
+from .errors import LexerError
 from .visitor import Options
 
 

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/parser.py

@@ -57,9 +57,9 @@ from .ast import Subexpression
 from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
-from .exceptions import IncompleteExpressionError
-from .exceptions import LexerError
-from .exceptions import ParseError
+from .errors import IncompleteExpressionError
+from .errors import LexerError
+from .errors import ParseError
 from .lexer import Lexer
 from .lexer import Token
 from .visitor import GraphvizVisitor

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish/specs/jmespath/visitor.py

@@ -36,7 +36,7 @@ from .ast import Subexpression
 from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
-from .exceptions import UndefinedVariableError
+from .errors import UndefinedVariableError
 from .functions import DefaultFunctions
 from .functions import Functions
 from .scope import ScopedChainDict

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev282
+Version: 0.0.0.dev283
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev282 → omlish-0.0.0.dev283}/omlish.egg-info/SOURCES.txt

@@ -157,7 +157,7 @@ omlish/codecs/text.py
 omlish/collections/__init__.py
 omlish/collections/abc.py
 omlish/collections/coerce.py
-omlish/collections/exceptions.py
+omlish/collections/errors.py
 omlish/collections/frozen.py
 omlish/collections/hasheq.py
 omlish/collections/identity.py
@@ -220,8 +220,7 @@ omlish/dataclasses/impl/__init__.py
 omlish/dataclasses/impl/api.py
 omlish/dataclasses/impl/as_.py
 omlish/dataclasses/impl/copy.py
-omlish/dataclasses/impl/descriptors.py
-omlish/dataclasses/impl/exceptions.py
+omlish/dataclasses/impl/errors.py
 omlish/dataclasses/impl/fields.py
 omlish/dataclasses/impl/frozen.py
 omlish/dataclasses/impl/hashing.py
@@ -371,7 +370,7 @@ omlish/inject/binder.py
 omlish/inject/bindings.py
 omlish/inject/eagers.py
 omlish/inject/elements.py
-omlish/inject/exceptions.py
+omlish/inject/errors.py
 omlish/inject/injector.py
 omlish/inject/inspect.py
 omlish/inject/keys.py
@@ -438,7 +437,7 @@ omlish/lang/comparison.py
 omlish/lang/contextmanagers.py
 omlish/lang/datetimes.py
 omlish/lang/descriptors.py
-omlish/lang/exceptions.py
+omlish/lang/enums.py
 omlish/lang/functions.py
 omlish/lang/generators.py
 omlish/lang/imports.py
@@ -512,7 +511,7 @@ omlish/manifests/static.py
 omlish/manifests/types.py
 omlish/marshal/__init__.py
 omlish/marshal/base.py
-omlish/marshal/exceptions.py
+omlish/marshal/errors.py
 omlish/marshal/factories.py
 omlish/marshal/global_.py
 omlish/marshal/naming.py
@@ -636,7 +635,7 @@ omlish/specs/jmespath/__init__.py
 omlish/specs/jmespath/__main__.py
 omlish/specs/jmespath/ast.py
 omlish/specs/jmespath/cli.py
-omlish/specs/jmespath/exceptions.py
+omlish/specs/jmespath/errors.py
 omlish/specs/jmespath/functions.py
 omlish/specs/jmespath/lexer.py
 omlish/specs/jmespath/parser.py

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

omlish-0.0.0.dev282/omlish/dataclasses/impl/descriptors.py

@@ -1,93 +0,0 @@
-import abc
-import dataclasses as dc
-import typing as ta
-
-from ... import defs
-
-
-class AbstractFieldDescriptor(abc.ABC):
-    def __init__(
-            self,
-            *,
-            default: ta.Any = dc.MISSING,
-            frozen: bool = False,
-            name: str | None = None,
-            pre_set: ta.Callable[[ta.Any, ta.Any], ta.Any] | None = None,
-            post_set: ta.Callable[[ta.Any, ta.Any], None] | None = None,
-    ) -> None:
-        super().__init__()
-
-        self._default = default
-        self._frozen = frozen
-        self._name = name
-        self._pre_set = pre_set
-        self._post_set = post_set
-
-    defs.repr('name')
-    defs.getter('default', 'frozen', 'name', 'pre_set', 'post_set')
-
-    def __set_name__(self, owner, name):
-        if self._name is None:
-            self._name = name
-
-    def __get__(self, instance, owner=None):
-        if instance is not None:
-            try:
-                return self._get(instance)
-            except AttributeError:
-                pass
-        if self._default is not dc.MISSING:
-            return self._default
-        raise AttributeError(self._name)
-
-    @abc.abstractmethod
-    def _get(self, instance):
-        raise NotImplementedError
-
-    def __set__(self, instance, value):
-        if self._frozen:
-            raise dc.FrozenInstanceError(f'cannot assign to field {self._name!r}')
-        if self._pre_set is not None:
-            value = self._pre_set(instance, value)
-        self._set(instance, value)
-        if self._post_set is not None:
-            self._post_set(instance, value)
-
-    @abc.abstractmethod
-    def _set(self, instance, value):
-        raise NotImplementedError
-
-    def __delete__(self, instance):
-        if self._frozen:
-            raise dc.FrozenInstanceError(f'cannot delete field {self._name!r}')
-        self._del(instance)
-
-    @abc.abstractmethod
-    def _del(self, instance):
-        raise NotImplementedError
-
-
-class PyFieldDescriptor(AbstractFieldDescriptor):
-    def __init__(
-            self,
-            attr: str,
-            **kwargs: ta.Any,
-    ) -> None:
-        super().__init__(**kwargs)
-
-        self._attr = attr
-
-    defs.repr('attr', 'name')
-    defs.getter('attr')
-
-    def _get(self, instance):
-        return getattr(instance, self._attr)
-
-    def _set(self, instance, value):
-        setattr(instance, self._attr, value)
-
-    def _del(self, instance):
-        delattr(instance, self._attr)
-
-
-FieldDescriptor = PyFieldDescriptor

omlish-0.0.0.dev282/omlish/lang/exceptions.py

@@ -1,2 +0,0 @@
-class Unreachable(Exception):  # noqa
-    pass