tests/test_infected_asyncio.py

@@ -289,35 +289,23 @@ async def aio_cancel():
 
     '''
     await asyncio.sleep(0.5)
+    task = asyncio.current_task()
 
     # cancel and enter sleep
-    task = asyncio.current_task()
     task.cancel()
     await aio_sleep_forever()
 
 
 def test_aio_cancelled_from_aio_causes_trio_cancelled(reg_addr):
-    '''
-    When the `asyncio.Task` cancels itself the `trio` side cshould
-    also cancel and teardown and relay the cancellation cross-process
-    to the caller (parent).
 
-    '''
     async def main():
-
-        an: tractor.ActorNursery
-        async with tractor.open_nursery() as an:
-            p: tractor.Portal = await an.run_in_actor(
+        async with tractor.open_nursery() as n:
+            await n.run_in_actor(
                 asyncio_actor,
                 target='aio_cancel',
                 expect_err='tractor.to_asyncio.AsyncioCancelled',
                 infect_asyncio=True,
             )
-            # NOTE: normally the `an.__aexit__()` waits on the
-            # portal's result but we do it explicitly here
-            # to avoid indent levels.
-            with trio.fail_after(1):
-                await p.wait_for_result()
 
     with pytest.raises(
         expected_exception=(RemoteActorError, ExceptionGroup),
@@ -325,7 +313,7 @@ def test_aio_cancelled_from_aio_causes_trio_cancelled(reg_addr):
         trio.run(main)
 
     # might get multiple `trio.Cancelled`s as well inside an inception
-    err: RemoteActorError|ExceptionGroup = excinfo.value
+    err = excinfo.value
     if isinstance(err, ExceptionGroup):
         err = next(itertools.dropwhile(
             lambda exc: not isinstance(exc, tractor.RemoteActorError),
@@ -333,8 +321,7 @@ def test_aio_cancelled_from_aio_causes_trio_cancelled(reg_addr):
         ))
         assert err
 
-    # relayed boxed error should be our `trio`-task's
-    # cancel-signal-proxy-equivalent of `asyncio.CancelledError`.
+    # ensure boxed error is correct
     assert err.boxed_type == to_asyncio.AsyncioCancelled
 
 
@@ -643,8 +630,6 @@ def test_echoserver_detailed_mechanics(
 async def manage_file(
     ctx: tractor.Context,
     tmp_path_str: str,
-    send_sigint_to: str,
-    trio_side_is_shielded: bool = True,
     bg_aio_task: bool = False,
 ):
     '''
