omlish 0.0.0.dev244__tar.gz → 0.0.0.dev245__tar.gz

{omlish-0.0.0.dev244/omlish.egg-info → omlish-0.0.0.dev245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev244
+Version: 0.0.0.dev245
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev244 → omlish-0.0.0.dev245}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev244'
-__revision__ = 'e7768b1afd9f43a5f1534c2840691f48c0a89efb'
+__version__ = '0.0.0.dev245'
+__revision__ = 'c3979ac75a1b25b3c679bc0310afb6364c124c4c'
 
 
 #

{omlish-0.0.0.dev244 → omlish-0.0.0.dev245}/omlish/cached.py

@@ -9,11 +9,12 @@ builtins and thus not distinguish it from a normal property.
         def p(self) -> str: ...
 
 """
-from .lang.cached import _CachedProperty  # noqa
-from .lang.cached import cached_function as _cached_function
+from .lang.cached.function import cached_function as _cached_function
+from .lang.cached.property import cached_property as _cached_property
+
 
 function = _cached_function
 
 property = property  # noqa
 
-globals()['property'] = _CachedProperty  # noqa
+globals()['property'] = _cached_property  # noqa

{omlish-0.0.0.dev244 → omlish-0.0.0.dev245}/omlish/lang/__init__.py

@@ -1,39 +1,63 @@
-from .cached import (  # noqa
+from .attrs import (  # noqa
+    AttrOps,
+    STD_ATTR_OPS,
+    StdAttrOps,
+    TRANSIENT_ATTR_OPS,
+    TransientAttrOps,
+    TransientDict,
+    transient_delattr,
+    transient_getattr,
+    transient_setattr,
+)
+
+from .cached.function import (  # noqa
     cached_function,
-    cached_property,
     static_init,
 )
 
-from .classes import (  # noqa
+from .cached.property import (  # noqa
+    cached_property,
+)
+
+from .classes.abstract import (  # noqa
     Abstract,
     AbstractTypeError,
+    get_abstract_methods,
+    is_abstract,
+    is_abstract_class,
+    is_abstract_method,
+    make_abstract,
+    unabstract_class,
+)
+
+from .classes.restrict import (  # noqa
     AnySensitive,
-    Callable,
-    Descriptor,
     Final,
     FinalTypeError,
-    LazySingleton,
-    Marker,
-    Namespace,
     NoBool,
     NotInstantiable,
     NotPicklable,
     PackageSealed,
-    Picklable,
     SENSITIVE_ATTR,
     Sealed,
     SealedError,
     Sensitive,
+    no_bool,
+)
+
+from .classes.simple import (  # noqa
+    LazySingleton,
+    Marker,
+    Namespace,
     SimpleMetaDict,
     Singleton,
+)
+
+from .classes.virtual import (  # noqa
+    Callable,
+    Descriptor,
+    Picklable,
     Virtual,
-    get_abstract_methods,
-    is_abstract,
-    is_abstract_class,
-    is_abstract_method,
-    make_abstract,
-    no_bool,
-    unabstract_class,
     virtual_check,
 )
 

omlish-0.0.0.dev245/omlish/lang/attrs.py

@@ -0,0 +1,132 @@
+import abc
+import collections.abc
+import typing as ta
+
+
+##
+
+
+class AttrOps(abc.ABC):
+    class NOT_SET:  # noqa
+        def __new__(cls, *args, **kwargs):  # noqa
+            raise TypeError
+
+    @abc.abstractmethod
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = NOT_SET) -> ta.Any:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def setattr(self, obj: ta.Any, name: str, value: ta.Any) -> None:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def delattr(self, obj: ta.Any, name: str) -> None:
+        raise NotImplementedError
+
+
+##
+
+
+class StdAttrOps(AttrOps):
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
+        if default is AttrOps.NOT_SET:
+            return getattr(obj, name)
+        else:
+            return getattr(obj, name, default)
+
+    def setattr(self, obj: ta.Any, name: str, value: ta.Any) -> None:
+        setattr(obj, name, value)
+
+    def delattr(self, obj: ta.Any, name: str) -> None:
+        delattr(obj, name)
+
+
+STD_ATTR_OPS = StdAttrOps()
+
+
+##
+
+
+class TransientDict(collections.abc.MutableMapping):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._dct: dict = {}
+
+    def __reduce__(self):
+        return (TransientDict, ())
+
+    def __getitem__(self, item):
+        return self._dct[item]
+
+    def __setitem__(self, key, value):
+        self._dct[key] = value
+
+    def __delitem__(self, key):
+        del self._dct[key]
+
+    def __len__(self):
+        return len(self._dct)
+
+    def __iter__(self):
+        return iter(self._dct)
+
+    def clear(self):
+        self._dct.clear()
+
+    def items(self):
+        return self._dct.items()
+
+    def keys(self):
+        return self._dct.keys()
+
+    def values(self):
+        return self._dct.values()
+
+    def __contains__(self, key, /):
+        return super().__contains__(key)
+
+    def __eq__(self, other, /):
+        raise TypeError(self)
+
+
+#
+
+
+_TRANSIENT_DICT_ATTR = '__transient_dict__'
+
+
+def _get_object_transient_dict(obj: ta.Any) -> TransientDict:
+    try:
+        return obj.__dict__[_TRANSIENT_DICT_ATTR]
+    except KeyError:
+        return obj.__dict__.setdefault(_TRANSIENT_DICT_ATTR, TransientDict())
+
+
+class TransientAttrOps(AttrOps):
+    def getattr(self, obj: ta.Any, name: str, default: ta.Any = AttrOps.NOT_SET) -> ta.Any:
+        td = _get_object_transient_dict(obj)
+        try:
+            return td[name]
+        except KeyError:
+            if default is not AttrOps.NOT_SET:
+                return default
+            raise AttributeError(name) from None
+
+    def setattr(self, obj: ta.Any, name: str, value: ta.Any) -> None:
+        td = _get_object_transient_dict(obj)
+        td[name] = value
+
+    def delattr(self, obj: ta.Any, name: str) -> None:
+        td = _get_object_transient_dict(obj)
+        try:
+            del td[name]
+        except KeyError:
+            raise AttributeError(name) from None
+
+
+TRANSIENT_ATTR_OPS = TransientAttrOps()
+
+transient_getattr = TRANSIENT_ATTR_OPS.getattr
+transient_setattr = TRANSIENT_ATTR_OPS.setattr
+transient_delattr = TRANSIENT_ATTR_OPS.delattr

omlish-0.0.0.dev244/omlish/lang/cached.py → omlish-0.0.0.dev245/omlish/lang/cached/function.py

@@ -2,37 +2,42 @@
 TODO:
  - integrate / expose with collections.cache
  - weakrefs (selectable by arg)
- - locks
+ - more rigorous descriptor pickling
+  - must support free functions (which have no instance nor owner)
+  - 'staticmethod' or effective equiv - which must resolve to the shared instance
+   - and must be transient?
 """
 import dataclasses as dc
 import functools
 import inspect
 import typing as ta
 
