omlish 0.0.0.dev317__tar.gz → 0.0.0.dev319__tar.gz

{omlish-0.0.0.dev317/omlish.egg-info → omlish-0.0.0.dev319}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev317
+Version: 0.0.0.dev319
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -41,7 +41,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.49; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
-Requires-Dist: duckdb~=1.2; 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"
@@ -89,7 +89,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.49; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
-Requires-Dist: duckdb~=1.2; extra == "sqldrivers"
+Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev317'
-__revision__ = 'fde65227a86537b0442352985307b74b7376b98e'
+__version__ = '0.0.0.dev319'
+__revision__ = 'db501bf0b4fbb5f1af2b467b004ffec22f3e769c'
 
 
 #
@@ -103,7 +103,7 @@ class Project(ProjectBase):
 
             'sqlean.py ~= 3.49',
 
-            'duckdb ~= 1.2',
+            'duckdb ~= 1.3',
         ],
 
         'templates': [

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish/dataclasses/api/classes/conversion.py

@@ -12,6 +12,8 @@ from ...specs import FieldSpec
 def std_params_to_class_spec(
         p: StdParams,
         fields: ta.Sequence[FieldSpec],
+        *,
+        metadata: ta.Sequence[ta.Any] | None = None,
 ) -> ClassSpec:
     return ClassSpec(
         fields=fields,
@@ -27,4 +29,6 @@ def std_params_to_class_spec(
         kw_only=check.isinstance(p.kw_only, bool),
         slots=check.isinstance(p.slots, bool),
         weakref_slot=check.isinstance(p.weakref_slot, bool),
+
+        metadata=metadata,
     )

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish/dataclasses/reflection.py

@@ -3,6 +3,7 @@ import typing as ta
 
 from .. import lang
 from .api.classes.conversion import std_params_to_class_spec
+from .api.classes.metadata import extract_cls_metadata
 from .api.classes.params import get_class_spec
 from .api.fields.conversion import std_field_to_field_spec
 from .concerns.fields import InitFields
@@ -49,9 +50,12 @@ class ClassReflection:
             for f in dc.fields(self._cls)  # noqa
         ]
 
+        cmd = extract_cls_metadata(self._cls, deep=True)
+
         cs = std_params_to_class_spec(
             p,
             fsl,
+            metadata=cmd.user_metadata or None,
         )
 
         return cs

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish/diag/_pycharm/runhack.py

@@ -59,6 +59,9 @@ class _cached_nullary:  # noqa
 #
 
 
+_repr = repr
+
+
 def _attr_repr(obj, *atts):
     return f'{obj.__class__.__name__}({", ".join(f"{a}={getattr(obj, a)!r}" for a in atts)})'
 
@@ -127,6 +130,109 @@ class AsJson:
 ##
 
 
+class SysModule(AttrsClass, AsJson):
+    def __init__(
+            self,
+            name,  # type: str
+            *,
+            seq=None,  # type: int | None
+            repr=None,  # type: str | None  # noqa
+
+            origin=None,  # type: str | None
+            file=None,  # type: str | None
+    ) -> None:
+        super().__init__()
+
+        self._name = name
+
+        self._seq = seq
+        self._repr = repr
+
+        self._origin = origin
+        self._file = file
+
+    __attrs__ = (
+        'name',
+
+        'seq',
+        'repr',
+
+        'origin',
+        'file',
+    )
+
+    @property
+    def name(self):  # type: () -> str
+        return self._name
+
+    @property
+    def seq(self):  # type: () -> int | None
+        return self._seq
+
+    @property
+    def repr(self):  # type: () -> str | None
+        return self._repr
+
+    @property
+    def origin(self):  # type: () -> str | None
+        return self._origin
+
+    @property
+    def file(self):  # type: () -> str | None
+        return self._file
+
+    def as_json(self):  # type: () -> dict[str, object]
+        return self.attrs_dict()
+
+
+def build_sys_module(
+        name,  # type: str
+        mod,
+        *,
+        seq=None,  # type: int | None
+) -> SysModule:
+    kwargs = dict()  # type: dict
+    kwargs.update(
+        name=name,
+
+        seq=seq,
+        repr=_repr(mod),
+    )
+
+    try:
+        spec = mod.__spec__
+    except AttributeError:
+        pass
+    else:
+        if spec is not None:
+            kwargs.update(origin=spec.origin)
+
+    try:
+        file = mod.__file__
+    except AttributeError:
+        pass
+    else:
+        kwargs.update(file=file)
+
+    return SysModule(**kwargs)
+
+
+def build_sys_modules(dct=None):  # type: (dict[str, object] | None) -> list[SysModule]
+    if dct is None:
+        dct_ = sys.modules
+    else:
+        dct_ = dct  # type: ignore
+
+    lst = []  # type: list[SysModule]
+    for i, (n, m) in enumerate(dct_.items()):
+        lst.append(build_sys_module(n, m, seq=i))
+
+    return lst
+
+
+##
+
+
 class RunEnv(AttrsClass, AsJson):
     def __init__(
             self,
@@ -143,6 +249,7 @@ class RunEnv(AttrsClass, AsJson):
             pycharm_hosted=None,  # type: bool | None
 
             sys_path=None,  # type: list[str] | None
+            sys_modules=None,  # type: list[SysModule] | None
     ) -> None:
         super().__init__()
 
@@ -182,6 +289,10 @@ class RunEnv(AttrsClass, AsJson):
             sys_path = list(sys.path)
         self._sys_path = sys_path
 
+        if sys_modules is None:
+            sys_modules = build_sys_modules()
+        self._sys_modules = sys_modules
+
     __attrs__ = (
         'argv',
         'orig_argv',
@@ -195,6 +306,7 @@ class RunEnv(AttrsClass, AsJson):
         'pycharm_hosted',
 
         'sys_path',
+        'sys_modules',
     )
 
     @property
@@ -233,8 +345,15 @@ class RunEnv(AttrsClass, AsJson):
     def sys_path(self):  # type: () -> list[str]
         return self._sys_path
 
+    @property
+    def sys_modules(self):  # type: () -> list[SysModule]
+        return self._sys_modules
+
     def as_json(self):  # type: () -> dict[str, object]
-        return self.attrs_dict()
+        return {
+            **self.attrs_dict(),
+            'sys_modules': [m.as_json() for m in self.sys_modules],
+        }
 
 
 ##

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/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-0.0.0.dev317 → omlish-0.0.0.dev319}/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-0.0.0.dev319/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.dev317 → omlish-0.0.0.dev319/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev317
+Version: 0.0.0.dev319
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -41,7 +41,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.49; extra == "all"
 Requires-Dist: sqlean.py~=3.49; extra == "all"