@@ -694,32 +679,22 @@ async def manage_file(
         # => ????? honestly i'm lost but it seems to be some issue
         #   with `asyncio` and SIGINT..
         #
+        # XXX NOTE XXX SO, if this LINE IS UNCOMMENTED and
+        # `run_as_asyncio_guest()` is written WITHOUT THE
+        # `.cancel_soon()` soln, both of these tests will pass ??
+        # so maybe it has something to do with `asyncio` loop init
+        # state?!?
         # honestly, this REALLY reminds me why i haven't used
         # `asyncio` by choice in years.. XD
         #
-        async with trio.open_nursery() as tn:
+        # await tractor.to_asyncio.run_task(aio_sleep_forever)
         if bg_aio_task:
+            async with trio.open_nursery() as tn:
                 tn.start_soon(
                     tractor.to_asyncio.run_task,
                     aio_sleep_forever,
                 )
 
-            # XXX don't-need/doesn't-make-a-diff right
-            # since we're already doing it from parent?
-            # if send_sigint_to == 'child':
-            #     os.kill(
-            #         os.getpid(),
-            #         signal.SIGINT,
-            #     )
-
-            # XXX spend a half sec doing shielded checkpointing to
-            # ensure that despite the `trio`-side task ignoring the
-            # SIGINT, the `asyncio` side won't abandon the guest-run!
-            if trio_side_is_shielded:
-                with trio.CancelScope(shield=True):
-                    for i in range(5):
-                        await trio.sleep(0.1)
-
         await trio.sleep_forever()
 
     # signalled manually at the OS level (aka KBI) by the parent actor.
@@ -727,29 +702,10 @@ async def manage_file(
         print('child raised KBI..')
         assert tmp_file.exists()
         raise
-
+    else:
         raise RuntimeError('shoulda received a KBI?')
 
 
-@pytest.mark.parametrize(
-    'trio_side_is_shielded',
-    [
-        False,
-        True,
-    ],
-    ids=[
-        'trio_side_no_shielding',
-        'trio_side_does_shielded_work',
-    ],
-)
-@pytest.mark.parametrize(
-    'send_sigint_to',
-    [
-        'child',
-        'parent',
-    ],
-    ids='send_SIGINT_to={}'.format,
-)
 @pytest.mark.parametrize(
     'bg_aio_task',
     [
@@ -784,9 +740,6 @@ def test_sigint_closes_lifetime_stack(
     tmp_path: Path,
     wait_for_ctx: bool,
     bg_aio_task: bool,
-    trio_side_is_shielded: bool,
-    debug_mode: bool,
-    send_sigint_to: str,
 ):
     '''
     Ensure that an infected child can use the `Actor.lifetime_stack`
@@ -796,11 +749,8 @@ def test_sigint_closes_lifetime_stack(
     '''
     async def main():
         try:
-            an: tractor.ActorNursery
-            async with tractor.open_nursery(
-                debug_mode=debug_mode,
-            ) as an:
-                p: tractor.Portal = await an.start_actor(
+            async with tractor.open_nursery() as n:
+                p = await n.start_actor(
                     'file_mngr',
                     enable_modules=[__name__],
                     infect_asyncio=True,
@@ -808,9 +758,7 @@ def test_sigint_closes_lifetime_stack(
                 async with p.open_context(
                     manage_file,
                     tmp_path_str=str(tmp_path),
-                    send_sigint_to=send_sigint_to,
                     bg_aio_task=bg_aio_task,
-                    trio_side_is_shielded=trio_side_is_shielded,
                 ) as (ctx, first):
 
                     path_str, cpid = first
@@ -829,13 +777,10 @@ def test_sigint_closes_lifetime_stack(
                     # shm-buffer leaks in `piker`'s live quote stream
                     # susbys!
                     #
+                    # await trio.sleep(.5)
                     await trio.sleep(.2)
-                    pid: int = (
-                        cpid if send_sigint_to == 'child'
-                        else os.getpid()
-                    )
                     os.kill(
-                        pid,
+                        cpid,
                         signal.SIGINT,
                     )
 
@@ -845,7 +790,7 @@ def test_sigint_closes_lifetime_stack(
                     if wait_for_ctx:
                         print('waiting for ctx outcome in parent..')
                         try:
-                            with trio.fail_after(1):
+                            with trio.fail_after(.7):
                                 await ctx.wait_for_result()
                         except tractor.ContextCancelled as ctxc:
                             assert ctxc.canceller == ctx.chan.uid

tractor/_exceptions.py

@@ -929,17 +929,6 @@ class MessagingError(Exception):
 
     '''
 
-class AsyncioCancelled(Exception):
-    '''
-    Asyncio cancelled translation (non-base) error
-    for use with the ``to_asyncio`` module
-    to be raised in the ``trio`` side task
-
-    NOTE: this should NOT inherit from `asyncio.CancelledError` or
-    tests should break!
-
-    '''
-
 
 def pack_error(
     exc: BaseException|RemoteActorError,

tractor/to_asyncio.py

@@ -33,12 +33,11 @@ from typing import (
 )
 
 import tractor
-from tractor._exceptions import AsyncioCancelled
 from tractor._state import (
     debug_mode,
 )
-from tractor.devx import _debug
 from tractor.log import get_logger
+from tractor.devx import _debug
 from tractor.trionics._broadcast import (
     broadcast_receiver,
     BroadcastReceiver,
@@ -52,10 +51,7 @@ from outcome import (
 log = get_logger(__name__)
 
 
-__all__ = [
-    'run_task',
-    'run_as_asyncio_guest',
-]
+__all__ = ['run_task', 'run_as_asyncio_guest']
 
 
 @dataclass
@@ -159,16 +155,15 @@ def _run_asyncio_task(
     *,
     qsize: int = 1,
     provide_channels: bool = False,
-    hide_tb: bool = False,
     **kwargs,
 
 ) -> LinkedTaskChannel:
     '''
     Run an ``asyncio`` async function or generator in a task, return
-    or stream the result back to the caller `trio.lowleve.Task`.
+    or stream the result back to ``trio``.
 
     '''
-    __tracebackhide__: bool = hide_tb
+    __tracebackhide__ = True
     if not tractor.current_actor().is_infected_aio():
         raise RuntimeError(
             "`infect_asyncio` mode is not enabled!?"
@@ -229,7 +224,6 @@ def _run_asyncio_task(
         try:
             result = await coro
         except BaseException as aio_err:
-            chan._aio_err = aio_err
             if isinstance(aio_err, CancelledError):
                 log.runtime(
                     '`asyncio` task was cancelled..\n'
@@ -238,6 +232,7 @@ def _run_asyncio_task(
                 log.exception(
                     '`asyncio` task errored\n'
                 )
+            chan._aio_err = aio_err
             raise
 
         else:
@@ -273,7 +268,7 @@ def _run_asyncio_task(
             aio_task_complete
         )
     )
-    chan._aio_task: asyncio.Task = task
+    chan._aio_task = task
 
     # XXX TODO XXX get this actually workin.. XD
     # maybe setup `greenback` for `asyncio`-side task REPLing
@@ -289,19 +284,19 @@ def _run_asyncio_task(
 
     def cancel_trio(task: asyncio.Task) -> None:
         '''
-        Cancel the calling `trio` task on error.
+        Cancel the calling ``trio`` task on error.
 
         '''
         nonlocal chan
-        aio_err: BaseException|None = chan._aio_err
+        aio_err = chan._aio_err
         task_err: BaseException|None = None
 
-        # only to avoid `asyncio` complaining about uncaptured
+        # only to avoid ``asyncio`` complaining about uncaptured
         # task exceptions
         try:
-            res: Any = task.result()
+            task.exception()
         except BaseException as terr:
-            task_err: BaseException = terr
+            task_err = terr
 
             msg: str = (
                 'Infected `asyncio` task {etype_str}\n'
@@ -333,49 +328,42 @@ def _run_asyncio_task(
 
             if task_err is None:
                 assert aio_err
-                # wait, wut?
-                # aio_err.with_traceback(aio_err.__traceback__)
-
-            # TODO: show when cancellation originated
-            # from each side more pedantically?
-            # elif (
-            #     type(aio_err) is CancelledError
-            #     and  # trio was the cause?
-            #     cancel_scope.cancel_called
-            # ):
-            #     log.cancel(
-            #         'infected task was cancelled by `trio`-side'
+                aio_err.with_traceback(aio_err.__traceback__)
+                # log.error(
+                #     'infected task errorred'
                 # )
-            #     raise aio_err from task_err
 
-            # XXX: if not already, alway cancel the scope
-            # on a task error in case the trio task is blocking on
-            # a checkpoint.
+            # TODO: show that the cancellation originated
+            # from the ``trio`` side? right?
+            # elif type(aio_err) is CancelledError:
+            #     log.cancel(
+            #         'infected task was cancelled'
+            #     )
+
+                # if cancel_scope.cancelled:
+                #     raise aio_err from err
+
+            # XXX: alway cancel the scope on error
+            # in case the trio task is blocking
+            # on a checkpoint.
             cancel_scope.cancel()
 
-            if (
-                task_err
-                and
-                aio_err is not task_err
-            ):
-                raise aio_err from task_err
-
             # raise any `asyncio` side error.
             raise aio_err
 
-        log.info(
-            '`trio` received final result from {task}\n'
-            f'|_{res}\n'
-        )
-        # TODO: do we need this?
-        # if task_err:
-        #     cancel_scope.cancel()
-        #     raise task_err
-
     task.add_done_callback(cancel_trio)
     return chan
 
 
+class AsyncioCancelled(CancelledError):
+    '''
+    Asyncio cancelled translation (non-base) error
+    for use with the ``to_asyncio`` module
+    to be raised in the ``trio`` side task
+
+    '''
+
+
 @acm
 async def translate_aio_errors(
 
@@ -398,9 +386,7 @@ async def translate_aio_errors(
     ) -> None:
         aio_err = chan._aio_err
         if (
-            aio_err is not None
-            and
-            # not isinstance(aio_err, CancelledError)
+            aio_err is not None and
             type(aio_err) != CancelledError
         ):
             # always raise from any captured asyncio error
@@ -432,17 +418,13 @@ async def translate_aio_errors(
     ):
         aio_err = chan._aio_err
         if (
-            task.cancelled()
-            and
+            task.cancelled() and
             type(aio_err) is CancelledError
         ):
-            # if an underlying `asyncio.CancelledError` triggered this
+            # if an underlying ``asyncio.CancelledError`` triggered this
             # channel close, raise our (non-``BaseException``) wrapper
             # error: ``AsyncioCancelled`` from that source error.
-            raise AsyncioCancelled(
-                f'Task cancelled\n'
-                f'|_{task}\n'
-            ) from aio_err
+            raise AsyncioCancelled from aio_err
 
         else:
             raise
@@ -485,8 +467,8 @@ async def run_task(
 
 ) -> Any:
     '''
-    Run an `asyncio` async function or generator in a task, return
-    or stream the result back to `trio`.
+    Run an ``asyncio`` async function or generator in a task, return
+    or stream the result back to ``trio``.
 
     '''
     # simple async func
@@ -544,27 +526,10 @@ async def open_channel_from(
                 chan._to_trio.close()
 
 
-class AsyncioRuntimeTranslationError(RuntimeError):
-    '''
-    We failed to correctly relay runtime semantics and/or maintain SC
-    supervision rules cross-event-loop.
-
-    '''
-
-
 def run_as_asyncio_guest(
     trio_main: Callable,
-    # ^-NOTE-^ when spawned with `infected_aio=True` this func is
-    # normally `Actor._async_main()` as is passed by some boostrap
-    # entrypoint like `._entry._trio_main()`.
 
 ) -> None:
-# ^-TODO-^ technically whatever `trio_main` returns.. we should
-# try to use func-typevar-params at leaast by 3.13!
-# -[ ] https://typing.readthedocs.io/en/latest/spec/callables.html#callback-protocols
-# -[ ] https://peps.python.org/pep-0646/#using-type-variable-tuples-in-functions
-# -[ ] https://typing.readthedocs.io/en/latest/spec/callables.html#unpack-for-keyword-arguments
-# -[ ] https://peps.python.org/pep-0718/
     '''
     Entry for an "infected ``asyncio`` actor".
 
@@ -590,13 +555,7 @@ def run_as_asyncio_guest(
     # :)
 
     async def aio_main(trio_main):
-        '''
-        Main `asyncio.Task` which calls
-        `trio.lowlevel.start_guest_run()` to "infect" the `asyncio`
-        event-loop by embedding the `trio` scheduler allowing us to
-        boot the `tractor` runtime and connect back to our parent.
 
-        '''
         loop = asyncio.get_running_loop()
         trio_done_fut = asyncio.Future()
         startup_msg: str = (
@@ -605,22 +564,17 @@ def run_as_asyncio_guest(
             '-> built a `trio`-done future\n'
         )
 
-        # TODO: shoudn't this be done in the guest-run trio task?
-        # if debug_mode():
-        #     # XXX make it obvi we know this isn't supported yet!
-        #     log.error(
-        #         'Attempting to enter unsupported `greenback` init '
-        #         'from `asyncio` task..'
-        #     )
-        #     await _debug.maybe_init_greenback(
-        #         force_reload=True,
-        #     )
+        if debug_mode():
+            # XXX make it obvi we know this isn't supported yet!
+            log.error(
+                'Attempting to enter unsupported `greenback` init '
+                'from `asyncio` task..'
+            )
+            await _debug.maybe_init_greenback(
+                force_reload=True,
+            )
 
         def trio_done_callback(main_outcome):
-            log.info(
-                f'trio_main finished with\n'
-                f'|_{main_outcome!r}'
-            )
 
             if isinstance(main_outcome, Error):
                 error: BaseException = main_outcome.error
@@ -640,6 +594,7 @@ def run_as_asyncio_guest(
 
             else:
                 trio_done_fut.set_result(main_outcome)
+                log.runtime(f'trio_main finished: {main_outcome!r}')
 
         startup_msg += (
             f'-> created {trio_done_callback!r}\n'
@@ -658,48 +613,26 @@ def run_as_asyncio_guest(
             run_sync_soon_threadsafe=loop.call_soon_threadsafe,
             done_callback=trio_done_callback,
         )
-        fute_err: BaseException|None = None
         try:
+            # TODO: better SIGINT handling since shielding seems to
+            # make NO DIFFERENCE XD
+            # -[ ] maybe this is due to 3.11's recent SIGINT handling
+            #  changes and we can better work with/around it?
+            # https://docs.python.org/3/library/asyncio-runner.html#handling-keyboard-interruption
             out: Outcome = await asyncio.shield(trio_done_fut)
-
-            # NOTE will raise (via `Error.unwrap()`) from any
-            # exception packed into the guest-run's `main_outcome`.
+            # NOTE `Error.unwrap()` will raise
             return out.unwrap()
 
-        except (
-            # XXX special SIGINT-handling is required since
-            # `asyncio.shield()`-ing seems to NOT handle that case as
-            # per recent changes in 3.11:
-            # https://docs.python.org/3/library/asyncio-runner.html#handling-keyboard-interruption
-            #
-            # NOTE: further, apparently ONLY need to handle this
-            # special SIGINT case since all other `asyncio`-side
-            # errors can be processed via our `chan._aio_err`
-            # relaying (right?); SIGINT seems to be totally diff
-            # error path in `asyncio`'s runtime..?
-            asyncio.CancelledError,
-
-        ) as fute_err:
-            err_message: str = (
-                'main `asyncio` task '
-            )
-            if isinstance(fute_err, asyncio.CancelledError):
-                err_message += 'was cancelled!\n'
-            else:
-                err_message += f'errored with {out.error!r}\n'
-
+        except asyncio.CancelledError:
             actor: tractor.Actor = tractor.current_actor()
             log.exception(
-                err_message
-                +
-                'Cancelling `trio`-side `tractor`-runtime..\n'
+                '`asyncio`-side main task was cancelled!\n'
+                'Cancelling actor-runtime..\n'
                 f'c)>\n'
                 f'  |_{actor}.cancel_soon()\n'
+
             )
 
-            # TODO: reduce this comment bloc since abandon issues are
-            # now solved?
-            #
             # XXX NOTE XXX the next LOC is super important!!!
             #  => without it, we can get a guest-run abandonment case
             #  where asyncio will not trigger `trio` in a final event
@@ -748,55 +681,16 @@ def run_as_asyncio_guest(
             # is apparently a working fix!
             actor.cancel_soon()
 
-            # XXX NOTE XXX pump the `asyncio` event-loop to allow
-            # `trio`-side to `trio`-guest-run to complete and
-            # teardown !!
+            # XXX NOTE XXX PUMP the asyncio event loop to allow `trio`-side to
+            # `trio`-guest-run to complete and teardown !!
             #
-            # *WITHOUT THIS* the guest-run can get race-conditionally abandoned!!
-            # XD
-            #
-            await asyncio.sleep(.1)  # `delay` can't be 0 either XD
-            while not trio_done_fut.done():
-                log.runtime(
-                    'Waiting on main guest-run `asyncio` task to complete..\n'
-                    f'|_trio_done_fut: {trio_done_fut}\n'
+            # XXX WITHOUT THIS the guest-run gets race-conditionally
+            # abandoned by `asyncio`!!
+            # XD XD XD
+            await asyncio.shield(
+                asyncio.sleep(.1)  # NOPE! it can't be 0 either XD
             )
-                await asyncio.sleep(.1)
-
-                # XXX: don't actually need the shield.. seems to
-                # make no difference (??) and we know it spawns an
-                # internal task..
-                # await asyncio.shield(asyncio.sleep(.1))
-
-                # XXX alt approach but can block indefinitely..
-                # so don't use?
-                # loop._run_once()
-
-            try:
-                return trio_done_fut.result()
-            except asyncio.exceptions.InvalidStateError as state_err:
-
-                # XXX be super dupere noisy about abandonment issues!
-                aio_task: asyncio.Task = asyncio.current_task()
-                message: str = (
-                    'The `asyncio`-side task likely exited before the '
-                    '`trio`-side guest-run completed!\n\n'
-                )
-                if fute_err:
-                    message += (
-                        f'The main {aio_task}\n'
-                        f'STOPPED due to {type(fute_err)}\n\n'
-                    )
-
-                message += (
-                    f'Likely something inside our guest-run-as-task impl is '
-                    f'not effectively waiting on the `trio`-side to complete ?!\n'
-                    f'This code -> {aio_main!r}\n\n'
-
-                    'Below you will likely see a '
-                    '"RuntimeWarning: Trio guest run got abandoned.." !!\n'
-                )
-                raise AsyncioRuntimeTranslationError(message) from state_err
+            raise
 
     # might as well if it's installed.
     try:
@@ -804,7 +698,7 @@ def run_as_asyncio_guest(
         loop = uvloop.new_event_loop()
         asyncio.set_event_loop(loop)
     except ImportError:
-        log.runtime('`uvloop` not available..')
+        pass
 
     return asyncio.run(
         aio_main(trio_main),