omlish 0.0.0.dev411__tar.gz → 0.0.0.dev413__tar.gz

{omlish-0.0.0.dev411/omlish.egg-info → omlish-0.0.0.dev413}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev411
+Version: 0.0.0.dev413
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -42,7 +42,7 @@ Requires-Dist: aiomysql~=0.2; extra == "all"
 Requires-Dist: aiosqlite~=0.21; extra == "all"
 Requires-Dist: asyncpg~=0.30; extra == "all"
 Requires-Dist: apsw~=3.50; extra == "all"
-Requires-Dist: sqlean.py~=3.49; extra == "all"
+Requires-Dist: sqlean.py~=3.50; extra == "all"
 Requires-Dist: duckdb~=1.3; extra == "all"
 Requires-Dist: markupsafe~=3.0; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
@@ -90,7 +90,7 @@ Requires-Dist: aiomysql~=0.2; extra == "sqldrivers"
 Requires-Dist: aiosqlite~=0.21; extra == "sqldrivers"
 Requires-Dist: asyncpg~=0.30; extra == "sqldrivers"
 Requires-Dist: apsw~=3.50; extra == "sqldrivers"
-Requires-Dist: sqlean.py~=3.49; extra == "sqldrivers"
+Requires-Dist: sqlean.py~=3.50; extra == "sqldrivers"
 Requires-Dist: duckdb~=1.3; extra == "sqldrivers"
 Provides-Extra: templates
 Requires-Dist: markupsafe~=3.0; extra == "templates"

{omlish-0.0.0.dev411 → omlish-0.0.0.dev413}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev411'
-__revision__ = 'ab397888a161157384b42de969a8c743c5a2c4b6'
+__version__ = '0.0.0.dev413'
+__revision__ = '3a75442fb3c6056a588c83a888a2f2792d35a3ab'
 
 
 #
@@ -105,7 +105,7 @@ class Project(ProjectBase):
 
             'apsw ~= 3.50',
 
-            'sqlean.py ~= 3.49',
+            'sqlean.py ~= 3.50',
 
             'duckdb ~= 1.3',
         ],

{omlish-0.0.0.dev411 → omlish-0.0.0.dev413}/omlish/asyncs/bridge.py

@@ -70,7 +70,7 @@ def trivial_s_to_a(fn):
 
 def trivial_a_to_s(fn):
     def inner(*args, **kwargs):
-        return lang.sync_await(fn, *args, **kwargs)
+        return lang.sync_await(fn(*args, **kwargs))
     return inner
 
 

{omlish-0.0.0.dev411 → omlish-0.0.0.dev413}/omlish/lang/__init__.py

