omlish 0.0.0.dev410__tar.gz → 0.0.0.dev412__tar.gz

{omlish-0.0.0.dev410/omlish.egg-info → omlish-0.0.0.dev412}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev410
+Version: 0.0.0.dev412
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev410 → omlish-0.0.0.dev412}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev410'
-__revision__ = 'fa58128e15cab568117709c80765dc8d633cb4e0'
+__version__ = '0.0.0.dev412'
+__revision__ = '28eaa6c829fe5127525ef9dd2962aee8626426b1'
 
 
 #

{omlish-0.0.0.dev410 → omlish-0.0.0.dev412}/omlish/lang/__init__.py

@@ -285,6 +285,9 @@ from .maysyncs import (  # noqa
 
     make_maysync,
     make_maysync_from_sync,
+
+    maysync_fn,
+    maysync_generator_fn,
     maysync,
 )
 

{omlish-0.0.0.dev410 → omlish-0.0.0.dev412}/omlish/lite/maysyncs.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP043 UP045 UP046 UP047
+# ruff: noqa: UP006 UP007 UP043 UP045 UP046 UP047
 # @omlish-lite
 """
 A system for writing a python function once which can then be effectively used in both sync and async contexts -
@@ -35,6 +35,8 @@ TODO:
  - for debug, mask any running eventloop while running maysync code
  - `[CO_ASYNC_GENERATOR] = {k for k, v in dis.COMPILER_FLAG_NAMES.items() if v == 'ASYNC_GENERATOR'}` ? inspect is big..
   - works down to 3.8
+ - make_maysync_from_sync can run with asyncio.run_in_thread
+ - make_maysync_from_async can run with asyncio.run_soon
 """
 import abc
 import functools
@@ -160,10 +162,6 @@ class _MaysyncThreadLocal(threading.local):
 class _MaysyncContext(abc.ABC):
     mode: ta.ClassVar[ta.Literal['s', 'a']]
 
-    @classmethod
-    def current(cls) -> ta.Optional['_MaysyncContext']:
-        return _MaysyncThreadLocal.context
-
     @abc.abstractmethod
     def run(self, fn: ta.Callable[..., T], *args: ta.Any, **kwargs: ta.Any) -> T:
         raise NotImplementedError
@@ -177,14 +175,18 @@ class _SyncMaysyncContext(_MaysyncContext):
         prev = _MaysyncThreadLocal.context
         _MaysyncThreadLocal.context = self
 
-        ph = sys.get_asyncgen_hooks()
-        sys.set_asyncgen_hooks(firstiter=None, finalizer=None)
+        ph: ta.Any = sys.get_asyncgen_hooks()
+        if ph.firstiter is not None or ph.finalizer is not None:
+            sys.set_asyncgen_hooks(firstiter=None, finalizer=None)
+        else:
+            ph = None
 
         try:
             return fn(*args, **kwargs)
 
         finally:
-            sys.set_asyncgen_hooks(*ph)
+            if ph is not None:
+                sys.set_asyncgen_hooks(*ph)
 
             _MaysyncThreadLocal.context = prev
 
@@ -220,9 +222,7 @@ class _MaywaitableLike(
             args: ta.Tuple[ta.Any, ...],
             kwargs: ta.Mapping[str, ta.Any],
     ) -> None:
-        self._x = x
-        self._args = args
-        self._kwargs = kwargs
+        self._x, self._args, self._kwargs = x, args, kwargs
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}@{id(self):x}({self._x!r})'
@@ -299,8 +299,8 @@ class _FpMaywaitable(
         return self._x._s(*self._args, **self._kwargs)  # noqa
 
     def a(self) -> ta.Awaitable[T]:
-        if _MaysyncContext.current() is not None:
-            return _MaysyncFuture(self._x, self._args, self._kwargs)
+        if _MaysyncThreadLocal.context is not None:
+            return _MaysyncFuture(self)
 
         return self._x._a(*self._args, **self._kwargs)  # noqa
 
@@ -332,7 +332,7 @@ class _FpMaysyncGenerator(
         return self._x._s(*self._args, **self._kwargs)  # noqa
 
     def a(self) -> ta.AsyncGenerator[O, I]:
-        if (ctx := _MaysyncContext.current()) is not None and ctx.mode == 's':
+        if (ctx := _MaysyncThreadLocal.context) is not None and ctx.mode == 's':
             async def inner():
                 g = self._x._s(*self._args, **self._kwargs)  # noqa
 
@@ -411,11 +411,6 @@ class _MgMaysyncFnLike(
     abc.ABC,
     ta.Generic[T],
 ):
-    """
-    A maysync object backed by an underlying generator yielding _MaysyncOp's. The _MgDriver and _MgGeneratorDriver
-    classes produce such generators.
-    """
-
     def __init__(
             self,
             mg: ta.Callable[..., T],
@@ -452,13 +447,13 @@ class _MgMaysyncFn(
 
 @ta.final
 class _MgMaysyncDriver:
-    def __init__(self, ctx, mg):
+    def __init__(self, ctx: _MaysyncContext, mg: ta.Any) -> None:
         self.ctx = ctx
         self.mg = mg
 
     value: ta.Any
 
-    def __iter__(self):
+    def __iter__(self) -> ta.Generator['_MaysyncFuture', None, None]:
         try:
             a = self.mg.__await__()
             try:
@@ -478,7 +473,8 @@ class _MgMaysyncDriver:
                         del f
 
                 finally:
-                    self.ctx.run(g.close)
+                    if g is not a:
+                        self.ctx.run(g.close)
 
             finally:
                 self.ctx.run(a.close)
@@ -502,7 +498,7 @@ class _MgMaywaitable(
         return drv.value
 
     def a(self) -> ta.Awaitable[T]:
-        if (ctx := _MaysyncContext.current()) is None or ctx.mode == 'a':
+        if (ctx := _MaysyncThreadLocal.context) is None or ctx.mode == 'a':
             return self._x._mg(*self._args, **self._kwargs)  # noqa
 
         async def inner():
@@ -527,11 +523,21 @@ class _MgMaysyncGeneratorFn(
 
 @ta.final
 class _MgMaysyncGeneratorDriver:
-    def __init__(self, ctx, ag):
+    def __init__(self, ctx: _MaysyncContext, ag: ta.Any) -> None:
         self.ctx = ctx
         self.ag = ag
 
-    def __iter__(self):
+    def __iter__(self) -> ta.Generator[
+        ta.Union[
+            ta.Tuple[ta.Literal['f'], '_MaysyncFuture'],
+            ta.Tuple[ta.Literal['o'], ta.Any],
+        ],
+        ta.Union[
+            ta.Tuple[ta.Any, BaseException],
+            None,
+        ],
+        None,
+    ]:
         try:
             ai = self.ag.__aiter__()
             try:
@@ -553,11 +559,12 @@ class _MgMaysyncGeneratorDriver:
 
                         del f
 
-                    i, e = yield ('o', drv.value)
+                    i, e = yield ('o', drv.value)  # type: ignore[misc]
 
             finally:
-                for f in _MgMaysyncDriver(self.ctx, ai.aclose()):
-                    yield ('f', f)
+                if ai is not self.ag:
+                    for f in _MgMaysyncDriver(self.ctx, ai.aclose()):
+                        yield ('f', f)
 
         finally:
             for f in _MgMaysyncDriver(self.ctx, self.ag.aclose()):
@@ -572,8 +579,7 @@ class _MgMaysyncGenerator(
         return _MgMaysyncGeneratorDriver(ctx, self._x._mg(*self._args, **self._kwargs))  # noqa
 
     def s(self) -> ta.Generator[O, I, None]:
-        drv = self._driver(_SyncMaysyncContext())
-        di = iter(drv)
+        di = iter(self._driver(_SyncMaysyncContext()))
 
         ie: ta.Any = None
 
@@ -592,8 +598,7 @@ class _MgMaysyncGenerator(
 
             elif t == 'o':
                 try:
-                    y = yield x
-                    ie = (y, None)
+                    ie = ((yield x), None)  # type: ignore[misc]
                 except BaseException as ex:  # noqa
                     ie = (None, ex)
 
@@ -603,12 +608,11 @@ class _MgMaysyncGenerator(
             del x
 
     def a(self) -> ta.AsyncGenerator[O, I]:
-        if _MaysyncContext.current() is not None:
+        if _MaysyncThreadLocal.context is not None:
             return self._x._mg(*self._args, **self._kwargs)  # noqa
 
         async def inner():
-            drv = self._driver(_AsyncMaysyncContext())
-            di = iter(drv)
+            di = iter(self._driver(_AsyncMaysyncContext()))
 
             ie: ta.Any = None
 
@@ -627,8 +631,7 @@ class _MgMaysyncGenerator(
 
                 elif t == 'o':
                     try:
-                        y = yield x
-                        ie = (y, None)
+                        ie = ((yield x), None)
                     except BaseException as ex:  # noqa
                         ie = (None, ex)
 
@@ -694,16 +697,12 @@ class _MaysyncFutureNotAwaitedError(RuntimeError):
 class _MaysyncFuture(ta.Generic[T]):
     def __init__(
             self,
-            x: ta.Any,
-            args: ta.Tuple[ta.Any, ...],
-            kwargs: ta.Mapping[str, ta.Any],
+            x: Maywaitable[T],
     ) -> None:
-        self.x = x
-        self.args = args
-        self.kwargs = kwargs
+        self._x = x
 
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}@{id(self):x}({self.x!r}, done={self.done!r})'
+        return f'{self.__class__.__name__}@{id(self):x}({self._x!r}, done={self.done!r})'
 
     done: bool = False
     result: T
@@ -724,7 +723,7 @@ class _MaysyncFuture(ta.Generic[T]):
             return
 
         try:
-            self.result = self.x(*self.args, **self.kwargs).s()
+            self.result = self._x.s()
         except BaseException as ex:  # noqa
             self.error = ex
         self.done = True
@@ -734,7 +733,7 @@ class _MaysyncFuture(ta.Generic[T]):
             return
 
         try:
-            self.result = await self.x(*self.args, **self.kwargs).a()
+            self.result = await self._x.a()
         except BaseException as ex:  # noqa
             self.error = ex
         self.done = True

{omlish-0.0.0.dev410 → omlish-0.0.0.dev412/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev410
+Version: 0.0.0.dev412
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev410 → omlish-0.0.0.dev412}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev410'
+version = '0.0.0.dev412'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',