-from .contextmanagers import DefaultLockable
-from .contextmanagers import default_lock
-from .descriptors import unwrap_func
-from .descriptors import unwrap_func_with_partials
+from ..classes.abstract import Abstract
+from ..contextmanagers import DefaultLockable
+from ..contextmanagers import default_lock
+from ..descriptors import unwrap_func
+from ..descriptors import unwrap_func_with_partials
 
 
 P = ta.ParamSpec('P')
 T = ta.TypeVar('T')
 CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 
-_IGNORE = object()
+
+##
 
 
-def _nullary_cache_keyer():
+def _nullary_cache_key_maker():
     return ()
 
 
-def _simple_cache_keyer(*args, **kwargs):
+def _simple_cache_key_maker(*args, **kwargs):
     return (args, tuple(sorted(kwargs.items())))
 
 
-def _make_cache_keyer(fn, *, simple=False, bound=False):
+def _make_cache_key_maker(fn, *, simple=False, bound=False):
     if simple:
-        return _simple_cache_keyer
+        return _simple_cache_key_maker
 
     fn, partials = unwrap_func_with_partials(fn)
 
@@ -42,7 +47,7 @@ def _make_cache_keyer(fn, *, simple=False, bound=False):
     sig = inspect.signature(fn)
     sig_params = list(sig.parameters.values())[1 if bound else 0:]
     if not sig_params:
-        return _nullary_cache_keyer
+        return _nullary_cache_key_maker
 
     ns = {}
     src_params = []
@@ -92,19 +97,23 @@ def _make_cache_keyer(fn, *, simple=False, bound=False):
     return kfn
 
 
-class _CachedFunction(ta.Generic[T]):
+##
+
+
+class _CachedFunction(ta.Generic[T], Abstract):
     @dc.dataclass(frozen=True)
     class Opts:
         map_maker: ta.Callable[[], ta.MutableMapping] = dict
         simple_key: bool = False
         lock: DefaultLockable = None
+        transient: bool = False
 
     def __init__(
             self,
             fn: ta.Callable[P, T],
             *,
             opts: Opts = Opts(),
-            keyer: ta.Callable[..., tuple] | None = None,
+            key_maker: ta.Callable[..., tuple] | None = None,
             values: ta.MutableMapping | None = None,
             value_fn: ta.Callable[P, T] | None = None,
     ) -> None:
@@ -112,7 +121,7 @@ class _CachedFunction(ta.Generic[T]):
 
         self._fn = (fn,)
         self._opts = opts