@@ -171,6 +171,8 @@ from .descriptors import (  # noqa
     decorator,
     is_method_descriptor,
     item_property,
+    unwrap_callable,
+    unwrap_callable_with_partials,
     unwrap_func,
     unwrap_func_with_partials,
     unwrap_method_descriptors,
@@ -280,12 +282,11 @@ from .lazyglobals import (  # noqa
 )
 
 from .maysyncs import (  # noqa
-    MaysyncFn,
-    MaysyncGeneratorFn,
-
+    make_maysync_fn,
+    make_maysync_generator_fn,
     make_maysync,
+
     make_maysync_from_sync,
-    maysync,
 )
 
 from .objects import (  # noqa
@@ -426,12 +427,23 @@ empty = Maybe.empty
 just = Maybe.just
 
 from ..lite.maysyncs import (  # noqa
+    mark_maysync,
+    is_maysync,
+
+    AnyMaysyncFn,
+
+    MaywaitableAlreadyConsumedError,
+    AnyMaywaitable,
+
+    MaysyncFn,
     Maywaitable,
+
+    MaysyncGeneratorFn,
     MaysyncGenerator,
 
-    Maysync_,
-    MaysyncFn_,
-    MaysyncGeneratorFn_,
+    is_running_maysync,
+
+    run_maysync,
 )
 
 from ..lite.reprs import (  # noqa

{omlish-0.0.0.dev411 → omlish-0.0.0.dev413}/omlish/lang/asyncs.py

@@ -2,29 +2,24 @@ import typing as ta
 
 
 T = ta.TypeVar('T')
-P = ta.ParamSpec('P')
 
 
 ##
 
 
 async def async_list(
-        fn: ta.Callable[P, ta.AsyncIterator[T]],
-        *args: P.args,
-        **kwargs: P.kwargs,
+        ai: ta.AsyncIterable[T],
 ) -> list[T]:
     """Simply eagerly reads the full contents of a function call returning an async iterator."""
 
-    return [v async for v in fn(*args, **kwargs)]
+    return [v async for v in ai]
 
 
 ##
 
 
 def sync_await(
-        fn: ta.Callable[P, ta.Awaitable[T]],
-        *args: P.args,
-        **kwargs: P.kwargs,
+        aw: ta.Awaitable[T],
 ) -> T:
     """
     Allows for the synchronous execution of async functions which will never actually *externally* await anything. These
@@ -37,7 +32,7 @@ def sync_await(
     async def gate():
         nonlocal ret
 
-        ret = await fn(*args, **kwargs)
+        ret = await aw
 
     cr = gate()
     try:
@@ -56,9 +51,7 @@ def sync_await(
 
 
 def sync_async_list(
-        fn: ta.Callable[P, ta.AsyncIterator[T]],
-        *args: P.args,
-        **kwargs: P.kwargs,
+        ai: ta.AsyncIterable[T],
 ) -> list[T]:
     """
     Uses `sync_await` to synchronously read the full contents of a function call returning an async iterator, given that
@@ -70,9 +63,9 @@ def sync_async_list(
     async def inner():
         nonlocal lst
 
-        lst = [v async for v in fn(*args, **kwargs)]
+        lst = [v async for v in ai]
 
-    sync_await(inner)
+    sync_await(inner())
 
     if not isinstance(lst, list):
         raise TypeError(lst)

{omlish-0.0.0.dev411 → omlish-0.0.0.dev413}/omlish/lang/descriptors.py

@@ -92,6 +92,20 @@ def unwrap_func(fn: ta.Any) -> ta.Any:
 ##
 
 
+def unwrap_callable_with_partials(obj: ta.Any) -> tuple[ta.Any, list[functools.partial]]:
+    if isinstance(obj, type):
+        obj = obj.__call__
+    return unwrap_func_with_partials(obj)
+
+
+def unwrap_callable(obj: ta.Any) -> ta.Any:
+    uw, _ = unwrap_callable_with_partials(obj)
+    return uw
+
+
+##
+
+
 def update_wrapper(
         wrapper: T,
         wrapped: ta.Any,

omlish-0.0.0.dev413/omlish/lang/maysyncs.py

@@ -0,0 +1,72 @@
+import typing as ta
+
+from ..lite.maysyncs import MaysyncFn
+from ..lite.maysyncs import MaysyncGeneratorFn
+from ..lite.maysyncs import make_maysync as _make_maysync
+from .functions import as_async
+
+
+T = ta.TypeVar('T')
+O = ta.TypeVar('O')
+I = ta.TypeVar('I')
+
+P = ta.ParamSpec('P')
+
+
+##
+
+
+def make_maysync_fn(
+        s: ta.Callable[P, T],
+        a: ta.Callable[P, ta.Awaitable[T]],
+) -> ta.Callable[P, ta.Awaitable[T]]:
+    """Constructs a MaysyncFn from a (sync, async) function pair."""
+
+    return MaysyncFn(s, a)
+
+
+def make_maysync_generator_fn(
+        s: ta.Callable[P, ta.Generator[O, I]],
+        a: ta.Callable[P, ta.AsyncGenerator[O, I]],
+) -> ta.Callable[P, ta.AsyncGenerator[O, I]]:
+    """Constructs a MaysyncGeneratorFn from a (sync, async) generator function pair."""
+
+    return MaysyncGeneratorFn(s, a)
+
+
+@ta.overload
+def make_maysync(
+        s: ta.Callable[P, T],
+        a: ta.Callable[P, ta.Awaitable[T]],
+) -> ta.Callable[P, ta.Awaitable[T]]:
+    ...
+
+
+@ta.overload
+def make_maysync(
+        s: ta.Callable[P, ta.Generator[O, I]],
+        a: ta.Callable[P, ta.AsyncGenerator[O, I]],
+) -> ta.Callable[P, ta.AsyncGenerator[O, I]]:
+    ...
+
+
+def make_maysync(s, a):
+    """
+    Constructs a MaysyncFn or MaysyncGeneratorFn from a (sync, async) function pair, using `inspect.isasyncgenfunction`
+    to determine the type.
+    """
+
+    return _make_maysync(s, a)
+
+
+##
+
+
+def make_maysync_from_sync(
+        s: ta.Callable[P, T],
+        a: ta.Callable[P, ta.Awaitable[T]] | None = None,
+) -> ta.Callable[P, ta.Awaitable[T]]:
+    return _make_maysync(
+        s,
+        a if a is not None else as_async(s),
+    )