-Requires-Dist: duckdb~=1.2; 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"
@@ -89,7 +89,7 @@ Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.49; extra == "sqldrivers"
 Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
-Requires-Dist: duckdb~=1.2; extra == "sqldrivers"
+Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"
 Requires-Dist: jinja2~=3.1; extra == "templates"

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish.egg-info/SOURCES.txt

@@ -429,6 +429,7 @@ omlish/lang/imports.py
 omlish/lang/iterables.py
 omlish/lang/objects.py
 omlish/lang/outcomes.py
+omlish/lang/overrides.py
 omlish/lang/params.py
 omlish/lang/recursion.py
 omlish/lang/resolving.py

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/omlish.egg-info/requires.txt

@@ -28,7 +28,7 @@ aiosqlite~=0.21
 asyncpg~=0.30
 apsw~=3.49
 sqlean.py~=3.49
-duckdb~=1.2
+duckdb~=1.3
 markupsafe~=3.0
 jinja2~=3.1
 pytest~=8.3
@@ -87,7 +87,7 @@ aiosqlite~=0.21
 asyncpg~=0.30
 apsw~=3.49
 sqlean.py~=3.49
-duckdb~=1.2
+duckdb~=1.3
 
 [templates]
 markupsafe~=3.0

{omlish-0.0.0.dev317 → omlish-0.0.0.dev319}/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.dev317'
+version = '0.0.0.dev319'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -52,7 +52,7 @@ all = [
     'asyncpg ~= 0.30',
     'apsw ~= 3.49',
     'sqlean.py ~= 3.49',
-    'duckdb ~= 1.2',
+    'duckdb ~= 1.3',
     'markupsafe ~= 3.0',
     'jinja2 ~= 3.1',
     'pytest ~= 8.3',
@@ -109,7 +109,7 @@ sqldrivers = [
     'asyncpg ~= 0.30',
     'apsw ~= 3.49',
     'sqlean.py ~= 3.49',
-    'duckdb ~= 1.2',
+    'duckdb ~= 1.3',
 ]
 templates = [
     'markupsafe ~= 3.0',