-        self._keyer = keyer if keyer is not None else _make_cache_keyer(fn, simple=opts.simple_key)
+        self._key_maker = key_maker if key_maker is not None else _make_cache_key_maker(fn, simple=opts.simple_key)
 
         self._lock = default_lock(opts.lock, False)() if opts.lock is not None else None
         self._values = values if values is not None else opts.map_maker()
@@ -134,7 +143,7 @@ class _CachedFunction(ta.Generic[T]):
         raise TypeError
 
     def __call__(self, *args, **kwargs) -> T:
-        k = self._keyer(*args, **kwargs)
+        k = self._key_maker(*args, **kwargs)
 
         try:
             return self._values[k]
@@ -157,11 +166,42 @@ class _CachedFunction(ta.Generic[T]):
         return value
 
 
-class _CachedFunctionDescriptor(_CachedFunction[T]):
+#
+
+
+class _FreeCachedFunction(_CachedFunction[T]):
+    @classmethod
+    def _unpickle(
+            cls,
+            fn,
+            opts,
+            values,
+    ):
+        return cls(
+            fn,
+            opts=opts,
+            values=values,
+        )
+
+    def __reduce__(self):
+        return (
+            _FreeCachedFunction._unpickle,
+            (
+                self._fn,
+                self._opts,
+                self._values if not self._opts.transient else None,
+            ),
+        )
+
+
+#
+
+
+class _DescriptorCachedFunction(_CachedFunction[T]):
     def __init__(
             self,
             fn: ta.Callable[P, T],
-            scope: ta.Any,
+            scope: ta.Any,  # classmethod | None
             *,
             instance: ta.Any = None,
             owner: ta.Any = None,
@@ -174,9 +214,61 @@ class _CachedFunctionDescriptor(_CachedFunction[T]):
         self._instance = instance
         self._owner = owner
         self._name = name if name is not None else unwrap_func(fn).__name__
-        self._bound_keyer = None
+        self._bound_key_maker = None
 
-    def __get__(self, instance, owner=None):
+    @classmethod
+    def _unpickle(
+            cls,
+            scope,
+            instance,
+            owner,
+            name,
+            values,
+    ):
+        if scope is not None:
+            raise NotImplementedError
+
+        if instance is None:
+            raise RuntimeError
+        obj = type(instance)
+
+        desc: _DescriptorCachedFunction = object.__getattribute__(obj, name)
+        if not isinstance(desc, cls):
+            raise TypeError(desc)
+        if (desc._instance is not None or desc._owner is not None):
+            raise RuntimeError
+
+        return desc._bind(
+            instance,
+            owner,
+            values=values,
+        )
+
+    def __reduce__(self):
+        if self._scope is not None:
+            raise NotImplementedError
+
+        if not (self._instance is not None or self._owner is not None):
+            raise RuntimeError
+
+        return (
+            _DescriptorCachedFunction._unpickle,
+            (
+                self._scope,
+                self._instance,
+                self._owner,
+                self._name,
+                self._values if not self._opts.transient else None,
+            ),
+        )
+
+    def _bind(
+            self,
+            instance,
+            owner=None,
+            *,
+            values: ta.MutableMapping | None = None,
+    ):
         scope = self._scope
         if owner is self._owner and (instance is self._instance or scope is classmethod):
             return self
@@ -184,8 +276,8 @@ class _CachedFunctionDescriptor(_CachedFunction[T]):
         fn, = self._fn
         name = self._name
         bound_fn = fn.__get__(instance, owner)
-        if self._bound_keyer is None:
-            self._bound_keyer = _make_cache_keyer(fn, simple=self._opts.simple_key, bound=True)
+        if self._bound_key_maker is None:
+            self._bound_key_maker = _make_cache_key_maker(fn, simple=self._opts.simple_key, bound=True)
 
         bound = self.__class__(
             fn,
@@ -194,8 +286,9 @@ class _CachedFunctionDescriptor(_CachedFunction[T]):
             instance=instance,
             owner=owner,
             name=name,
-            keyer=self._bound_keyer,
-            # values=None if scope is classmethod else self._values,
+            key_maker=self._bound_key_maker,
+            # values=None if scope is classmethod else self._values,  # FIXME: ?
+            values=values,
             value_fn=bound_fn,
         )
 
@@ -206,76 +299,24 @@ class _CachedFunctionDescriptor(_CachedFunction[T]):
 
         return bound
 
+    def __get__(self, instance, owner=None):
+        return self._bind(instance, owner)
+
+
+#
+
 
 def cached_function(fn=None, **kwargs):  # noqa
     if fn is None:
         return functools.partial(cached_function, **kwargs)
     opts = _CachedFunction.Opts(**kwargs)
     if isinstance(fn, staticmethod):
-        return _CachedFunction(fn, opts=opts, value_fn=unwrap_func(fn))
+        return _FreeCachedFunction(fn, opts=opts, value_fn=unwrap_func(fn))
     scope = classmethod if isinstance(fn, classmethod) else None
-    return _CachedFunctionDescriptor(fn, scope, opts=opts)
+    return _DescriptorCachedFunction(fn, scope, opts=opts)
 
 
 def static_init(fn: CallableT) -> CallableT:
     fn = cached_function(fn)
     fn()
     return fn
-
-
-##
-
-
-class _CachedProperty(property):
-    def __init__(
-            self,
-            fn,
-            *,
-            name=None,
-            ignore_if=lambda _: False,
-            clear_on_init=False,
-    ):
-        if isinstance(fn, property):
-            fn = fn.fget
-        super().__init__(fn)
-        self._fn = fn
-        self._ignore_if = ignore_if
-        self._name = name
-        self._clear_on_init = clear_on_init
-
-    def __set_name__(self, owner, name):
-        if self._name is None:
-            self._name = name
-
-    def __get__(self, instance, owner=None):
-        if instance is None:
-            return self
-        if self._name is None:
-            raise TypeError(self)
-
-        try:
-            return instance.__dict__[self._name]
-        except KeyError:
-            pass
-
-        value = self._fn.__get__(instance, owner)()
-        if value is _IGNORE:
-            return None
-        instance.__dict__[self._name] = value
-        return value
-
-    def __set__(self, instance, value):
-        if self._ignore_if(value):
-            return
-        if instance.__dict__[self._name] == value:
-            return
-        raise TypeError(self._name)
-
-    def __delete__(self, instance):
-        raise TypeError
-
-
-def cached_property(fn=None, **kwargs):  # noqa
-    if fn is None:
-        return functools.partial(cached_property, **kwargs)
-    return _CachedProperty(fn, **kwargs)

omlish-0.0.0.dev245/omlish/lang/cached/property.py

@@ -0,0 +1,118 @@
+import abc
+import functools
+import typing as ta
+
+from ..attrs import transient_getattr
+from ..attrs import transient_setattr
+from ..classes.abstract import Abstract
+
+
+_IGNORE = object()
+
+
+##
+
+
+class _CachedProperty(property, Abstract):
+    def __init__(
+            self,
+            fn,
+            *,
+            name=None,
+            ignore_if=lambda _: False,
+    ):
+        if isinstance(fn, property):
+            fn = fn.fget
+
+        super().__init__(fn)
+
+        self._fn = fn
+        self._ignore_if = ignore_if
+
+        self._name = name
+
+    def __set_name__(self, owner, name):
+        if self._name is None:
+            self._name = name
+
+    @abc.abstractmethod
+    def _instance_get(self, instance: ta.Any) -> tuple[ta.Any, bool]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _instance_set(self, instance: ta.Any, value: ta.Any) -> None:
+        raise NotImplementedError
+
+    def __get__(self, instance, owner=None):
+        if instance is None:
+            return self
+        if self._name is None:
+            raise TypeError(self)
+
+        value, ok = self._instance_get(instance)
+        if ok:
+            return value
+
+        value = self._fn.__get__(instance, owner)()
+        if value is _IGNORE:
+            return None
+
+        self._instance_set(instance, value)
+        return value
+
+    def __set__(self, instance, value):
+        if self._ignore_if(value):
+            return
+
+        ev, ok = self._instance_get(instance)
+        if ok and ev == value:
+            return
+
+        raise TypeError(self._name)
+
+    def __delete__(self, instance):
+        raise TypeError
+
+
+#
+
+
+class _DictCachedProperty(_CachedProperty):
+    def _instance_get(self, instance: ta.Any) -> tuple[ta.Any, bool]:
+        try:
+            value = instance.__dict__[self._name]
+        except KeyError:
+            return None, False
+        else:
+            return value, True
+
+    def _instance_set(self, instance: ta.Any, value: ta.Any) -> None:
+        instance.__dict__[self._name] = value
+
+
+#
+
+
+class _TransientCachedProperty(_CachedProperty):
+    def _instance_get(self, instance: ta.Any) -> tuple[ta.Any, bool]:
+        try:
+            value = transient_getattr(instance, self._name)
+        except AttributeError:
+            return None, False
+        else:
+            return value, True
+
+    def _instance_set(self, instance: ta.Any, value: ta.Any) -> None:
+        transient_setattr(instance, self._name, value)
+
+
+#
+
+
+def cached_property(fn=None, *, transient=False, **kwargs):  # noqa
+    if fn is None:
+        return functools.partial(cached_property, transient=transient, **kwargs)
+    if transient:
+        return _TransientCachedProperty(fn, **kwargs)
+    else:
+        return _DictCachedProperty(fn, **kwargs)

{omlish-0.0.0.dev244 → omlish-0.0.0.dev245/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev244
+Version: 0.0.0.dev245
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause