omlish 0.0.0.dev20__tar.gz → 0.0.0.dev22__tar.gz

{omlish-0.0.0.dev20/omlish.egg-info → omlish-0.0.0.dev22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev20
+Version: 0.0.0.dev22
 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.dev20 → omlish-0.0.0.dev22}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev20'
-__revision__ = '56a3421b375112818e306f2c17d467c7aac1d26b'
+__version__ = '0.0.0.dev22'
+__revision__ = '3d902899000237758f62e46319a8da3bccd2d447'
 
 
 #
@@ -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,8 +77,7 @@ 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',
             'pymysql ~= 1.1',

{omlish-0.0.0.dev20 → omlish-0.0.0.dev22}/omlish/asyncs/bridge.py

@@ -15,22 +15,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 +55,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 +114,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 +142,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 +171,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 +207,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 +223,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 +232,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 +283,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 +319,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.dev20 → omlish-0.0.0.dev22}/omlish/bootstrap/diag.py

@@ -70,6 +70,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 +80,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 +99,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:

omlish-0.0.0.dev22/omlish/concurrent/__init__.py

@@ -0,0 +1,11 @@
+from .executors import (  # noqa
+    ImmediateExecutor,
+    new_executor,
+)
+
+from .futures import (  # noqa
+    FutureError,
+    FutureTimeoutError,
+    wait_futures,
+    wait_dependent_futures,
+)

omlish-0.0.0.dev22/omlish/concurrent/executors.py

@@ -0,0 +1,52 @@
+import concurrent.futures as cf
+import contextlib
+import typing as ta
+
+
+T = ta.TypeVar('T')
+P = ta.ParamSpec('P')
+
+
+class ImmediateExecutor(cf.Executor):
+
+    def __init__(self, *, immediate_exceptions: bool = False) -> None:
+        super().__init__()
+        self._immediate_exceptions = immediate_exceptions
+
+    def submit(
+            self,
+            fn: ta.Callable[P, T],
+            /,
+            *args: P.args,
+            **kwargs: P.kwargs,
+    ) -> cf.Future[T]:
+        future: ta.Any = cf.Future()
+        try:
+            result = fn(*args, **kwargs)
+            future.set_result(result)
+        except Exception as e:
+            if self._immediate_exceptions:
+                raise
+            future.set_exception(e)
+        return future
+
+
+@contextlib.contextmanager
+def new_executor(
+        max_workers: int | None = None,
+        cls: type[cf.Executor] = cf.ThreadPoolExecutor,
+        *,
+        immediate_exceptions: bool = False,
+        **kwargs: ta.Any,
+) -> ta.Generator[cf.Executor, None, None]:
+    if max_workers == 0:
+        yield ImmediateExecutor(
+            immediate_exceptions=immediate_exceptions,
+        )
+
+    else:
+        with cls(  # type: ignore
+                max_workers,
+                **kwargs,
+        ) as exe:
+            yield exe

omlish-0.0.0.dev20/omlish/concurrent.py → omlish-0.0.0.dev22/omlish/concurrent/futures.py

@@ -1,11 +1,9 @@
 import concurrent.futures as cf
-import contextlib
 import time
 import typing as ta
 
 
 T = ta.TypeVar('T')
-P = ta.ParamSpec('P')
 
 
 ##
