omlish 0.0.0.dev318__py3-none-any.whl → 0.0.0.dev319__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev318'
-__revision__ = 'b80bceb394abe03974e4312775224ac1dbcb5b22'
+__version__ = '0.0.0.dev319'
+__revision__ = 'db501bf0b4fbb5f1af2b467b004ffec22f3e769c'
 
 
 #

omlish/dispatch/methods.py

@@ -29,6 +29,7 @@ class Method(ta.Generic[P, R]):
             func: ta.Callable,
             *,
             installable: bool = False,
+            requires_override: bool = False,
     ) -> None:
         super().__init__()
 
@@ -37,6 +38,7 @@ class Method(ta.Generic[P, R]):
 
         self._func = func
         self._installable = installable
+        self._requires_override = requires_override
 
         self._impls: ta.MutableMapping[ta.Callable, frozenset[type] | None] = weakref.WeakKeyDictionary()
 
@@ -97,33 +99,73 @@ class Method(ta.Generic[P, R]):
 
         return impl
 
+    def _is_impl(self, obj: ta.Any) -> bool:
+        try:
+            hash(obj)
+        except TypeError:
+            return False
+
+        return obj in self._impls
+
     def build_attr_dispatcher(self, instance_cls: type, owner_cls: type | None = None) -> Dispatcher[str]:
-        disp: Dispatcher[str] = Dispatcher()
+        if owner_cls is None:
+            owner_cls = instance_cls
 
-        mro_dct = lang.mro_dict(instance_cls, owner_cls)
-        seen: ta.Mapping[ta.Any, str] = {}
-        for nam, att in mro_dct.items():
-            try:
-                hash(att)
-            except TypeError:
-                continue
+        mro = instance_cls.__mro__[-2::-1]
+        try:
+            mro_pos = mro.index(owner_cls)
+        except ValueError:
+            raise TypeError(f'Owner class {owner_cls} not in mro of instance class {instance_cls}') from None
+
+        mro_dct: dict[str, list[tuple[type, ta.Any]]] = {}
+        for cur_cls in mro[:mro_pos + 1]:
+            for att, obj in cur_cls.__dict__.items():
+                if att not in mro_dct:
+                    if not self._is_impl(obj):
+                        continue
+
+                try:
+                    lst = mro_dct[att]
+                except KeyError:
+                    lst = mro_dct[att] = []
+                lst.append((cur_cls, obj))
 
-            if att not in self._impls:
+        #
+
+        disp: Dispatcher[str] = Dispatcher()
+
+        seen: dict[ta.Any, str] = {}
+        for att, lst in mro_dct.items():
+            if not lst:
+                raise RuntimeError
+            _, obj = lst[-1]
+
+            if len(lst) > 1:
+                if self._requires_override and not lang.is_override(obj):
+                    raise lang.RequiresOverrideError(
+                        att,
+                        instance_cls,
+                        lst[-1][0],
+                        lst[0][0],
+                    )
+
+            if not self._is_impl(obj):
                 continue
-            cls_set = self._impls[att]
 
+            cls_set = self._impls[obj]
             if cls_set is None:
-                cls_set = get_impl_func_cls_set(att, arg_offset=1)
-                self._impls[att] = cls_set
+                cls_set = get_impl_func_cls_set(obj, arg_offset=1)
+                self._impls[obj] = cls_set
 
             try:
-                ex_nam = seen[att]
+                ex_att = seen[obj]
             except KeyError:
                 pass
             else:
-                raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {nam} {ex_nam}')
+                raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {att} {ex_att}')
+            seen[obj] = att
 
-            disp.register(nam, cls_set)
+            disp.register(att, cls_set)
 
         return disp
 
@@ -186,19 +228,42 @@ class Method(ta.Generic[P, R]):
 
 
 @ta.overload
-def method(func: ta.Callable[P, R], /, *, installable: bool = False) -> Method[P, R]:  # noqa
+def method(
+        func: ta.Callable[P, R],
+        /,
+        *,
+        installable: bool = False,
+        requires_override: bool = False,
+) -> Method[P, R]:  # noqa
     ...
 
 
 @ta.overload
-def method(func: None = None, /, *, installable: bool = False) -> ta.Callable[[ta.Callable[P, R]], Method[P, R]]:  # noqa
+def method(
+        func: None = None,
+        /,
+        *,
+        installable: bool = False,
+        requires_override: bool = False,
+) -> ta.Callable[[ta.Callable[P, R]], Method[P, R]]:  # noqa
     ...
 
 
-def method(func=None, /, *, installable=False):  # noqa
-    kw = dict(installable=installable)
+def method(
+        func=None,
+        /,
+        *,
+        installable=False,
+        requires_override=False,
+):
+    kw = dict(
+        installable=installable,
+        requires_override=requires_override,
+    )
+
     if func is None:
         return functools.partial(Method, **kw)
+
     return Method(func, **kw)
 
 

omlish/lang/__init__.py

@@ -252,6 +252,15 @@ from .outcomes import (  # noqa
     value,
 )
 
