omlish 0.0.0.dev423__py3-none-any.whl → 0.0.0.dev484__py3-none-any.whl

omlish/diag/pydevd.py

@@ -6,7 +6,7 @@ an already-debugging PyCharm instance to debug PySpark jobs.
 TODO:
  - https://www.jetbrains.com/help/pycharm/remote-debugging-with-product.html#
 
-==
+====
 
 https://www.jetbrains.com/help/pycharm/remote-debugging-with-product.html#remote-debug-config ->
 
@@ -25,13 +25,34 @@ buf = textwrap.dedent(f'''
            stderrToServer=True,
        )
 ''') + '\n' * 2 + buf
+
+====
+
+TODO: monkeypatch:
+
+/Applications/PyCharm.app/Contents/plugins/python-ce/helpers/pydev/_pydev_bundle/pydev_monkey.py ::
+
+def starts_with_python_shebang(path):
+    try:
+        with open(path) as f:
+            for line in f:
+                line = line.strip()
+                if line:
+                    for name in PYTHON_NAMES:
+                        if line.startswith('#!/usr/bin/env %s' % name):
+                            return True
+                    return False
+    except (UnicodeDecodeError, IsADirectoryError):  # <-- Add catch for `IsADirectoryError`
+        return False
+    except:
+        traceback.print_exc()
+        return False
 """
 import json
 import os
 import sys
 import tempfile
 import textwrap
-import threading
 import types
 import typing as ta
 
@@ -119,7 +140,19 @@ def _pydevd() -> types.ModuleType | None:
 
 
 def is_present() -> bool:
-    return _pydevd() is not None
+    # FIXME: try to use `lang.can_import('pydevd'), but raises with:
+    # INTERNALERROR>   File "/Users/spinlock/src/wrmsr/omlish/omlish/lang/imports/resolving.py", line 16, in can_import
+    # INTERNALERROR>     spec = importlib.util.find_spec(name, package)
+    # INTERNALERROR>   File "<frozen importlib.util>", line 111, in find_spec
+    # INTERNALERROR> ValueError: pydevd.__spec__ is None
+    # Really want to avoid actually importing pydevd due to side-effects, slowness, and even a pkg_resources deprecation
+    # warning...
+    try:
+        __import__('pydevd')
+    except ImportError:
+        return False
+    else:
+        return True
 
 
 def get_setup() -> dict | None:
@@ -243,23 +276,23 @@ def maybe_reexec(
         bootstrap_path = os.path.join(tmpdir, 'bootstrap.py')
         with open(bootstrap_path, 'w') as f:
             f.write(textwrap.dedent(f"""
