omlish 0.0.0.dev327__tar.gz → 0.0.0.dev329__tar.gz

{omlish-0.0.0.dev327/omlish.egg-info → omlish-0.0.0.dev329}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev327
+Version: 0.0.0.dev329
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -44,7 +44,7 @@ Requires-Dist: sqlean.py~=3.49; extra == "all"
 Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
-Requires-Dist: pytest~=8.3; extra == "all"
+Requires-Dist: pytest~=8.4; extra == "all"
 Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
@@ -94,7 +94,7 @@ Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Provides-Extra: testing
-Requires-Dist: pytest~=8.3; extra == "testing"
+Requires-Dist: pytest~=8.4; extra == "testing"
 Provides-Extra: plus
 Requires-Dist: anyio~=4.9; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev327'
-__revision__ = 'ce58b88c3e3c1e9bd7b09f89667cb4047b61684c'
+__version__ = '0.0.0.dev329'
+__revision__ = '7e2175a0f120aff13b483ddfb737fe5676cd9721'
 
 
 #
@@ -113,7 +113,7 @@ class Project(ProjectBase):
         ],
 
         'testing': [
-            'pytest ~= 8.3',
+            'pytest ~= 8.4',
         ],
     }
 

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/collections/__init__.py

@@ -59,7 +59,7 @@ from .hasheq import (  # noqa
 from .identity import (  # noqa
     IdentityKeyDict,
     IdentitySet,
-    IdentityWrapper,
+    IdentityWeakKeyDictionary,
     IdentityWeakSet,
 )
 

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/collections/identity.py

@@ -13,29 +13,6 @@ V = ta.TypeVar('V')
 ##
 
 
-class IdentityWrapper(ta.Generic[T]):
-    def __init__(self, value: T) -> None:
-        super().__init__()
-
-        self._value = value
-
-    def __repr__(self) -> str:
-        return lang.attr_repr(self, 'value')
-
-    @property
-    def value(self) -> T:
-        return self._value
-
-    def __eq__(self, other):
-        return isinstance(other, IdentityWrapper) and other._value is self._value
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __hash__(self):
-        return id(self._value)
-
-
 class IdentityKeyDict(ta.MutableMapping[K, V]):
     def __init__(self, *args, **kwargs) -> None:
         super().__init__()
@@ -115,31 +92,90 @@ class IdentitySet(ta.MutableSet[T]):
         return iter(self._dict.values())
 
 
+##
+
+
+class IdentityWeakKeyDictionary(ta.MutableMapping[K, V]):
+    """
+    https://ideone.com/G4iIri
+    https://stackoverflow.com/questions/75314250/python-weakkeydictionary-for-unhashable-types#comment135919973_77100606
+
+    See also:
+    https://github.com/python-trio/trio/blob/efd785a20721707b52a6e2289a65e25722b30c96/src/trio/_core/_ki.py#L81
+    """
+
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__()
+
+        self._keys: ta.MutableMapping[IdentityWeakKeyDictionary._Id[K], K] = weakref.WeakValueDictionary()
+        self._values: ta.MutableMapping[IdentityWeakKeyDictionary._Id[K], V] = weakref.WeakKeyDictionary()
+
+        for k, v in lang.yield_dict_init(*args, **kwargs):
+            self[k] = v
+
+    def __len__(self) -> int:
+        return len(self._keys)
+
+    def __iter__(self) -> ta.Iterator[K]:
+        return iter(self._keys.values())
+
+    class _Id(ta.Generic[T]):
+        def __init__(self, key: T) -> None:
+            super().__init__()
+
+            self._id = id(key)
+            self._key_ref = weakref.ref(key)
+
+        def __repr__(self) -> str:
+            return f'{self.__class__.__name__}<id={self._id}>'
+
+        def __hash__(self) -> int:
+            return self._id
+
+        def __eq__(self, other: object) -> bool:
+            return (
+                type(other) is type(self) and
+                self._id == other._id and  # type: ignore  # noqa
+                self._key_ref() is other._key_ref()  # type: ignore  # noqa
+            )
+
+        def __ne__(self, other: object) -> bool:
+            return not (self == other)
+
+    def __getitem__(self, key: K) -> V:
+        return self._values.__getitem__(self._Id(key))
+
+    def __setitem__(self, key: K, value: V) -> None:
+        id_obj = self._Id(key)
+        self._keys.__setitem__(id_obj, key)
+        self._values.__setitem__(id_obj, value)
+
+    def __delitem__(self, key: K) -> None:
+        self._values.__delitem__(self._Id(key))
+        self._keys.__delitem__(self._Id(key))
+
+
 class IdentityWeakSet(ta.MutableSet[T]):
     def __init__(self, init: ta.Iterable[T] | None = None) -> None:
         super().__init__()
 
-        self._dict: weakref.WeakValueDictionary[int, T] = weakref.WeakValueDictionary()
+        self._dict: IdentityWeakKeyDictionary[T, None] = IdentityWeakKeyDictionary()
+
+        if init is not None:
+            for e in init:
+                self._dict[e] = None
 
     def add(self, value):
-        # FIXME: race with weakref callback?
-        self._dict[id(value)] = value
+        self._dict[value] = None
 
     def discard(self, value):
-        try:
-            del self._dict[id(value)]
-        except KeyError:
-            pass
+        del self._dict[value]
 
     def __contains__(self, x):
-        try:
-            o = self._dict[id(x)]
-        except KeyError:
-            return False
-        return x is o
+        return x in self._dict
 
     def __len__(self):
         return len(self._dict)
 
     def __iter__(self):
-        return self._dict.values()
+        return self._dict.keys()

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/dataclasses/api/classes/decorator.py

@@ -49,6 +49,7 @@ def dataclass(
         cache_hash: bool | None = None,
         generic_init: bool | None = None,
         override: bool | None = None,
+        allow_dynamic_dunder_attrs: bool | None = None,
 
         repr_id: bool | None = None,
         terse_repr: bool | None = None,
@@ -153,6 +154,7 @@ def dataclass(
                 cache_hash=cache_hash,
                 generic_init=generic_init,
                 override=override,
+                allow_dynamic_dunder_attrs=allow_dynamic_dunder_attrs,
 
                 repr_id=repr_id,
                 terse_repr=terse_repr,

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/dataclasses/api/classes/make.py

@@ -39,6 +39,7 @@ def make_dataclass(  # noqa
         cache_hash: bool | None = None,
         generic_init: bool | None = None,
         override: bool | None = None,
+        allow_dynamic_dunder_attrs: bool | None = None,
 
         repr_id: bool | None = None,
         terse_repr: bool | None = None,
@@ -109,6 +110,7 @@ def make_dataclass(  # noqa
         cache_hash=cache_hash,
         generic_init=generic_init,
         override=override,
+        allow_dynamic_dunder_attrs=allow_dynamic_dunder_attrs,
 
         repr_id=repr_id,
         terse_repr=terse_repr,

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/dataclasses/concerns/frozen.py

@@ -65,9 +65,10 @@ def check_frozen_bases(cls: type, frozen: bool) -> None:
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass(frozen=True, kw_only=True)
 class FrozenPlan(Plan):
     fields: tuple[str, ...]
+    allow_dynamic_dunder_attrs: bool
 
 
 @register_generator_type(FrozenPlan)
@@ -78,7 +79,10 @@ class FrozenGenerator(Generator[FrozenPlan]):
         if not ctx.cs.frozen:
             return None
 
-        return PlanResult(FrozenPlan(tuple(f.name for f in ctx.cs.fields)))
+        return PlanResult(FrozenPlan(
+            fields=tuple(f.name for f in ctx.cs.fields),
+            allow_dynamic_dunder_attrs=ctx.cs.allow_dynamic_dunder_attrs,
+        ))
 
     def _generate_one(
             self,
@@ -88,8 +92,20 @@ class FrozenGenerator(Generator[FrozenPlan]):
             exc_args: str,
     ) -> AddMethodOp:
         preamble = []
+        condition = []
+
         # https://github.com/python/cpython/commit/ee6f8413a99d0ee4828e1c81911e203d3fff85d5
-        condition = f'type(self) is {CLS_IDENT}'
+        base_condition = f'type(self) is {CLS_IDENT}'
+
+        if plan.allow_dynamic_dunder_attrs:
+            condition.extend([
+                f'(',
+                f'    {base_condition}',
+                f'    and not (len(name) > 4 and name[:2] == name[-2:] == "__")',
+                f')',
+            ])
+        else:
+            condition.append(base_condition)
 
         if plan.fields:
             set_ident = f'{IDENT_PREFIX}_{mth}_frozen_fields'
@@ -102,14 +118,19 @@ class FrozenGenerator(Generator[FrozenPlan]):
                 f'}}',
                 f'',
             ])
-            condition += f' or name in {set_ident}'
+            condition.append(f' or name in {set_ident}')
 
         return AddMethodOp(
             f'__{mth}__',
             '\n'.join([
                 *preamble,
                 f'def __{mth}__(self, {", ".join(params)}):',
-                f'    if {condition}:',
+                f'    if (',
+                *[
+                    f'        {l}'
+                    for l in condition
+                ],
+                f'    ):',
                 f'        raise {FROZEN_INSTANCE_ERROR_GLOBAL.ident}{exc_args}',
                 f'    super({CLS_IDENT}, self).__{mth}__({", ".join(params)})',
             ]),

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/dataclasses/specs.py

@@ -183,6 +183,7 @@ class ClassSpec(lang.Final):
     cache_hash: bool = False
     generic_init: bool = False
     override: bool = False
+    allow_dynamic_dunder_attrs: bool = False
 
     repr_id: bool = False
     terse_repr: bool = False

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/lang/objects.py

@@ -250,3 +250,8 @@ class Identity(ta.Generic[T]):
         if type(other) is not type(self):
             return NotImplemented
         return self._obj is other._obj  # noqa
+
+    def __ne__(self, other):
+        if type(other) is not type(self):
+            return NotImplemented
+        return self._obj is not other._obj  # noqa

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/reflect/subst.py

@@ -43,13 +43,14 @@ def replace_type_vars(
             args = tuple(rec(a) for a in cur.args)
             if update_aliases:
                 obj = cur.obj
-                if (ops := get_params(obj)):
-                    nargs = [to_annotation(rpl[p]) for p in ops]
-                    if ta.get_origin(obj) is ta.Generic:
-                        # FIXME: None? filter_typing_generic in get_generic_bases?
-                        pass
-                    else:
-                        obj = cur.obj[*nargs]
+                if (og := ta.get_origin(obj)) is ta.Generic:
+                    # FIXME: None? filter_typing_generic in get_generic_bases?
+                    pass
+                elif (ops := get_params(og)):
+                    if len(ops) != len(args):
+                        raise RuntimeError
+                    nargs = [to_annotation(a) for a in args]
+                    obj = og[*nargs]
             else:
                 obj = None
             return dc.replace(cur, args=args, obj=obj)
@@ -89,6 +90,7 @@ class GenericSubstitution:
                 if isinstance(bty, Generic) and isinstance(b, type):
                     # FIXME: throws away relative types, but can't use original vars as they're class-contextual
                     bty = type_(b[*((ta.Any,) * len(bty.params))])  # type: ignore
+                # rpl2 = {p: rpl[a] for p, a in zip(bty.params, bty.args)}
                 rty = replace_type_vars(bty, rpl, update_aliases=self._update_aliases)
                 ret.append(rty)
             return tuple(ret)

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/typedvalues/accessor.py

@@ -14,7 +14,7 @@ from .values import UniqueTypedValue  # noqa
 
 T = ta.TypeVar('T')
 
-TypedValueT = ta.TypeVar('TypedValueT', bound='TypedValue')
+TypedValueT0 = ta.TypeVar('TypedValueT0', bound='TypedValue')
 TypedValueU = ta.TypeVar('TypedValueU', bound='TypedValue')
 
 UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound='UniqueTypedValue')
@@ -27,7 +27,7 @@ class _NOT_SET(lang.Marker):  # noqa
     pass
 
 
-class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
+class TypedValuesAccessor(lang.Abstract, ta.Sequence[TypedValueT0]):
     def __iter__(self):
         raise TypeError(
             'TypedValuesAccessor does not implement __iter__ - it is reserved for implementation by subclasses.',
@@ -36,7 +36,7 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
     #
 
     @ta.final
-    def __contains__(self, cls: type[TypedValueU]) -> bool:
+    def __contains__(self, cls: type[TypedValueU]) -> bool:  # type: ignore[override]
         return self._typed_value_contains(cls)
 
     @abc.abstractmethod
@@ -45,8 +45,8 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
 
     #
 
-    @ta.overload
-    def __getitem__(self, idx: int) -> TypedValueT:
+    @ta.overload  # type: ignore[override]
+    def __getitem__(self, idx: int) -> TypedValueT0:
         ...
 
     @ta.overload

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish/typedvalues/holder.py

@@ -8,20 +8,20 @@ from .generic import TypedValueGeneric
 from .values import TypedValue
 
 
-TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
+TypedValueT1 = ta.TypeVar('TypedValueT1', bound=TypedValue)
 
 
 ##
 
 
 class TypedValueHolder(
-    TypedValuesAccessor[TypedValueT],
-    TypedValueGeneric[TypedValueT],
+    TypedValuesAccessor[TypedValueT1],
+    TypedValueGeneric[TypedValueT1],
     lang.Abstract,
 ):
     @property
     @abc.abstractmethod
-    def _typed_values(self) -> TypedValues[TypedValueT] | None:
+    def _typed_values(self) -> TypedValues[TypedValueT1] | None:
         raise NotImplementedError
 
     #

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev327
+Version: 0.0.0.dev329
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -44,7 +44,7 @@ Requires-Dist: sqlean.py~=3.49; extra == "all"
 Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
-Requires-Dist: pytest~=8.3; extra == "all"
+Requires-Dist: pytest~=8.4; extra == "all"
 Requires-Dist: anyio~=4.9; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
 Requires-Dist: asttokens~=3.0; extra == "all"
@@ -94,7 +94,7 @@ Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Provides-Extra: testing
-Requires-Dist: pytest~=8.3; extra == "testing"
+Requires-Dist: pytest~=8.4; extra == "testing"
 Provides-Extra: plus
 Requires-Dist: anyio~=4.9; extra == "plus"
 Requires-Dist: sniffio~=1.3; extra == "plus"

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/omlish.egg-info/requires.txt

@@ -31,7 +31,7 @@ sqlean.py~=3.49
 duckdb~=1.3
 markupsafe~=3.0
 jinja2~=3.1
-pytest~=8.3
+pytest~=8.4
 
 [async]
 anyio~=4.9
@@ -94,4 +94,4 @@ markupsafe~=3.0
 jinja2~=3.1
 
 [testing]
-pytest~=8.3
+pytest~=8.4

{omlish-0.0.0.dev327 → omlish-0.0.0.dev329}/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.dev327'
+version = '0.0.0.dev329'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -55,7 +55,7 @@ all = [
     'duckdb ~= 1.3',
     'markupsafe ~= 3.0',
     'jinja2 ~= 3.1',
-    'pytest ~= 8.3',
+    'pytest ~= 8.4',
     'anyio ~= 4.9',
     'sniffio ~= 1.3',
     'asttokens ~= 3.0',
@@ -116,7 +116,7 @@ templates = [
     'jinja2 ~= 3.1',
 ]
 testing = [
-    'pytest ~= 8.3',
+    'pytest ~= 8.4',
 ]
 plus = [
     'anyio ~= 4.9',