+from .overrides import (  # noqa
+    needs_override,
+
+    is_override,
+
+    RequiresOverrideError,
+    RequiresOverride,
+)
+
 from .params import (  # noqa
     ArgsParam,
     KwOnlyParam,

omlish/lang/overrides.py

@@ -0,0 +1,82 @@
+import types
+import typing as ta
+
+from .descriptors import unwrap_func
+
+
+##
+
+
+class _EmptyClass:
+    pass
+
+
+_OVERRIDE_NOT_NEEDED_ATTRS: ta.AbstractSet[str] = {
+    *_EmptyClass.__dict__,
+}
+
+
+def needs_override(attr: str, obj: ta.Any) -> bool:
+    if attr in _OVERRIDE_NOT_NEEDED_ATTRS:
+        return False
+
+    return True
+
+
+##
+
+
+def is_override(obj: ta.Any) -> bool:
+    if isinstance(obj, types.FunctionType):
+        fn = unwrap_func(obj)
+        if getattr(fn, '__override__', False):
+            return True
+
+    return False
+
+
+##
+
+
+class RequiresOverrideError(TypeError):
+    def __init__(
+            self,
+            att: str | None = None,
+            cls: type | None = None,
+            mro_cls: type | None = None,
+            owner_cls: type | None = None,
+    ) -> None:
+        super().__init__(' '.join([
+            'Attribute',
+            *([f'{att!r}'] if att is not None else []),
+            *([f'on class {cls.__qualname__}'] if cls is not None else []),
+            *([f'from mro class {mro_cls.__qualname__}'] if mro_cls is not None and mro_cls is not cls else []),
+            f'is not marked as a @typing.override',
+            *([f'from owning class {owner_cls.__qualname__}'] if owner_cls is not None else []),
+        ]))
+
+        self.att = att
+        self.cls = cls
+        self.mro_cls = mro_cls
+        self.owner_cls = owner_cls
+
+
+class RequiresOverride:
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
+
+        req_ovr_dct: dict[str, type] = {}
+        for m_cls in reversed(cls.__mro__):
+            for a, o in m_cls.__dict__.items():
+                if a in req_ovr_dct and not is_override(o):
+                    raise RequiresOverrideError(
+                        a,
+                        cls,
+                        m_cls,
+                        req_ovr_dct[a],
+                    )
+
+            if RequiresOverride in m_cls.__bases__:
+                for a, o in m_cls.__dict__.items():
+                    if needs_override(a, o):
+                        req_ovr_dct.setdefault(a, m_cls)

{omlish-0.0.0.dev318.dist-info → omlish-0.0.0.dev319.dist-info}/METADATA

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

{omlish-0.0.0.dev318.dist-info → omlish-0.0.0.dev319.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=kisuBtrw4R5wrzm5nluakJkzLD7HYXcYuB7zYWAgrQc,3478
+omlish/__about__.py,sha256=BUm8C0RUF_mH5RRsEW0hH9yf1ygPXOnka9jzpOJkyck,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -225,7 +225,7 @@ omlish/dispatch/_dispatch3.py,sha256=9Zjd7bINAC3keiaBdssc4v5dY0-8OI6XooV2DR9U7Z0
 omlish/dispatch/dispatch.py,sha256=KA5l49AiGLRjp4J7RDJW9RiDp9WUD1ewR1AOPEF8g38,3062
 omlish/dispatch/functions.py,sha256=cwNzGIg2ZIalEgn9I03cnJVbMTHjWloyDTaowlO3UPs,1524
 omlish/dispatch/impls.py,sha256=K_okKvpZml4NkTHJmTVyMQSrIaIJcqTEgkreGwukaOw,1895
-omlish/dispatch/methods.py,sha256=CeGVwiUdeadzyOe0xQVY_jegyj0tdHLQZpaIlLkJNnY,7330
+omlish/dispatch/methods.py,sha256=sSGA52swdrdHEbm_jAPBZVoKP9xMIfVcw2MnTvIJtrI,8913
 omlish/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/docker/all.py,sha256=xXRgJgLGPwAtr7bDMJ_Dp9jTfOwfGvohNhc6LsoELJc,514
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
@@ -403,7 +403,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=Zs5YE5F7rq2cdEqK2e6QuamTQGGwLaM0OP_RNOmcT1A,5921
+omlish/lang/__init__.py,sha256=ZtAmS2HiXPaJexoyPXD2fCl-8DNA4s8zlErlvhU_2o0,6045
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -419,6 +419,7 @@ omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
 omlish/lang/iterables.py,sha256=StoGp9yaP3njdLKHoWYcEevO3eE8SHEPYl5_avZob24,2149
 omlish/lang/objects.py,sha256=nbxBHfQHVw0OG4qeSTP2GvIiFIcH2tbbitY8y-mYPPo,5959
 omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
+omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
 omlish/lang/params.py,sha256=sfbNoGrKCsAtubFufj_uh_WKshIgA8fqJ4PmLH1PH00,6639
 omlish/lang/recursion.py,sha256=1VfSqzKO-8Is3t9LKw0W4jwPfE0aBS70EUlbUxAx4eE,1900
 omlish/lang/resolving.py,sha256=ei9LDyJexsMMHB9z8diUkNmynWhd_da7h7TqrMYM6lA,1611
@@ -853,9 +854,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev318.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev318.dist-info/METADATA,sha256=-Nc1DXmiJNc5JokC60eHTE9VTgT6oMoXEf496J6i6UE,4416
-omlish-0.0.0.dev318.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-omlish-0.0.0.dev318.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev318.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev318.dist-info/RECORD,,
+omlish-0.0.0.dev319.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev319.dist-info/METADATA,sha256=AJfjWjvSfK3uESd-jYGGUmEgPjkW22rJLSBh3h6hGbk,4416
+omlish-0.0.0.dev319.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omlish-0.0.0.dev319.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev319.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev319.dist-info/RECORD,,