omlish 0.0.0.dev21__tar.gz → 0.0.0.dev23__tar.gz

{omlish-0.0.0.dev21/omlish.egg-info → omlish-0.0.0.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev21
+Version: 0.0.0.dev23
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -15,14 +15,17 @@ License-File: LICENSE
 Provides-Extra: all
 Requires-Dist: anyio~=4.4; extra == "all"
 Requires-Dist: sniffio~=1.3; extra == "all"
-Requires-Dist: greenlet~=3.0; python_version < "3.13" and extra == "all"
+Requires-Dist: greenlet~=3.1; extra == "all"
 Requires-Dist: trio~=0.26; extra == "all"
-Requires-Dist: trio-asyncio~=0.15; python_version < "3.13" and extra == "all"
+Requires-Dist: trio-asyncio~=0.15; extra == "all"
 Requires-Dist: lz4~=4.0; extra == "all"
 Requires-Dist: python-snappy~=0.7; python_version < "3.13" and extra == "all"
 Requires-Dist: zstd~=1.5; extra == "all"
+Requires-Dist: asttokens~=2.4; extra == "all"
+Requires-Dist: executing~=2.1; extra == "all"
 Requires-Dist: psutil~=6.0; extra == "all"
 Requires-Dist: orjson~=3.10; extra == "all"
+Requires-Dist: ujson~=5.10; extra == "all"
 Requires-Dist: json5~=0.9; extra == "all"
 Requires-Dist: pyyaml~=5.0; extra == "all"
 Requires-Dist: cloudpickle~=3.0; extra == "all"
@@ -30,8 +33,7 @@ Requires-Dist: httpx[http2]~=0.27; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
 Requires-Dist: wrapt~=1.14; extra == "all"
 Requires-Dist: cryptography~=43.0; extra == "all"
-Requires-Dist: sqlalchemy~=2.0; python_version ~= "3.13" and extra == "all"
-Requires-Dist: sqlalchemy[asyncio]~=2.0; python_version < "3.13" and extra == "all"
+Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "all"
 Requires-Dist: pg8000~=1.31; extra == "all"
 Requires-Dist: pymysql~=1.1; extra == "all"
 Requires-Dist: aiomysql~=0.2; extra == "all"
@@ -43,17 +45,20 @@ Requires-Dist: pytest~=8.0; extra == "all"
 Provides-Extra: async
 Requires-Dist: anyio~=4.4; extra == "async"
 Requires-Dist: sniffio~=1.3; extra == "async"
-Requires-Dist: greenlet~=3.0; python_version < "3.13" and extra == "async"
+Requires-Dist: greenlet~=3.1; extra == "async"
 Requires-Dist: trio~=0.26; extra == "async"
-Requires-Dist: trio-asyncio~=0.15; python_version < "3.13" and extra == "async"
+Requires-Dist: trio-asyncio~=0.15; extra == "async"
 Provides-Extra: compression
 Requires-Dist: lz4~=4.0; extra == "compression"
 Requires-Dist: python-snappy~=0.7; python_version < "3.13" and extra == "compression"
 Requires-Dist: zstd~=1.5; extra == "compression"
 Provides-Extra: diag
+Requires-Dist: asttokens~=2.4; extra == "diag"
+Requires-Dist: executing~=2.1; extra == "diag"
 Requires-Dist: psutil~=6.0; extra == "diag"
 Provides-Extra: formats
 Requires-Dist: orjson~=3.10; extra == "formats"
+Requires-Dist: ujson~=5.10; extra == "formats"
 Requires-Dist: json5~=0.9; extra == "formats"
 Requires-Dist: pyyaml~=5.0; extra == "formats"
 Requires-Dist: cloudpickle~=3.0; extra == "formats"
@@ -65,8 +70,7 @@ Requires-Dist: wrapt~=1.14; extra == "misc"
 Provides-Extra: secrets
 Requires-Dist: cryptography~=43.0; extra == "secrets"
 Provides-Extra: sql
-Requires-Dist: sqlalchemy~=2.0; python_version ~= "3.13" and extra == "sql"
-Requires-Dist: sqlalchemy[asyncio]~=2.0; python_version < "3.13" and extra == "sql"
+Requires-Dist: sqlalchemy[asyncio]~=2.0; extra == "sql"
 Requires-Dist: pg8000~=1.31; extra == "sql"
 Requires-Dist: pymysql~=1.1; extra == "sql"
 Requires-Dist: aiomysql~=0.2; extra == "sql"

{omlish-0.0.0.dev21 → omlish-0.0.0.dev23}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev21'
-__revision__ = '4cb4af9e253f312d5f301449f08dfa7168234e07'
+__version__ = '0.0.0.dev23'
+__revision__ = '1d019b6879a9552ea31622e40f50d260d6b08824'
 
 
 #
@@ -33,10 +33,10 @@ class Project(ProjectBase):
             'anyio ~= 4.4',
             'sniffio ~= 1.3',
 
-            'greenlet ~= 3.0; python_version < "3.13"',
+            'greenlet ~= 3.1',
 
             'trio ~= 0.26',
-            'trio-asyncio ~= 0.15; python_version < "3.13"',
+            'trio-asyncio ~= 0.15',
         ],
 
         'compression': [
@@ -46,12 +46,15 @@ class Project(ProjectBase):
         ],
 
         'diag': [
+            'asttokens ~= 2.4',
+            'executing ~= 2.1',
+
             'psutil ~= 6.0',
         ],
 
         'formats': [
             'orjson ~= 3.10',
-            # 'ujson ~= 5.10',
+            'ujson ~= 5.10',
 
             'json5 ~= 0.9',
 
@@ -74,11 +77,14 @@ class Project(ProjectBase):
         ],
 
         'sql': [
-            'sqlalchemy ~= 2.0; python_version ~= "3.13"',
-            'sqlalchemy[asyncio] ~= 2.0; python_version < "3.13"',
+            'sqlalchemy[asyncio] ~= 2.0',
 
             'pg8000 ~= 1.31',
+            # 'psycopg2 ~= 2.9',
+
             'pymysql ~= 1.1',
+            # 'mysql-connector-python ~= 9.0',
+            # 'mysqlclient ~= 2.2',
 
             'aiomysql ~= 0.2',
             'aiosqlite ~= 0.20',
@@ -108,7 +114,10 @@ class SetuptoolsBase:
     include_package_data = False
 
     find_packages = {
-        'exclude': ['*.tests', '*.tests.*'],
+        'exclude': [
+            '*.tests',
+            '*.tests.*',
+        ],
     }
 
 

{omlish-0.0.0.dev21 → omlish-0.0.0.dev23}/omlish/asyncs/bridge.py

@@ -8,6 +8,9 @@ KEEP THE SPACE SHUTTLE FLYING.
 
 TODO:
  - reuse greenlet if nested somehow?
+
+See:
+ - https://greenback.readthedocs.io/en/latest/
 """
 import itertools
 import sys
@@ -15,22 +18,21 @@ import types
 import typing as ta
 import weakref
 
+from .. import check
 from .. import lang
+from .. import sync
+from ..concurrent import threadlets
 from .asyncs import sync_await
 
 
 if ta.TYPE_CHECKING:
     import asyncio
 
-    import greenlet
-
     from . import anyio as aiu
 
 else:
     asyncio = lang.proxy_import('asyncio')
 
-    greenlet = lang.proxy_import('greenlet')
-
     aiu = lang.proxy_import('.anyio', __package__)
 
 
@@ -56,6 +58,20 @@ def trivial_a_to_s(fn):
 # https://gist.github.com/snaury/202bf4f22c41ca34e56297bae5f33fef
 
 
+_THREADLETS_IMPL = threadlets.GreenletThreadlets
+# from ..concurrent.tests.real import RealThreadlets
+# _THREADLETS_IMPL = RealThreadlets
+
+_THREADLETS = sync.LazyFn(lambda: _THREADLETS_IMPL())
+
+
+def _threadlets() -> threadlets.Threadlets:
+    return _THREADLETS.get()
+
+
+#
+
+
 class BridgeAwaitRequiredError(Exception):
     pass
 
@@ -101,7 +117,7 @@ def _make_transition(seq: int, a_to_s: bool, obj: ta.Any) -> _BridgeTransition:
 
 _BRIDGED_TASKS: ta.MutableMapping[ta.Any, list[_BridgeTransition]] = weakref.WeakKeyDictionary()
 
-_BRIDGE_GREENLET_ATTR = f'__{__package__.replace(".", "__")}__bridge_greenlet__'
+_BRIDGE_THREADLET_ATTR = f'__{__package__.replace(".", "__")}__bridge_threadlet__'
 
 
 def _push_transition(a_to_s: bool, l: list[_BridgeTransition], t: _BridgeTransition) -> _BridgeTransition:
@@ -129,9 +145,9 @@ def _get_transitions() -> list[_BridgeTransition]:
         else:
             l.extend(tl)
 
-    g = greenlet.getcurrent()
+    g = _threadlets().get_current()
     try:
-        gl = getattr(g, _BRIDGE_GREENLET_ATTR)
+        gl = getattr(g.underlying, _BRIDGE_THREADLET_ATTR)
     except AttributeError:
         pass
     else:
@@ -158,9 +174,9 @@ def is_in_bridge() -> bool:
     else:
         last_t = None
 
-    g = greenlet.getcurrent()
+    g = _threadlets().get_current()
     try:
-        gl = getattr(g, _BRIDGE_GREENLET_ATTR)
+        gl = getattr(g.underlying, _BRIDGE_THREADLET_ATTR)
     except AttributeError:
         last_g = None
     else:
@@ -194,13 +210,13 @@ def _safe_cancel_awaitable(awaitable: ta.Awaitable[ta.Any]) -> None:
 
 
 def s_to_a_await(awaitable: ta.Awaitable[T]) -> T:
-    g = greenlet.getcurrent()
+    g = _threadlets().get_current()
 
-    if not getattr(g, _BRIDGE_GREENLET_ATTR, False):
+    if not getattr(g.underlying, _BRIDGE_THREADLET_ATTR, False):
         _safe_cancel_awaitable(awaitable)
         raise MissingBridgeGreenletError
 
-    return g.parent.switch(awaitable)
+    return check.not_none(g.parent).switch(awaitable)
 
 
 def s_to_a(fn, *, require_await=False):
@@ -210,7 +226,7 @@ def s_to_a(fn, *, require_await=False):
             try:
                 return fn(*args, **kwargs)
             finally:
-                if (gl2 := getattr(g, _BRIDGE_GREENLET_ATTR)) is not gl:  # noqa
+                if (gl2 := getattr(g.underlying, _BRIDGE_THREADLET_ATTR)) is not gl:  # noqa
                     raise UnexpectedBridgeNestingError
                 if (cur_g := _pop_transition(False, gl)) is not added_g:  # noqa
                     raise UnexpectedBridgeNestingError
@@ -219,8 +235,8 @@ def s_to_a(fn, *, require_await=False):
 
         seq = next(_BRIDGE_TRANSITIONS_SEQ)
 
-        g = greenlet.greenlet(inner)
-        setattr(g, _BRIDGE_GREENLET_ATTR, gl := [])  # type: ignore
+        g = _threadlets().spawn(inner)
+        setattr(g.underlying, _BRIDGE_THREADLET_ATTR, gl := [])  # type: ignore
         added_g = _push_transition(False, gl, _make_transition(seq, False, g))
 
         if (t := aiu.get_current_backend_task()) is not None:
@@ -270,11 +286,11 @@ def a_to_s(fn):
         else:
             added_t = None
 
-        g = greenlet.getcurrent()
+        g = _threadlets().get_current()
         try:
-            gl = getattr(g, _BRIDGE_GREENLET_ATTR)
+            gl = getattr(g.underlying, _BRIDGE_THREADLET_ATTR)
         except AttributeError:
-            setattr(g, _BRIDGE_GREENLET_ATTR, gl := [])
+            setattr(g.underlying, _BRIDGE_THREADLET_ATTR, gl := [])
         added_g = _push_transition(True, gl, _make_transition(seq, True, g))
 
         try:
@@ -306,7 +322,7 @@ def a_to_s(fn):
                 if (cur_t := _pop_transition(True, tl)) is not added_t:  # noqa
                     raise UnexpectedBridgeNestingError
 
-            if (gl2 := getattr(g, _BRIDGE_GREENLET_ATTR)) is not gl:  # noqa
+            if (gl2 := getattr(g.underlying, _BRIDGE_THREADLET_ATTR)) is not gl:  # noqa
                 raise UnexpectedBridgeNestingError
             if (cur_g := _pop_transition(True, gl)) is not added_g:  # noqa
                 raise UnexpectedBridgeNestingError

omlish-0.0.0.dev23/omlish/bootstrap/__init__.py

@@ -0,0 +1,42 @@
+from .base import (  # noqa
+    Bootstrap,
+    ContextBootstrap,
+    SimpleBootstrap,
+)
+
+from .diag import (  # noqa
+    CheckBootstrap,
+    CprofileBootstrap,
+    PycharmBootstrap,
+    ThreadDumpBootstrap,
+    TimebombBootstrap,
+)
+
+from .harness import (  # noqa
+    bootstrap,
+)
+
+from .sys import (  # noqa
+    CwdBootstrap,
+    EnvBootstrap,
+    FaulthandlerBootstrap,
+    FdsBootstrap,
+    GcBootstrap,
+    GcDebugFlag,
+    ImportBootstrap,
+    LogBootstrap,
+    NiceBootstrap,
+    PidfileBootstrap,
+    PrctlBootstrap,
+    PrintPidBootstrap,
+    RlimitBootstrap,
+    SetuidBootstrap,
+)
+
+
+##
+
+
+from ..lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('..marshal', '.marshal', __package__)

{omlish-0.0.0.dev21 → omlish-0.0.0.dev23}/omlish/bootstrap/base.py

@@ -2,6 +2,8 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish import lang
+
 
 BootstrapConfigT = ta.TypeVar('BootstrapConfigT', bound='Bootstrap.Config')
 
@@ -9,7 +11,7 @@ BootstrapConfigT = ta.TypeVar('BootstrapConfigT', bound='Bootstrap.Config')
 ##
 
 
-class Bootstrap(abc.ABC, ta.Generic[BootstrapConfigT]):
+class Bootstrap(abc.ABC, lang.PackageSealed, ta.Generic[BootstrapConfigT]):
     @dc.dataclass(frozen=True)
     class Config(abc.ABC):  # noqa
         pass

{omlish-0.0.0.dev21 → omlish-0.0.0.dev23}/omlish/bootstrap/diag.py

@@ -5,28 +5,56 @@ import signal
 import sys
 import typing as ta
 
+from .. import check
 from .. import lang
 from .base import Bootstrap
 from .base import ContextBootstrap
+from .base import SimpleBootstrap
 
 
 if ta.TYPE_CHECKING:
     import cProfile  # noqa
     import pstats
 
+    from ..diag import pycharm as diagpc
     from ..diag import threads as diagt
 
 else:
     cProfile = lang.proxy_import('cProfile')  # noqa
     pstats = lang.proxy_import('pstats')
 
+    diagpc = lang.proxy_import('..diag.pycharm', __package__)
     diagt = lang.proxy_import('..diag.threads', __package__)
 
 
 ##
 
 
-class ProfilingBootstrap(ContextBootstrap['ProfilingBootstrap.Config']):
+class CheckBootstrap(ContextBootstrap['CheckBootstrap.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Bootstrap.Config):
+        breakpoint: bool = False
+
+    @staticmethod
+    def _breakpoint(exc: Exception) -> None:  # noqa
+        breakpoint()  # noqa
+
+    @contextlib.contextmanager
+    def enter(self) -> ta.Iterator[None]:
+        if not self._config.breakpoint:
+            return
+
+        check.register_on_raise(CheckBootstrap._breakpoint)
+        try:
+            yield
+        finally:
+            check.unregister_on_raise(CheckBootstrap._breakpoint)
+
+
+##
+
+
+class CprofileBootstrap(ContextBootstrap['CprofileBootstrap.Config']):
     @dc.dataclass(frozen=True)
     class Config(Bootstrap.Config):
         enable: bool = False
@@ -70,6 +98,7 @@ class ThreadDumpBootstrap(ContextBootstrap['ThreadDumpBootstrap.Config']):
     @dc.dataclass(frozen=True)
     class Config(Bootstrap.Config):
         interval_s: ta.Optional[float] = None
+        nodaemon: bool = False
 
         on_sigquit: bool = False
 
@@ -79,6 +108,7 @@ class ThreadDumpBootstrap(ContextBootstrap['ThreadDumpBootstrap.Config']):
             tdt = diagt.create_thread_dump_thread(
                 interval_s=self._config.interval_s,
                 start=True,
+                nodaemon=self._config.nodaemon,
             )
         else:
             tdt = None
@@ -97,7 +127,7 @@ class ThreadDumpBootstrap(ContextBootstrap['ThreadDumpBootstrap.Config']):
             yield
 
         finally:
-            if tdt is not None:
+            if tdt is not None and not self._config.nodaemon:
                 tdt.stop_nowait()
 
             if prev_sq.present:
@@ -126,3 +156,22 @@ class TimebombBootstrap(ContextBootstrap['TimebombBootstrap.Config']):
             yield
         finally:
             tbt.stop_nowait()
+
+
+##
+
+
+class PycharmBootstrap(SimpleBootstrap['PycharmBootstrap.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Bootstrap.Config):
+        debug_host: ta.Optional[str] = None
+        debug_port: ta.Optional[int] = None
+        debug_version: ta.Optional[str] = None
+
+    def run(self) -> None:
+        if self._config.debug_port is not None:
+            diagpc.pycharm_remote_debugger_attach(
+                self._config.debug_host,
+                self._config.debug_port,
+                version=self._config.debug_version,
+            )

{omlish-0.0.0.dev21 → omlish-0.0.0.dev23}/omlish/bootstrap/main.py

@@ -156,8 +156,9 @@ def _main() -> int:
     with bootstrap(*cfgs):
         tgt = args.target
 
+        sys.argv = [tgt, *(args.args or ())]
+
         if args.module:
-            sys.argv = [tgt, *(args.args or ())]
             runpy._run_module_as_main(tgt)  # type: ignore  # noqa
 
         else:

omlish-0.0.0.dev23/omlish/bootstrap/marshal.py

@@ -0,0 +1,18 @@
+from .. import lang
+from .. import marshal as msh
+from .base import Bootstrap
+from .harness import BOOTSTRAP_TYPES_BY_NAME
+
+
+@lang.cached_function
+def _install_standard_marshalling() -> None:
+    cfgs_poly = msh.Polymorphism(
+        Bootstrap.Config,
+        [msh.Impl(b.Config, n) for n, b in BOOTSTRAP_TYPES_BY_NAME.items()],
+    )
+
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(cfgs_poly)]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(cfgs_poly)]
+
+
+_install_standard_marshalling()