@@ -137,45 +135,3 @@ def wait_dependent_futures(
 
     futs_by_fn = {fn: fut for fut, fn in fns_by_fut.items()}
     return futs_by_fn
-
-
-##
-
-
-class ImmediateExecutor(cf.Executor):
-
-    def __init__(self, *, immediate_exceptions: bool = False) -> None:
-        super().__init__()
-        self._immediate_exceptions = immediate_exceptions
-
-    def submit(self, fn: ta.Callable[P, T], /, *args: P.args, **kwargs: P.kwargs) -> cf.Future[T]:
-        future: ta.Any = cf.Future()
-        try:
-            result = fn(*args, **kwargs)
-            future.set_result(result)
-        except Exception as e:
-            if self._immediate_exceptions:
-                raise
-            future.set_exception(e)
-        return future
-
-
-@contextlib.contextmanager
-def new_executor(
-        max_workers: int | None = None,
-        cls: type[cf.Executor] = cf.ThreadPoolExecutor,
-        *,
-        immediate_exceptions: bool = False,
-        **kwargs: ta.Any,
-) -> ta.Generator[cf.Executor, None, None]:
-    if max_workers == 0:
-        yield ImmediateExecutor(
-            immediate_exceptions=immediate_exceptions,
-        )
-
-    else:
-        with cls(  # type: ignore
-                max_workers,
-                **kwargs,
-        ) as exe:
-            yield exe

omlish-0.0.0.dev22/omlish/concurrent/threadlets.py

@@ -0,0 +1,91 @@
+import abc
+import dataclasses as dc
+import typing as ta
+
+from omlish import lang
+
+
+if ta.TYPE_CHECKING:
+    import greenlet
+else:
+    greenlet = lang.proxy_import('greenlet')
+
+
+##
+
+
+class Threadlet(abc.ABC):
+    """Not safe to identity-key - use `underlying`."""
+
+    def __hash__(self):
+        raise TypeError('use `underlying`')
+
+    def __eq__(self, other):
+        raise TypeError('use `underlying`')
+
+    @property
+    @abc.abstractmethod
+    def underlying(self) -> ta.Any:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def parent(self) -> ta.Optional['Threadlet']:
+        raise NotImplementedError
+
+    @property
+    @abc.abstractmethod
+    def dead(self) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def switch(self, *args: ta.Any, **kwargs: ta.Any) -> ta.Any:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def throw(self, ex: Exception) -> ta.Any:
+        raise NotImplementedError
+
+
+class Threadlets(abc.ABC):
+    @abc.abstractmethod
+    def spawn(self, fn: ta.Callable[[], None]) -> Threadlet:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def get_current(self) -> Threadlet:
+        raise NotImplementedError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class GreenletThreadlet(Threadlet):
+    g: 'greenlet.greenlet'
+
+    @property
+    def underlying(self) -> 'greenlet.greenlet':
+        return self.g
+
+    @property
+    def parent(self) -> ta.Optional['GreenletThreadlet']:
+        return GreenletThreadlet(self.g.parent)
+
+    @property
+    def dead(self) -> bool:
+        return self.g.dead
+
+    def switch(self, *args: ta.Any, **kwargs: ta.Any) -> ta.Any:
+        return self.g.switch(*args, **kwargs)
+
+    def throw(self, ex: Exception) -> ta.Any:
+        return self.g.throw(ex)
+
+
+class GreenletThreadlets(Threadlets):
+    def spawn(self, fn: ta.Callable[[], None]) -> Threadlet:
+        return GreenletThreadlet(greenlet.greenlet(fn))
+
+    def get_current(self) -> Threadlet:
+        return GreenletThreadlet(greenlet.getcurrent())

{omlish-0.0.0.dev20 → omlish-0.0.0.dev22}/omlish/dataclasses/impl/fields.py

@@ -4,10 +4,13 @@ import typing as ta
 
 from ... import check as check_
 from ... import lang
+from .internals import FIELDS_ATTR
 from .internals import FieldType
 from .internals import is_classvar
 from .internals import is_initvar
+from .internals import is_kw_only
 from .params import get_field_extras
+from .processing import Processor
 
 
 if ta.TYPE_CHECKING:
@@ -19,6 +22,9 @@ else:
 MISSING = dc.MISSING
 
 
+##
+
+
 def field_type(f: dc.Field) -> FieldType:
     if (ft := getattr(f, '_field_type')) is not None:
         return FieldType(ft)
@@ -30,6 +36,51 @@ def has_default(f: dc.Field) -> bool:
     return not (f.default is MISSING and f.default_factory is MISSING)
 
 
+##
+
+
+class FieldsProcessor(Processor):
+    def _process(self) -> None:
+        cls = self._info.cls
+        fields: dict[str, dc.Field] = {}
+
+        for b in cls.__mro__[-1:0:-1]:
+            base_fields = getattr(b, FIELDS_ATTR, None)
+            if base_fields is not None:
+                for f in base_fields.values():
+                    fields[f.name] = f
+
+        cls_fields: list[dc.Field] = []
+
+        kw_only = self._info.params.kw_only
+        kw_only_seen = False
+        for name, ann in self._info.cls_annotations.items():
+            if is_kw_only(cls, ann):
+                if kw_only_seen:
+                    raise TypeError(f'{name!r} is KW_ONLY, but KW_ONLY has already been specified')
+                kw_only_seen = True
+                kw_only = True
+            else:
+                cls_fields.append(preprocess_field(cls, name, ann, kw_only))
+
+        for f in cls_fields:
+            fields[f.name] = f
+            if isinstance(getattr(cls, f.name, None), dc.Field):
+                if f.default is MISSING:
+                    delattr(cls, f.name)
+                else:
+                    setattr(cls, f.name, f.default)
+
+        for name, value in cls.__dict__.items():
+            if isinstance(value, dc.Field) and name not in self._info.cls_annotations:
+                raise TypeError(f'{name!r} is a field but has no type annotation')
+
+        setattr(cls, FIELDS_ATTR, fields)
+
+
+##
+
+
 def preprocess_field(
         cls: type,
         a_name: str,

{omlish-0.0.0.dev20 → omlish-0.0.0.dev22}/omlish/dataclasses/impl/frozen.py

@@ -1,12 +1,47 @@
 import dataclasses as dc
 import typing as ta
 
+from ... import lang
+from .internals import FIELDS_ATTR
+from .internals import PARAMS_ATTR
 from .processing import Processor
+from .reflect import ClassInfo
 from .utils import Namespace
 from .utils import create_fn
 from .utils import set_new_attribute
 
 
+if ta.TYPE_CHECKING:
+    from . import metaclass
+else:
+    metaclass = lang.proxy_import('.metaclass', __package__)
+
+
+def check_frozen_bases(info: ClassInfo) -> None:
+    mc_base = getattr(metaclass, 'Data', None)
+    all_frozen_bases = None
+    any_frozen_base = False
+    has_dataclass_bases = False
+    for b in info.cls.__mro__[-1:0:-1]:
+        if b is mc_base:
+            continue
+        base_fields = getattr(b, FIELDS_ATTR, None)
+        if base_fields is not None:
+            has_dataclass_bases = True
+            if all_frozen_bases is None:
+                all_frozen_bases = True
+            current_frozen = getattr(b, PARAMS_ATTR).frozen
+            all_frozen_bases = all_frozen_bases and current_frozen
+            any_frozen_base = any_frozen_base or current_frozen
+
+    if has_dataclass_bases:
+        if any_frozen_base and not info.params.frozen:
+            raise TypeError('cannot inherit non-frozen dataclass from a frozen one')
+
+        if all_frozen_bases is False and info.params.frozen:
+            raise TypeError('cannot inherit frozen dataclass from a non-frozen one')
+
+
 def frozen_get_del_attr(
         cls: type,
         fields: ta.Sequence[dc.Field],
@@ -46,6 +81,9 @@ def frozen_get_del_attr(
 
 
 class FrozenProcessor(Processor):
+    def check(self) -> None:
+        check_frozen_bases(self._info)
+
     def _process(self) -> None:
         if not self._info.params.frozen:
             return