omlish 0.0.0.dev447__py3-none-any.whl → 0.0.0.dev493__py3-none-any.whl

omlish/dataclasses/impl/processing/base.py

@@ -10,6 +10,8 @@ import typing as ta
 from .... import check
 from .... import lang
 from ...specs import ClassSpec
+from ..configs import DEFAULT_NAMED_PACKAGE_CONFIG
+from ..configs import NamedPackageConfig
 
 
 T = ta.TypeVar('T')
@@ -33,6 +35,7 @@ class ProcessingContext:
             cs: ClassSpec,
             item_factories: ta.Mapping[type, ProcessingContextItemFactory],
             *,
+            pkg_cfg: NamedPackageConfig = DEFAULT_NAMED_PACKAGE_CONFIG,
             options: ta.Sequence[ProcessingOption] | None = None,
     ) -> None:
         super().__init__()
@@ -40,6 +43,7 @@ class ProcessingContext:
         self._cls = cls
         self._cs = cs
         self._item_factories = item_factories
+        self._pkg_cfg = pkg_cfg
 
         options_dct: dict = {}
         for o in options or ():
@@ -57,6 +61,10 @@ class ProcessingContext:
     def cs(self) -> ClassSpec:
         return self._cs
 
+    @property
+    def pkg_cfg(self) -> NamedPackageConfig:
+        return self._pkg_cfg
+
     def __getitem__(self, ty: type[T]) -> T:
         try:
             return self._items[ty]

omlish/dataclasses/impl/processing/driving.py

@@ -1,11 +1,12 @@
 import contextlib
 import contextvars
+import sys
 import typing as ta
 
 from .... import lang
 from ...specs import ClassSpec
 from .. import concerns as _concerns  # noqa  # imported for registration
-from ..configs import DEFAULT_PACKAGE_CONFIG
+from ..configs import DEFAULT_NAMED_PACKAGE_CONFIG
 from ..configs import PACKAGE_CONFIG_CACHE
 from ..generation import processor as gp
 from .base import ProcessingContext
@@ -36,26 +37,36 @@ def processing_options_context(*opts: ProcessingOption) -> ta.Iterator[None]:
 ##
 
 
+def _is_pkg_init_mod(mod_name: str) -> bool:
+    if (mod_obj := sys.modules.get(mod_name)) is None:
+        return False
+    if (mod_spec := getattr(mod_obj, '__spec__', None)) is None:
+        return False
+    return bool(mod_spec.submodule_search_locations)
+
+
 def drive_cls_processing(
         cls: type,
         cs: ClassSpec,
         *,
         plan_only: bool = False,
-        verbose: bool = False,
+        warn: bool = False,
+        debug: bool = False,
 ) -> type:
     options: list[ProcessingOption] = list(_OPTIONS_CONTEXT_VAR.get())
     if plan_only:
         options.append(gp.PlanOnly(True))
-    if verbose:
-        options.append(gp.Verbose(True))
+    if warn or debug:
+        options.append(gp.Verbosity(warn=warn, debug=debug))
 
     #
 
-    pkg_config = DEFAULT_PACKAGE_CONFIG
     cls_mod = cls.__module__
-    if '.' in cls_mod:
+    if _is_pkg_init_mod(cls_mod):
+        cls_pkg = cls_mod
+    else:
         cls_pkg = cls_mod.rpartition('.')[0]
-        pkg_cfg = PACKAGE_CONFIG_CACHE.get(cls_pkg, pkg_config)  # noqa
+    pkg_cfg = lang.coalesce(PACKAGE_CONFIG_CACHE.get(cls_pkg), DEFAULT_NAMED_PACKAGE_CONFIG)
 
     #
 
@@ -63,6 +74,7 @@ def drive_cls_processing(
         cls,
         cs,
         all_processing_context_item_factories(),
+        pkg_cfg=pkg_cfg,
         options=options,
     )
 

omlish/dataclasses/specs.py

@@ -216,6 +216,7 @@ class ClassSpec(_SpecBase, lang.Final):
 
     repr_id: bool = False
     terse_repr: bool = False
+    default_repr_fn: ReprFn | None = None
 
     allow_redundant_decorator: bool = False
 

omlish/dataclasses/tools/modifiers.py

@@ -3,6 +3,7 @@ import typing as ta
 
 from ... import check
 from ... import lang
+from ...lite.dataclasses import is_immediate_dataclass
 
 
 if ta.TYPE_CHECKING:
@@ -40,6 +41,8 @@ def update_fields(
     def inner(cls):
         if issubclass(cls, meta.DataMeta):
             raise TypeError('update_fields() cannot be used on DataMeta subclasses')
+        if is_immediate_dataclass(cls):
+            raise TypeError('update_fields() cannot be used on already processed dataclasses')
 
         if fields is None:
             for a, v in list(cls.__dict__.items()):
@@ -51,6 +54,8 @@ def update_fields(
                 try:
                     v = cls.__dict__[a]
                 except KeyError:
+                    if hasattr(cls, a):
+                        raise TypeError('update_fields() cannot be used on parent dataclass fields') from None
                     v = dc.field()
                 else:
                     if not isinstance(v, dc.Field):

omlish/diag/_pycharm/runhack.py

@@ -95,7 +95,7 @@ _BOOL_ENV_VAR_VALUES = {
 def _get_opt_env_bool(n, d):  # type: (str | None, bool) -> bool
     if n is None or n not in os.environ:
         return d
-    return _BOOL_ENV_VAR_VALUES[os.environ[n]]
+    return _BOOL_ENV_VAR_VALUES[os.environ[n].lower()]
 
 
 def _get_env_path_list(k):  # type: (str) -> list[str]

omlish/diag/{lslocks.py → cmds/lslocks.py}

@@ -7,12 +7,12 @@ import dataclasses as dc
 import json
 import typing as ta
 
-from ..lite.check import check
-from ..lite.marshal import OBJ_MARSHALER_FIELD_KEY
-from ..lite.marshal import unmarshal_obj
-from ..subprocesses.run import SubprocessRun
-from ..subprocesses.run import SubprocessRunnable
-from ..subprocesses.run import SubprocessRunOutput
+from ...lite.check import check
+from ...lite.marshal import OBJ_MARSHALER_FIELD_KEY
+from ...lite.marshal import unmarshal_obj
+from ...subprocesses.run import SubprocessRun
+from ...subprocesses.run import SubprocessRunnable
+from ...subprocesses.run import SubprocessRunOutput
 
 
 ##

omlish/diag/{lsof.py → cmds/lsof.py}

@@ -7,12 +7,12 @@ import dataclasses as dc
 import enum
 import typing as ta
 
-from ..lite.check import check
-from ..lite.dataclasses import dataclass_repr_omit_falsey
-from ..lite.marshal import OBJ_MARSHALER_OMIT_IF_NONE
-from ..subprocesses.run import SubprocessRun
-from ..subprocesses.run import SubprocessRunnable
-from ..subprocesses.run import SubprocessRunOutput
+from ...lite.check import check
+from ...lite.dataclasses import dataclass_repr_omit_falsey
+from ...lite.marshal import OBJ_MARSHALER_OMIT_IF_NONE
+from ...subprocesses.run import SubprocessRun
+from ...subprocesses.run import SubprocessRunnable
+from ...subprocesses.run import SubprocessRunOutput
 
 
 ##

omlish/diag/{ps.py → cmds/ps.py}

@@ -4,12 +4,12 @@ import dataclasses as dc
 import os
 import typing as ta
 
-from ..lite.check import check
-from ..lite.timeouts import Timeout
-from ..subprocesses.run import SubprocessRun
-from ..subprocesses.run import SubprocessRunnable
-from ..subprocesses.run import SubprocessRunOutput
-from ..subprocesses.sync import subprocesses
+from ...lite.check import check
+from ...lite.timeouts import Timeout
+from ...subprocesses.run import SubprocessRun
+from ...subprocesses.run import SubprocessRunnable
+from ...subprocesses.run import SubprocessRunOutput
+from ...subprocesses.sync import subprocesses
 
 
 ##

omlish/diag/pycharm.py

@@ -191,9 +191,23 @@ def pycharm_remote_debugger_attach(prd: PycharmRemoteDebugger) -> None:
     else:
         pydevd_pycharm = _import_pydevd_pycharm(version=version)
 
+    import inspect
+    st_sig = inspect.signature(pydevd_pycharm.settrace)
+
+    kw: dict = {}
+    if 'stdoutToServer' in st_sig.parameters:
+        kw.update(
+            stdoutToServer=True,
+            stderrToServer=True,
+        )
+    else:
+        kw.update(
+            stdout_to_server=True,
+            stderr_to_server=True,
+        )
+
     pydevd_pycharm.settrace(
         host,
         port=prd.port,
-        stdoutToServer=True,
-        stderrToServer=True,
+        **kw,
     )

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

@@ -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/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,
+    )