-            import sys
-            old_paths = set(sys.path)
-            for new_path in {sys.path!r}:
-                if new_path not in old_paths:
-                    sys.path.insert(0, new_path)
-
-            _stderr_write = sys.stderr.write
-            def stderr_write(*args, **kwargs):
-                code = sys._getframe(1).f_code
-                if code is not None and code.co_filename and code.co_filename.endswith('/pydev_log.py'):
-                    return
-                _stderr_write(*args, **kwargs)
-            sys.stderr.write = stderr_write
-
-            sys.argv = {args[1:]!r}
-            import runpy
-            runpy.run_path({args[1]!r}, run_name='__main__')
+                import sys
+                old_paths = set(sys.path)
+                for new_path in {sys.path!r}:
+                    if new_path not in old_paths:
+                        sys.path.insert(0, new_path)
+
+                _stderr_write = sys.stderr.write
+                def stderr_write(*args, **kwargs):
+                    code = sys._getframe(1).f_code
+                    if code is not None and code.co_filename and code.co_filename.endswith('/pydev_log.py'):
+                        return
+                    _stderr_write(*args, **kwargs)
+                sys.stderr.write = stderr_write
+
+                sys.argv = {args[1:]!r}
+                import runpy
+                runpy.run_path({args[1]!r}, run_name='__main__')
             """))
         args = [args[0], bootstrap_path]
 
@@ -272,29 +305,14 @@ def debug_unhandled_exception(exc_info: ta.Any = None) -> None:
 
     try:
         import pydevd
-        from pydevd import pydevd_tracing
 
     except ImportError:
         return
 
-    exctype, value, traceback = exc_info
-    frames = []
-    while traceback:
-        frames.append(traceback.tb_frame)
-        traceback = traceback.tb_next
-
-    thread = threading.current_thread()
-    frames_by_id = {id(frame): frame for frame in frames}
-    frame = frames[-1]
-    exception = (exctype, value, traceback)
-
-    if hasattr(thread, 'additional_info'):
-        thread.additional_info.pydev_message = 'server exception'
-    try:
-        debugger = pydevd.debugger  # noqa
-    except AttributeError:
-        debugger = pydevd.get_global_debugger()  # noqa
+    et, e, tb = exc_info
 
-    pydevd_tracing.SetTrace(None)
+    while tb.tb_next is not None:
+        tb = tb.tb_next
+    original_frame = tb.tb_frame
 
-    debugger.stop_on_unhandled_exception(thread, frame, frames_by_id, exception)
+    pydevd.settrace(stop_at_frame=original_frame, suspend=True)

omlish/diag/replserver/console.py

@@ -17,7 +17,6 @@ def _attach(repl):
 import ast
 import codeop
 import errno
-import logging
 import socket as sock
 import sys
 import threading
@@ -26,9 +25,10 @@ import types
 import typing as ta
 
 from ... import check
+from ...logs import all as logs
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -173,7 +173,7 @@ class InteractiveSocketConsole:
 
         # Case 3 (complete)
         try:
-            node = ast.parse(source)  # type: ignore
+            node = ast.parse(source)
         except (OverflowError, SyntaxError, ValueError):
             return True
 

omlish/diag/replserver/server.py

@@ -22,7 +22,6 @@ socat - UNIX-CONNECT:repl.sock
 """
 import contextlib
 import functools
-import logging
 import os
 import socket as sock
 import threading
@@ -31,10 +30,11 @@ import weakref
 
 from ... import check
 from ... import dataclasses as dc
+from ...logs import all as logs
 from .console import InteractiveSocketConsole
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omlish/dispatch/__init__.py

@@ -1,12 +1,18 @@
-from .dispatch import (  # noqa
-    Dispatcher,
-)
-
-from .functions import (  # noqa
-    function,
-)
-
-from .methods import (  # noqa
-    install_method,
-    method,
-)
+from .. import lang as _lang
+
+
+with _lang.auto_proxy_init(globals()):
+    ##
+
+    from .dispatch import (  # noqa
+        Dispatcher,
+    )
+
+    from .functions import (  # noqa
+        function,
+    )
+
+    from .methods import (  # noqa
+        install_method,
+        method,
+    )

omlish/dispatch/methods.py

