Compare commits
10 Commits
a045ba489a
...
c37eee6011
Author | SHA1 | Date |
---|---|---|
Tyler Goodlet | c37eee6011 | |
Tyler Goodlet | e637d9d23d | |
Tyler Goodlet | d345ba4f2f | |
Tyler Goodlet | 0c3cd553d3 | |
Tyler Goodlet | ce5ed631e0 | |
Tyler Goodlet | f174aaf7d8 | |
Tyler Goodlet | e830862181 | |
Tyler Goodlet | 8d9f0a12a4 | |
Tyler Goodlet | a6963b2c6a | |
Tyler Goodlet | f0861b9d79 |
|
@ -0,0 +1,61 @@
|
|||
from functools import partial
|
||||
import asyncio
|
||||
|
||||
import trio
|
||||
import tractor
|
||||
|
||||
|
||||
async def asyncio_loop_forever():
|
||||
while True:
|
||||
await asyncio.sleep(0.1)
|
||||
# print('yo')
|
||||
|
||||
|
||||
async def sleep_forever(asyncio=False):
|
||||
|
||||
if asyncio:
|
||||
await tractor.to_asyncio.run_task(asyncio_loop_forever)
|
||||
else:
|
||||
await trio.sleep_forever()
|
||||
|
||||
|
||||
async def stream_forever():
|
||||
while True:
|
||||
yield 'doggy'
|
||||
|
||||
|
||||
async def main():
|
||||
"""Test breakpoint in a streaming actor.
|
||||
"""
|
||||
await tractor.breakpoint()
|
||||
async with tractor.open_nursery() as n:
|
||||
|
||||
p0 = await n.start_actor('streamer',
|
||||
rpc_module_paths=[__name__])
|
||||
|
||||
|
||||
p1 = await n.start_actor(
|
||||
'sleep_forever',
|
||||
rpc_module_paths=[__name__], infect_asyncio=True
|
||||
)
|
||||
# await n.run_in_actor('sleeper', sleep_forever)
|
||||
# await n.run_in_actor('sleeper', sleep_forever)
|
||||
|
||||
async with trio.open_nursery() as ln:
|
||||
ln.start_soon(
|
||||
partial(
|
||||
p1.run,
|
||||
__name__,
|
||||
'sleep_forever',
|
||||
asyncio=True,
|
||||
)
|
||||
)
|
||||
# ln.start_soon(p0.run, __name__, 'sleep_forever')
|
||||
async for val in await p0.run(__name__, 'stream_forever'):
|
||||
print(val)
|
||||
|
||||
await trio.sleep(1)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
tractor.run(main, debug_mode=True, loglevel='trace')
|
|
@ -22,6 +22,7 @@ from ._exceptions import RemoteActorError, ModuleNotExposed
|
|||
from ._debug import breakpoint, post_mortem
|
||||
from . import _spawn
|
||||
from . import msg
|
||||
from . import to_asyncio
|
||||
|
||||
|
||||
__all__ = [
|
||||
|
@ -38,7 +39,8 @@ __all__ = [
|
|||
'MultiError',
|
||||
'RemoteActorError',
|
||||
'ModuleNotExposed',
|
||||
'msg'
|
||||
'msg',
|
||||
'to_asyncio',
|
||||
]
|
||||
|
||||
|
||||
|
@ -110,7 +112,10 @@ async def _main(
|
|||
else:
|
||||
# start this local actor as the arbiter
|
||||
actor = Arbiter(
|
||||
name or 'arbiter', arbiter_addr=arbiter_addr, **kwargs)
|
||||
name or 'arbiter',
|
||||
arbiter_addr=arbiter_addr,
|
||||
**kwargs
|
||||
)
|
||||
|
||||
# ``Actor._async_main()`` creates an internal nursery if one is not
|
||||
# provided and thus blocks here until it's main task completes.
|
||||
|
|
|
@ -1006,6 +1006,7 @@ class Actor:
|
|||
def is_infected_aio(self) -> bool:
|
||||
return self._infected_aio
|
||||
|
||||
|
||||
class Arbiter(Actor):
|
||||
"""A special actor who knows all the other actors and always has
|
||||
access to a top level nursery.
|
||||
|
|
|
@ -19,12 +19,15 @@ def parse_ipaddr(arg):
|
|||
return (str(host), int(port))
|
||||
|
||||
|
||||
from ._entry import _trio_main
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--uid", type=parse_uid)
|
||||
parser.add_argument("--loglevel", type=str)
|
||||
parser.add_argument("--parent_addr", type=parse_ipaddr)
|
||||
parser.add_argument("--asyncio", action='store_true')
|
||||
args = parser.parse_args()
|
||||
|
||||
subactor = Actor(
|
||||
|
@ -36,5 +39,6 @@ if __name__ == "__main__":
|
|||
|
||||
_trio_main(
|
||||
subactor,
|
||||
parent_addr=args.parent_addr
|
||||
)
|
||||
parent_addr=args.parent_addr,
|
||||
infect_asyncio=args.asyncio,
|
||||
)
|
||||
|
|
|
@ -22,6 +22,7 @@ def _mp_main(
|
|||
forkserver_info: Tuple[Any, Any, Any, Any, Any],
|
||||
start_method: str,
|
||||
parent_addr: Tuple[str, int] = None,
|
||||
infect_asyncio: bool = False,
|
||||
) -> None:
|
||||
"""The routine called *after fork* which invokes a fresh ``trio.run``
|
||||
"""
|
||||
|
@ -59,7 +60,9 @@ def _mp_main(
|
|||
|
||||
def _trio_main(
|
||||
actor: 'Actor',
|
||||
parent_addr: Tuple[str, int] = None
|
||||
*,
|
||||
parent_addr: Tuple[str, int] = None,
|
||||
infect_asyncio: bool = False,
|
||||
) -> None:
|
||||
"""Entry point for a `trio_run_in_process` subactor.
|
||||
"""
|
||||
|
@ -70,6 +73,8 @@ def _trio_main(
|
|||
# TODO: make a global func to set this or is it too hacky?
|
||||
# os.environ['PYTHONBREAKPOINT'] = 'tractor._debug.breakpoint'
|
||||
|
||||
log.info(f"Started new trio process for {actor.uid}")
|
||||
|
||||
if actor.loglevel is not None:
|
||||
log.info(
|
||||
f"Setting loglevel for {actor.uid} to {actor.loglevel}")
|
||||
|
@ -87,7 +92,11 @@ def _trio_main(
|
|||
)
|
||||
|
||||
try:
|
||||
trio.run(trio_main)
|
||||
if infect_asyncio:
|
||||
actor._infected_aio = True
|
||||
run_as_asyncio_guest(trio_main)
|
||||
else:
|
||||
trio.run(trio_main)
|
||||
except KeyboardInterrupt:
|
||||
log.warning(f"Actor {actor.uid} received KBI")
|
||||
|
||||
|
|
|
@ -157,6 +157,7 @@ async def cancel_on_completion(
|
|||
async def spawn_subactor(
|
||||
subactor: 'Actor',
|
||||
parent_addr: Tuple[str, int],
|
||||
infect_asyncio: bool,
|
||||
):
|
||||
spawn_cmd = [
|
||||
sys.executable,
|
||||
|
@ -181,6 +182,10 @@ async def spawn_subactor(
|
|||
subactor.loglevel
|
||||
]
|
||||
|
||||
# Tell child to run in guest mode on top of ``asyncio`` loop
|
||||
if infect_asyncio:
|
||||
spawn_cmd.append("--asyncio")
|
||||
|
||||
proc = await trio.open_process(spawn_cmd)
|
||||
try:
|
||||
yield proc
|
||||
|
@ -217,6 +222,7 @@ async def new_proc(
|
|||
_runtime_vars: Dict[str, Any], # serialized and sent to _child
|
||||
*,
|
||||
use_trio_run_in_process: bool = False,
|
||||
infect_asyncio: bool = False,
|
||||
task_status: TaskStatus[Portal] = trio.TASK_STATUS_IGNORED
|
||||
) -> None:
|
||||
"""Create a new ``multiprocessing.Process`` using the
|
||||
|
@ -232,6 +238,7 @@ async def new_proc(
|
|||
async with spawn_subactor(
|
||||
subactor,
|
||||
parent_addr,
|
||||
infect_asyncio=infect_asyncio
|
||||
) as proc:
|
||||
log.info(f"Started {proc}")
|
||||
|
||||
|
@ -321,6 +328,7 @@ async def new_proc(
|
|||
fs_info,
|
||||
start_method,
|
||||
parent_addr,
|
||||
infect_asyncio,
|
||||
),
|
||||
# daemon=True,
|
||||
name=name,
|
||||
|
|
|
@ -56,6 +56,7 @@ class ActorNursery:
|
|||
rpc_module_paths: List[str] = None,
|
||||
loglevel: str = None, # set log level per subactor
|
||||
nursery: trio.Nursery = None,
|
||||
infect_asyncio: bool = False,
|
||||
) -> Portal:
|
||||
loglevel = loglevel or self._actor.loglevel or get_loglevel()
|
||||
|
||||
|
@ -89,6 +90,7 @@ class ActorNursery:
|
|||
bind_addr,
|
||||
parent_addr,
|
||||
_rtv, # run time vars
|
||||
infect_asyncio=infect_asyncio,
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -101,6 +103,7 @@ class ActorNursery:
|
|||
rpc_module_paths: Optional[List[str]] = None,
|
||||
statespace: Dict[str, Any] = None,
|
||||
loglevel: str = None, # set log level per subactor
|
||||
infect_asyncio: bool = False,
|
||||
**kwargs, # explicit args to ``fn``
|
||||
) -> Portal:
|
||||
"""Spawn a new actor, run a lone task, then terminate the actor and
|
||||
|
@ -119,6 +122,7 @@ class ActorNursery:
|
|||
loglevel=loglevel,
|
||||
# use the run_in_actor nursery
|
||||
nursery=self._ria_nursery,
|
||||
infect_asyncio=infect_asyncio,
|
||||
)
|
||||
# this marks the actor to be cancelled after its portal result
|
||||
# is retreived, see logic in `open_nursery()` below.
|
||||
|
|
|
@ -55,7 +55,15 @@ def get_logger(
|
|||
'''Return the package log or a sub-log for `name` if provided.
|
||||
'''
|
||||
log = rlog = logging.getLogger(_root_name)
|
||||
|
||||
if name and name != _proj_name:
|
||||
|
||||
# handling for modules that use ``get_logger(__name__)`` to
|
||||
# avoid duplicate project-package token in msg output
|
||||
rname, _, tail = name.partition('.')
|
||||
if rname == _root_name:
|
||||
name = tail
|
||||
|
||||
log = rlog.getChild(name)
|
||||
log.level = rlog.level
|
||||
|
||||
|
|
|
@ -4,8 +4,9 @@ Infection apis for ``asyncio`` loops running ``trio`` using guest mode.
|
|||
import asyncio
|
||||
import inspect
|
||||
from typing import (
|
||||
Any,
|
||||
Callable,
|
||||
AsyncGenerator,
|
||||
AsyncIterator,
|
||||
Awaitable,
|
||||
Union,
|
||||
)
|
||||
|
@ -21,21 +22,26 @@ log = get_logger(__name__)
|
|||
__all__ = ['run_task', 'run_as_asyncio_guest']
|
||||
|
||||
|
||||
async def _invoke(
|
||||
from_trio: trio.abc.ReceiveChannel,
|
||||
to_trio: asyncio.Queue,
|
||||
async def run_coro(
|
||||
to_trio: trio.MemorySendChannel,
|
||||
coro: Awaitable,
|
||||
) -> None:
|
||||
"""Await or stream awaiable object based on ``coro`` type into
|
||||
``trio`` memory channel.
|
||||
|
||||
``from_trio`` might eventually be used here for bidirectional streaming.
|
||||
"""Await ``coro`` and relay result back to ``trio``.
|
||||
"""
|
||||
if inspect.isasyncgen(coro):
|
||||
async for item in coro:
|
||||
to_trio.send_nowait(item)
|
||||
elif inspect.iscoroutine(coro):
|
||||
to_trio.send_nowait(await coro)
|
||||
to_trio.send_nowait(await coro)
|
||||
|
||||
|
||||
async def consume_asyncgen(
|
||||
to_trio: trio.MemorySendChannel,
|
||||
coro: AsyncIterator,
|
||||
) -> None:
|
||||
"""Stream async generator results back to ``trio``.
|
||||
|
||||
``from_trio`` might eventually be used here for
|
||||
bidirectional streaming.
|
||||
"""
|
||||
async for item in coro:
|
||||
to_trio.send_nowait(item)
|
||||
|
||||
|
||||
async def run_task(
|
||||
|
@ -44,15 +50,15 @@ async def run_task(
|
|||
qsize: int = 2**10,
|
||||
_treat_as_stream: bool = False,
|
||||
**kwargs,
|
||||
) -> Union[AsyncGenerator, Awaitable]:
|
||||
) -> Any:
|
||||
"""Run an ``asyncio`` async function or generator in a task, return
|
||||
or stream the result back to ``trio``.
|
||||
"""
|
||||
assert current_actor().is_infected_aio()
|
||||
|
||||
# ITC (inter task comms)
|
||||
from_trio = asyncio.Queue(qsize)
|
||||
to_trio, from_aio = trio.open_memory_channel(qsize)
|
||||
from_trio = asyncio.Queue(qsize) # type: ignore
|
||||
to_trio, from_aio = trio.open_memory_channel(qsize) # type: ignore
|
||||
|
||||
args = tuple(inspect.getfullargspec(func).args)
|
||||
|
||||
|
@ -66,49 +72,69 @@ async def run_task(
|
|||
if 'to_trio' in args:
|
||||
kwargs['to_trio'] = to_trio
|
||||
if 'from_trio' in args:
|
||||
kwargs['from_trio'] = to_trio
|
||||
kwargs['from_trio'] = from_trio
|
||||
|
||||
coro = func(**kwargs)
|
||||
|
||||
cancel_scope = trio.CancelScope()
|
||||
|
||||
# start the asyncio task we submitted from trio
|
||||
# TODO: try out ``anyio`` asyncio based tg here
|
||||
task = asyncio.create_task(_invoke(from_trio, to_trio, coro))
|
||||
err = None
|
||||
if inspect.isawaitable(coro):
|
||||
task = asyncio.create_task(run_coro(to_trio, coro))
|
||||
elif inspect.isasyncgen(coro):
|
||||
task = asyncio.create_task(consume_asyncgen(to_trio, coro))
|
||||
else:
|
||||
raise TypeError(f"No support for invoking {coro}")
|
||||
|
||||
aio_err = None
|
||||
|
||||
def cancel_trio(task):
|
||||
"""Cancel the calling ``trio`` task on error.
|
||||
"""
|
||||
nonlocal err
|
||||
err = task.exception()
|
||||
aio_err = task.exception()
|
||||
if aio_err:
|
||||
log.exception(f"asyncio task errorred:\n{aio_err}")
|
||||
cancel_scope.cancel()
|
||||
|
||||
task.add_done_callback(cancel_trio)
|
||||
|
||||
# asycn gen
|
||||
# async iterator
|
||||
if inspect.isasyncgen(coro) or _treat_as_stream:
|
||||
async def result():
|
||||
with cancel_scope:
|
||||
async with from_aio:
|
||||
async for item in from_aio:
|
||||
yield item
|
||||
if cancel_scope.cancelled_caught and err:
|
||||
raise err
|
||||
|
||||
return result()
|
||||
async def stream_results():
|
||||
try:
|
||||
with cancel_scope:
|
||||
# stream values upward
|
||||
async with from_aio:
|
||||
async for item in from_aio:
|
||||
yield item
|
||||
except BaseException as err:
|
||||
if aio_err is not None:
|
||||
# always raise from any captured asyncio error
|
||||
raise err from aio_err
|
||||
else:
|
||||
raise
|
||||
|
||||
return stream_results()
|
||||
|
||||
# simple async func
|
||||
elif inspect.iscoroutine(coro):
|
||||
try:
|
||||
with cancel_scope:
|
||||
result = await from_aio.receive()
|
||||
return result
|
||||
if cancel_scope.cancelled_caught and err:
|
||||
raise err
|
||||
# return single value
|
||||
return await from_aio.receive()
|
||||
|
||||
# Do we need this?
|
||||
except BaseException as err:
|
||||
if aio_err is not None:
|
||||
# always raise from any captured asyncio error
|
||||
raise err from aio_err
|
||||
else:
|
||||
raise
|
||||
|
||||
|
||||
def run_as_asyncio_guest(
|
||||
trio_main: Awaitable,
|
||||
trio_main: Callable,
|
||||
) -> None:
|
||||
"""Entry for an "infected ``asyncio`` actor".
|
||||
|
||||
|
|
Loading…
Reference in New Issue