@@ -4,13 +4,11 @@ TODO:
  - ALT: A.f(super(), ... ? :/
  - classmethod/staticmethod
 """
-import contextlib
 import functools
 import typing as ta
-import weakref
 
 from .. import check
-from .. import lang
+from .. import collections as col
 from .dispatch import Dispatcher
 from .impls import get_impl_func_cls_set
 
@@ -34,9 +32,8 @@ class Method(ta.Generic[P, R]):
     it must be explicitly `@register`'ed itself. This is a feature, allowing for selective de-registration of
     implementations in subclasses via name shadowing.
 
-    Methods have ability to choose to allow external installation of implementations outside of direct subclasses. This
-    is to be used *extremely* rarely - basically only in the rare case of externally extensible type hierarchies with
-    visitors.
+    Methods can choose to allow external installation of implementations outside of direct subclasses. This is to be
+    used *extremely* rarely - basically only in the rare case of externally extensible type hierarchies with visitors.
     """
 
     def __init__(
@@ -45,6 +42,7 @@ class Method(ta.Generic[P, R]):
             *,
             installable: bool = False,
             requires_override: bool = False,
+            instance_cache: bool = False,
     ) -> None:
         super().__init__()
 
@@ -53,9 +51,16 @@ class Method(ta.Generic[P, R]):
 
         self._func = func
         self._installable = installable
-        self._requires_override = requires_override
+        self._instance_cache = instance_cache
 
-        self._impls: ta.MutableMapping[ta.Callable, frozenset[type] | None] = weakref.WeakKeyDictionary()
+        self._registry: col.AttrRegistry[ta.Callable, Method._Entry] = col.AttrRegistry(
+            requires_override=requires_override,
+        )
+
+        self._cache: col.AttrRegistryCache[ta.Callable, Method._Entry, ta.Callable] = col.AttrRegistryCache(
+            self._registry,
+            self._prepare,
+        )
 
         # bpo-45678: special-casing for classmethod/staticmethod in Python <=3.9, as functools.update_wrapper doesn't
         # work properly in singledispatchmethod.__get__ if it is applied to an unbound classmethod/staticmethod
@@ -68,19 +73,12 @@ class Method(ta.Generic[P, R]):
         self._is_abstractmethod = getattr(func, '__isabstractmethod__', False)  # noqa
         self.update_wrapper(self)
 
-        self._dispatch_func_cache: dict[ta.Any, ta.Callable] = {}
-
-        def dispatch_func_cache_remove(k, self_ref=weakref.ref(self)):
-            if (ref_self := self_ref()) is not None:
-                cache = ref_self._dispatch_func_cache  # noqa
-                with contextlib.suppress(KeyError):
-                    del cache[k]
-
-        self._dispatch_func_cache_remove = dispatch_func_cache_remove
-
         self._owner: type | None = None
         self._name: str | None = None
 
+    class _Entry:
+        cls_set: frozenset[type]
+
     def __set_name__(self, owner, name):
         if self._owner is None:
             self._owner = owner
@@ -102,83 +100,29 @@ class Method(ta.Generic[P, R]):
 
     def register(self, impl: T, cls_set: frozenset[type] | None = None) -> T:
         check.callable(impl)
-        if impl not in self._impls:
-            self._impls[impl] = cls_set  # type: ignore
-            self._dispatch_func_cache.clear()
-
-        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]:
-        if owner_cls is None:
-            owner_cls = instance_cls
+        entry = Method._Entry()
+        if cls_set is not None:
+            entry.cls_set = cls_set
 
-        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
+        self._registry.register(ta.cast(ta.Callable, impl), entry)
 
-        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))
-
-        #
+        return impl
 
+    def _build_dispatcher(self, collected: ta.Mapping[str, tuple[ta.Callable, _Entry]]) -> Dispatcher[str]:
         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[obj]
-            if cls_set is None:
-                cls_set = get_impl_func_cls_set(obj, arg_offset=1)
-                self._impls[obj] = cls_set
-
+        for a, (f, e) in collected.items():
             try:
-                ex_att = seen[obj]
-            except KeyError:
-                pass
-            else:
-                raise TypeError(f'Duplicate impl: {owner_cls} {instance_cls} {att} {ex_att}')
-            seen[obj] = att
+                cls_set = e.cls_set
+            except AttributeError:
+                cls_set = e.cls_set = get_impl_func_cls_set(f, arg_offset=1)
 
-            disp.register(att, cls_set)
+            disp.register(a, cls_set)
 
         return disp
 
-    def build_dispatch_func(self, disp: Dispatcher[str]) -> ta.Callable:
+    def _build_dispatch_func(self, disp: Dispatcher[str]) -> ta.Callable:
         dispatch = disp.dispatch
         type_ = type
         getattr_ = getattr
@@ -190,25 +134,16 @@ class Method(ta.Generic[P, R]):
                 raise TypeError(f'{func_name} requires at least 1 positional argument')
 
             if (impl_att := dispatch(type_(args[0]))) is not None:
-                fn = getattr_(self, impl_att)
-                return fn(*args, **kwargs)
+                return getattr_(self, impl_att)(*args, **kwargs)
 
             return base_func.__get__(self)(*args, **kwargs)  # noqa
 
         self.update_wrapper(__call__)
         return __call__
 
-    def get_dispatch_func(self, instance_cls: type) -> ta.Callable:
-        cls_ref = weakref.ref(instance_cls)
-        try:
-            return self._dispatch_func_cache[cls_ref]
-        except KeyError:
-            pass
-        del cls_ref
-
-        att_disp = self.build_attr_dispatcher(instance_cls)
-        func = self.build_dispatch_func(att_disp)
-        self._dispatch_func_cache[weakref.ref(instance_cls, self._dispatch_func_cache_remove)] = func
+    def _prepare(self, instance_cls: type, collected: ta.Mapping[str, tuple[ta.Callable, _Entry]]) -> ta.Callable:
+        disp = self._build_dispatcher(collected)
+        func = self._build_dispatch_func(disp)
         return func
 
     def __get__(self, instance, owner=None):
@@ -216,16 +151,21 @@ class Method(ta.Generic[P, R]):
             # FIXME: classmethod/staticmethod
             return self
 
-        instance_cls = type(instance)
-        try:
-            func = self._dispatch_func_cache[weakref.ref(instance_cls)]
-        except KeyError:
-            func = self.get_dispatch_func(instance_cls)
-        return func.__get__(instance, owner)  # noqa
+        if self._instance_cache:
+            try:
+                return instance.__dict__[self._name]
+            except KeyError:
+                pass
+
+        bound = self._cache.get(type(instance)).__get__(instance, owner)  # noqa
+
+        if self._instance_cache:
+            instance.__dict__[self._name] = bound
+
+        return bound
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         instance, *rest = args
-        instance_cls = type(instance)
 
         # if instance_cls is super:
         #     owner = instance.__self_class__.__mro__[instance.__self_class__.__mro__.index(instance.__thisclass__) + 1]
@@ -233,55 +173,25 @@ class Method(ta.Generic[P, R]):
         #     func = self.build_dispatch_func(att_disp)
         #     return func.__get__(instance, instance.__thisclass__)(*rest, **kwargs)
 
-        try:
-            func = self._dispatch_func_cache[weakref.ref(instance_cls)]
-        except KeyError:
-            func = self.get_dispatch_func(instance_cls)
-        return func.__get__(instance)(*rest, **kwargs)  # noqa
+        return self.__get__(instance)(*rest, **kwargs)
 
 
 ##
 
 
-@ta.overload
-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,
         requires_override: bool = False,
+        instance_cache: bool = False,
 ) -> ta.Callable[[ta.Callable[P, R]], Method[P, R]]:  # noqa
-    ...
-
-
-def method(
-        func=None,
-        /,
-        *,
-        installable=False,
-        requires_override=False,
-):
-    kw = dict(
+    return functools.partial(
+        Method,  # type: ignore[arg-type]
         installable=installable,
         requires_override=requires_override,
+        instance_cache=instance_cache,
     )
 
-    if func is None:
-        return functools.partial(Method, **kw)
-
-    return Method(func, **kw)
-
 
 #
 
@@ -305,7 +215,7 @@ def install_method(
         if on is None:
             cls = owner
         else:
-            cls = check.issubclass(on, owner)
+            cls = check.issubclass(on, owner)  # noqa
 
         check.arg(not hasattr(cls, a))
         setattr(cls, a, fn)

omlish/dom/rendering.py

@@ -100,7 +100,7 @@ class Renderer:
 
     #
 
-    @dispatch.method
+    @dispatch.method(instance_cache=True)
     def render(self, o: ta.Any) -> None:
         raise TypeError(o)
 

omlish/formats/dotenv.py

@@ -27,7 +27,6 @@ import abc
 import codecs
 import contextlib
 import io
-import logging
 import os
 import pathlib
 import re
@@ -36,6 +35,7 @@ import tempfile
 import typing as ta
 
 from ..lite.abstract import Abstract
+from ..logs.protocols import LoggerLike
 
 
 ##
@@ -312,7 +312,7 @@ def parse_dotenv_stream(stream: ta.IO[str]) -> ta.Iterator[DotenvBinding]:
 
 def _dotenv_with_warn_for_invalid_lines(
         mappings: ta.Iterator[DotenvBinding],
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
 ) -> ta.Iterator[DotenvBinding]:
     for mapping in mappings:
         if mapping.error:
@@ -337,7 +337,7 @@ class Dotenv:
         interpolate: bool = True,
         override: bool = True,
         env: ta.Optional[ta.Mapping[str, str]] = None,
-        log: ta.Optional[logging.Logger] = None,
+        log: ta.Optional[LoggerLike] = None,
     ) -> None:
         super().__init__()
 
@@ -415,7 +415,7 @@ def dotenv_get_key(
     key_to_get: str,
     *,
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Optional[str]:
     """
     Get the value of a given key from the given .env.
@@ -461,7 +461,7 @@ def dotenv_set_key(
     quote_mode: str = 'always',
     export: bool = False,
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Tuple[ta.Optional[bool], str, str]:
     """
     Adds or Updates a key/value to the given .env
@@ -511,7 +511,7 @@ def dotenv_unset_key(
     *,
     quote_mode: str = 'always',
     encoding: ta.Optional[str] = 'utf-8',
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Tuple[ta.Optional[bool], str]:
     """
     Removes a given key from the given `.env` file.
@@ -575,7 +575,7 @@ def dotenv_values(
     interpolate: bool = True,
     encoding: ta.Optional[str] = 'utf-8',
     env: ta.Optional[ta.Mapping[str, str]] = None,
-    log: ta.Optional[logging.Logger] = None,
+    log: ta.Optional[LoggerLike] = None,
 ) -> ta.Dict[str, ta.Optional[str]]:
     """
     Parse a .env file and return its content as a dict.
@@ -584,7 +584,7 @@ def dotenv_values(
     For example, `foo=bar` results in `{"foo": "bar"}` whereas `foo` alone results in
     `{"foo": None}`
 
-    Parameters:
+    Args:
         path: Absolute or relative path to the .env file.
         stream: `StringIO` object with .env content, used if `path` is `None`.
         verbose: Whether to output a warning if the .env file is missing.

omlish/formats/json/stream/__init__.py

@@ -1,3 +1,16 @@
+"""
+A generator powered, configurable, mostly fully streaming JSON parser.
+
+Regarding the 'streamyness' of the subsystems:
+ - Lexing only buffers for string and number literals.
+ - Parsing maintains only a stack that scales by nesting depth.
+ - Building values will obviously hold everything under the topmost object it's building until it's finished.
+
+It's reasonably optimized, but performance is not a primary or even secondary goal: its goal is flexibility. If speed
+matters use a native library.
+"""
+
+
 from .building import (  # noqa
     JsonValueBuilder,
 )
@@ -8,6 +21,7 @@ from .errors import (  # noqa
 
 
 from .lexing import (  # noqa
+    IdentTokenKind,
     ValueTokenKind,
     VALUE_TOKEN_KINDS,
     ControlTokenKind,
@@ -22,7 +36,7 @@ from .lexing import (  # noqa
     Token,
 
     CONTROL_TOKENS,
-    CONST_TOKENS,
+    CONST_IDENT_VALUES,
 
     JsonStreamLexError,
     JsonStreamLexer,
@@ -35,8 +49,8 @@ from .parsing import (  # noqa
     BeginArray,
     EndArray,
 
-    JsonStreamParserEvent,
-    JsonStreamParserEvents,
+    Event,
+    Events,
 
     yield_parser_events,
 
@@ -54,4 +68,5 @@ from .utils import (  # noqa
 
     stream_parse_values,
     stream_parse_one_value,
+    stream_parse_exactly_one_value,
 )

omlish/formats/json/stream/building.py

@@ -5,8 +5,8 @@ from .parsing import BeginArray
 from .parsing import BeginObject
 from .parsing import EndArray
 from .parsing import EndObject
+from .parsing import Event
 from .parsing import JsonStreamObject
-from .parsing import JsonStreamParserEvent
 from .parsing import Key
 
 
@@ -62,7 +62,7 @@ class JsonValueBuilder:
         else:
             raise self.StateError
 
-    def __call__(self, e: JsonStreamParserEvent) -> ta.Iterable[ta.Any]:
+    def __call__(self, e: Event) -> ta.Iterable[ta.Any]:
         stk = self._stack
 
         #