examples/advanced_faults/ipc_failure_during_stream.py

@@ -6,115 +6,47 @@ been an outage) and we want to ensure that despite being in debug mode
 actor tree will eventually be cancelled without leaving any zombies.
 
 '''
-from contextlib import asynccontextmanager as acm
+import trio
-from functools import partial
-
 from tractor import (
     open_nursery,
     context,
     Context,
-    ContextCancelled,
     MsgStream,
-    _testing,
 )
-import trio
-import pytest
 
 
-async def break_ipc(
+async def break_channel_silently_then_error(
     stream: MsgStream,
-    method: str|None = None,
-    pre_close: bool = False,
-
-    def_method: str = 'eof',
-
-) -> None:
-    '''
-    XXX: close the channel right after an error is raised
-    purposely breaking the IPC transport to make sure the parent
-    doesn't get stuck in debug or hang on the connection join.
-    this more or less simulates an infinite msg-receive hang on
-    the other end.
-
-    '''
-    # close channel via IPC prot msging before
-    # any transport breakage
-    if pre_close:
-        await stream.aclose()
-
-    method: str = method or def_method
-    print(
-        '#################################\n'
-        'Simulating CHILD-side IPC BREAK!\n'
-        f'method: {method}\n'
-        f'pre `.aclose()`: {pre_close}\n'
-        '#################################\n'
-    )
-
-    match method:
-        case 'trans_aclose':
-            await stream._ctx.chan.transport.stream.aclose()
-
-        case 'eof':
-            await stream._ctx.chan.transport.stream.send_eof()
-
-        case 'msg':
-            await stream._ctx.chan.send(None)
-
-        # TODO: the actual real-world simulated cases like
-        # transport layer hangs and/or lower layer 2-gens type
-        # scenarios..
-        #
-        # -[ ] already have some issues for this general testing
-        # area:
-        #  - https://github.com/goodboy/tractor/issues/97
-        #  - https://github.com/goodboy/tractor/issues/124
-        #   - PR from @guille:
-        #     https://github.com/goodboy/tractor/pull/149
-        # case 'hang':
-        # TODO: framework research:
-        #
-        # - https://github.com/GuoTengda1993/pynetem
-        # - https://github.com/shopify/toxiproxy
-        # - https://manpages.ubuntu.com/manpages/trusty/man1/wirefilter.1.html
-
-        case _:
-            raise RuntimeError(
-                f'IPC break method unsupported: {method}'
-            )
-
-
-async def break_ipc_then_error(
-    stream: MsgStream,
-    break_ipc_with: str|None = None,
-    pre_close: bool = False,
 ):
-    await break_ipc(
-        stream=stream,
-        method=break_ipc_with,
-        pre_close=pre_close,
-    )
     async for msg in stream:
         await stream.send(msg)
 
+        # XXX: close the channel right after an error is raised
+        # purposely breaking the IPC transport to make sure the parent
+        # doesn't get stuck in debug or hang on the connection join.
+        # this more or less simulates an infinite msg-receive hang on
+        # the other end.
+        await stream._ctx.chan.send(None)
         assert 0
 
 
-async def iter_ipc_stream(
+async def close_stream_and_error(
     stream: MsgStream,
-    break_ipc_with: str|None = None,
-    pre_close: bool = False,
 ):
     async for msg in stream:
         await stream.send(msg)
 
+        # wipe out channel right before raising
+        await stream._ctx.chan.send(None)
+        await stream.aclose()
+        assert 0
+
 
 @context
 async def recv_and_spawn_net_killers(
 
     ctx: Context,
     break_ipc_after: bool | int = False,
-    pre_close: bool = False,
 
 ) -> None:
     '''
@@ -129,53 +61,26 @@ async def recv_and_spawn_net_killers(
         async for i in stream:
             print(f'child echoing {i}')
             await stream.send(i)
-
             if (
                 break_ipc_after
-                and
+                and i > break_ipc_after
-                i >= break_ipc_after
             ):
-                n.start_soon(
+                '#################################\n'
-                    iter_ipc_stream,
+                'Simulating child-side IPC BREAK!\n'
-                    stream,
+                '#################################'
-                )
+                n.start_soon(break_channel_silently_then_error, stream)
-                n.start_soon(
+                n.start_soon(close_stream_and_error, stream)
-                    partial(
-                        break_ipc_then_error,
-                        stream=stream,
-                        pre_close=pre_close,
-                    )
-                )
-
-
-@acm
-async def stuff_hangin_ctlc(timeout: float = 1) -> None:
-
-    with trio.move_on_after(timeout) as cs:
-        yield timeout
-
-    if cs.cancelled_caught:
-        # pretend to be a user seeing no streaming action
-        # thinking it's a hang, and then hitting ctl-c..
-        print(
-            f"i'm a user on the PARENT side and thingz hangin "
-            f'after timeout={timeout} ???\n\n'
-            'MASHING CTlR-C..!?\n'
-        )
-        raise KeyboardInterrupt
 
 
 async def main(
     debug_mode: bool = False,
     start_method: str = 'trio',
-    loglevel: str = 'cancel',
 
     # by default we break the parent IPC first (if configured to break
     # at all), but this can be changed so the child does first (even if
     # both are set to break).
     break_parent_ipc_after: int | bool = False,
     break_child_ipc_after: int | bool = False,
-    pre_close: bool = False,
 
 ) -> None:
 
@@ -186,122 +91,59 @@ async def main(
             # NOTE: even debugger is used we shouldn't get
             # a hang since it never engages due to broken IPC
             debug_mode=debug_mode,
-            loglevel=loglevel,
+            loglevel='warning',
 
         ) as an,
     ):
-        sub_name: str = 'chitty_hijo'
         portal = await an.start_actor(
-            sub_name,
+            'chitty_hijo',
             enable_modules=[__name__],
         )
 
-        async with (
+        async with portal.open_context(
-            stuff_hangin_ctlc(timeout=2) as timeout,
-            _testing.expect_ctxc(
-                yay=(
-                    break_parent_ipc_after
-                    or break_child_ipc_after
-                ),
-                # TODO: we CAN'T remove this right?
-                # since we need the ctxc to bubble up from either
-                # the stream API after the `None` msg is sent
-                # (which actually implicitly cancels all remote
-                # tasks in the hijo) or from simluated
-                # KBI-mash-from-user
-                # or should we expect that a KBI triggers the ctxc
-                # and KBI in an eg?
-                reraise=True,
-            ),
-
-            portal.open_context(
             recv_and_spawn_net_killers,
             break_ipc_after=break_child_ipc_after,
-                pre_close=pre_close,
+
-            ) as (ctx, sent),
+        ) as (ctx, sent):
-        ):
-            rx_eoc: bool = False
-            ipc_break_sent: bool = False
             async with ctx.open_stream() as stream:
                 for i in range(1000):
 
                     if (
                         break_parent_ipc_after
-                        and
+                        and i > break_parent_ipc_after
-                        i > break_parent_ipc_after
-                        and
-                        not ipc_break_sent
                     ):
                         print(
                             '#################################\n'
-                            'Simulating PARENT-side IPC BREAK!\n'
+                            'Simulating parent-side IPC BREAK!\n'
-                            '#################################\n'
+                            '#################################'
                         )
-
+                        await stream._ctx.chan.send(None)
-                        # TODO: other methods? see break func above.
-                        # await stream._ctx.chan.send(None)
-                        # await stream._ctx.chan.transport.stream.send_eof()
-                        await stream._ctx.chan.transport.stream.aclose()
-
-                        ipc_break_sent = True
 
                     # it actually breaks right here in the
                     # mp_spawn/forkserver backends and thus the zombie
                     # reaper never even kicks in?
                     print(f'parent sending {i}')
-                    try:
                     await stream.send(i)
-                    except ContextCancelled as ctxc:
-                        print(
-                            'parent received ctxc on `stream.send()`\n'
-                            f'{ctxc}\n'
-                        )
-                        assert 'root' in ctxc.canceller
-                        assert sub_name in ctx.canceller
 
-                        # TODO: is this needed or no?
+                    with trio.move_on_after(2) as cs:
-                        raise
 
-                    # timeout: int = 1
-                    # with trio.move_on_after(timeout) as cs:
-                    async with stuff_hangin_ctlc() as timeout:
-                        print(
-                            f'PARENT `stream.receive()` with timeout={timeout}\n'
-                        )
                         # NOTE: in the parent side IPC failure case this
                         # will raise an ``EndOfChannel`` after the child
                         # is killed and sends a stop msg back to it's
                         # caller/this-parent.
-                        try:
                         rx = await stream.receive()
-                            print(
+
-                                "I'm a happy PARENT user and echoed to me is\n"
+                        print(f"I'm a happy user and echoed to me is {rx}")
-                                f'{rx}\n'
+
-                            )
+                    if cs.cancelled_caught:
-                        except trio.EndOfChannel:
+                        # pretend to be a user seeing no streaming action
-                            rx_eoc: bool = True
+                        # thinking it's a hang, and then hitting ctl-c..
-                            print('MsgStream got EoC for PARENT')
+                        print("YOO i'm a user anddd thingz hangin..")
-                            raise
 
                 print(
-                'Streaming finished and we got Eoc.\n'
+                    "YOO i'm mad send side dun but thingz hangin..\n"
-                'Canceling `.open_context()` in root with\n'
+                    'MASHING CTlR-C Ctl-c..'
-                'CTlR-C..'
                 )
-            if rx_eoc:
-                assert stream.closed
-                try:
-                    await stream.send(i)
-                    pytest.fail('stream not closed?')
-                except (
-                    trio.ClosedResourceError,
-                    trio.EndOfChannel,
-                ) as send_err:
-                    if rx_eoc:
-                        assert send_err is stream._eoc
-                    else:
-                        assert send_err is stream._closed
-
                 raise KeyboardInterrupt
 
 

examples/debugging/debug_mode_hang.py

@@ -1,9 +0,0 @@
-'''
-Reproduce a bug where enabling debug mode for a sub-actor actually causes
-a hang on teardown...
-
-'''
-import asyncio
-
-import trio
-import tractor

examples/parallelism/concurrent_actors_primes.py

@@ -8,10 +8,7 @@ This uses no extra threads, fancy semaphores or futures; all we need
 is ``tractor``'s channels.
 
 """
-from contextlib import (
+from contextlib import asynccontextmanager
-    asynccontextmanager as acm,
-    aclosing,
-)
 from typing import Callable
 import itertools
 import math
@@ -19,6 +16,7 @@ import time
 
 import tractor
 import trio
+from async_generator import aclosing
 
 
 PRIMES = [
@@ -46,7 +44,7 @@ async def is_prime(n):
     return True
 
 
-@acm
+@asynccontextmanager
 async def worker_pool(workers=4):
     """Though it's a trivial special case for ``tractor``, the well
     known "worker pool" seems to be the defacto "but, I want this

examples/rpc_bidir_streaming.py

@@ -13,7 +13,7 @@ async def simple_rpc(
 
     '''
     # signal to parent that we're up much like
-    # ``trio.TaskStatus.started()``
+    # ``trio_typing.TaskStatus.started()``
     await ctx.started(data + 1)
 
     async with ctx.open_stream() as stream:

pyproject.toml

@@ -26,23 +26,3 @@ all_bullets = true
   directory = "trivial"
   name = "Trivial/Internal Changes"
   showcontent = true
-
-
-[tool.pytest.ini_options]
-minversion = '6.0'
-testpaths = [
-  'tests'
-]
-addopts = [
-  # TODO: figure out why this isn't working..
-  '--rootdir=./tests',
-
-  '--import-mode=importlib',
-  # don't show frickin captured logs AGAIN in the report..
-  '--show-capture=no',
-]
-log_cli = false
-
-# TODO: maybe some of these layout choices?
-# https://docs.pytest.org/en/8.0.x/explanation/goodpractices.html#choosing-a-test-layout-import-rules
-# pythonpath = "src"

setup.py

@@ -36,20 +36,18 @@ setup(
     platforms=['linux', 'windows'],
     packages=[
         'tractor',
-        'tractor.experimental',  # wacky ideas
+        'tractor.experimental',
-        'tractor.trionics',  # trio extensions
+        'tractor.trionics',
-        'tractor.msg',  # lowlevel data types
     ],
     install_requires=[
 
         # trio related
         # proper range spec:
         # https://packaging.python.org/en/latest/discussions/install-requires-vs-requirements/#id5
-        'trio >= 0.24',
+        'trio >= 0.22',
-
+        'async_generator',
-        # 'async_generator',  # in stdlib mostly!
+        'trio_typing',
-        # 'trio_typing',  # trio==0.23.0 has type hints!
+        'exceptiongroup',
-        # 'exceptiongroup',  # in stdlib as of 3.11!
 
         # tooling
         'tricycle',

tests/conftest.py

@@ -7,19 +7,94 @@ import os
 import random
 import signal
 import platform
+import pathlib
 import time
+import inspect
+from functools import partial, wraps
 
 import pytest
+import trio
 import tractor
-from tractor._testing import (
-    examples_dir as examples_dir,
-    tractor_test as tractor_test,
-    expect_ctxc as expect_ctxc,
-)
 
-# TODO: include wtv plugin(s) we build in `._testing.pytest`?
 pytest_plugins = ['pytester']
 
+
+def tractor_test(fn):
+    """
+    Use:
+
+    @tractor_test
+    async def test_whatever():
+        await ...
+
+    If fixtures:
+
+        - ``arb_addr`` (a socket addr tuple where arbiter is listening)
+        - ``loglevel`` (logging level passed to tractor internals)
+        - ``start_method`` (subprocess spawning backend)
+
+    are defined in the `pytest` fixture space they will be automatically
+    injected to tests declaring these funcargs.
+    """
+    @wraps(fn)
+    def wrapper(
+        *args,
+        loglevel=None,
+        arb_addr=None,
+        start_method=None,
+        **kwargs
+    ):
+        # __tracebackhide__ = True
+
+        if 'arb_addr' in inspect.signature(fn).parameters:
+            # injects test suite fixture value to test as well
+            # as `run()`
+            kwargs['arb_addr'] = arb_addr
+
+        if 'loglevel' in inspect.signature(fn).parameters:
+            # allows test suites to define a 'loglevel' fixture
+            # that activates the internal logging
+            kwargs['loglevel'] = loglevel
+
+        if start_method is None:
+            if platform.system() == "Windows":
+                start_method = 'trio'
+
+        if 'start_method' in inspect.signature(fn).parameters:
+            # set of subprocess spawning backends
+            kwargs['start_method'] = start_method
+
+        if kwargs:
+
+            # use explicit root actor start
+
+            async def _main():
+                async with tractor.open_root_actor(
+                    # **kwargs,
+                    arbiter_addr=arb_addr,
+                    loglevel=loglevel,
+                    start_method=start_method,
+
+                    # TODO: only enable when pytest is passed --pdb
+                    # debug_mode=True,
+
+                ):
+                    await fn(*args, **kwargs)
+
+            main = _main
+
+        else:
+            # use implicit root actor start
+            main = partial(fn, *args, **kwargs)
+
+        return trio.run(main)
+
+    return wrapper
+
+
+_arb_addr = '127.0.0.1', random.randint(1000, 9999)
+
+
 # Sending signal.SIGINT on subprocess fails on windows. Use CTRL_* alternatives
 if platform.system() == 'Windows':
     _KILL_SIGNAL = signal.CTRL_BREAK_EVENT
@@ -39,6 +114,23 @@ no_windows = pytest.mark.skipif(
 )
 
 
+def repodir() -> pathlib.Path:
+    '''
+    Return the abspath to the repo directory.
+
+    '''
+    # 2 parents up to step up through tests/<repo_dir>
+    return pathlib.Path(__file__).parent.parent.absolute()
+
+
+def examples_dir() -> pathlib.Path:
+    '''
+    Return the abspath to the examples directory as `pathlib.Path`.
+
+    '''
+    return repodir() / 'examples'
+
+
 def pytest_addoption(parser):
     parser.addoption(
         "--ll", action="store", dest='loglevel',
@@ -76,26 +168,11 @@ _ci_env: bool = os.environ.get('CI', False)
 
 @pytest.fixture(scope='session')
 def ci_env() -> bool:
-    '''
+    """Detect CI envoirment.
-    Detect CI envoirment.
+    """
-
-    '''
     return _ci_env
 
 
-# TODO: also move this to `._testing` for now?
-# -[ ] possibly generalize and re-use for multi-tree spawning
-#    along with the new stuff for multi-addrs in distribute_dis
-#    branch?
-#
-# choose randomly at import time
-_reg_addr: tuple[str, int] = (
-    '127.0.0.1',
-    random.randint(1000, 9999),
-)
-_arb_addr = _reg_addr
-
-
 @pytest.fixture(scope='session')
 def arb_addr():
     return _arb_addr
@@ -135,7 +212,6 @@ def sig_prog(proc, sig):
     assert ret
 
 
-# TODO: factor into @cm and move to `._testing`?
 @pytest.fixture
 def daemon(
     loglevel: str,

tests/test_advanced_faults.py

@@ -3,29 +3,22 @@ Sketchy network blackoutz, ugly byzantine gens, puedes eschuchar la
 cancelacion?..
 
 '''
-import itertools
 from functools import partial
-from types import ModuleType
 
 import pytest
 from _pytest.pathlib import import_path
 import trio
 import tractor
-from tractor._testing import (
+
+from conftest import (
     examples_dir,
 )
 
 
 @pytest.mark.parametrize(
-    'pre_aclose_msgstream',
+    'debug_mode',
-    [
+    [False, True],
-        False,
+    ids=['no_debug_mode', 'debug_mode'],
-        True,
-    ],
-    ids=[
-        'no_msgstream_aclose',
-        'pre_aclose_msgstream',
-    ],
 )
 @pytest.mark.parametrize(
     'ipc_break',
@@ -70,10 +63,8 @@ from tractor._testing import (
 )
 def test_ipc_channel_break_during_stream(
     debug_mode: bool,
-    loglevel: str,
     spawn_backend: str,
     ipc_break: dict | None,
-    pre_aclose_msgstream: bool,
 ):
     '''
     Ensure we can have an IPC channel break its connection during
@@ -92,130 +83,70 @@ def test_ipc_channel_break_during_stream(
         # requires the user to do ctl-c to cancel the actor tree.
         expect_final_exc = trio.ClosedResourceError
 
-    mod: ModuleType = import_path(
+    mod = import_path(
         examples_dir() / 'advanced_faults' / 'ipc_failure_during_stream.py',
         root=examples_dir(),
     )
 
-    # by def we expect KBI from user after a simulated "hang
-    # period" wherein the user eventually hits ctl-c to kill the
-    # root-actor tree.
-    expect_final_exc: BaseException = KeyboardInterrupt
-    if (
-        # only expect EoC if trans is broken on the child side,
-        ipc_break['break_child_ipc_after'] is not False
-        # AND we tell the child to call `MsgStream.aclose()`.
-        and pre_aclose_msgstream
-    ):
-        # expect_final_exc = trio.EndOfChannel
-        # ^XXX NOPE! XXX^ since now `.open_stream()` absorbs this
-        # gracefully!
     expect_final_exc = KeyboardInterrupt
 
-    # NOTE when ONLY the child breaks or it breaks BEFORE the
+    # when ONLY the child breaks we expect the parent to get a closed
-    # parent we expect the parent to get a closed resource error
+    # resource error on the next `MsgStream.receive()` and then fail out
-    # on the next `MsgStream.receive()` and then fail out and
+    # and cancel the child from there.
-    # cancel the child from there.
-    #
-    # ONLY CHILD breaks
     if (
+
+        # only child breaks
+        (
             ipc_break['break_child_ipc_after']
-        and
+            and ipc_break['break_parent_ipc_after'] is False
-        ipc_break['break_parent_ipc_after'] is False
+        )
-    ):
-        # NOTE: we DO NOT expect this any more since
-        # the child side's channel will be broken silently
-        # and nothing on the parent side will indicate this!
-        # expect_final_exc = trio.ClosedResourceError
 
-        # NOTE: child will send a 'stop' msg before it breaks
+        # both break but, parent breaks first
-        # the transport channel BUT, that will be absorbed by the
+        or (
-        # `ctx.open_stream()` block and thus the `.open_context()`
-        # should hang, after which the test script simulates
-        # a user sending ctl-c by raising a KBI.
-        if pre_aclose_msgstream:
-            expect_final_exc = KeyboardInterrupt
-
-            # XXX OLD XXX
-            # if child calls `MsgStream.aclose()` then expect EoC.
-            # ^ XXX not any more ^ since eoc is always absorbed
-            # gracefully and NOT bubbled to the `.open_context()`
-            # block!
-            # expect_final_exc = trio.EndOfChannel
-
-    # BOTH but, CHILD breaks FIRST
-    elif (
             ipc_break['break_child_ipc_after'] is not False
             and (
                 ipc_break['break_parent_ipc_after']
                 > ipc_break['break_child_ipc_after']
             )
-    ):
+        )
-        if pre_aclose_msgstream:
-            expect_final_exc = KeyboardInterrupt
 
-    # NOTE when the parent IPC side dies (even if the child's does as well
-    # but the child fails BEFORE the parent) we always expect the
-    # IPC layer to raise a closed-resource, NEVER do we expect
-    # a stop msg since the parent-side ctx apis will error out
-    # IMMEDIATELY before the child ever sends any 'stop' msg.
-    #
-    # ONLY PARENT breaks
-    elif (
-        ipc_break['break_parent_ipc_after']
-        and
-        ipc_break['break_child_ipc_after'] is False
     ):
         expect_final_exc = trio.ClosedResourceError
 
-    # BOTH but, PARENT breaks FIRST
+    # when the parent IPC side dies (even if the child's does as well
+    # but the child fails BEFORE the parent) we expect the channel to be
+    # sent a stop msg from the child at some point which will signal the
+    # parent that the stream has been terminated.
+    # NOTE: when the parent breaks "after" the child you get this same
+    # case as well, the child breaks the IPC channel with a stop msg
+    # before any closure takes place.
     elif (
+        # only parent breaks
+        (
+            ipc_break['break_parent_ipc_after']
+            and ipc_break['break_child_ipc_after'] is False
+        )
+
+        # both break but, child breaks first
+        or (
             ipc_break['break_parent_ipc_after'] is not False
             and (
                 ipc_break['break_child_ipc_after']
-            >
+                > ipc_break['break_parent_ipc_after']
-            ipc_break['break_parent_ipc_after']
+            )
         )
     ):
-        expect_final_exc = trio.ClosedResourceError
+        expect_final_exc = trio.EndOfChannel
 
-    with pytest.raises(
+    with pytest.raises(expect_final_exc):
-        expected_exception=(
-            expect_final_exc,
-            ExceptionGroup,
-        ),
-    ) as excinfo:
-        try:
         trio.run(
             partial(
                 mod.main,
                 debug_mode=debug_mode,
                 start_method=spawn_backend,
-                    loglevel=loglevel,
-                    pre_close=pre_aclose_msgstream,
                 **ipc_break,
             )
         )
-        except KeyboardInterrupt as kbi:
-            _err = kbi
-            if expect_final_exc is not KeyboardInterrupt:
-                pytest.fail(
-                    'Rxed unexpected KBI !?\n'
-                    f'{repr(kbi)}'
-                )
-
-            raise
-
-    # get raw instance from pytest wrapper
-    value = excinfo.value
-    if isinstance(value, ExceptionGroup):
-        value = next(
-            itertools.dropwhile(
-                lambda exc: not isinstance(exc, expect_final_exc),
-                value.exceptions,
-            )
-        )
-        assert value
 
 
 @tractor.context
@@ -238,7 +169,6 @@ def test_stream_closed_right_after_ipc_break_and_zombie_lord_engages():
 
     '''
     async def main():
-        with trio.fail_after(3):
         async with tractor.open_nursery() as n:
             portal = await n.start_actor(
                 'ipc_breaker',
@@ -256,10 +186,7 @@ def test_stream_closed_right_after_ipc_break_and_zombie_lord_engages():
 
                     print('parent waiting on context')
 
-                print(
+            print('parent exited context')
-                    'parent exited context\n'
-                    'parent raising KBI..\n'
-                )
             raise KeyboardInterrupt
 
     with pytest.raises(KeyboardInterrupt):

tests/test_advanced_streaming.py

@@ -6,7 +6,6 @@ from collections import Counter
 import itertools
 import platform
 
-import pytest
 import trio
 import tractor
 
@@ -144,16 +143,8 @@ def test_dynamic_pub_sub():
 
     try:
         trio.run(main)
-    except (
+    except trio.TooSlowError:
-        trio.TooSlowError,
+        pass
-        ExceptionGroup,
-    ) as err:
-        if isinstance(err, ExceptionGroup):
-            for suberr in err.exceptions:
-                if isinstance(suberr, trio.TooSlowError):
-                    break
-            else:
-                pytest.fail('Never got a `TooSlowError` ?')
 
 
 @tractor.context
@@ -307,69 +298,44 @@ async def inf_streamer(
 
     async with (
         ctx.open_stream() as stream,
-        trio.open_nursery() as tn,
+        trio.open_nursery() as n,
     ):
-        async def close_stream_on_sentinel():
+        async def bail_on_sentinel():
             async for msg in stream:
                 if msg == 'done':
-                    print(
-                        'streamer RXed "done" sentinel msg!\n'
-                        'CLOSING `MsgStream`!'
-                    )
                     await stream.aclose()
                 else:
                     print(f'streamer received {msg}')
-            else:
-                print('streamer exited recv loop')
 
         # start termination detector
-        tn.start_soon(close_stream_on_sentinel)
+        n.start_soon(bail_on_sentinel)
 
-        cap: int = 10000  # so that we don't spin forever when bug..
+        for val in itertools.count():
-        for val in range(cap):
             try:
-                print(f'streamer sending {val}')
                 await stream.send(val)
-                if val > cap:
-                    raise RuntimeError(
-                        'Streamer never cancelled by setinel?'
-                    )
-                await trio.sleep(0.001)
-
-            # close out the stream gracefully
             except trio.ClosedResourceError:
-                print('transport closed on streamer side!')
+                # close out the stream gracefully
-                assert stream.closed
                 break
-        else:
-            raise RuntimeError(
-                'Streamer not cancelled before finished sending?'
-            )
 
-    print('streamer exited .open_streamer() block')
+    print('terminating streamer')
 
 
-def test_local_task_fanout_from_stream(
+def test_local_task_fanout_from_stream():
-    debug_mode: bool,
-):
     '''
     Single stream with multiple local consumer tasks using the
     ``MsgStream.subscribe()` api.
 
-    Ensure all tasks receive all values after stream completes
+    Ensure all tasks receive all values after stream completes sending.
-    sending.
 
     '''
-    consumers: int = 22
+    consumers = 22
 
     async def main():
 
         counts = Counter()
 
-        async with tractor.open_nursery(
+        async with tractor.open_nursery() as tn:
-            debug_mode=debug_mode,
+            p = await tn.start_actor(
-        ) as tn:
-            p: tractor.Portal = await tn.start_actor(
                 'inf_streamer',
                 enable_modules=[__name__],
             )
@@ -377,6 +343,7 @@ def test_local_task_fanout_from_stream(
                 p.open_context(inf_streamer) as (ctx, _),
                 ctx.open_stream() as stream,
             ):
+
                 async def pull_and_count(name: str):
                     # name = trio.lowlevel.current_task().name
                     async with stream.subscribe() as recver:
@@ -385,7 +352,7 @@ def test_local_task_fanout_from_stream(
                             tractor.trionics.BroadcastReceiver
                         )
                         async for val in recver:
-                            print(f'bx {name} rx: {val}')
+                            # print(f'{name}: {val}')
                             counts[name] += 1
 
                         print(f'{name} bcaster ended')
@@ -395,14 +362,10 @@ def test_local_task_fanout_from_stream(
                 with trio.fail_after(3):
                     async with trio.open_nursery() as nurse:
                         for i in range(consumers):
-                            nurse.start_soon(
+                            nurse.start_soon(pull_and_count, i)
-                                pull_and_count,
-                                i,
-                            )
 
-                        # delay to let bcast consumers pull msgs
                         await trio.sleep(0.5)
-                        print('terminating nursery of bcast rxer consumers!')
+                        print('\nterminating')
                         await stream.send('done')
 
             print('closed stream connection')

tests/test_cancellation.py

@@ -8,13 +8,15 @@ import platform
 import time
 from itertools import repeat
 
+from exceptiongroup import (
+    BaseExceptionGroup,
+    ExceptionGroup,
+)
 import pytest
 import trio
 import tractor
-from tractor._testing import (
+
-    tractor_test,
+from conftest import tractor_test, no_windows
-)
-from conftest import no_windows
 
 
 def is_win():
@@ -46,13 +48,11 @@ async def do_nuthin():
     ids=['no_args', 'unexpected_args'],
 )
 def test_remote_error(reg_addr, args_err):
-    '''
+    """Verify an error raised in a subactor that is propagated
-    Verify an error raised in a subactor that is propagated
     to the parent nursery, contains the underlying boxed builtin
     error type info and causes cancellation and reraising all the
     way up the stack.
-
+    """
-    '''
     args, errtype = args_err
 
     async def main():
@@ -65,9 +65,7 @@ def test_remote_error(reg_addr, args_err):
             # an exception group outside the nursery since the error
             # here and the far end task error are one in the same?
             portal = await nursery.run_in_actor(
-                assert_err,
+                assert_err, name='errorer', **args
-                name='errorer',
-                **args
             )
 
             # get result(s) from main task

tests/test_child_manages_service_nursery.py

@@ -6,15 +6,14 @@ sub-sub-actor daemons.
 '''
 from typing import Optional
 import asyncio
-from contextlib import (
+from contextlib import asynccontextmanager as acm
-    asynccontextmanager as acm,
-    aclosing,
-)
 
 import pytest
 import trio
+from trio_typing import TaskStatus
 import tractor
 from tractor import RemoteActorError
+from async_generator import aclosing
 
 
 async def aio_streamer(

tests/test_clustering.py

@@ -5,7 +5,9 @@ import trio
 import tractor
 from tractor import open_actor_cluster
 from tractor.trionics import gather_contexts
-from tractor._testing import tractor_test
+
+from conftest import tractor_test
+
 
 MESSAGE = 'tractoring at full speed'
 

tests/test_context_stream_semantics.py

@@ -5,12 +5,10 @@ Verify the we raise errors when streams are opened prior to
 sync-opening a ``tractor.Context`` beforehand.
 
 '''
+# from contextlib import asynccontextmanager as acm
 from itertools import count
 import platform
-from pprint import pformat
+from typing import Optional
-from typing import (
-    Callable,
-)
 
 import pytest
 import trio
@@ -25,10 +23,7 @@ from tractor._exceptions import (
     ContextCancelled,
 )
 
-from tractor._testing import (
+from conftest import tractor_test
-    tractor_test,
-    expect_ctxc,
-)
 
 # ``Context`` semantics are as follows,
 #  ------------------------------------
@@ -74,7 +69,7 @@ _state: bool = False
 
 @tractor.context
 async def too_many_starteds(
-    ctx: Context,
+    ctx: tractor.Context,
 ) -> None:
     '''
     Call ``Context.started()`` more then once (an error).
@@ -89,7 +84,7 @@ async def too_many_starteds(
 
 @tractor.context
 async def not_started_but_stream_opened(
-    ctx: Context,
+    ctx: tractor.Context,
 ) -> None:
     '''
     Enter ``Context.open_stream()`` without calling ``.started()``.
@@ -110,15 +105,11 @@ async def not_started_but_stream_opened(
     ],
     ids='misuse_type={}'.format,
 )
-def test_started_misuse(
+def test_started_misuse(target):
-    target: Callable,
+
-    debug_mode: bool,
-):
     async def main():
-        async with tractor.open_nursery(
+        async with tractor.open_nursery() as n:
-            debug_mode=debug_mode,
+            portal = await n.start_actor(
-        ) as an:
-            portal = await an.start_actor(
                 target.__name__,
                 enable_modules=[__name__],
             )
@@ -133,7 +124,7 @@ def test_started_misuse(
 @tractor.context
 async def simple_setup_teardown(
 
-    ctx: Context,
+    ctx: tractor.Context,
     data: int,
     block_forever: bool = False,
 
@@ -179,7 +170,6 @@ def test_simple_context(
     error_parent,
     callee_blocks_forever,
     pointlessly_open_stream,
-    debug_mode: bool,
 ):
 
     timeout = 1.5 if not platform.system() == 'Windows' else 4
@@ -187,22 +177,20 @@ def test_simple_context(
     async def main():
 
         with trio.fail_after(timeout):
-            async with tractor.open_nursery(
+            async with tractor.open_nursery() as nursery:
-                debug_mode=debug_mode,
+
-            ) as an:
+                portal = await nursery.start_actor(
-                portal = await an.start_actor(
                     'simple_context',
                     enable_modules=[__name__],
                 )
 
                 try:
-                    async with (
+                    async with portal.open_context(
-                        portal.open_context(
                         simple_setup_teardown,
                         data=10,
                         block_forever=callee_blocks_forever,
-                        ) as (ctx, sent),
+                    ) as (ctx, sent):
-                    ):
+
                         assert sent == 11
 
                         if callee_blocks_forever:
@@ -272,7 +260,6 @@ def test_caller_cancels(
     cancel_method: str,
     chk_ctx_result_before_exit: bool,
     callee_returns_early: bool,
-    debug_mode: bool,
 ):
     '''
     Verify that when the opening side of a context (aka the caller)
@@ -281,100 +268,37 @@ def test_caller_cancels(
 
     '''
     async def check_canceller(
-        ctx: Context,
+        ctx: tractor.Context,
     ) -> None:
-        actor: Actor = current_actor()
+        # should not raise yet return the remote
-        uid: tuple = actor.uid
+        # context cancelled error.
-        _ctxc: ContextCancelled|None = None
-
-        if (
-            cancel_method == 'portal'
-            and not callee_returns_early
-        ):
-            try:
         res = await ctx.result()
-                assert 0, 'Portal cancel should raise!'
 
-            except ContextCancelled as ctxc:
-                # with trio.CancelScope(shield=True):
-                #     await tractor.pause()
-                _ctxc = ctxc
-                assert ctx.chan._cancel_called
-                assert ctxc.canceller == uid
-                assert ctxc is ctx.maybe_error
-
-        # NOTE: should not ever raise even in the `ctx`
-        # case since self-cancellation should swallow the ctxc
-        # silently!
-        else:
-            try:
-                res = await ctx.result()
-            except ContextCancelled as ctxc:
-                pytest.fail(f'should not have raised ctxc\n{ctxc}')
-
-        # we actually get a result
         if callee_returns_early:
             assert res == 'yo'
-            assert ctx.outcome is res
-            assert ctx.maybe_error is None
 
         else:
-            err: Exception = ctx.outcome
+            err = res
             assert isinstance(err, ContextCancelled)
             assert (
                 tuple(err.canceller)
                 ==
-                uid
+                current_actor().uid
             )
-            assert (
-                err
-                is ctx.maybe_error
-                is ctx._remote_error
-            )
-            if le := ctx._local_error:
-                assert err is le
-
-            # else:
-                # TODO: what should this be then?
-                # not defined until block closes right?
-                #
-                # await tractor.pause()
-                # assert ctx._local_error is None
-
-        # TODO: don't need this right?
-        # if _ctxc:
-        #     raise _ctxc
-
 
     async def main():
-
+        async with tractor.open_nursery() as nursery:
-        async with tractor.open_nursery(
+            portal = await nursery.start_actor(
-            debug_mode=debug_mode,
-        ) as an:
-            portal = await an.start_actor(
                 'simple_context',
                 enable_modules=[__name__],
             )
-            timeout: float = (
+            timeout = 0.5 if not callee_returns_early else 2
-                0.5
-                if not callee_returns_early
-                else 2
-            )
             with trio.fail_after(timeout):
-                async with (
+                async with portal.open_context(
-                    expect_ctxc(
-                        yay=(
-                            not callee_returns_early
-                            and cancel_method == 'portal'
-                        )
-                    ),
-
-                    portal.open_context(
                     simple_setup_teardown,
                     data=10,
                     block_forever=not callee_returns_early,
-                    ) as (ctx, sent),
+                ) as (ctx, sent):
-                ):
 
                     if callee_returns_early:
                         # ensure we block long enough before sending
@@ -383,17 +307,9 @@ def test_caller_cancels(
                         await trio.sleep(0.5)
 
                     if cancel_method == 'ctx':
-                        print('cancelling with `Context.cancel()`')
                         await ctx.cancel()
-
-                    elif cancel_method == 'portal':
-                        print('cancelling with `Portal.cancel_actor()`')
-                        await portal.cancel_actor()
-
                     else:
-                        pytest.fail(
+                        await portal.cancel_actor()
-                            f'Unknown `cancel_method={cancel_method} ?'
-                        )
 
                     if chk_ctx_result_before_exit:
                         await check_canceller(ctx)
@@ -404,23 +320,6 @@ def test_caller_cancels(
             if cancel_method != 'portal':
                 await portal.cancel_actor()
 
-            # XXX NOTE XXX: non-normal yet purposeful
-            # test-specific ctxc suppression is implemented!
-            #
-            # WHY: the `.cancel_actor()` case (cancel_method='portal')
-            # will cause both:
-            #  * the `ctx.result()` inside `.open_context().__aexit__()`
-            #  * AND the `ctx.result()` inside `check_canceller()`
-            # to raise ctxc.
-            #
-            #   which should in turn cause `ctx._scope` to
-            # catch any cancellation?
-            if (
-                not callee_returns_early
-                and cancel_method != 'portal'
-            ):
-                assert not ctx._scope.cancelled_caught
-
     trio.run(main)
 
 
@@ -439,7 +338,7 @@ def test_caller_cancels(
 @tractor.context
 async def close_ctx_immediately(
 
-    ctx: Context,
+    ctx: tractor.Context,
 
 ) -> None:
 
@@ -451,33 +350,17 @@ async def close_ctx_immediately(
 
 
 @tractor_test
-async def test_callee_closes_ctx_after_stream_open(
+async def test_callee_closes_ctx_after_stream_open():
-    debug_mode: bool,
+    'callee context closes without using stream'
-):
-    '''
-    callee context closes without using stream.
 
-    This should result in a msg sequence
+    async with tractor.open_nursery() as n:
-    |_<root>_
-             |_<fast_stream_closer>
 
-             <= {'started': <Any>, 'cid': <str>}
+        portal = await n.start_actor(
-             <= {'stop': True, 'cid': <str>}
-             <= {'result': Any, ..}
-
-     (ignored by child)
-    => {'stop': True, 'cid': <str>}
-
-    '''
-    async with tractor.open_nursery(
-        debug_mode=debug_mode,
-    ) as an:
-        portal = await an.start_actor(
             'fast_stream_closer',
             enable_modules=[__name__],
         )
 
-        with trio.fail_after(0.5):
+        with trio.fail_after(2):
             async with portal.open_context(
                 close_ctx_immediately,
 
@@ -485,9 +368,10 @@ async def test_callee_closes_ctx_after_stream_open(
                 # cancel_on_exit=True,
 
             ) as (ctx, sent):
+
                 assert sent is None
 
-                with trio.fail_after(0.4):
+                with trio.fail_after(0.5):
                     async with ctx.open_stream() as stream:
 
                         # should fall through since ``StopAsyncIteration``
@@ -495,14 +379,11 @@ async def test_callee_closes_ctx_after_stream_open(
                         # a ``trio.EndOfChannel`` by
                         # ``trio.abc.ReceiveChannel.__anext__()``
                         async for _ in stream:
-                            # trigger failure if we DO NOT
-                            # get an EOC!
                             assert 0
                         else:
 
                             # verify stream is now closed
                             try:
-                                with trio.fail_after(0.3):
                                 await stream.receive()
                             except trio.EndOfChannel:
                                 pass
@@ -523,7 +404,8 @@ async def test_callee_closes_ctx_after_stream_open(
 
 @tractor.context
 async def expect_cancelled(
-    ctx: Context,
+
+    ctx: tractor.Context,
 
 ) -> None:
     global _state
@@ -537,29 +419,12 @@ async def expect_cancelled(
                 await stream.send(msg)  # echo server
 
     except trio.Cancelled:
-
-        # on ctx.cancel() the internal RPC scope is cancelled but
-        # never caught until the func exits.
-        assert ctx._scope.cancel_called
-        assert not ctx._scope.cancelled_caught
-
-        # should be the RPC cmd request for `._cancel_task()`
-        assert ctx._cancel_msg
-        # which, has not yet resolved to an error outcome
-        # since this rpc func has not yet exited.
-        assert not ctx.maybe_error
-        assert not ctx._final_result_is_set()
-
-        # debug REPL if needed
-        # with trio.CancelScope(shield=True):
-        #     await tractor.pause()
-
         # expected case
         _state = False
         raise
 
     else:
-        assert 0, "callee wasn't cancelled !?"
+        assert 0, "Wasn't cancelled!?"
 
 
 @pytest.mark.parametrize(
@@ -569,17 +434,13 @@ async def expect_cancelled(
 @tractor_test
 async def test_caller_closes_ctx_after_callee_opens_stream(
     use_ctx_cancel_method: bool,
-    debug_mode: bool,
 ):
-    '''
+    'caller context closes without using stream'
-    caller context closes without using/opening stream
 
-    '''
+    async with tractor.open_nursery() as an:
-    async with tractor.open_nursery(
-        debug_mode=debug_mode,
-    ) as an:
 
         root: Actor = current_actor()
+
         portal = await an.start_actor(
             'ctx_cancelled',
             enable_modules=[__name__],
@@ -592,13 +453,11 @@ async def test_caller_closes_ctx_after_callee_opens_stream(
 
             await portal.run(assert_state, value=True)
 
-            # call `ctx.cancel()` explicitly
+            # call cancel explicitly
             if use_ctx_cancel_method:
+
                 await ctx.cancel()
 
-                # NOTE: means the local side `ctx._scope` will
-                # have been cancelled by an ctxc ack and thus
-                # `._scope.cancelled_caught` should be set.
                 try:
                     async with ctx.open_stream() as stream:
                         async for msg in stream:
@@ -627,10 +486,7 @@ async def test_caller_closes_ctx_after_callee_opens_stream(
                 assert portal.channel.connected()
 
                 # ctx is closed here
-                await portal.run(
+                await portal.run(assert_state, value=False)
-                    assert_state,
-                    value=False,
-                )
 
             else:
                 try:
@@ -641,21 +497,9 @@ async def test_caller_closes_ctx_after_callee_opens_stream(
                     # NO-OP -> since already called above
                     await ctx.cancel()
 
-        # NOTE: local scope should have absorbed the cancellation since
+        # local scope should have absorbed the cancellation
-        # in this case we call `ctx.cancel()` and the local
+        assert ctx.cancelled_caught
-        # `._scope` does not get `.cancel_called` and thus
+        assert ctx._remote_error is ctx._local_error
-        # `.cancelled_caught` neither will ever bet set.
-        if use_ctx_cancel_method:
-            assert not ctx._scope.cancelled_caught
-
-        # rxed ctxc response from far end
-        assert ctx.cancel_acked
-        assert (
-            ctx._remote_error
-            is ctx._local_error
-            is ctx.maybe_error
-            is ctx.outcome
-        )
 
         try:
             async with ctx.open_stream() as stream:
@@ -678,13 +522,11 @@ async def test_caller_closes_ctx_after_callee_opens_stream(
 
 
 @tractor_test
-async def test_multitask_caller_cancels_from_nonroot_task(
+async def test_multitask_caller_cancels_from_nonroot_task():
-    debug_mode: bool,
+
-):
+    async with tractor.open_nursery() as n:
-    async with tractor.open_nursery(
+
-        debug_mode=debug_mode,
+        portal = await n.start_actor(
-    ) as an:
-        portal = await an.start_actor(
             'ctx_cancelled',
             enable_modules=[__name__],
         )
@@ -731,7 +573,7 @@ async def test_multitask_caller_cancels_from_nonroot_task(
 @tractor.context
 async def cancel_self(
 
-    ctx: Context,
+    ctx: tractor.Context,
 
 ) -> None:
     global _state
@@ -768,20 +610,16 @@ async def cancel_self(
 
     raise RuntimeError('Context didnt cancel itself?!')
 
-
 @tractor_test
-async def test_callee_cancels_before_started(
+async def test_callee_cancels_before_started():
-    debug_mode: bool,
-):
     '''
     Callee calls `Context.cancel()` while streaming and caller
     sees stream terminated in `ContextCancelled`.
 
     '''
-    async with tractor.open_nursery(
+    async with tractor.open_nursery() as n:
-        debug_mode=debug_mode,
+
-    ) as an:
+        portal = await n.start_actor(
-        portal = await an.start_actor(
             'cancels_self',
             enable_modules=[__name__],
         )
@@ -807,7 +645,7 @@ async def test_callee_cancels_before_started(
 @tractor.context
 async def never_open_stream(
 
-    ctx:  Context,
+    ctx:  tractor.Context,
 
 ) -> None:
     '''
@@ -821,8 +659,8 @@ async def never_open_stream(
 @tractor.context
 async def keep_sending_from_callee(
 
-    ctx:  Context,
+    ctx:  tractor.Context,
-    msg_buffer_size: int|None = None,
+    msg_buffer_size: Optional[int] = None,
 
 ) -> None:
     '''
@@ -847,10 +685,7 @@ async def keep_sending_from_callee(
     ],
     ids='overrun_condition={}'.format,
 )
-def test_one_end_stream_not_opened(
+def test_one_end_stream_not_opened(overrun_by):
-    overrun_by: tuple[str, int, Callable],
-    debug_mode: bool,
-):
     '''
     This should exemplify the bug from:
     https://github.com/goodboy/tractor/issues/265
@@ -861,10 +696,8 @@ def test_one_end_stream_not_opened(
     buf_size = buf_size_increase + Actor.msg_buffer_size
 
     async def main():
-        async with tractor.open_nursery(
+        async with tractor.open_nursery() as n:
-            debug_mode=debug_mode,
+            portal = await n.start_actor(
-        ) as an:
-            portal = await an.start_actor(
                 entrypoint.__name__,
                 enable_modules=[__name__],
             )
@@ -921,7 +754,7 @@ def test_one_end_stream_not_opened(
 @tractor.context
 async def echo_back_sequence(
 
-    ctx:  Context,
+    ctx:  tractor.Context,
     seq: list[int],
     wait_for_cancel: bool,
     allow_overruns_side: str,
@@ -938,10 +771,7 @@ async def echo_back_sequence(
     # NOTE: ensure that if the caller is expecting to cancel this task
     # that we stay echoing much longer then they are so we don't
     # return early instead of receive the cancel msg.
-    total_batches: int = (
+    total_batches: int = 1000 if wait_for_cancel else 6
-        1000 if wait_for_cancel
-        else 6
-    )
 
     await ctx.started()
     # await tractor.breakpoint()
@@ -960,23 +790,8 @@ async def echo_back_sequence(
         )
 
         seq = list(seq)  # bleh, msgpack sometimes ain't decoded right
-        for i in range(total_batches):
+        for _ in range(total_batches):
-            print(f'starting new stream batch {i} iter in child')
             batch = []
-
-            # EoC case, delay a little instead of hot
-            # iter-stopping (since apparently py3.11+ can do that
-            # faster then a ctxc can be sent) on the async for
-            # loop when child was requested to ctxc.
-            if (
-                stream.closed
-                or
-                ctx.cancel_called
-            ):
-                print('child stream already closed!?!')
-                await trio.sleep(0.05)
-                continue
-
             async for msg in stream:
                 batch.append(msg)
                 if batch == seq:
@@ -987,18 +802,15 @@ async def echo_back_sequence(
 
                 print('callee waiting on next')
 
-            print(f'callee echoing back latest batch\n{batch}')
             for msg in batch:
-                print(f'callee sending msg\n{msg}')
+                print(f'callee sending {msg}')
                 await stream.send(msg)
 
-    try:
-        return 'yo'
-    finally:
     print(
-            'exiting callee with context:\n'
+        'EXITING CALLEEE:\n'
-            f'{pformat(ctx)}\n'
+        f'{ctx.canceller}'
     )
+    return 'yo'
 
 
 @pytest.mark.parametrize(
@@ -1024,10 +836,7 @@ def test_maybe_allow_overruns_stream(
     cancel_ctx: bool,
     slow_side: str,
     allow_overruns_side: str,
-
-    # conftest wide
     loglevel: str,
-    debug_mode: bool,
 ):
     '''
     Demonstrate small overruns of each task back and forth
@@ -1046,14 +855,13 @@ def test_maybe_allow_overruns_stream(
 
     '''
     async def main():
-        async with tractor.open_nursery(
+        async with tractor.open_nursery() as n:
-            debug_mode=debug_mode,
+            portal = await n.start_actor(
-        ) as an:
-            portal = await an.start_actor(
                 'callee_sends_forever',
                 enable_modules=[__name__],
                 loglevel=loglevel,
-                debug_mode=debug_mode,
+
+                # debug_mode=True,
             )
             seq = list(range(10))
             async with portal.open_context(
@@ -1062,8 +870,8 @@ def test_maybe_allow_overruns_stream(
                 wait_for_cancel=cancel_ctx,
                 be_slow=(slow_side == 'child'),
                 allow_overruns_side=allow_overruns_side,
-
             ) as (ctx, sent):
+
                 assert sent is None
 
                 async with ctx.open_stream(
@@ -1091,10 +899,10 @@ def test_maybe_allow_overruns_stream(
 
                 if cancel_ctx:
                     # cancel the remote task
-                    print('Requesting `ctx.cancel()` in parent!')
+                    print('sending root side cancel')
                     await ctx.cancel()
 
-            res: str|ContextCancelled = await ctx.result()
+            res = await ctx.result()
 
             if cancel_ctx:
                 assert isinstance(res, ContextCancelled)
@@ -1149,52 +957,3 @@ def test_maybe_allow_overruns_stream(
         # if this hits the logic blocks from above are not
         # exhaustive..
         pytest.fail('PARAMETRIZED CASE GEN PROBLEM YO')
-
-
-def test_ctx_with_self_actor(
-    loglevel: str,
-    debug_mode: bool,
-):
-    '''
-    NOTE: for now this is an INVALID OP!
-
-    BUT, eventually presuming we add a "side" key to `Actor.get_context()`,
-    we might be able to get this working symmetrically, but should we??
-
-    Open a context back to the same actor and ensure all cancellation
-    and error semantics hold the same.
-
-    '''
-    async def main():
-        async with tractor.open_nursery(
-            debug_mode=debug_mode,
-            enable_modules=[__name__],
-        ) as an:
-            assert an
-            async with (
-                tractor.find_actor('root') as portal,
-                portal.open_context(
-                    expect_cancelled,
-                    # echo_back_sequence,
-                    # seq=seq,
-                    # wait_for_cancel=cancel_ctx,
-                    # be_slow=(slow_side == 'child'),
-                    # allow_overruns_side=allow_overruns_side,
-
-                ) as (ctx, sent),
-                ctx.open_stream() as ipc,
-            ):
-                assert sent is None
-
-                seq = list(range(10))
-                for i in seq:
-                    await ipc.send(i)
-                    rx: int = await ipc.receive()
-                    assert rx == i
-
-                await ctx.cancel()
-
-    with pytest.raises(RuntimeError) as excinfo:
-        trio.run(main)
-
-    assert 'Invalid Operation' in repr(excinfo.value)

tests/test_debugger.py

@@ -11,9 +11,11 @@ TODO:
 
 """
 import itertools
+from os import path
 from typing import Optional
 import platform
 import pathlib
+import sys
 import time
 
 import pytest
@@ -23,10 +25,8 @@ from pexpect.exceptions import (
     EOF,
 )
 
-from tractor._testing import (
-    examples_dir,
-)
 from conftest import (
+    examples_dir,
     _ci_env,
 )
 

tests/test_discovery.py

@@ -9,9 +9,10 @@ import itertools
 
 import pytest
 import tractor
-from tractor._testing import tractor_test
 import trio
 
+from conftest import tractor_test
+
 
 @tractor_test
 async def test_reg_then_unreg(reg_addr):

tests/test_docs_examples.py

@@ -11,7 +11,8 @@ import platform
 import shutil
 
 import pytest
-from tractor._testing import (
+
+from conftest import (
     examples_dir,
 )
 

tests/test_infected_asyncio.py

@@ -8,6 +8,7 @@ import builtins
 import itertools
 import importlib
 
+from exceptiongroup import BaseExceptionGroup
 import pytest
 import trio
 import tractor
@@ -17,7 +18,6 @@ from tractor import (
     ContextCancelled,
 )
 from tractor.trionics import BroadcastReceiver
-from tractor._testing import expect_ctxc
 
 
 async def sleep_and_err(
@@ -68,7 +68,7 @@ def test_trio_cancels_aio_on_actor_side(reg_addr):
 async def asyncio_actor(
 
     target: str,
-    expect_err: Exception|None = None
+    expect_err: Optional[Exception] = None
 
 ) -> None:
 
@@ -112,21 +112,10 @@ def test_aio_simple_error(reg_addr):
                 infect_asyncio=True,
             )
 
-    with pytest.raises(
+    with pytest.raises(RemoteActorError) as excinfo:
-        expected_exception=(RemoteActorError, ExceptionGroup),
-    ) as excinfo:
         trio.run(main)
 
     err = excinfo.value
-
-    # might get multiple `trio.Cancelled`s as well inside an inception
-    if isinstance(err, ExceptionGroup):
-        err = next(itertools.dropwhile(
-            lambda exc: not isinstance(exc, tractor.RemoteActorError),
-            err.exceptions
-        ))
-        assert err
-
     assert isinstance(err, RemoteActorError)
     assert err.type == AssertionError
 
@@ -201,8 +190,7 @@ async def trio_ctx(
 
 
 @pytest.mark.parametrize(
-    'parent_cancels',
+    'parent_cancels', [False, True],
-    ['context', 'actor', False],
     ids='parent_actor_cancels_child={}'.format
 )
 def test_context_spawns_aio_task_that_errors(
@@ -226,36 +214,18 @@ def test_context_spawns_aio_task_that_errors(
                     # debug_mode=True,
                     loglevel='cancel',
                 )
-                async with (
+                async with p.open_context(
-                    expect_ctxc(
-                        yay=parent_cancels == 'actor',
-                    ),
-                    p.open_context(
                     trio_ctx,
-                    ) as (ctx, first),
+                ) as (ctx, first):
-                ):
 
                     assert first == 'start'
 
-                    if parent_cancels == 'actor':
+                    if parent_cancels:
                         await p.cancel_actor()
 
-                    elif parent_cancels == 'context':
-                        await ctx.cancel()
-
-                    else:
                     await trio.sleep_forever()
 
-                async with expect_ctxc(
+                return await ctx.result()
-                    yay=parent_cancels == 'actor',
-                ):
-                    await ctx.result()
-
-                if parent_cancels == 'context':
-                    # to tear down sub-acor
-                    await p.cancel_actor()
-
-        return ctx.outcome
 
     if parent_cancels:
         # bc the parent made the cancel request,
@@ -299,22 +269,11 @@ def test_aio_cancelled_from_aio_causes_trio_cancelled(reg_addr):
                 infect_asyncio=True,
             )
 
-    with pytest.raises(
+    with pytest.raises(RemoteActorError) as excinfo:
-        expected_exception=(RemoteActorError, ExceptionGroup),
-    ) as excinfo:
         trio.run(main)
 
-    # might get multiple `trio.Cancelled`s as well inside an inception
-    err = excinfo.value
-    if isinstance(err, ExceptionGroup):
-        err = next(itertools.dropwhile(
-            lambda exc: not isinstance(exc, tractor.RemoteActorError),
-            err.exceptions
-        ))
-        assert err
-
     # ensure boxed error is correct
-    assert err.type == to_asyncio.AsyncioCancelled
+    assert excinfo.value.type == to_asyncio.AsyncioCancelled
 
 
 # TODO: verify open_channel_from will fail on this..

tests/test_inter_peer_cancellation.py

@@ -10,9 +10,6 @@ import pytest
 import trio
 import tractor
 from tractor import (  # typing
-    Actor,
-    current_actor,
-    open_nursery,
     Portal,
     Context,
     ContextCancelled,
@@ -126,9 +123,7 @@ async def error_before_started(
                 await peer_ctx.cancel()
 
 
-def test_do_not_swallow_error_before_started_by_remote_contextcancelled(
+def test_do_not_swallow_error_before_started_by_remote_contextcancelled():
-    debug_mode: bool,
-):
     '''
     Verify that an error raised in a remote context which itself
     opens YET ANOTHER remote context, which it then cancels, does not
@@ -137,9 +132,7 @@ def test_do_not_swallow_error_before_started_by_remote_contextcancelled(
 
     '''
     async def main():
-        async with tractor.open_nursery(
+        async with tractor.open_nursery() as n:
-            debug_mode=debug_mode,
-        ) as n:
             portal = await n.start_actor(
                 'errorer',
                 enable_modules=[__name__],
@@ -220,12 +213,11 @@ async def stream_from_peer(
             # - what about IPC-transport specific errors, should
             #   they bubble from the async for and trigger
             #   other special cases?
-            #
             # NOTE: current ctl flow:
             # - stream raises `trio.EndOfChannel` and
             #   exits the loop
-            # - `.open_context()` will raise the ctxc received
+            # - `.open_context()` will raise the ctxcanc
-            #   from the sleeper.
+            #   received from the sleeper.
             async for msg in stream:
                 assert msg is not None
                 print(msg)
@@ -233,37 +225,25 @@ async def stream_from_peer(
     # NOTE: cancellation of the (sleeper) peer should always
     # cause a `ContextCancelled` raise in this streaming
     # actor.
-    except ContextCancelled as ctxc:
+    except ContextCancelled as ctxerr:
-        ctxerr = ctxc
+        err = ctxerr
-
         assert peer_ctx._remote_error is ctxerr
-        assert peer_ctx._remote_error.msgdata == ctxerr.msgdata
+        assert peer_ctx.canceller == ctxerr.canceller
-
-        # the peer ctx is the canceller even though it's canceller
-        # is the "canceller" XD
-        assert peer_name in peer_ctx.canceller
-
-        assert "canceller" in ctxerr.canceller
 
         # caller peer should not be the cancel requester
         assert not ctx.cancel_called
-        assert not ctx.cancel_acked
+        # XXX can never be true since `._invoke` only
-
-        # XXX can NEVER BE TRUE since `._invoke` only
         # sets this AFTER the nursery block this task
         # was started in, exits.
-        assert not ctx._scope.cancelled_caught
+        assert not ctx.cancelled_caught
 
-        # we never requested cancellation, it was the 'canceller'
+        # we never requested cancellation
-        # peer.
         assert not peer_ctx.cancel_called
-        assert not peer_ctx.cancel_acked
-
         # the `.open_context()` exit definitely caught
         # a cancellation in the internal `Context._scope` since
         # likely the runtime called `_deliver_msg()` after
         # receiving the remote error from the streaming task.
-        assert not peer_ctx._scope.cancelled_caught
+        assert peer_ctx.cancelled_caught
 
         # TODO / NOTE `.canceller` won't have been set yet
         # here because that machinery is inside
@@ -272,11 +252,10 @@ async def stream_from_peer(
         # checkpoint) that cancellation was due to
         # a remote, we COULD assert this here..see,
         # https://github.com/goodboy/tractor/issues/368
-        #
-        # assert 'canceller' in ctx.canceller
 
         # root/parent actor task should NEVER HAVE cancelled us!
         assert not ctx.canceller
+        assert 'canceller' in peer_ctx.canceller
 
         raise
         # TODO: IN THEORY we could have other cases depending on
@@ -290,17 +269,17 @@ async def stream_from_peer(
         # assert ctx.canceller[0] == 'root'
         # assert peer_ctx.canceller[0] == 'sleeper'
 
-    raise RuntimeError('Never triggered local `ContextCancelled` ?!?')
+    raise RuntimeError(
+        'peer never triggered local `ContextCancelled`?'
+    )
 
 
 @pytest.mark.parametrize(
     'error_during_ctxerr_handling',
     [False, True],
-    ids=lambda item: f'rte_during_ctxerr={item}',
 )
 def test_peer_canceller(
     error_during_ctxerr_handling: bool,
-    debug_mode: bool,
 ):
     '''
     Verify that a cancellation triggered by an in-actor-tree peer
@@ -357,7 +336,7 @@ def test_peer_canceller(
     async def main():
         async with tractor.open_nursery(
             # NOTE: to halt the peer tasks on ctxc, uncomment this.
-            debug_mode=debug_mode,
+            # debug_mode=True
         ) as an:
             canceller: Portal = await an.start_actor(
                 'canceller',
@@ -371,7 +350,8 @@ def test_peer_canceller(
                 'just_caller',  # but i just met her?
                 enable_modules=[__name__],
             )
-            root: Actor = current_actor()
+
+            root = tractor.current_actor()
 
             try:
                 async with (
@@ -389,16 +369,15 @@ def test_peer_canceller(
                     ) as (canceller_ctx, sent),
 
                 ):
-                    ctxs: dict[str, Context] = {
+                    ctxs: list[Context] = [
-                        'sleeper': sleeper_ctx,
+                        sleeper_ctx,
-                        'caller': caller_ctx,
+                        caller_ctx,
-                        'canceller': canceller_ctx,
+                        canceller_ctx,
-                    }
+                    ]
 
                     try:
                         print('PRE CONTEXT RESULT')
-                        res = await sleeper_ctx.result()
+                        await sleeper_ctx.result()
-                        assert res
 
                         # should never get here
                         pytest.fail(
@@ -408,19 +387,13 @@ def test_peer_canceller(
                     # should always raise since this root task does
                     # not request the sleeper cancellation ;)
                     except ContextCancelled as ctxerr:
-                        print(
+                        print(f'CAUGHT REMOTE CONTEXT CANCEL {ctxerr}')
-                            'CAUGHT REMOTE CONTEXT CANCEL\n\n'
-                            f'{ctxerr}\n'
-                        )
 
                         # canceller and caller peers should not
                         # have been remotely cancelled.
                         assert canceller_ctx.canceller is None
                         assert caller_ctx.canceller is None
 
-                        # we were not the actor, our peer was
-                        assert not sleeper_ctx.cancel_acked
-
                         assert ctxerr.canceller[0] == 'canceller'
 
                         # XXX NOTE XXX: since THIS `ContextCancelled`
@@ -428,273 +401,123 @@ def test_peer_canceller(
                         # `sleeper.open_context().__aexit__()` this
                         # value is not yet set, however outside this
                         # block it should be.
-                        assert not sleeper_ctx._scope.cancelled_caught
+                        assert not sleeper_ctx.cancelled_caught
 
-                        # CASE_1: error-during-ctxc-handling,
                         if error_during_ctxerr_handling:
                             raise RuntimeError('Simulated error during teardown')
 
-                        # CASE_2: standard teardown inside in `.open_context()` block
                         raise
 
                     # XXX SHOULD NEVER EVER GET HERE XXX
                     except BaseException as berr:
-                        raise
+                        err = berr
-
+                        pytest.fail('did not rx ctx-cancelled error?')
-                        # XXX if needed to debug failure
-                        # _err = berr
-                        # await tractor.pause()
-                        # await trio.sleep_forever()
-
-                        pytest.fail(
-                            'did not rx ctxc ?!?\n\n'
-
-                            f'{berr}\n'
-                        )
-
                     else:
-                        pytest.fail(
+                        pytest.fail('did not rx ctx-cancelled error?')
-                            'did not rx ctxc ?!?\n\n'
-                            f'{ctxs}\n'
-                        )
 
             except (
                 ContextCancelled,
                 RuntimeError,
-            )as loc_err:
+            )as ctxerr:
-                _loc_err = loc_err
+                _err = ctxerr
 
                 # NOTE: the main state to check on `Context` is:
+                # - `.cancelled_caught` (maps to nursery cs)
                 # - `.cancel_called` (bool of whether this side
                 #    requested)
-                # - `.cancel_acked` (bool of whether a ctxc
-                #   response was received due to cancel req).
-                # - `.maybe_error` (highest prio error to raise
-                #    locally)
-                # - `.outcome` (final error or result value)
                 # - `.canceller` (uid of cancel-causing actor-task)
                 # - `._remote_error` (any `RemoteActorError`
                 #    instance from other side of context)
-                # - `._local_error` (any error caught inside the
-                #   `.open_context()` block).
-                #
-                # XXX: Deprecated and internal only
-                # - `.cancelled_caught` (maps to nursery cs)
-                #  - now just use `._scope.cancelled_caught`
-                #    since it maps to the internal (maps to nursery cs)
-                #
                 # TODO: are we really planning to use this tho?
                 # - `._cancel_msg` (any msg that caused the
                 #    cancel)
 
-                # CASE_1: error-during-ctxc-handling,
+                # CASE: error raised during handling of
-                # - far end cancels due to peer 'canceller',
+                # `ContextCancelled` inside `.open_context()`
-                # - `ContextCancelled` relayed to this scope,
+                # block
-                # - inside `.open_context()` ctxc is caught and
-                #   a rte raised instead
-                #
-                # => block should raise the rte but all peers
-                #   should be cancelled by US.
-                #
                 if error_during_ctxerr_handling:
-                    # since we do a rte reraise above, the
+                    assert isinstance(ctxerr, RuntimeError)
-                    # `.open_context()` error handling should have
-                    # raised a local rte, thus the internal
-                    # `.open_context()` enterer task's
-                    # cancel-scope should have raised the RTE, NOT
-                    # a `trio.Cancelled` due to a local
-                    # `._scope.cancel()` call.
-                    assert not sleeper_ctx._scope.cancelled_caught
-
-                    assert isinstance(loc_err, RuntimeError)
-                    print(f'_loc_err: {_loc_err}\n')
-                    # assert sleeper_ctx._local_error is _loc_err
-                    # assert sleeper_ctx._local_error is _loc_err
-                    assert not (
-                        loc_err
-                        is sleeper_ctx.maybe_error
-                        is sleeper_ctx.outcome
-                        is sleeper_ctx._remote_error
-                    )
 
                     # NOTE: this root actor task should have
                     # called `Context.cancel()` on the
                     # `.__aexit__()` to every opened ctx.
-                    for name, ctx in ctxs.items():
+                    for ctx in ctxs:
+                        assert ctx.cancel_called
 
                         # this root actor task should have
                         # cancelled all opened contexts except the
                         # sleeper which is obvi by the "canceller"
                         # peer.
                         re = ctx._remote_error
-                        le = ctx._local_error
+                        if (
-
+                            ctx is sleeper_ctx
-                        assert ctx.cancel_called
+                            or ctx is caller_ctx
-
+                        ):
-                        if ctx is sleeper_ctx:
-                            assert 'canceller' in re.canceller
-                            assert 'sleeper' in ctx.canceller
-
-                        if ctx is canceller_ctx:
                             assert (
                                 re.canceller
                                 ==
-                                root.uid
+                                ctx.canceller
-                            )
-
-                        else:  # the other 2 ctxs
-                            assert (
-                                re.canceller
                                 ==
                                 canceller.channel.uid
                             )
 
-                    # since the sleeper errors while handling a
+                        else:
-                    # peer-cancelled (by ctxc) scenario, we expect
-                    # that the `.open_context()` block DOES call
-                    # `.cancel() (despite in this test case it
-                    # being unecessary).
                             assert (
-                        sleeper_ctx.cancel_called
+                                re.canceller
-                        and
+                                ==
-                        not sleeper_ctx.cancel_acked
+                                ctx.canceller
+                                ==
+                                root.uid
                             )
 
-                # CASE_2: standard teardown inside in `.open_context()` block
+                # CASE: standard teardown inside in `.open_context()` block
-                # - far end cancels due to peer 'canceller',
-                # - `ContextCancelled` relayed to this scope and
-                #   raised locally without any raise-during-handle,
-                #
-                # => inside `.open_context()` ctxc is raised and
-                #   propagated
-                #
                 else:
-                    # since sleeper_ctx.result() IS called above
+                    assert ctxerr.canceller == sleeper_ctx.canceller
-                    # we should have (silently) absorbed the
+                    assert (
-                    # corresponding `ContextCancelled` for it and
+                        ctxerr.canceller[0]
-                    # `._scope.cancel()` should never have been
+                        ==
-                    # called.
+                        sleeper_ctx.canceller[0]
-                    assert not sleeper_ctx._scope.cancelled_caught
+                        ==
-
+                        'canceller'
-                    assert isinstance(loc_err, ContextCancelled)
+                    )
-
-                    # the received remote error's `.canceller`
-                    # will of course be the "canceller" actor BUT
-                    # the canceller set on the local handle to
-                    # `sleeper_ctx` will be the "sleeper" uid
-                    # since it's the actor that relayed us the
-                    # error which was **caused** by the
-                    # "canceller".
-                    assert 'sleeper' in sleeper_ctx.canceller
-                    assert 'canceller' == loc_err.canceller[0]
 
                     # the sleeper's remote error is the error bubbled
                     # out of the context-stack above!
-                    final_err = sleeper_ctx.outcome
+                    re = sleeper_ctx._remote_error
-                    assert (
+                    assert re is ctxerr
-                        final_err is loc_err
-                        is sleeper_ctx.maybe_error
-                        is sleeper_ctx._remote_error
-                    )
-
-                    for name, ctx in ctxs.items():
 
+                    for ctx in ctxs:
                         re: BaseException | None = ctx._remote_error
-                        le: BaseException|None = ctx._local_error
+                        assert re
-                        err = ctx.maybe_error
-                        out = ctx.outcome
-
-                        # every ctx should error!
-                        assert out is err
-
-                        # the recorded local erro should always be
-                        # the same as the one raised by the
-                        # `sleeper_ctx.result()` call
-                        assert (
-                            le
-                            and
-                            le is loc_err
-                        )
 
                         # root doesn't cancel sleeper since it's
                         # cancelled by its peer.
                         if ctx is sleeper_ctx:
-                            assert re
-                            assert (
-                                ctx._remote_error
-                                is ctx.maybe_error
-                                is ctx.outcome
-                                is ctx._local_error
-                            )
-
                             assert not ctx.cancel_called
-                            assert not ctx.cancel_acked
-
                             # since sleeper_ctx.result() IS called
                             # above we should have (silently)
                             # absorbed the corresponding
                             # `ContextCancelled` for it and thus
                             # the logic inside `.cancelled_caught`
                             # should trigger!
-                            assert not ctx._scope.cancelled_caught
+                            assert ctx.cancelled_caught
 
-                        elif ctx in (
+                        elif ctx is caller_ctx:
-                            caller_ctx,
+                            # since its context was remotely
-                            canceller_ctx,
+                            # cancelled, we never needed to
-                        ):
+                            # call `Context.cancel()` bc it was
+                            # done by the peer and also we never 
+                            assert ctx.cancel_called
 
-                            assert not ctx._remote_error
+                            # TODO: figure out the details of
-
+                            # this..
-                            # neither of the `caller/canceller_ctx` should
-                            # have called `ctx.cancel()` bc the
-                            # canceller's task internally issues
-                            # a `Portal.cancel_actor()` to the
-                            # sleeper and thus never should call
-                            # `ctx.cancel()` per say UNLESS the
-                            # sleeper's `.result()` call above
-                            # ctxc exception results in the
-                            # canceller's
-                            # `.open_context().__aexit__()` error
-                            # handling to kick in BEFORE a remote
-                            # error is delivered - which since
-                            # we're asserting what we are above,
-                            # that should normally be the case
-                            # right?
-                            #
-                            assert not ctx.cancel_called
-                            #
-                            # assert ctx.cancel_called
-                            # orig ^
-
-                            # TODO: figure out the details of this..?
                             # if you look the `._local_error` here
                             # is a multi of ctxc + 2 Cancelleds?
-                            # assert not ctx._scope.cancelled_caught
+                            # assert not ctx.cancelled_caught
-
-                            assert (
-                                not ctx.cancel_called
-                                and not ctx.cancel_acked
-                            )
-                            assert not ctx._scope.cancelled_caught
-
-                        # elif ctx is canceller_ctx:
-                        #     assert not ctx._remote_error
-
-                            # XXX NOTE XXX: ONLY the canceller
-                            # will get a self-cancelled outcome
-                            # whilst everyone else gets
-                            # a peer-caused cancellation!
-                            #
-                            # TODO: really we should avoid calling
-                            # .cancel() whenever an interpeer
-                            # cancel takes place since each
-                            # reception of a ctxc
 
                         else:
-                            pytest.fail(
+                            assert ctx.cancel_called
-                                'Uhh wut ctx is this?\n'
+                            assert not ctx.cancelled_caught
-                                f'{ctx}\n'
-                            )
 
                         # TODO: do we even need this flag?
                         # -> each context should have received
@@ -710,24 +533,14 @@ def test_peer_canceller(
                     # `Context.cancel()` SHOULD NOT have been
                     # called inside
                     # `Portal.open_context().__aexit__()`.
-                    assert not (
+                    assert not sleeper_ctx.cancel_called
-                        sleeper_ctx.cancel_called
-                        or
-                        sleeper_ctx.cancel_acked
-                    )
 
                 # XXX NOTE XXX: and see matching comment above but,
-                # the `._scope` is only set by `trio` AFTER the
+                # this flag is set only AFTER the `.open_context()`
-                # `.open_context()` block has exited and should be
+                # has exited and should be set in both outcomes
-                # set in both outcomes including the case where
+                # including the case where ctx-cancel handling
-                # ctx-cancel handling itself errors.
+                # itself errors.
-                assert not sleeper_ctx._scope.cancelled_caught
+                assert sleeper_ctx.cancelled_caught
-                assert _loc_err is sleeper_ctx._local_error
-                assert (
-                    sleeper_ctx.outcome
-                    is sleeper_ctx.maybe_error
-                    is sleeper_ctx._remote_error
-                )
 
                 raise  # always to ensure teardown
 
@@ -741,317 +554,3 @@ def test_peer_canceller(
 
         assert excinfo.value.type == ContextCancelled
         assert excinfo.value.canceller[0] == 'canceller'
-
-
-@tractor.context
-async def basic_echo_server(
-    ctx: Context,
-    peer_name: str = 'stepbro',
-
-) -> None:
-    '''
-    Just the simplest `MsgStream` echo server which resays what
-    you told it but with its uid in front ;)
-
-    '''
-    actor: Actor = tractor.current_actor()
-    uid: tuple = actor.uid
-    await ctx.started(uid)
-    async with ctx.open_stream() as ipc:
-        async for msg in ipc:
-
-            # repack msg pair with our uid
-            # as first element.
-            (
-                client_uid,
-                i,
-            ) = msg
-            resp: tuple = (
-                uid,
-                i,
-            )
-            # OOF! looks like my runtime-error is causing a lockup
-            # assert 0
-            await ipc.send(resp)
-
-
-@tractor.context
-async def serve_subactors(
-    ctx: Context,
-    peer_name: str,
-
-) -> None:
-    async with open_nursery() as an:
-        await ctx.started(peer_name)
-        async with ctx.open_stream() as reqs:
-            async for msg in reqs:
-                peer_name: str = msg
-                peer: Portal = await an.start_actor(
-                    name=peer_name,
-                    enable_modules=[__name__],
-                )
-                print(
-                    'Spawning new subactor\n'
-                    f'{peer_name}\n'
-                    f'|_{peer}\n'
-                )
-                await reqs.send((
-                    peer.chan.uid,
-                    peer.chan.raddr,
-                ))
-
-        print('Spawner exiting spawn serve loop!')
-
-
-@tractor.context
-async def client_req_subactor(
-    ctx: Context,
-    peer_name: str,
-
-    # used to simulate a user causing an error to be raised
-    # directly in thread (like a KBI) to better replicate the
-    # case where a `modden` CLI client would hang afer requesting
-    # a `Context.cancel()` to `bigd`'s wks spawner.
-    reraise_on_cancel: str|None = None,
-
-) -> None:
-    # TODO: other cases to do with sub lifetimes:
-    # -[ ] test that we can have the server spawn a sub
-    #   that lives longer then ctx with this client.
-    # -[ ] test that
-
-    # open ctx with peer spawn server and ask it to spawn a little
-    # bro which we'll then connect and stream with.
-    async with (
-        tractor.find_actor(
-            name='spawn_server',
-            raise_on_none=True,
-
-            # TODO: we should be isolating this from other runs!
-            # => ideally so we can eventually use something like
-            # `pytest-xdist` Bo
-            # registry_addrs=bigd._reg_addrs,
-        ) as spawner,
-
-        spawner.open_context(
-            serve_subactors,
-            peer_name=peer_name,
-        ) as (spawner_ctx, first),
-    ):
-        assert first == peer_name
-        await ctx.started(
-            'yup i had brudder',
-        )
-
-        async with spawner_ctx.open_stream() as reqs:
-
-            # send single spawn request to the server
-            await reqs.send(peer_name)
-            with trio.fail_after(3):
-                (
-                    sub_uid,
-                    sub_raddr,
-                ) = await reqs.receive()
-
-
-            await tell_little_bro(
-                actor_name=sub_uid[0],
-                caller='client',
-            )
-
-            # TODO: test different scope-layers of
-            # cancellation?
-            # with trio.CancelScope() as cs:
-            try:
-                await trio.sleep_forever()
-
-            # TODO: would be super nice to have a special injected
-            # cancel type here (maybe just our ctxc) but using
-            # some native mechanism in `trio` :p
-            except (
-                trio.Cancelled
-            ) as err:
-                _err = err
-                if reraise_on_cancel:
-                    errtype = globals()['__builtins__'][reraise_on_cancel]
-                    assert errtype
-                    to_reraise: BaseException = errtype()
-                    print(f'client re-raising on cancel: {repr(to_reraise)}')
-                    raise err
-
-                raise
-
-            # if cs.cancelled_caught:
-            #     print('client handling expected KBI!')
-            #     await ctx.
-            #     await trio.sleep(
-            #     await tractor.pause()
-            #     await spawner_ctx.cancel()
-
-            # cancel spawned sub-actor directly?
-            # await sub_ctx.cancel()
-
-            # maybe cancel runtime?
-            # await sub.cancel_actor()
-
-
-async def tell_little_bro(
-    actor_name: str,
-    caller: str = ''
-):
-    # contact target actor, do a stream dialog.
-    async with (
-        tractor.wait_for_actor(
-            name=actor_name
-        ) as lb,
-        lb.open_context(
-            basic_echo_server,
-        ) as (sub_ctx, first),
-        sub_ctx.open_stream(
-            basic_echo_server,
-        ) as echo_ipc,
-    ):
-        actor: Actor = current_actor()
-        uid: tuple = actor.uid
-        for i in range(100):
-            msg: tuple = (
-                uid,
-                i,
-            )
-            await echo_ipc.send(msg)
-            resp = await echo_ipc.receive()
-            print(
-                f'{caller} => {actor_name}: {msg}\n'
-                f'{caller} <= {actor_name}: {resp}\n'
-            )
-            (
-                sub_uid,
-                _i,
-            ) = resp
-            assert sub_uid != uid
-            assert _i == i
-
-
-@pytest.mark.parametrize(
-    'raise_client_error',
-    [None, 'KeyboardInterrupt'],
-)
-def test_peer_spawns_and_cancels_service_subactor(
-    debug_mode: bool,
-    raise_client_error: str,
-):
-    # NOTE: this tests for the modden `mod wks open piker` bug
-    # discovered as part of implementing workspace ctx
-    # open-.pause()-ctx.cancel() as part of the CLI..
-
-    # -> start actor-tree (server) that offers sub-actor spawns via
-    #   context API
-    # -> start another full actor-tree (client) which requests to the first to
-    #   spawn over its `@context` ep / api.
-    # -> client actor cancels the context and should exit gracefully
-    #   and the server's spawned child should cancel and terminate!
-    peer_name: str = 'little_bro'
-
-    async def main():
-        async with tractor.open_nursery(
-            # NOTE: to halt the peer tasks on ctxc, uncomment this.
-            debug_mode=debug_mode,
-        ) as an:
-            server: Portal = await an.start_actor(
-                (server_name := 'spawn_server'),
-                enable_modules=[__name__],
-            )
-            print(f'Spawned `{server_name}`')
-
-            client: Portal = await an.start_actor(
-                client_name := 'client',
-                enable_modules=[__name__],
-            )
-            print(f'Spawned `{client_name}`')
-
-            try:
-                async with (
-                    server.open_context(
-                        serve_subactors,
-                        peer_name=peer_name,
-                    ) as (spawn_ctx, first),
-
-                    client.open_context(
-                        client_req_subactor,
-                        peer_name=peer_name,
-                        reraise_on_cancel=raise_client_error,
-                    ) as (client_ctx, client_says),
-                ):
-                    print(
-                        f'Server says: {first}\n'
-                        f'Client says: {client_says}\n'
-                    )
-
-                    # attach to client-requested-to-spawn
-                    # (grandchild of this root actor) "little_bro"
-                    # and ensure we can also use it as an echo
-                    # server.
-                    async with tractor.wait_for_actor(
-                        name=peer_name,
-                    ) as sub:
-                        assert sub
-
-                    print(
-                        'Sub-spawn came online\n'
-                        f'portal: {sub}\n'
-                        f'.uid: {sub.actor.uid}\n'
-                        f'chan.raddr: {sub.chan.raddr}\n'
-                    )
-                    await tell_little_bro(
-                        actor_name=peer_name,
-                        caller='root',
-                    )
-
-                    # signal client to raise a KBI
-                    await client_ctx.cancel()
-                    print('root cancelled client, checking that sub-spawn is down')
-
-                    async with tractor.find_actor(
-                        name=peer_name,
-                    ) as sub:
-                        assert not sub
-
-                    print('root cancelling server/client sub-actors')
-
-                    # await tractor.pause()
-                    res = await client_ctx.result(hide_tb=False)
-                    assert isinstance(res, ContextCancelled)
-                    assert client_ctx.cancel_acked
-                    assert res.canceller == current_actor().uid
-
-                    await spawn_ctx.cancel()
-                    # await server.cancel_actor()
-
-            # since we called `.cancel_actor()`, `.cancel_ack`
-            # will not be set on the ctx bc `ctx.cancel()` was not
-            # called directly fot this confext.
-            except ContextCancelled as ctxc:
-                print('caught ctxc from contexts!')
-                assert ctxc.canceller == current_actor().uid
-                assert ctxc is spawn_ctx.outcome
-                assert ctxc is spawn_ctx.maybe_error
-                raise
-
-            # assert spawn_ctx.cancel_acked
-            assert spawn_ctx.cancel_acked
-            assert client_ctx.cancel_acked
-
-            await client.cancel_actor()
-            await server.cancel_actor()
-
-            # WOA WOA WOA! we need this to close..!!!??
-            # that's super bad XD
-
-            # TODO: why isn't this working!?!?
-            # we're now outside the `.open_context()` block so
-            # the internal `Context._scope: CancelScope` should be
-            # gracefully "closed" ;)
-
-            # assert spawn_ctx.cancelled_caught
-
-    trio.run(main)

tests/test_legacy_one_way_streaming.py

@@ -9,7 +9,7 @@ import trio
 import tractor
 import pytest
 
-from tractor._testing import tractor_test
+from conftest import tractor_test
 
 
 def test_must_define_ctx():

tests/test_local.py

@@ -7,7 +7,7 @@ import pytest
 import trio
 import tractor
 
-from tractor._testing import tractor_test
+from conftest import tractor_test
 
 
 @pytest.mark.trio

tests/test_multi_program.py

@@ -7,10 +7,8 @@ import time
 import pytest
 import trio
 import tractor
-from tractor._testing import (
-    tractor_test,
-)
 from conftest import (
+    tractor_test,
     sig_prog,
     _INT_SIGNAL,
     _INT_RETURN_CODE,

tests/test_pubsub.py

@@ -5,7 +5,8 @@ import pytest
 import trio
 import tractor
 from tractor.experimental import msgpub
-from tractor._testing import tractor_test
+
+from conftest import tractor_test
 
 
 def test_type_checks():

tests/test_rpc.py

@@ -1,8 +1,6 @@
-'''
+"""
-RPC (or maybe better labelled as "RTS: remote task scheduling"?)
+RPC related
-related API and error checks.
+"""
-
-'''
 import itertools
 
 import pytest
@@ -44,13 +42,8 @@ async def short_sleep():
         (['tmp_mod'], 'import doggy', ModuleNotFoundError),
         (['tmp_mod'], '4doggy', SyntaxError),
     ],
-    ids=[
+    ids=['no_mods', 'this_mod', 'this_mod_bad_func', 'fail_to_import',
-        'no_mods',
+         'fail_on_syntax'],
-        'this_mod',
-        'this_mod_bad_func',
-        'fail_to_import',
-        'fail_on_syntax',
-    ],
 )
 def test_rpc_errors(reg_addr, to_call, testdir):
     """Test errors when making various RPC requests to an actor
@@ -112,16 +105,14 @@ def test_rpc_errors(reg_addr, to_call, testdir):
         run()
     else:
         # underlying errors aren't propagated upwards (yet)
-        with pytest.raises(
+        with pytest.raises(remote_err) as err:
-            expected_exception=(remote_err, ExceptionGroup),
-        ) as err:
             run()
 
         # get raw instance from pytest wrapper
         value = err.value
 
         # might get multiple `trio.Cancelled`s as well inside an inception
-        if isinstance(value, ExceptionGroup):
+        if isinstance(value, trio.MultiError):
             value = next(itertools.dropwhile(
                 lambda exc: not isinstance(exc, tractor.RemoteActorError),
                 value.exceptions

tests/test_runtime.py

@@ -8,7 +8,7 @@ import pytest
 import trio
 import tractor
 
-from tractor._testing import tractor_test
+from conftest import tractor_test
 
 
 _file_path: str = ''
@@ -64,8 +64,7 @@ async def test_lifetime_stack_wipes_tmpfile(
 
     except (
         tractor.RemoteActorError,
-        # tractor.BaseExceptionGroup,
+        tractor.BaseExceptionGroup,
-        BaseExceptionGroup,
     ):
         pass
 

tests/test_spawning.py

@@ -8,7 +8,7 @@ import pytest
 import trio
 import tractor
 
-from tractor._testing import tractor_test
+from conftest import tractor_test
 
 data_to_pass_down = {'doggy': 10, 'kitty': 4}
 

tests/test_trioisms.py

@@ -5,7 +5,7 @@ want to see changed.
 '''
 import pytest
 import trio
-from trio import TaskStatus
+from trio_typing import TaskStatus
 
 
 @pytest.mark.parametrize(

tractor/_entry.py

@@ -106,29 +106,25 @@ def _trio_main(
     Entry point for a `trio_run_in_process` subactor.
 
     '''
+    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}")
+        get_console_log(actor.loglevel)
+
+    log.info(
+        f"Started {actor.uid}")
+
     _state._current_actor = actor
+
+    log.debug(f"parent_addr is {parent_addr}")
     trio_main = partial(
         async_main,
         actor,
         parent_addr=parent_addr
     )
 
-    if actor.loglevel is not None:
-        get_console_log(actor.loglevel)
-        import os
-        actor_info: str = (
-            f'|_{actor}\n'
-            f'  uid: {actor.uid}\n'
-            f'  pid: {os.getpid()}\n'
-            f'  parent_addr: {parent_addr}\n'
-            f'  loglevel: {actor.loglevel}\n'
-        )
-        log.info(
-            'Started new trio process:\n'
-            +
-            actor_info
-        )
-
     try:
         if infect_asyncio:
             actor._infected_aio = True
@@ -136,15 +132,7 @@ def _trio_main(
         else:
             trio.run(trio_main)
     except KeyboardInterrupt:
-        log.cancel(
+        log.cancel(f"Actor {actor.uid} received KBI")
-            'Actor received KBI\n'
-            +
-            actor_info
-        )
 
     finally:
-        log.info(
+        log.info(f"Actor {actor.uid} terminated")
-            'Actor terminated\n'
-            +
-            actor_info
-        )

tractor/_exceptions.py

@@ -27,21 +27,17 @@ from typing import (
     Type,
     TYPE_CHECKING,
 )
-import textwrap
 import traceback
 
+import exceptiongroup as eg
 import trio
 
-from tractor._state import current_actor
+from ._state import current_actor
-from tractor.log import get_logger
 
 if TYPE_CHECKING:
     from ._context import Context
-    from .log import StackLevelAdapter
     from ._stream import MsgStream
-    from ._ipc import Channel
+    from .log import StackLevelAdapter
-
-log = get_logger('tractor')
 
 _this_mod = importlib.import_module(__name__)
 
@@ -50,25 +46,6 @@ class ActorFailure(Exception):
     "General actor failure"
 
 
-class InternalError(RuntimeError):
-    '''
-    Entirely unexpected internal machinery error indicating
-    a completely invalid state or interface.
-
-    '''
-
-_body_fields: list[str] = [
-    'src_actor_uid',
-    'canceller',
-    'sender',
-]
-
-_msgdata_keys: list[str] = [
-    'type_str',
-] + _body_fields
-
-
-
 # TODO: rename to just `RemoteError`?
 class RemoteActorError(Exception):
     '''
@@ -80,10 +57,6 @@ class RemoteActorError(Exception):
     a special "error" IPC msg sent by some remote actor-runtime.
 
     '''
-    reprol_fields: list[str] = [
-        'src_actor_uid',
-    ]
-
     def __init__(
         self,
         message: str,
@@ -101,83 +74,24 @@ class RemoteActorError(Exception):
         # - .remote_type
         # also pertains to our long long oustanding issue XD
         # https://github.com/goodboy/tractor/issues/5
-        self.boxed_type: str = suberror_type
+        self.type: str = suberror_type
         self.msgdata: dict[str, Any] = msgdata
 
-    @property
-    def type(self) -> str:
-        return self.boxed_type
-
-    @property
-    def type_str(self) -> str:
-        return str(type(self.boxed_type).__name__)
-
     @property
     def src_actor_uid(self) -> tuple[str, str] | None:
         return self.msgdata.get('src_actor_uid')
 
-    @property
-    def tb_str(
-        self,
-        indent: str = ' '*3,
-    ) -> str:
-        if remote_tb := self.msgdata.get('tb_str'):
-            return textwrap.indent(
-                remote_tb,
-                prefix=indent,
-            )
-
-        return ''
-
-    def reprol(self) -> str:
-        '''
-        Represent this error for "one line" display, like in
-        a field of our `Context.__repr__()` output.
-
-        '''
-        _repr: str = f'{type(self).__name__}('
-        for key in self.reprol_fields:
-            val: Any|None = self.msgdata.get(key)
-            if val:
-                _repr += f'{key}={repr(val)} '
-
-        return _repr
-
     def __repr__(self) -> str:
-
+        if remote_tb := self.msgdata.get('tb_str'):
-        fields: str = ''
+            pformat(remote_tb)
-        for key in _body_fields:
-            val: str|None = self.msgdata.get(key)
-            if val:
-                fields += f'{key}={val}\n'
-
-        fields: str = textwrap.indent(
-            fields,
-            # prefix=' '*2,
-            prefix=' |_',
-        )
-        indent: str = ''*1
-        body: str = (
-            f'{fields}'
-            f'  |\n'
-            f'   ------ - ------\n\n'
-            f'{self.tb_str}\n'
-            f'   ------ - ------\n'
-            f' _|\n'
-        )
-            # f'|\n'
-            # f'         |\n'
-        if indent:
-            body: str = textwrap.indent(
-                body,
-                prefix=indent,
-            )
             return (
-            f'<{type(self).__name__}(\n'
+                f'{type(self).__name__}(\n'
-            f'{body}'
+                f'msgdata={pformat(self.msgdata)}\n'
-            ')>'
+                ')'
             )
 
+        return super().__repr__()
+
     # TODO: local recontruction of remote exception deats
     # def unbox(self) -> BaseException:
     #     ...
@@ -185,9 +99,8 @@ class RemoteActorError(Exception):
 
 class InternalActorError(RemoteActorError):
     '''
-    (Remote) internal `tractor` error indicating failure of some
+    Remote internal ``tractor`` error indicating
-    primitive, machinery state or lowlevel task that should never
+    failure of some primitive or machinery.
-    occur.
 
     '''
 
@@ -198,43 +111,12 @@ class ContextCancelled(RemoteActorError):
     ``Portal.cancel_actor()`` or ``Context.cancel()``.
 
     '''
-    reprol_fields: list[str] = [
-        'canceller',
-    ]
     @property
     def canceller(self) -> tuple[str, str] | None:
-        '''
-        Return the (maybe) `Actor.uid` for the requesting-author
-        of this ctxc.
-
-        Emit a warning msg when `.canceller` has not been set,
-        which usually idicates that a `None` msg-loop setinel was
-        sent before expected in the runtime. This can happen in
-        a few situations:
-
-        - (simulating) an IPC transport network outage
-        - a (malicious) pkt sent specifically to cancel an actor's
-          runtime non-gracefully without ensuring ongoing RPC tasks are 
-          incrementally cancelled as is done with:
-          `Actor`
-          |_`.cancel()`
-          |_`.cancel_soon()`
-          |_`._cancel_task()`
-
-        '''
         value = self.msgdata.get('canceller')
         if value:
             return tuple(value)
 
-        log.warning(
-            'IPC Context cancelled without a requesting actor?\n'
-            'Maybe the IPC transport ended abruptly?\n\n'
-            f'{self}'
-        )
-
-    # to make `.__repr__()` work uniformly
-    # src_actor_uid = canceller
-
 
 class TransportClosed(trio.ClosedResourceError):
     "Underlying channel transport was closed prior to use"
@@ -256,9 +138,6 @@ class StreamOverrun(
     RemoteActorError,
     trio.TooSlowError,
 ):
-    reprol_fields: list[str] = [
-        'sender',
-    ]
     '''
     This stream was overrun by sender
 
@@ -306,7 +185,6 @@ def pack_error(
     ] = {
         'tb_str': tb_str,
         'type_str': type(exc).__name__,
-        'boxed_type': type(exc).__name__,
         'src_actor_uid': current_actor().uid,
     }
 
@@ -321,6 +199,7 @@ def pack_error(
     ):
         error_msg.update(exc.msgdata)
 
+
     pkt: dict = {'error': error_msg}
     if cid:
         pkt['cid'] = cid
@@ -331,10 +210,8 @@ def pack_error(
 def unpack_error(
 
     msg: dict[str, Any],
-
+    chan=None,
-    chan: Channel|None = None,
+    err_type=RemoteActorError,
-    box_type: RemoteActorError = RemoteActorError,
-
     hide_tb: bool = True,
 
 ) -> None|Exception:
@@ -358,20 +235,18 @@ def unpack_error(
     # retrieve the remote error's msg encoded details
     tb_str: str = error_dict.get('tb_str', '')
     message: str = f'{chan.uid}\n' + tb_str
-    type_name: str = (
+    type_name: str = error_dict['type_str']
-        error_dict.get('type_str')
-        or error_dict['boxed_type']
-    )
     suberror_type: Type[BaseException] = Exception
 
     if type_name == 'ContextCancelled':
-        box_type = ContextCancelled
+        err_type = ContextCancelled
-        suberror_type = box_type
+        suberror_type = err_type
 
     else:  # try to lookup a suitable local error type
         for ns in [
             builtins,
             _this_mod,
+            eg,
             trio,
         ]:
             if suberror_type := getattr(
@@ -381,7 +256,7 @@ def unpack_error(
             ):
                 break
 
-    exc = box_type(
+    exc = err_type(
         message,
         suberror_type=suberror_type,
 
@@ -394,13 +269,12 @@ def unpack_error(
 
 def is_multi_cancelled(exc: BaseException) -> bool:
     '''
-    Predicate to determine if a possible ``BaseExceptionGroup`` contains
+    Predicate to determine if a possible ``eg.BaseExceptionGroup`` contains
     only ``trio.Cancelled`` sub-exceptions (and is likely the result of
     cancelling a collection of subtasks.
 
     '''
-    # if isinstance(exc, eg.BaseExceptionGroup):
+    if isinstance(exc, eg.BaseExceptionGroup):
-    if isinstance(exc, BaseExceptionGroup):
         return exc.subgroup(
             lambda exc: isinstance(exc, trio.Cancelled)
         ) is not None
@@ -413,63 +287,37 @@ def _raise_from_no_key_in_msg(
     msg: dict,
     src_err: KeyError,
     log: StackLevelAdapter,  # caller specific `log` obj
-
     expect_key: str = 'yield',
     stream: MsgStream | None = None,
 
-    # allow "deeper" tbs when debugging B^o
-    hide_tb: bool = True,
-
 ) -> bool:
     '''
-    Raise an appopriate local error when a
+    Raise an appopriate local error when a `MsgStream` msg arrives
-    `MsgStream` msg arrives which does not
+    which does not contain the expected (under normal operation)
-    contain the expected (at least under normal
+    `'yield'` field.
-    operation) `'yield'` field.
-
-    `Context` and any embedded `MsgStream` termination,
-    as well as remote task errors are handled in order
-    of priority as:
-
-    - any 'error' msg is re-boxed and raised locally as
-      -> `RemoteActorError`|`ContextCancelled`
-
-    - a `MsgStream` 'stop' msg is constructed, assigned
-      and raised locally as -> `trio.EndOfChannel`
-
-    - All other mis-keyed msgss (like say a "final result"
-      'return' msg, normally delivered from `Context.result()`)
-      are re-boxed inside a `MessagingError` with an explicit
-      exc content describing the missing IPC-msg-key.
 
     '''
-    __tracebackhide__: bool = hide_tb
+    __tracebackhide__: bool = True
 
-    # an internal error should never get here
+    # internal error should never get here
     try:
         cid: str = msg['cid']
     except KeyError as src_err:
         raise MessagingError(
             f'IPC `Context` rx-ed msg without a ctx-id (cid)!?\n'
-            f'cid: {cid}\n\n'
+            f'cid: {cid}\n'
-
+            'received msg:\n'
             f'{pformat(msg)}\n'
         ) from src_err
 
     # TODO: test that shows stream raising an expected error!!!
-
-    # raise the error message in a boxed exception type!
     if msg.get('error'):
+        # raise the error message
         raise unpack_error(
             msg,
             ctx.chan,
-            hide_tb=hide_tb,
-
         ) from None
 
-    # `MsgStream` termination msg.
-    # TODO: does it make more sense to pack 
-    # the stream._eoc outside this in the calleer always?
     elif (
         msg.get('stop')
         or (
@@ -482,26 +330,29 @@ def _raise_from_no_key_in_msg(
             f'cid: {cid}\n'
         )
 
+        # XXX: important to set so that a new ``.receive()``
+        # call (likely by another task using a broadcast receiver)
+        # doesn't accidentally pull the ``return`` message
+        # value out of the underlying feed mem chan!
+        stream._eoc: bool = True
+
         # TODO: if the a local task is already blocking on
         # a `Context.result()` and thus a `.receive()` on the
         # rx-chan, we close the chan and set state ensuring that
         # an eoc is raised!
 
+        # # when the send is closed we assume the stream has
+        # # terminated and signal this local iterator to stop
+        # await stream.aclose()
+
         # XXX: this causes ``ReceiveChannel.__anext__()`` to
         # raise a ``StopAsyncIteration`` **and** in our catch
         # block below it will trigger ``.aclose()``.
-        eoc = trio.EndOfChannel(
+        raise trio.EndOfChannel(
-            f'Context stream ended due to msg:\n\n'
+            f'Context stream ended due to msg:\n'
-            f'{pformat(msg)}\n'
+            f'{pformat(msg)}'
-        )
+        ) from src_err
-        # XXX: important to set so that a new `.receive()`
-        # call (likely by another task using a broadcast receiver)
-        # doesn't accidentally pull the `return` message
-        # value out of the underlying feed mem chan which is
-        # destined for the `Context.result()` call during ctx-exit!
-        stream._eoc: Exception = eoc
 
-        raise eoc from src_err
 
     if (
         stream

tractor/_ipc.py

@@ -19,33 +19,35 @@ Inter-process comms abstractions
 
 """
 from __future__ import annotations
+import struct
+import platform
+from pprint import pformat
 from collections.abc import (
     AsyncGenerator,
     AsyncIterator,
 )
-from contextlib import asynccontextmanager as acm
-import platform
-from pprint import pformat
-import struct
 import typing
 from typing import (
     Any,
     runtime_checkable,
+    Optional,
     Protocol,
     Type,
     TypeVar,
 )
 
-import msgspec
 from tricycle import BufferedReceiveStream
+import msgspec
 import trio
+from async_generator import asynccontextmanager
 
-from tractor.log import get_logger
+from .log import get_logger
-from tractor._exceptions import TransportClosed
+from ._exceptions import TransportClosed
-
 log = get_logger(__name__)
 
+
 _is_windows = platform.system() == 'Windows'
+log = get_logger(__name__)
 
 
 def get_stream_addrs(stream: trio.SocketStream) -> tuple:
@@ -111,13 +113,6 @@ class MsgpackTCPStream(MsgTransport):
     using the ``msgspec`` codec lib.
 
     '''
-    layer_key: int = 4
-    name_key: str = 'tcp'
-
-    # TODO: better naming for this?
-    # -[ ] check how libp2p does naming for such things?
-    codec_key: str = 'msgpack'
-
     def __init__(
         self,
         stream: trio.SocketStream,
@@ -205,17 +200,7 @@ class MsgpackTCPStream(MsgTransport):
                 else:
                     raise
 
-    async def send(
+    async def send(self, msg: Any) -> None:
-        self,
-        msg: Any,
-
-        # hide_tb: bool = False,
-    ) -> None:
-        '''
-        Send a msgpack coded blob-as-msg over TCP.
-
-        '''
-        # __tracebackhide__: bool = hide_tb
         async with self._send_lock:
 
             bytes_data: bytes = self.encode(msg)
@@ -283,7 +268,7 @@ class Channel:
     def __init__(
 
         self,
-        destaddr: tuple[str, int]|None,
+        destaddr: Optional[tuple[str, int]],
 
         msg_transport_type_key: tuple[str, str] = ('msgpack', 'tcp'),
 
@@ -301,14 +286,14 @@ class Channel:
 
         # Either created in ``.connect()`` or passed in by
         # user in ``.from_stream()``.
-        self._stream: trio.SocketStream|None = None
+        self._stream: Optional[trio.SocketStream] = None
-        self._transport: MsgTransport|None = None
+        self.msgstream: Optional[MsgTransport] = None
 
         # set after handshake - always uid of far end
-        self.uid: tuple[str, str]|None = None
+        self.uid: Optional[tuple[str, str]] = None
 
         self._agen = self._aiter_recv()
-        self._exc: Exception|None = None  # set if far end actor errors
+        self._exc: Optional[Exception] = None  # set if far end actor errors
         self._closed: bool = False
 
         # flag set by ``Portal.cancel_actor()`` indicating remote
@@ -316,15 +301,6 @@ class Channel:
         # runtime.
         self._cancel_called: bool = False
 
-    @property
-    def msgstream(self) -> MsgTransport:
-        log.info('`Channel.msgstream` is an old name, use `._transport`')
-        return self._transport
-
-    @property
-    def transport(self) -> MsgTransport:
-        return self._transport
-
     @classmethod
     def from_stream(
         cls,
@@ -334,44 +310,40 @@ class Channel:
     ) -> Channel:
 
         src, dst = get_stream_addrs(stream)
-        chan = Channel(
+        chan = Channel(destaddr=dst, **kwargs)
-            destaddr=dst,
-            **kwargs,
-        )
 
         # set immediately here from provided instance
-        chan._stream: trio.SocketStream = stream
+        chan._stream = stream
         chan.set_msg_transport(stream)
         return chan
 
     def set_msg_transport(
         self,
         stream: trio.SocketStream,
-        type_key: tuple[str, str]|None = None,
+        type_key: Optional[tuple[str, str]] = None,
 
     ) -> MsgTransport:
         type_key = type_key or self._transport_key
-        self._transport = get_msg_transport(type_key)(stream)
+        self.msgstream = get_msg_transport(type_key)(stream)
-        return self._transport
+        return self.msgstream
 
     def __repr__(self) -> str:
-        if not self._transport:
+        if self.msgstream:
-            return '<Channel with inactive transport?>'
-
             return repr(
-            self._transport.stream.socket._sock
+                self.msgstream.stream.socket._sock
             ).replace(  # type: ignore
                 "socket.socket",
                 "Channel",
             )
+        return object.__repr__(self)
 
     @property
-    def laddr(self) -> tuple[str, int]|None:
+    def laddr(self) -> Optional[tuple[str, int]]:
-        return self._transport.laddr if self._transport else None
+        return self.msgstream.laddr if self.msgstream else None
 
     @property
-    def raddr(self) -> tuple[str, int]|None:
+    def raddr(self) -> Optional[tuple[str, int]]:
-        return self._transport.raddr if self._transport else None
+        return self.msgstream.raddr if self.msgstream else None
 
     async def connect(
         self,
@@ -390,42 +362,29 @@ class Channel:
             *destaddr,
             **kwargs
         )
-        transport = self.set_msg_transport(stream)
+        msgstream = self.set_msg_transport(stream)
 
         log.transport(
-            f'Opened channel[{type(transport)}]: {self.laddr} -> {self.raddr}'
+            f'Opened channel[{type(msgstream)}]: {self.laddr} -> {self.raddr}'
         )
-        return transport
+        return msgstream
 
-    async def send(
+    async def send(self, item: Any) -> None:
-        self,
-        payload: Any,
 
-        # hide_tb: bool = False,
-
-    ) -> None:
-        '''
-        Send a coded msg-blob over the transport.
-
-        '''
-        # __tracebackhide__: bool = hide_tb
         log.transport(
             '=> send IPC msg:\n\n'
-            f'{pformat(payload)}\n'
+            f'{pformat(item)}\n'
         )  # type: ignore
-        assert self._transport
+        assert self.msgstream
 
-        await self._transport.send(
+        await self.msgstream.send(item)
-            payload,
-            # hide_tb=hide_tb,
-        )
 
     async def recv(self) -> Any:
-        assert self._transport
+        assert self.msgstream
-        return await self._transport.recv()
+        return await self.msgstream.recv()
 
         # try:
-        #     return await self._transport.recv()
+        #     return await self.msgstream.recv()
         # except trio.BrokenResourceError:
         #     if self._autorecon:
         #         await self._reconnect()
@@ -438,8 +397,8 @@ class Channel:
             f'Closing channel to {self.uid} '
             f'{self.laddr} -> {self.raddr}'
         )
-        assert self._transport
+        assert self.msgstream
-        await self._transport.stream.aclose()
+        await self.msgstream.stream.aclose()
         self._closed = True
 
     async def __aenter__(self):
@@ -490,16 +449,16 @@ class Channel:
         Async iterate items from underlying stream.
 
         '''
-        assert self._transport
+        assert self.msgstream
         while True:
             try:
-                async for item in self._transport:
+                async for item in self.msgstream:
                     yield item
                     # sent = yield item
                     # if sent is not None:
                     #     # optimization, passing None through all the
                     #     # time is pointless
-                    #     await self._transport.send(sent)
+                    #     await self.msgstream.send(sent)
             except trio.BrokenResourceError:
 
                 # if not self._autorecon:
@@ -512,10 +471,10 @@ class Channel:
             #     continue
 
     def connected(self) -> bool:
-        return self._transport.connected() if self._transport else False
+        return self.msgstream.connected() if self.msgstream else False
 
 
-@acm
+@asynccontextmanager
 async def _connect_chan(
     host: str, port: int
 ) -> typing.AsyncGenerator[Channel, None]:

tractor/_portal.py

@@ -24,35 +24,42 @@ OS processes, possibly on different (hardware) hosts.
 
 '''
 from __future__ import annotations
-from contextlib import asynccontextmanager as acm
 import importlib
 import inspect
 from typing import (
-    Any,
+    Any, Optional,
-    Callable,
+    Callable, AsyncGenerator,
-    AsyncGenerator,
+    Type,
-    # Type,
 )
 from functools import partial
 from dataclasses import dataclass
 import warnings
 
 import trio
+from async_generator import asynccontextmanager
 
 from .trionics import maybe_open_nursery
+from .devx import (
+    # acquire_debug_lock,
+    # pause,
+    maybe_wait_for_debugger,
+)
 from ._state import (
     current_actor,
+    debug_mode,
 )
 from ._ipc import Channel
 from .log import get_logger
 from .msg import NamespacePath
 from ._exceptions import (
+    _raise_from_no_key_in_msg,
     unpack_error,
     NoResult,
+    ContextCancelled,
+    RemoteActorError,
 )
 from ._context import (
     Context,
-    open_context_from_portal,
 )
 from ._streaming import (
     MsgStream,
@@ -62,35 +69,18 @@ from ._streaming import (
 log = get_logger(__name__)
 
 
-# TODO: rename to `unwrap_result()` and use
-# `._raise_from_no_key_in_msg()` (after tweak to
-# accept a `chan: Channel` arg) in key block!
 def _unwrap_msg(
     msg: dict[str, Any],
-    channel: Channel,
+    channel: Channel
-
-    hide_tb: bool = True,
 
 ) -> Any:
-    '''
+    __tracebackhide__ = True
-    Unwrap a final result from a `{return: <Any>}` IPC msg.
-
-    '''
-    __tracebackhide__: bool = hide_tb
-
     try:
         return msg['return']
     except KeyError as ke:
-
         # internal error should never get here
-        assert msg.get('cid'), (
+        assert msg.get('cid'), "Received internal error at portal?"
-            "Received internal error at portal?"
+        raise unpack_error(msg, channel) from ke
-        )
-
-        raise unpack_error(
-            msg,
-            channel
-        ) from ke
 
 
 class Portal:
@@ -117,9 +107,9 @@ class Portal:
     cancel_timeout: float = 0.5
 
     def __init__(self, channel: Channel) -> None:
-        self.chan = channel
+        self.channel = channel
         # during the portal's lifetime
-        self._result_msg: dict|None = None
+        self._result_msg: Optional[dict] = None
 
         # When set to a ``Context`` (when _submit_for_result is called)
         # it is expected that ``result()`` will be awaited at some
@@ -128,18 +118,6 @@ class Portal:
         self._streams: set[MsgStream] = set()
         self.actor = current_actor()
 
-    @property
-    def channel(self) -> Channel:
-        '''
-        Proxy to legacy attr name..
-
-        Consider the shorter `Portal.chan` instead of `.channel` ;)
-        '''
-        log.debug(
-            'Consider the shorter `Portal.chan` instead of `.channel` ;)'
-        )
-        return self.chan
-
     async def _submit_for_result(
         self,
         ns: str,
@@ -147,14 +125,14 @@ class Portal:
         **kwargs
     ) -> None:
 
-        assert self._expect_result is None, (
+        assert self._expect_result is None, \
                 "A pending main result has already been submitted"
-        )
 
         self._expect_result = await self.actor.start_remote_task(
             self.channel,
-            nsf=NamespacePath(f'{ns}:{func}'),
+            ns,
-            kwargs=kwargs
+            func,
+            kwargs
         )
 
     async def _return_once(
@@ -164,7 +142,7 @@ class Portal:
     ) -> dict[str, Any]:
 
         assert ctx._remote_func_type == 'asyncfunc'  # single response
-        msg: dict = await ctx._recv_chan.receive()
+        msg = await ctx._recv_chan.receive()
         return msg
 
     async def result(self) -> Any:
@@ -195,10 +173,7 @@ class Portal:
                 self._expect_result
             )
 
-        return _unwrap_msg(
+        return _unwrap_msg(self._result_msg, self.channel)
-            self._result_msg,
-            self.channel,
-        )
 
     async def _cancel_streams(self):
         # terminate all locally running async generator
@@ -240,33 +215,26 @@ class Portal:
         purpose.
 
         '''
-        chan: Channel = self.channel
+        if not self.channel.connected():
-        if not chan.connected():
+            log.cancel("This channel is already closed can't cancel")
-            log.runtime(
-                'This channel is already closed, skipping cancel request..'
-            )
             return False
 
-        reminfo: str = (
-            f'`Portal.cancel_actor()` => {self.channel.uid}\n'
-            f' |_{chan}\n'
-        )
         log.cancel(
-            f'Sending runtime `.cancel()` request to peer\n\n'
+            f"Sending actor cancel request to {self.channel.uid} on "
-            f'{reminfo}'
+            f"{self.channel}")
-        )
+
+        self.channel._cancel_called = True
 
-        self.channel._cancel_called: bool = True
         try:
             # send cancel cmd - might not get response
             # XXX: sure would be nice to make this work with
             # a proper shield
             with trio.move_on_after(
                 timeout
-                or
+                or self.cancel_timeout
-                self.cancel_timeout
             ) as cs:
-                cs.shield: bool = True
+                cs.shield = True
+
                 await self.run_from_ns(
                     'self',
                     'cancel',
@@ -274,12 +242,7 @@ class Portal:
                 return True
 
             if cs.cancelled_caught:
-                # may timeout and we never get an ack (obvi racy)
+                log.cancel(f"May have failed to cancel {self.channel.uid}")
-                # but that doesn't mean it wasn't cancelled.
-                log.debug(
-                    'May have failed to cancel peer?\n'
-                    f'{reminfo}'
-                )
 
             # if we get here some weird cancellation case happened
             return False
@@ -288,11 +251,9 @@ class Portal:
             trio.ClosedResourceError,
             trio.BrokenResourceError,
         ):
-            log.debug(
+            log.cancel(
-                'IPC chan for actor already closed or broken?\n\n'
+                f"{self.channel} for {self.channel.uid} was already "
-                f'{self.channel.uid}\n'
+                "closed or broken?")
-                f' |_{self.channel}\n'
-            )
             return False
 
     async def run_from_ns(
@@ -313,31 +274,25 @@ class Portal:
 
             A special namespace `self` can be used to invoke `Actor`
             instance methods in the remote runtime. Currently this
-          should only ever be used for `Actor` (method) runtime
+            should only be used solely for ``tractor`` runtime
-          internals!
+            internals.
 
         '''
-        nsf = NamespacePath(
-            f'{namespace_path}:{function_name}'
-        )
         ctx = await self.actor.start_remote_task(
-            chan=self.channel,
+            self.channel,
-            nsf=nsf,
+            namespace_path,
-            kwargs=kwargs,
+            function_name,
+            kwargs,
         )
         ctx._portal = self
         msg = await self._return_once(ctx)
-        return _unwrap_msg(
+        return _unwrap_msg(msg, self.channel)
-            msg,
-            self.channel,
-        )
 
     async def run(
         self,
         func: str,
-        fn_name: str|None = None,
+        fn_name: Optional[str] = None,
         **kwargs
-
     ) -> Any:
         '''
         Submit a remote function to be scheduled and run by actor, in
@@ -356,9 +311,8 @@ class Portal:
                 DeprecationWarning,
                 stacklevel=2,
             )
-            fn_mod_path: str = func
+            fn_mod_path = func
             assert isinstance(fn_name, str)
-            nsf = NamespacePath(f'{fn_mod_path}:{fn_name}')
 
         else:  # function reference was passed directly
             if (
@@ -371,12 +325,13 @@ class Portal:
                 raise TypeError(
                     f'{func} must be a non-streaming async function!')
 
-            nsf = NamespacePath.from_ref(func)
+            fn_mod_path, fn_name = NamespacePath.from_ref(func).to_tuple()
 
         ctx = await self.actor.start_remote_task(
             self.channel,
-            nsf=nsf,
+            fn_mod_path,
-            kwargs=kwargs,
+            fn_name,
+            kwargs,
         )
         ctx._portal = self
         return _unwrap_msg(
@@ -384,7 +339,7 @@ class Portal:
             self.channel,
         )
 
-    @acm
+    @asynccontextmanager
     async def open_stream_from(
         self,
         async_gen_func: Callable,  # typing: ignore
@@ -400,10 +355,15 @@ class Portal:
                 raise TypeError(
                     f'{async_gen_func} must be an async generator function!')
 
-        ctx: Context = await self.actor.start_remote_task(
+        fn_mod_path, fn_name = NamespacePath.from_ref(
+            async_gen_func
+        ).to_tuple()
+
+        ctx = await self.actor.start_remote_task(
             self.channel,
-            nsf=NamespacePath.from_ref(async_gen_func),
+            fn_mod_path,
-            kwargs=kwargs,
+            fn_name,
+            kwargs
         )
         ctx._portal = self
 
@@ -413,8 +373,7 @@ class Portal:
         try:
             # deliver receive only stream
             async with MsgStream(
-                ctx=ctx,
+                ctx, ctx._recv_chan,
-                rx_chan=ctx._recv_chan,
             ) as rchan:
                 self._streams.add(rchan)
                 yield rchan
@@ -441,12 +400,492 @@ class Portal:
             # await recv_chan.aclose()
             self._streams.remove(rchan)
 
-    # NOTE: impl is found in `._context`` mod to make
+    @asynccontextmanager
-    # reading/groking the details simpler code-org-wise. This
+    async def open_context(
-    # method does not have to be used over that `@acm` module func
+
-    # directly, it is for conventience and from the original API
+        self,
-    # design.
+        func: Callable,
-    open_context = open_context_from_portal
+        allow_overruns: bool = False,
+        **kwargs,
+
+    ) -> AsyncGenerator[tuple[Context, Any], None]:
+        '''
+        Open an inter-actor "task context"; a remote task is
+        scheduled and cancel-scope-state-linked to a `trio.run()` across
+        memory boundaries in another actor's runtime.
+
+        This is an `@acm` API which allows for deterministic setup
+        and teardown of a remotely scheduled task in another remote
+        actor. Once opened, the 2 now "linked" tasks run completely
+        in parallel in each actor's runtime with their enclosing
+        `trio.CancelScope`s kept in a synced state wherein if
+        either side errors or cancels an equivalent error is
+        relayed to the other side via an SC-compat IPC protocol.
+
+        The yielded `tuple` is a pair delivering a `tractor.Context`
+        and any first value "sent" by the "callee" task via a call
+        to `Context.started(<value: Any>)`; this side of the
+        context does not unblock until the "callee" task calls
+        `.started()` in similar style to `trio.Nursery.start()`.
+        When the "callee" (side that is "called"/started by a call
+        to *this* method) returns, the caller side (this) unblocks
+        and any final value delivered from the other end can be
+        retrieved using the `Contex.result()` api.
+
+        The yielded ``Context`` instance further allows for opening
+        bidirectional streams, explicit cancellation and
+        structurred-concurrency-synchronized final result-msg
+        collection. See ``tractor.Context`` for more details.
+
+        '''
+        # conduct target func method structural checks
+        if not inspect.iscoroutinefunction(func) and (
+            getattr(func, '_tractor_contex_function', False)
+        ):
+            raise TypeError(
+                f'{func} must be an async generator function!')
+
+        # TODO: i think from here onward should probably
+        # just be factored into an `@acm` inside a new
+        # a new `_context.py` mod.
+        fn_mod_path, fn_name = NamespacePath.from_ref(func).to_tuple()
+
+        ctx = await self.actor.start_remote_task(
+            self.channel,
+            fn_mod_path,
+            fn_name,
+            kwargs,
+
+            # NOTE: it's imporant to expose this since you might
+            # get the case where the parent who opened the context does
+            # not open a stream until after some slow startup/init
+            # period, in which case when the first msg is read from
+            # the feeder mem chan, say when first calling
+            # `Context.open_stream(allow_overruns=True)`, the overrun condition will be
+            # raised before any ignoring of overflow msgs can take
+            # place..
+            allow_overruns=allow_overruns,
+        )
+
+        assert ctx._remote_func_type == 'context'
+        msg: dict = await ctx._recv_chan.receive()
+
+        try:
+            # the "first" value here is delivered by the callee's
+            # ``Context.started()`` call.
+            first: Any = msg['started']
+            ctx._started_called: bool = True
+
+        except KeyError as src_error:
+            _raise_from_no_key_in_msg(
+                ctx=ctx,
+                msg=msg,
+                src_err=src_error,
+                log=log,
+                expect_key='started',
+            )
+
+        ctx._portal: Portal = self
+        uid: tuple = self.channel.uid
+        cid: str = ctx.cid
+
+        # placeholder for any exception raised in the runtime
+        # or by user tasks which cause this context's closure.
+        scope_err: BaseException | None = None
+        try:
+            async with trio.open_nursery() as nurse:
+                ctx._scope_nursery: trio.Nursery = nurse
+                ctx._scope: trio.CancelScope = nurse.cancel_scope
+
+                # deliver context instance and .started() msg value
+                # in enter tuple.
+                yield ctx, first
+
+                # between the caller exiting and arriving here the
+                # far end may have sent a ctxc-msg or other error,
+                # so check for it here immediately and maybe raise
+                # so as to engage the ctxc handling block below!
+                # if re := ctx._remote_error:
+                #     maybe_ctxc: ContextCancelled|None = ctx._maybe_raise_remote_err(
+                #         re,
+
+                #         # TODO: do we want this to always raise?
+                #         # - means that on self-ctxc, if/when the
+                #         #   block is exited before the msg arrives
+                #         #   but then the msg during __exit__
+                #         #   calling we may not activate the
+                #         #   ctxc-handler block below? should we
+                #         #   be?
+                #         # - if there's a remote error that arrives
+                #         #   after the child has exited, we won't
+                #         #   handle until the `finally:` block
+                #         #   where `.result()` is always called,
+                #         #   again in which case we handle it
+                #         #   differently then in the handler block
+                #         #   that would normally engage from THIS
+                #         #   block?
+                #         raise_ctxc_from_self_call=True,
+                #     )
+                #     assert maybe_ctxc
+
+                # when in allow_overruns mode there may be
+                # lingering overflow sender tasks remaining?
+                if nurse.child_tasks:
+                    # XXX: ensure we are in overrun state
+                    # with ``._allow_overruns=True`` bc otherwise
+                    # there should be no tasks in this nursery!
+                    if (
+                        not ctx._allow_overruns
+                        or len(nurse.child_tasks) > 1
+                    ):
+                        raise RuntimeError(
+                            'Context has sub-tasks but is '
+                            'not in `allow_overruns=True` mode!?'
+                        )
+
+                    # ensure cancel of all overflow sender tasks
+                    # started in the ctx nursery.
+                    ctx._scope.cancel()
+
+        # XXX NOTE XXX: maybe shield against
+        # self-context-cancellation (which raises a local
+        # `ContextCancelled`) when requested (via
+        # `Context.cancel()`) by the same task (tree) which entered
+        # THIS `.open_context()`.
+        #
+        # NOTE: There are 2 operating cases for a "graceful cancel"
+        # of a `Context`. In both cases any `ContextCancelled`
+        # raised in this scope-block came from a transport msg
+        # relayed from some remote-actor-task which our runtime set
+        # as a `Context._remote_error`
+        #
+        # the CASES:
+        #
+        # - if that context IS THE SAME ONE that called
+        #   `Context.cancel()`, we want to absorb the error
+        #   silently and let this `.open_context()` block to exit
+        #   without raising.
+        #
+        # - if it is from some OTHER context (we did NOT call
+        #   `.cancel()`), we want to re-RAISE IT whilst also
+        #   setting our own ctx's "reason for cancel" to be that
+        #   other context's cancellation condition; we set our
+        #   `.canceller: tuple[str, str]` to be same value as
+        #   caught here in a `ContextCancelled.canceller`.
+        #
+        # AGAIN to restate the above, there are 2 cases:
+        #
+        # 1-some other context opened in this `.open_context()`
+        #   block cancelled due to a self or peer cancellation
+        #   request in which case we DO let the error bubble to the
+        #   opener.
+        #
+        # 2-THIS "caller" task somewhere invoked `Context.cancel()`
+        #   and received a `ContextCanclled` from the "callee"
+        #   task, in which case we mask the `ContextCancelled` from
+        #   bubbling to this "caller" (much like how `trio.Nursery`
+        #   swallows any `trio.Cancelled` bubbled by a call to
+        #   `Nursery.cancel_scope.cancel()`)
+        except ContextCancelled as ctxc:
+            scope_err = ctxc
+
+            # XXX TODO XXX: FIX THIS debug_mode BUGGGG!!!
+            # using this code and then resuming the REPL will
+            # cause a SIGINT-ignoring HANG!
+            # -> prolly due to a stale debug lock entry..
+            # -[ ] USE `.stackscope` to demonstrate that (possibly
+            #   documenting it as a definittive example of
+            #   debugging the tractor-runtime itself using it's
+            #   own `.devx.` tooling!
+            # await pause()
+
+            # CASE 2: context was cancelled by local task calling
+            # `.cancel()`, we don't raise and the exit block should
+            # exit silently.
+            if (
+                ctx._cancel_called
+                and (
+                    ctxc is ctx._remote_error
+                    # ctxc.msgdata == ctx._remote_error.msgdata
+
+                    # TODO: uhh `Portal.canceller` ain't a thangg
+                    # dawg? (was `self.canceller` before?!?)
+                    and
+                    ctxc.canceller == self.actor.uid
+                )
+            ):
+                log.cancel(
+                    f'Context (cid=[{ctx.cid[-6:]}..] cancelled gracefully with:\n'
+                    f'{ctxc}'
+                )
+            # CASE 1: this context was never cancelled via a local
+            # task (tree) having called `Context.cancel()`, raise
+            # the error since it was caused by someone else!
+            else:
+                # await pause()
+                raise
+
+        # the above `._scope` can be cancelled due to:
+        # 1. an explicit self cancel via `Context.cancel()` or
+        #    `Actor.cancel()`,
+        # 2. any "callee"-side remote error, possibly also a cancellation
+        #    request by some peer,
+        # 3. any "caller" (aka THIS scope's) local error raised in the above `yield`
+        except (
+            # CASE 3: standard local error in this caller/yieldee
+            Exception,
+
+            # CASES 1 & 2: normally manifested as
+            # a `Context._scope_nursery` raised
+            # exception-group of,
+            # 1.-`trio.Cancelled`s, since
+            #   `._scope.cancel()` will have been called and any
+            #   `ContextCancelled` absorbed and thus NOT RAISED in
+            #   any `Context._maybe_raise_remote_err()`,
+            # 2.-`BaseExceptionGroup[ContextCancelled | RemoteActorError]`
+            #    from any error raised in the "callee" side with
+            #    a group only raised if there was any more then one
+            #    task started here in the "caller" in the
+            #    `yield`-ed to task.
+            BaseExceptionGroup,  # since overrun handler tasks may have been spawned
+            trio.Cancelled,  # NOTE: NOT from inside the ctx._scope
+            KeyboardInterrupt,
+
+        ) as caller_err:
+            scope_err = caller_err
+
+            # XXX: ALWAYS request the context to CANCEL ON any ERROR.
+            # NOTE: `Context.cancel()` is conversely NEVER CALLED in
+            # the `ContextCancelled` "self cancellation absorbed" case
+            # handled in the block above!
+            log.cancel(
+                'Context cancelled for task due to\n'
+                f'{caller_err}\n'
+                'Sending cancel request..\n'
+                f'task:{cid}\n'
+                f'actor:{uid}'
+            )
+
+            if debug_mode():
+                log.pdb(
+                    'Delaying `ctx.cancel()` until debug lock '
+                    'acquired..'
+                )
+                # async with acquire_debug_lock(self.actor.uid):
+                #     pass
+                # TODO: factor ^ into below for non-root cases?
+                await maybe_wait_for_debugger()
+                log.pdb(
+                    'Acquired debug lock! '
+                    'Calling `ctx.cancel()`!'
+                )
+
+            try:
+                await ctx.cancel()
+            except trio.BrokenResourceError:
+                log.warning(
+                    'IPC connection for context is broken?\n'
+                    f'task:{cid}\n'
+                    f'actor:{uid}'
+                )
+
+            raise  # duh
+
+        # no local scope error, the "clean exit with a result" case.
+        else:
+            # between the caller exiting and arriving here the
+            # far end may have sent a ctxc-msg or other error,
+            # so check for it here immediately and maybe raise
+            # so as to engage the ctxc handling block below!
+            # if re := ctx._remote_error:
+            #     maybe_ctxc: ContextCancelled|None = ctx._maybe_raise_remote_err(
+            #         re,
+
+            #         # TODO: do we want this to always raise?
+            #         # - means that on self-ctxc, if/when the
+            #         #   block is exited before the msg arrives
+            #         #   but then the msg during __exit__
+            #         #   calling we may not activate the
+            #         #   ctxc-handler block below? should we
+            #         #   be?
+            #         # - if there's a remote error that arrives
+            #         #   after the child has exited, we won't
+            #         #   handle until the `finally:` block
+            #         #   where `.result()` is always called,
+            #         #   again in which case we handle it
+            #         #   differently then in the handler block
+            #         #   that would normally engage from THIS
+            #         #   block?
+            #         raise_ctxc_from_self_call=True,
+            #     )
+            #     assert maybe_ctxc
+
+            if ctx.chan.connected():
+                log.info(
+                    'Waiting on final context-task result for\n'
+                    f'task: {cid}\n'
+                    f'actor: {uid}'
+                )
+                # XXX NOTE XXX: the below call to
+                # `Context.result()` will ALWAYS raise
+                # a `ContextCancelled` (via an embedded call to
+                # `Context._maybe_raise_remote_err()`) IFF
+                # a `Context._remote_error` was set by the runtime
+                # via a call to
+                # `Context._maybe_cancel_and_set_remote_error()`.
+                # As per `Context._deliver_msg()`, that error IS
+                # ALWAYS SET any time "callee" side fails and causes "caller
+                # side" cancellation via a `ContextCancelled` here.
+                try:
+                    result_or_err: Exception|Any = await ctx.result()
+                except BaseException as berr:
+                    # on normal teardown, if we get some error
+                    # raised in `Context.result()` we still want to
+                    # save that error on the ctx's state to
+                    # determine things like `.cancelled_caught` for
+                    # cases where there was remote cancellation but
+                    # this task didn't know until final teardown
+                    # / value collection.
+                    scope_err = berr
+                    raise
+
+                # an exception type boxed in a `RemoteActorError`
+                # is returned (meaning it was obvi not raised).
+                msgdata: str|None = getattr(
+                    result_or_err,
+                    'msgdata',
+                    None
+                )
+                # yes! this worx Bp
+                # from .devx import _debug
+                # await _debug.pause()
+                match (msgdata, result_or_err):
+                    case (
+                        {'tb_str': tbstr},
+                        ContextCancelled(),
+                    ):
+                        log.cancel(tbstr)
+
+                    case (
+                        {'tb_str': tbstr},
+                        RemoteActorError(),
+                    ):
+                        log.exception(
+                            f'Context `{fn_name}` remotely errored:\n'
+                            f'`{tbstr}`'
+                        )
+                    case (None, _):
+                        log.runtime(
+                            f'Context {fn_name} returned value from callee:\n'
+                            f'`{result_or_err}`'
+                        )
+
+        finally:
+            # XXX: (MEGA IMPORTANT) if this is a root opened process we
+            # wait for any immediate child in debug before popping the
+            # context from the runtime msg loop otherwise inside
+            # ``Actor._push_result()`` the msg will be discarded and in
+            # the case where that msg is global debugger unlock (via
+            # a "stop" msg for a stream), this can result in a deadlock
+            # where the root is waiting on the lock to clear but the
+            # child has already cleared it and clobbered IPC.
+            await maybe_wait_for_debugger()
+
+            # though it should be impossible for any tasks
+            # operating *in* this scope to have survived
+            # we tear down the runtime feeder chan last
+            # to avoid premature stream clobbers.
+            rxchan: trio.ReceiveChannel = ctx._recv_chan
+            if (
+                 rxchan
+
+                # maybe TODO: yes i know the below check is
+                # touching `trio` memchan internals..BUT, there are
+                # only a couple ways to avoid a `trio.Cancelled`
+                # bubbling from the `.aclose()` call below:
+                #
+                # - catch and mask it via the cancel-scope-shielded call
+                #   as we are rn (manual and frowned upon) OR,
+                # - specially handle the case where `scope_err` is
+                #   one of {`BaseExceptionGroup`, `trio.Cancelled`}
+                #   and then presume that the `.aclose()` call will
+                #   raise a `trio.Cancelled` and just don't call it
+                #   in those cases..
+                #
+                # that latter approach is more logic, LOC, and more
+                # convoluted so for now stick with the first
+                # psuedo-hack-workaround where we just try to avoid
+                # the shielded call as much as we can detect from
+                # the memchan's `._closed` state..
+                #
+                # XXX MOTIVATION XXX-> we generally want to raise
+                # any underlying actor-runtime/internals error that
+                # surfaces from a bug in tractor itself so it can
+                # be easily detected/fixed AND, we also want to
+                # minimize noisy runtime tracebacks (normally due
+                # to the cross-actor linked task scope machinery
+                # teardown) displayed to user-code and instead only
+                # displaying `ContextCancelled` traces where the
+                # cause of crash/exit IS due to something in
+                # user/app code on either end of the context.
+                and not rxchan._closed
+            ):
+                # XXX NOTE XXX: and again as per above, we mask any
+                # `trio.Cancelled` raised here so as to NOT mask
+                # out any exception group or legit (remote) ctx
+                # error that sourced from the remote task or its
+                # runtime.
+                #
+                # NOTE: further, this should be the only place the
+                # underlying feeder channel is
+                # once-and-only-CLOSED!
+                with trio.CancelScope(shield=True):
+                    await ctx._recv_chan.aclose()
+
+            # XXX: we always raise remote errors locally and
+            # generally speaking mask runtime-machinery related
+            # multi-`trio.Cancelled`s. As such, any `scope_error`
+            # which was the underlying cause of this context's exit
+            # should be stored as the `Context._local_error` and
+            # used in determining `Context.cancelled_caught: bool`.
+            if scope_err is not None:
+                ctx._local_error: BaseException = scope_err
+                etype: Type[BaseException] = type(scope_err)
+
+                # CASE 2
+                if ctx._cancel_called:
+                    log.cancel(
+                        f'Context {fn_name} cancelled by caller with\n'
+                        f'{etype}'
+                    )
+
+                # CASE 1
+                else:
+                    log.cancel(
+                        f'Context cancelled by callee with {etype}\n'
+                        f'target: `{fn_name}`\n'
+                        f'task:{cid}\n'
+                        f'actor:{uid}'
+                    )
+
+            # XXX: (MEGA IMPORTANT) if this is a root opened process we
+            # wait for any immediate child in debug before popping the
+            # context from the runtime msg loop otherwise inside
+            # ``Actor._push_result()`` the msg will be discarded and in
+            # the case where that msg is global debugger unlock (via
+            # a "stop" msg for a stream), this can result in a deadlock
+            # where the root is waiting on the lock to clear but the
+            # child has already cleared it and clobbered IPC.
+
+            # FINALLY, remove the context from runtime tracking and
+            # exit!
+            log.runtime(
+                f'Exiting context opened with {ctx.chan.uid}'
+            )
+            self.actor._contexts.pop(
+                (self.channel.uid, ctx.cid),
+                None,
+            )
 
 
 @dataclass
@@ -472,11 +911,11 @@ class LocalPortal:
         return await func(**kwargs)
 
 
-@acm
+@asynccontextmanager
 async def open_portal(
 
     channel: Channel,
-    nursery: trio.Nursery|None = None,
+    nursery: Optional[trio.Nursery] = None,
     start_msg_loop: bool = True,
     shield: bool = False,
 
@@ -501,7 +940,7 @@ async def open_portal(
         if channel.uid is None:
             await actor._do_handshake(channel)
 
-        msg_loop_cs: trio.CancelScope|None = None
+        msg_loop_cs: Optional[trio.CancelScope] = None
         if start_msg_loop:
             from ._runtime import process_messages
             msg_loop_cs = await nursery.start(

tractor/_root.py

@@ -25,17 +25,15 @@ import logging
 import signal
 import sys
 import os
-import typing
 import warnings
 
 
+from exceptiongroup import BaseExceptionGroup
 import trio
 
 from ._runtime import (
     Actor,
     Arbiter,
-    # TODO: rename and make a non-actor subtype?
-    # Arbiter as Registry,
     async_main,
 )
 from . import _debug
@@ -238,11 +236,8 @@ async def open_root_actor(
 
                 entered = await _debug._maybe_enter_pm(err)
 
-                if (
+                if not entered and not is_multi_cancelled(err):
-                    not entered
+                    logger.exception("Root actor crashed:")
-                    and not is_multi_cancelled(err)
-                ):
-                    logger.exception('Root actor crashed:\n')
 
                 # always re-raise
                 raise
@@ -257,13 +252,12 @@ async def open_root_actor(
                 #     for an in nurseries:
                 #         tempn.start_soon(an.exited.wait)
 
-                logger.info(
+                logger.cancel("Shutting down root actor")
-                    'Closing down root actor'
+                await actor.cancel(
+                    requesting_uid=actor.uid,
                 )
-                await actor.cancel(None)  # self cancel
     finally:
         _state._current_actor = None
-        _state._last_actor_terminated = actor
 
         # restore breakpoint hook state
         sys.breakpointhook = builtin_bp_handler

tractor/_spawn.py

@@ -31,24 +31,25 @@ from typing import (
     TYPE_CHECKING,
 )
 
+from exceptiongroup import BaseExceptionGroup
 import trio
-from trio import TaskStatus
+from trio_typing import TaskStatus
 
 from ._debug import (
     maybe_wait_for_debugger,
     acquire_debug_lock,
 )
-from tractor._state import (
+from ._state import (
     current_actor,
     is_main_process,
     is_root_process,
     debug_mode,
 )
-from tractor.log import get_logger
+from .log import get_logger
-from tractor._portal import Portal
+from ._portal import Portal
-from tractor._runtime import Actor
+from ._runtime import Actor
-from tractor._entry import _mp_main
+from ._entry import _mp_main
-from tractor._exceptions import ActorFailure
+from ._exceptions import ActorFailure
 
 
 if TYPE_CHECKING:
@@ -195,16 +196,16 @@ async def cancel_on_completion(
     result: Any|Exception = await exhaust_portal(portal, actor)
     if isinstance(result, Exception):
         errors[actor.uid]: Exception = result
-        log.cancel(
+        log.warning(
-            'Cancelling subactor runtime due to error:\n\n'
+            'Cancelling subactor due to error:\n'
-            f'Portal.cancel_actor() => {portal.channel.uid}\n\n'
+            f'uid: {portal.channel.uid}\n'
             f'error: {result}\n'
         )
 
     else:
         log.runtime(
-            'Cancelling subactor gracefully:\n\n'
+            'Cancelling subactor gracefully:\n'
-            f'Portal.cancel_actor() => {portal.channel.uid}\n\n'
+            f'uid: {portal.channel.uid}\n'
             f'result: {result}\n'
         )
 
@@ -212,9 +213,9 @@ async def cancel_on_completion(
     await portal.cancel_actor()
 
 
-async def hard_kill(
+async def do_hard_kill(
     proc: trio.Process,
-    terminate_after: int = 1.6,
+    terminate_after: int = 3,
 
     # NOTE: for mucking with `.pause()`-ing inside the runtime
     # whilst also hacking on it XD
@@ -280,17 +281,14 @@ async def hard_kill(
     # zombies (as a feature) we ask the OS to do send in the
     # removal swad as the last resort.
     if cs.cancelled_caught:
-        # TODO: toss in the skynet-logo face as ascii art?
         log.critical(
-            # 'Well, the #ZOMBIE_LORD_IS_HERE# to collect\n'
+            'Well, the #ZOMBIE_LORD_IS_HERE# to collect\n'
-            '#T-800 deployed to collect zombie B0\n'
-            f'|\n'
             f'|_{proc}\n'
         )
         proc.kill()
 
 
-async def soft_kill(
+async def soft_wait(
 
     proc: ProcessType,
     wait_func: Callable[
@@ -301,20 +299,17 @@ async def soft_kill(
 
 ) -> None:
     '''
-    Wait for proc termination but **don't yet** teardown
+    Wait for proc termination but **dont' yet** teardown
-    std-streams since it will clobber any ongoing pdb REPL
+    std-streams (since it will clobber any ongoing pdb REPL
-    session.
+    session). This is our "soft" (and thus itself cancellable)
-
+    join/reap on an actor-runtime-in-process.
-    This is our "soft"/graceful, and thus itself also cancellable,
-    join/reap on an actor-runtime-in-process shutdown; it is
-    **not** the same as a "hard kill" via an OS signal (for that
-    see `.hard_kill()`).
 
     '''
     uid: tuple[str, str] = portal.channel.uid
     try:
         log.cancel(
-            'Soft killing sub-actor via `Portal.cancel_actor()`\n'
+            'Soft waiting on sub-actor proc:\n'
+            f'uid: {uid}\n'
             f'|_{proc}\n'
         )
         # wait on sub-proc to signal termination
@@ -331,9 +326,8 @@ async def soft_kill(
 
             async def cancel_on_proc_deth():
                 '''
-                "Cancel-the-cancel" request: if we detect that the
+                "Cancel the (actor) cancel" request if we detect
-                underlying sub-process exited prior to
+                that that the underlying sub-process terminated.
-                a `Portal.cancel_actor()` call completing .
 
                 '''
                 await wait_func(proc)
@@ -450,17 +444,14 @@ async def trio_proc(
         try:
             # TODO: needs ``trio_typing`` patch?
             proc = await trio.lowlevel.open_process(spawn_cmd)
-            log.runtime(
+
-                'Started new sub-proc\n'
+            log.runtime(f"Started {proc}")
-                f'|_{proc}\n'
-            )
 
             # wait for actor to spawn and connect back to us
             # channel should have handshake completed by the
             # local actor by the time we get a ref to it
             event, chan = await actor_nursery._actor.wait_for_peer(
-                subactor.uid
+                subactor.uid)
-            )
 
         except trio.Cancelled:
             cancelled_during_spawn = True
@@ -522,7 +513,7 @@ async def trio_proc(
             # This is a "soft" (cancellable) join/reap which
             # will remote cancel the actor on a ``trio.Cancelled``
             # condition.
-            await soft_kill(
+            await soft_wait(
                 proc,
                 trio.Process.wait,
                 portal
@@ -583,7 +574,7 @@ async def trio_proc(
 
                 if proc.poll() is None:
                     log.cancel(f"Attempting to hard kill {proc}")
-                    await hard_kill(proc)
+                    await do_hard_kill(proc)
 
                 log.debug(f"Joined {proc}")
         else:
@@ -727,7 +718,7 @@ async def mp_proc(
             # This is a "soft" (cancellable) join/reap which
             # will remote cancel the actor on a ``trio.Cancelled``
             # condition.
-            await soft_kill(
+            await soft_wait(
                 proc,
                 proc_waiter,
                 portal

tractor/_state.py

@@ -18,18 +18,12 @@
 Per process state
 
 """
-from __future__ import annotations
 from typing import (
+    Optional,
     Any,
-    TYPE_CHECKING,
 )
 
-if TYPE_CHECKING:
+_current_actor: Optional['Actor'] = None  # type: ignore # noqa
-    from ._runtime import Actor
-
-
-_current_actor: Actor|None = None  # type: ignore # noqa
-_last_actor_terminated: Actor|None = None
 _runtime_vars: dict[str, Any] = {
     '_debug_mode': False,
     '_is_root': False,
@@ -37,49 +31,14 @@ _runtime_vars: dict[str, Any] = {
 }
 
 
-def last_actor() -> Actor|None:
+def current_actor(err_on_no_runtime: bool = True) -> 'Actor':  # type: ignore # noqa
-    '''
-    Try to return last active `Actor` singleton
-    for this process.
-
-    For case where runtime already exited but someone is asking
-    about the "last" actor probably to get its `.uid: tuple`.
-
-    '''
-    return _last_actor_terminated
-
-
-def current_actor(
-    err_on_no_runtime: bool = True,
-) -> Actor:
     '''
     Get the process-local actor instance.
 
     '''
-    if (
-        err_on_no_runtime
-        and _current_actor is None
-    ):
-        msg: str = 'No local actor has been initialized yet'
     from ._exceptions import NoRuntime
-
+    if _current_actor is None and err_on_no_runtime:
-        if last := last_actor():
+        raise NoRuntime("No local actor has been initialized yet")
-            msg += (
-                f'Apparently the lact active actor was\n'
-                f'|_{last}\n'
-                f'|_{last.uid}\n'
-            )
-        # no actor runtime has (as of yet) ever been started for
-        # this process.
-        else:
-            msg += (
-                'No last actor found?\n'
-                'Did you forget to open one of:\n\n'
-                '- `tractor.open_root_actor()`\n'
-                '- `tractor.open_nursery()`\n'
-            )
-
-        raise NoRuntime(msg)
 
     return _current_actor
 

tractor/_streaming.py

@@ -90,43 +90,30 @@ class MsgStream(trio.abc.Channel):
         self._closed: bool|trio.ClosedResourceError = False
 
     # delegate directly to underlying mem channel
-    def receive_nowait(
+    def receive_nowait(self):
-        self,
+        msg = self._rx_chan.receive_nowait()
-        allow_msg_keys: list[str] = ['yield'],
-    ):
-        msg: dict = self._rx_chan.receive_nowait()
-        for (
-            i,
-            key,
-        ) in enumerate(allow_msg_keys):
         try:
-                return msg[key]
+            return msg['yield']
         except KeyError as kerr:
-                if i < (len(allow_msg_keys) - 1):
+            # if 'return' in msg:
-                    continue
+            #     return msg
 
             _raise_from_no_key_in_msg(
                 ctx=self._ctx,
                 msg=msg,
                 src_err=kerr,
                 log=log,
-                    expect_key=key,
+                expect_key='yield',
                 stream=self,
             )
 
-    async def receive(
+    async def receive(self):
-        self,
-
-        hide_tb: bool = True,
-    ):
         '''
         Receive a single msg from the IPC transport, the next in
         sequence sent by the far end task (possibly in order as
         determined by the underlying protocol).
 
         '''
-        __tracebackhide__: bool = hide_tb
-
         # NOTE: `trio.ReceiveChannel` implements
         # EOC handling as follows (aka uses it
         # to gracefully exit async for loops):
@@ -136,16 +123,20 @@ class MsgStream(trio.abc.Channel):
         #         return await self.receive()
         #     except trio.EndOfChannel:
         #         raise StopAsyncIteration
-        #
+
         # see ``.aclose()`` for notes on the old behaviour prior to
         # introducing this
         if self._eoc:
             raise self._eoc
+            # raise trio.EndOfChannel
 
         if self._closed:
             raise self._closed
+            # raise trio.ClosedResourceError(
+            #     'This stream was already closed'
+            # )
 
-        src_err: Exception|None = None  # orig tb
+        src_err: Exception|None = None
         try:
             try:
                 msg = await self._rx_chan.receive()
@@ -165,23 +156,33 @@ class MsgStream(trio.abc.Channel):
                     stream=self,
                 )
 
-        # XXX: the stream terminates on either of:
+        # XXX: we close the stream on any of these error conditions:
-        # - via `self._rx_chan.receive()` raising  after manual closure
-        #   by the rpc-runtime OR,
-        # - via a received `{'stop': ...}` msg from remote side.
-        #   |_ NOTE: previously this was triggered by calling
-        #   ``._rx_chan.aclose()`` on the send side of the channel inside
-        #   `Actor._push_result()`, but now the 'stop' message handling
-        #   has been put just above inside `_raise_from_no_key_in_msg()`.
         except (
-            trio.EndOfChannel,
+            # trio.ClosedResourceError,  # by self._rx_chan
+            trio.EndOfChannel,  # by self._rx_chan or `stop` msg from far end
         ) as eoc:
             src_err = eoc
             self._eoc = eoc
+            # await trio.sleep(1)
+
+            # a ``ClosedResourceError`` indicates that the internal
+            # feeder memory receive channel was closed likely by the
+            # runtime after the associated transport-channel
+            # disconnected or broke.
+
+            # an ``EndOfChannel`` indicates either the internal recv
+            # memchan exhausted **or** we raisesd it just above after
+            # receiving a `stop` message from the far end of the stream.
+
+            # Previously this was triggered by calling ``.aclose()`` on
+            # the send side of the channel inside
+            # ``Actor._push_result()`` (should still be commented code
+            # there - which should eventually get removed), but now the
+            # 'stop' message handling has been put just above.
 
             # TODO: Locally, we want to close this stream gracefully, by
             # terminating any local consumers tasks deterministically.
-            # Once we have broadcast support, we **don't** want to be
+            # One we have broadcast support, we **don't** want to be
             # closing this stream and not flushing a final value to
             # remaining (clone) consumers who may not have been
             # scheduled to receive it yet.
@@ -199,11 +200,7 @@ class MsgStream(trio.abc.Channel):
 
             # raise eoc
 
-        # a ``ClosedResourceError`` indicates that the internal
+        except trio.ClosedResourceError as cre:  # by self._rx_chan
-        # feeder memory receive channel was closed likely by the
-        # runtime after the associated transport-channel
-        # disconnected or broke.
-        except trio.ClosedResourceError as cre:  # by self._rx_chan.receive()
             src_err = cre
             log.warning(
                 '`Context._rx_chan` was already closed?'
@@ -214,8 +211,6 @@ class MsgStream(trio.abc.Channel):
         # terminated and signal this local iterator to stop
         drained: list[Exception|dict] = await self.aclose()
         if drained:
-            # from .devx import pause
-            # await pause()
             log.warning(
                 'Drained context msgs during closure:\n'
                 f'{drained}'
@@ -229,99 +224,67 @@ class MsgStream(trio.abc.Channel):
         # over the end-of-stream connection error since likely
         # the remote error was the source cause?
         ctx: Context = self._ctx
-        ctx.maybe_raise(
+        if re := ctx._remote_error:
+            ctx._maybe_raise_remote_err(
+                re,
                 raise_ctxc_from_self_call=True,
             )
 
-        # propagate any error but hide low-level frame details
+        raise src_err  # propagate
-        # from the caller by default for debug noise reduction.
-        if (
-            hide_tb
-
-            # XXX NOTE XXX don't reraise on certain
-            # stream-specific internal error types like,
-            #
-            # - `trio.EoC` since we want to use the exact instance
-            #   to ensure that it is the error that bubbles upward
-            #   for silent absorption by `Context.open_stream()`.
-            and not self._eoc
-
-            # - `RemoteActorError` (or `ContextCancelled`) if it gets
-            #   raised from `_raise_from_no_key_in_msg()` since we
-            #   want the same (as the above bullet) for any
-            #   `.open_context()` block bubbled error raised by
-            #   any nearby ctx API remote-failures.
-            # and not isinstance(src_err, RemoteActorError)
-        ):
-            raise type(src_err)(*src_err.args) from src_err
-        else:
-            raise src_err
 
     async def aclose(self) -> list[Exception|dict]:
         '''
         Cancel associated remote actor task and local memory channel on
         close.
 
-        Notes: 
-         - REMEMBER that this is also called by `.__aexit__()` so
-           careful consideration must be made to handle whatever
-           internal stsate is mutated, particuarly in terms of
-           draining IPC msgs!
-
-         - more or less we try to maintain adherance to trio's `.aclose()` semantics:
-           https://trio.readthedocs.io/en/stable/reference-io.html#trio.abc.AsyncResource.aclose
         '''
+        # XXX: keep proper adherance to trio's `.aclose()` semantics:
+        # https://trio.readthedocs.io/en/stable/reference-io.html#trio.abc.AsyncResource.aclose
+        rx_chan = self._rx_chan
 
-        # rx_chan = self._rx_chan
+        if (
+            rx_chan._closed
+            or
+            self._closed
+        ):
+            log.cancel(
+                f'`MsgStream` is already closed\n'
+                f'.cid: {self._ctx.cid}\n'
+                f'._rx_chan`: {rx_chan}\n'
+                f'._eoc: {self._eoc}\n'
+                f'._closed: {self._eoc}\n'
+            )
 
-        # XXX NOTE XXX
-        # it's SUPER IMPORTANT that we ensure we don't DOUBLE
-        # DRAIN msgs on closure so avoid getting stuck handing on
-        # the `._rx_chan` since we call this method on
-        # `.__aexit__()` as well!!!
-        # => SO ENSURE WE CATCH ALL TERMINATION STATES in this
-        # block including the EoC..
-        if self.closed:
             # this stream has already been closed so silently succeed as
             # per ``trio.AsyncResource`` semantics.
             # https://trio.readthedocs.io/en/stable/reference-io.html#trio.abc.AsyncResource.aclose
             return []
 
         ctx: Context = self._ctx
+        # caught_eoc: bool = False
         drained: list[Exception|dict] = []
         while not drained:
             try:
-                maybe_final_msg = self.receive_nowait(
+                maybe_final_msg = self.receive_nowait()
-                    allow_msg_keys=['yield', 'return'],
-                )
                 if maybe_final_msg:
-                    log.debug(
+                    log.cancel(
                         'Drained un-processed stream msg:\n'
                         f'{pformat(maybe_final_msg)}'
                     )
                     # TODO: inject into parent `Context` buf?
                     drained.append(maybe_final_msg)
 
-            # NOTE: we only need these handlers due to the
-            # `.receive_nowait()` call above which may re-raise
-            # one of these errors on a msg key error!
-
             except trio.WouldBlock as be:
                 drained.append(be)
                 break
 
             except trio.EndOfChannel as eoc:
-                self._eoc: Exception = eoc
                 drained.append(eoc)
-                break
+                # caught_eoc = True
-
+                self._eoc: bool = eoc
-            except trio.ClosedResourceError as cre:
-                self._closed = cre
-                drained.append(cre)
                 break
 
             except ContextCancelled as ctxc:
-                # log.exception('GOT CTXC')
                 log.cancel(
                     'Context was cancelled during stream closure:\n'
                     f'canceller: {ctxc.canceller}\n'
@@ -376,15 +339,8 @@ class MsgStream(trio.abc.Channel):
         #     with trio.CancelScope(shield=True):
         #         await rx_chan.aclose()
 
-        if not self._eoc:
+        # self._eoc: bool = caught_eoc
-            log.cancel(
+
-                'Stream closed before it received an EoC?\n'
-                'Setting eoc manually..\n..'
-            )
-            self._eoc: bool = trio.EndOfChannel(
-                f'Context stream closed by {self._ctx.side}\n'
-                f'|_{self}\n'
-            )
         # ?XXX WAIT, why do we not close the local mem chan `._rx_chan` XXX?
         # => NO, DEFINITELY NOT! <=
         # if we're a bi-dir ``MsgStream`` BECAUSE this same
@@ -423,24 +379,6 @@ class MsgStream(trio.abc.Channel):
         # self._closed = True
         return drained
 
-    @property
-    def closed(self) -> bool:
-
-        rxc: bool = self._rx_chan._closed
-        _closed: bool|Exception = self._closed
-        _eoc: bool|trio.EndOfChannel = self._eoc
-        if rxc or _closed or _eoc:
-            log.runtime(
-                f'`MsgStream` is already closed\n'
-                f'{self}\n'
-                f' |_cid: {self._ctx.cid}\n'
-                f' |_rx_chan._closed: {type(rxc)} = {rxc}\n'
-                f' |_closed: {type(_closed)} = {_closed}\n'
-                f' |_eoc: {type(_eoc)} = {_eoc}'
-            )
-            return True
-        return False
-
     @acm
     async def subscribe(
         self,
@@ -495,43 +433,23 @@ class MsgStream(trio.abc.Channel):
 
     async def send(
         self,
-        data: Any,
+        data: Any
-
-        hide_tb: bool = True,
     ) -> None:
         '''
         Send a message over this stream to the far end.
 
         '''
-        __tracebackhide__: bool = hide_tb
+        if self._ctx._remote_error:
-
+            raise self._ctx._remote_error  # from None
-        # raise any alreay known error immediately
-        self._ctx.maybe_raise()
-        if self._eoc:
-            raise self._eoc
 
         if self._closed:
             raise self._closed
+            # raise trio.ClosedResourceError('This stream was already closed')
 
-        try:
+        await self._ctx.chan.send({
-            await self._ctx.chan.send(
-                payload={
             'yield': data,
             'cid': self._ctx.cid,
-                },
+        })
-                # hide_tb=hide_tb,
-            )
-        except (
-            trio.ClosedResourceError,
-            trio.BrokenResourceError,
-            BrokenPipeError,
-        ) as trans_err:
-            if hide_tb:
-                raise type(trans_err)(
-                    *trans_err.args
-                ) from trans_err
-            else:
-                raise
 
 
 def stream(func: Callable) -> Callable:

tractor/_supervise.py

@@ -21,7 +21,6 @@
 from contextlib import asynccontextmanager as acm
 from functools import partial
 import inspect
-from pprint import pformat
 from typing import (
     Optional,
     TYPE_CHECKING,
@@ -29,6 +28,7 @@ from typing import (
 import typing
 import warnings
 
+from exceptiongroup import BaseExceptionGroup
 import trio
 
 from ._debug import maybe_wait_for_debugger
@@ -36,10 +36,7 @@ from ._state import current_actor, is_main_process
 from .log import get_logger, get_loglevel
 from ._runtime import Actor
 from ._portal import Portal
-from ._exceptions import (
+from ._exceptions import is_multi_cancelled
-    is_multi_cancelled,
-    ContextCancelled,
-)
 from ._root import open_root_actor
 from . import _state
 from . import _spawn
@@ -109,14 +106,6 @@ class ActorNursery:
         self.errors = errors
         self.exited = trio.Event()
 
-        # NOTE: when no explicit call is made to
-        # `.open_root_actor()` by application code,
-        # `.open_nursery()` will implicitly call it to start the
-        # actor-tree runtime. In this case we mark ourselves as
-        # such so that runtime components can be aware for logging
-        # and syncing purposes to any actor opened nurseries.
-        self._implicit_runtime_started: bool = False
-
     async def start_actor(
         self,
         name: str,
@@ -201,16 +190,14 @@ class ActorNursery:
         **kwargs,  # explicit args to ``fn``
 
     ) -> Portal:
-        '''
+        """Spawn a new actor, run a lone task, then terminate the actor and
-        Spawn a new actor, run a lone task, then terminate the actor and
         return its result.
 
         Actors spawned using this method are kept alive at nursery teardown
         until the task spawned by executing ``fn`` completes at which point
         the actor is terminated.
-
+        """
-        '''
+        mod_path = fn.__module__
-        mod_path: str = fn.__module__
 
         if name is None:
             # use the explicit function name if not provided
@@ -245,11 +232,7 @@ class ActorNursery:
         )
         return portal
 
-    async def cancel(
+    async def cancel(self, hard_kill: bool = False) -> None:
-        self,
-        hard_kill: bool = False,
-
-    ) -> None:
         '''
         Cancel this nursery by instructing each subactor to cancel
         itself and wait for all subactors to terminate.
@@ -260,13 +243,10 @@ class ActorNursery:
         '''
         self.cancelled = True
 
-        # TODO: impl a repr for spawn more compact
+        log.cancel(f"Cancelling nursery in {self._actor.uid}")
-        # then `._children`..
-        children: dict = self._children
-        child_count: int = len(children)
-        msg: str = f'Cancelling actor nursery with {child_count} children\n'
         with trio.move_on_after(3) as cs:
-            async with trio.open_nursery() as tn:
+
+            async with trio.open_nursery() as nursery:
 
                 subactor: Actor
                 proc: trio.Process
@@ -275,7 +255,7 @@ class ActorNursery:
                     subactor,
                     proc,
                     portal,
-                ) in children.values():
+                ) in self._children.values():
 
                     # TODO: are we ever even going to use this or
                     # is the spawning backend responsible for such
@@ -287,13 +267,12 @@ class ActorNursery:
                         if portal is None:  # actor hasn't fully spawned yet
                             event = self._actor._peer_connected[subactor.uid]
                             log.warning(
-                                f"{subactor.uid} never 't finished spawning?"
+                                f"{subactor.uid} wasn't finished spawning?")
-                            )
 
                             await event.wait()
 
                             # channel/portal should now be up
-                            _, _, portal = children[subactor.uid]
+                            _, _, portal = self._children[subactor.uid]
 
                             # XXX should be impossible to get here
                             # unless method was called from within
@@ -310,15 +289,13 @@ class ActorNursery:
                         # spawn cancel tasks for each sub-actor
                         assert portal
                         if portal.channel.connected():
-                            tn.start_soon(portal.cancel_actor)
+                            nursery.start_soon(portal.cancel_actor)
 
-                log.cancel(msg)
         # if we cancelled the cancel (we hung cancelling remote actors)
         # then hard kill all sub-processes
         if cs.cancelled_caught:
             log.error(
-                f'Failed to cancel {self}?\n'
+                f'Failed to cancel {self}\nHard killing process tree!'
-                'Hard killing underlying subprocess tree!\n'
             )
             subactor: Actor
             proc: trio.Process
@@ -327,7 +304,7 @@ class ActorNursery:
                 subactor,
                 proc,
                 portal,
-            ) in children.values():
+            ) in self._children.values():
                 log.warning(f"Hard killing process {proc}")
                 proc.terminate()
 
@@ -367,7 +344,7 @@ async def _open_and_supervise_one_cancels_all_nursery(
             # the above "daemon actor" nursery will be notified.
             async with trio.open_nursery() as ria_nursery:
 
-                an = ActorNursery(
+                anursery = ActorNursery(
                     actor,
                     ria_nursery,
                     da_nursery,
@@ -376,16 +353,16 @@ async def _open_and_supervise_one_cancels_all_nursery(
                 try:
                     # spawning of actors happens in the caller's scope
                     # after we yield upwards
-                    yield an
+                    yield anursery
 
                     # When we didn't error in the caller's scope,
                     # signal all process-monitor-tasks to conduct
                     # the "hard join phase".
                     log.runtime(
-                        'Waiting on subactors to complete:\n'
+                        f"Waiting on subactors {anursery._children} "
-                        f'{pformat(an._children)}\n'
+                        "to complete"
                     )
-                    an._join_procs.set()
+                    anursery._join_procs.set()
 
                 except BaseException as inner_err:
                     errors[actor.uid] = inner_err
@@ -397,47 +374,34 @@ async def _open_and_supervise_one_cancels_all_nursery(
                     # Instead try to wait for pdb to be released before
                     # tearing down.
                     await maybe_wait_for_debugger(
-                        child_in_debug=an._at_least_one_child_in_debug
+                        child_in_debug=anursery._at_least_one_child_in_debug
                     )
 
                     # if the caller's scope errored then we activate our
                     # one-cancels-all supervisor strategy (don't
                     # worry more are coming).
-                    an._join_procs.set()
+                    anursery._join_procs.set()
 
-                    # XXX NOTE XXX: hypothetically an error could
+                    # XXX: hypothetically an error could be
-                    # be raised and then a cancel signal shows up
+                    # raised and then a cancel signal shows up
                     # slightly after in which case the `else:`
                     # block here might not complete?  For now,
                     # shield both.
                     with trio.CancelScope(shield=True):
-                        etype: type = type(inner_err)
+                        etype = type(inner_err)
                         if etype in (
                             trio.Cancelled,
-                            KeyboardInterrupt,
+                            KeyboardInterrupt
                         ) or (
                             is_multi_cancelled(inner_err)
                         ):
                             log.cancel(
-                                f'Actor-nursery cancelled by {etype}\n\n'
+                                f"Nursery for {current_actor().uid} "
-
+                                f"was cancelled with {etype}")
-                                f'{current_actor().uid}\n'
-                                f' |_{an}\n\n'
-
-                                # TODO: show tb str?
-                                # f'{tb_str}'
-                            )
-                        elif etype in {
-                            ContextCancelled,
-                        }:
-                            log.cancel(
-                                'Actor-nursery caught remote cancellation\n\n'
-
-                                f'{inner_err.tb_str}'
-                            )
                         else:
                             log.exception(
-                                'Nursery errored with:\n'
+                                f"Nursery for {current_actor().uid} "
+                                "errored with\n"
 
                                 # TODO: same thing as in
                                 # `._invoke()` to compute how to
@@ -450,7 +414,7 @@ async def _open_and_supervise_one_cancels_all_nursery(
                             )
 
                         # cancel all subactors
-                        await an.cancel()
+                        await anursery.cancel()
 
             # ria_nursery scope end
 
@@ -471,22 +435,18 @@ async def _open_and_supervise_one_cancels_all_nursery(
             # XXX: yet another guard before allowing the cancel
             # sequence in case a (single) child is in debug.
             await maybe_wait_for_debugger(
-                child_in_debug=an._at_least_one_child_in_debug
+                child_in_debug=anursery._at_least_one_child_in_debug
             )
 
             # If actor-local error was raised while waiting on
             # ".run_in_actor()" actors then we also want to cancel all
             # remaining sub-actors (due to our lone strategy:
             # one-cancels-all).
-            if an._children:
+            log.cancel(f"Nursery cancelling due to {err}")
-                log.cancel(
+            if anursery._children:
-                    'Actor-nursery cancelling due error type:\n'
-                    f'{err}\n'
-                )
                 with trio.CancelScope(shield=True):
-                    await an.cancel()
+                    await anursery.cancel()
             raise
-
         finally:
             # No errors were raised while awaiting ".run_in_actor()"
             # actors but those actors may have returned remote errors as
@@ -495,9 +455,9 @@ async def _open_and_supervise_one_cancels_all_nursery(
             # collected in ``errors`` so cancel all actors, summarize
             # all errors and re-raise.
             if errors:
-                if an._children:
+                if anursery._children:
                     with trio.CancelScope(shield=True):
-                        await an.cancel()
+                        await anursery.cancel()
 
                 # use `BaseExceptionGroup` as needed
                 if len(errors) > 1:
@@ -532,20 +492,19 @@ async def open_nursery(
     which cancellation scopes correspond to each spawned subactor set.
 
     '''
-    implicit_runtime: bool = False
+    implicit_runtime = False
-    actor: Actor = current_actor(err_on_no_runtime=False)
+
-    an: ActorNursery|None = None
+    actor = current_actor(err_on_no_runtime=False)
+
     try:
-        if (
+        if actor is None and is_main_process():
-            actor is None
+
-            and is_main_process()
-        ):
             # if we are the parent process start the
             # actor runtime implicitly
             log.info("Starting actor runtime!")
 
             # mark us for teardown on exit
-            implicit_runtime: bool = True
+            implicit_runtime = True
 
             async with open_root_actor(**kwargs) as actor:
                 assert actor is current_actor()
@@ -553,42 +512,24 @@ async def open_nursery(
                 try:
                     async with _open_and_supervise_one_cancels_all_nursery(
                         actor
-                    ) as an:
+                    ) as anursery:
-
+                        yield anursery
-                        # NOTE: mark this nursery as having
-                        # implicitly started the root actor so
-                        # that `._runtime` machinery can avoid
-                        # certain teardown synchronization
-                        # blocking/waits and any associated (warn)
-                        # logging when it's known that this
-                        # nursery shouldn't be exited before the
-                        # root actor is.
-                        an._implicit_runtime_started = True
-                        yield an
                 finally:
-                    # XXX: this event will be set after the root actor
+                    anursery.exited.set()
-                    # runtime is already torn down, so we want to
-                    # avoid any blocking on it.
-                    an.exited.set()
 
         else:  # sub-nursery case
 
             try:
                 async with _open_and_supervise_one_cancels_all_nursery(
                     actor
-                ) as an:
+                ) as anursery:
-                    yield an
+                    yield anursery
             finally:
-                an.exited.set()
+                anursery.exited.set()
 
     finally:
-        msg: str = (
+        log.debug("Nursery teardown complete")
-            'Actor-nursery exited\n'
-            f'|_{an}\n\n'
-        )
 
         # shutdown runtime if it was started
         if implicit_runtime:
-            msg += '=> Shutting down actor runtime <=\n'
+            log.info("Shutting down actor tree")
-
-        log.info(msg)

tractor/_testing/__init__.py

@@ -1,74 +0,0 @@
-# tractor: structured concurrent "actors".
-# Copyright 2018-eternity Tyler Goodlet.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-Various helpers/utils for auditing your `tractor` app and/or the
-core runtime.
-
-'''
-from contextlib import asynccontextmanager as acm
-import pathlib
-
-import tractor
-from .pytest import (
-    tractor_test as tractor_test
-)
-
-
-def repodir() -> pathlib.Path:
-    '''
-    Return the abspath to the repo directory.
-
-    '''
-    # 2 parents up to step up through tests/<repo_dir>
-    return pathlib.Path(
-        __file__
-
-    # 3 .parents bc:
-    # <._testing-pkg>.<tractor-pkg>.<git-repo-dir>
-    # /$HOME/../<tractor-repo-dir>/tractor/_testing/__init__.py
-    ).parent.parent.parent.absolute()
-
-
-def examples_dir() -> pathlib.Path:
-    '''
-    Return the abspath to the examples directory as `pathlib.Path`.
-
-    '''
-    return repodir() / 'examples'
-
-
-@acm
-async def expect_ctxc(
-    yay: bool,
-    reraise: bool = False,
-) -> None:
-    '''
-    Small acm to catch `ContextCancelled` errors when expected
-    below it in a `async with ()` block.
-
-    '''
-    if yay:
-        try:
-            yield
-            raise RuntimeError('Never raised ctxc?')
-        except tractor.ContextCancelled:
-            if reraise:
-                raise
-            else:
-                return
-    else:
-        yield

tractor/_testing/pytest.py

@@ -1,113 +0,0 @@
-# tractor: structured concurrent "actors".
-# Copyright 2018-eternity Tyler Goodlet.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-`pytest` utils helpers and plugins for testing `tractor`'s runtime
-and applications.
-
-'''
-from functools import (
-    partial,
-    wraps,
-)
-import inspect
-import platform
-
-import tractor
-import trio
-
-
-def tractor_test(fn):
-    '''
-    Decorator for async test funcs to present them as "native"
-    looking sync funcs runnable by `pytest` using `trio.run()`.
-
-    Use:
-
-    @tractor_test
-    async def test_whatever():
-        await ...
-
-    If fixtures:
-
-        - ``reg_addr`` (a socket addr tuple where arbiter is listening)
-        - ``loglevel`` (logging level passed to tractor internals)
-        - ``start_method`` (subprocess spawning backend)
-
-    are defined in the `pytest` fixture space they will be automatically
-    injected to tests declaring these funcargs.
-    '''
-    @wraps(fn)
-    def wrapper(
-        *args,
-        loglevel=None,
-        reg_addr=None,
-        start_method: str|None = None,
-        debug_mode: bool = False,
-        **kwargs
-    ):
-        # __tracebackhide__ = True
-
-        # NOTE: inject ant test func declared fixture
-        # names by manually checking!
-        if 'reg_addr' in inspect.signature(fn).parameters:
-            # injects test suite fixture value to test as well
-            # as `run()`
-            kwargs['reg_addr'] = reg_addr
-
-        if 'loglevel' in inspect.signature(fn).parameters:
-            # allows test suites to define a 'loglevel' fixture
-            # that activates the internal logging
-            kwargs['loglevel'] = loglevel
-
-        if start_method is None:
-            if platform.system() == "Windows":
-                start_method = 'trio'
-
-        if 'start_method' in inspect.signature(fn).parameters:
-            # set of subprocess spawning backends
-            kwargs['start_method'] = start_method
-
-        if 'debug_mode' in inspect.signature(fn).parameters:
-            # set of subprocess spawning backends
-            kwargs['debug_mode'] = debug_mode
-
-
-        if kwargs:
-
-            # use explicit root actor start
-            async def _main():
-                async with tractor.open_root_actor(
-                    # **kwargs,
-                    registry_addrs=[reg_addr] if reg_addr else None,
-                    loglevel=loglevel,
-                    start_method=start_method,
-
-                    # TODO: only enable when pytest is passed --pdb
-                    debug_mode=debug_mode,
-
-                ):
-                    await fn(*args, **kwargs)
-
-            main = _main
-
-        else:
-            # use implicit root actor start
-            main = partial(fn, *args, **kwargs)
-
-        return trio.run(main)
-
-    return wrapper

tractor/experimental/_pubsub.py

@@ -31,7 +31,7 @@ from typing import (
     Callable,
 )
 from functools import partial
-from contextlib import aclosing
+from async_generator import aclosing
 
 import trio
 import wrapt

tractor/msg.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 '''
-IPC-compat cross-mem-boundary object pointer.
+Built-in messaging patterns, types, APIs and helpers.
 
 '''
 
@@ -43,33 +43,21 @@ IPC-compat cross-mem-boundary object pointer.
 # - https://github.com/msgpack/msgpack-python#packingunpacking-of-custom-data-type
 
 from __future__ import annotations
-from inspect import (
+from inspect import isfunction
-    isfunction,
-    ismethod,
-)
 from pkgutil import resolve_name
 
 
 class NamespacePath(str):
     '''
-    A serializeable `str`-subtype implementing a "namespace
+    A serializeable description of a (function) Python object
-    pointer" to any Python object reference (like a function)
+    location described by the target's module path and namespace
-    using the same format as the built-in `pkgutil.resolve_name()`
+    key meant as a message-native "packet" to allows actors to
-    system.
+    point-and-load objects by an absolute ``str`` (and thus
-
+    serializable) reference.
-    A value describes a target's module-path and namespace-key
-    separated by a ':' and thus can be easily used as
-    a IPC-message-native reference-type allowing memory isolated
-    actors to point-and-load objects via a minimal `str` value.
 
     '''
     _ref: object | type | None = None
 
-    # TODO: support providing the ns instance in
-    # order to support 'self.<meth>` style to make
-    # `Portal.run_from_ns()` work!
-    # _ns: ModuleType|type|None = None
-
     def load_ref(self) -> object | type:
         if self._ref is None:
             self._ref = resolve_name(self)
@@ -88,22 +76,12 @@ class NamespacePath(str):
 
         '''
         if (
-            isfunction(ref)
+            isinstance(ref, object)
+            and not isfunction(ref)
         ):
-            name: str = getattr(ref, '__name__')
-
-        elif ismethod(ref):
-            # build out the path manually i guess..?
-            # TODO: better way?
-            name: str = '.'.join([
-                type(ref.__self__).__name__,
-                ref.__func__.__name__,
-            ])
-
-        else:  # object or other?
-            # isinstance(ref, object)
-            # and not isfunction(ref)
             name: str = type(ref).__name__
+        else:
+            name: str = getattr(ref, '__name__')
 
         # fully qualified namespace path, tuple.
         fqnp: tuple[str, str] = (
@@ -122,13 +100,5 @@ class NamespacePath(str):
         fqnp: tuple[str, str] = cls._mk_fqnp(ref)
         return cls(':'.join(fqnp))
 
-    def to_tuple(
+    def to_tuple(self) -> tuple[str, str]:
-        self,
+        return self._mk_fqnp(self.load_ref())
-
-        # TODO: could this work re `self:<meth>` case from above?
-        # load_ref: bool = True,
-
-    ) -> tuple[str, str]:
-        return self._mk_fqnp(
-            self.load_ref()
-        )

tractor/msg/__init__.py

@@ -1,26 +0,0 @@
-# tractor: structured concurrent "actors".
-# Copyright 2018-eternity Tyler Goodlet.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-Built-in messaging patterns, types, APIs and helpers.
-
-'''
-from .ptr import (
-    NamespacePath as NamespacePath,
-)
-from .types import (
-    Struct as Struct,
-)

tractor/msg/types.py

@@ -1,270 +0,0 @@
-# tractor: structured concurrent "actors".
-# Copyright 2018-eternity Tyler Goodlet.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-'''
-Extensions to built-in or (heavily used but 3rd party) friend-lib
-types.
-
-'''
-from __future__ import annotations
-from collections import UserList
-from pprint import (
-    saferepr,
-)
-from typing import (
-    Any,
-    Iterator,
-)
-
-from msgspec import (
-    msgpack,
-    Struct as _Struct,
-    structs,
-)
-
-# TODO: auto-gen type sig for input func both for
-# type-msgs and logging of RPC tasks?
-# taken and modified from:
-# https://stackoverflow.com/a/57110117
-# import inspect
-# from typing import List
-
-# def my_function(input_1: str, input_2: int) -> list[int]:
-#     pass
-
-# def types_of(func):
-#     specs = inspect.getfullargspec(func)
-#     return_type = specs.annotations['return']
-#     input_types = [t.__name__ for s, t in specs.annotations.items() if s != 'return']
-#     return f'{func.__name__}({": ".join(input_types)}) -> {return_type}'
-
-# types_of(my_function)
-
-
-class DiffDump(UserList):
-    '''
-    Very simple list delegator that repr() dumps (presumed) tuple
-    elements of the form `tuple[str, Any, Any]` in a nice
-    multi-line readable form for analyzing `Struct` diffs.
-
-    '''
-    def __repr__(self) -> str:
-        if not len(self):
-            return super().__repr__()
-
-        # format by displaying item pair's ``repr()`` on multiple,
-        # indented lines such that they are more easily visually
-        # comparable when printed to console when printed to
-        # console.
-        repstr: str = '[\n'
-        for k, left, right in self:
-            repstr += (
-                f'({k},\n'
-                f'\t{repr(left)},\n'
-                f'\t{repr(right)},\n'
-                ')\n'
-            )
-        repstr += ']\n'
-        return repstr
-
-
-class Struct(
-    _Struct,
-
-    # https://jcristharif.com/msgspec/structs.html#tagged-unions
-    # tag='pikerstruct',
-    # tag=True,
-):
-    '''
-    A "human friendlier" (aka repl buddy) struct subtype.
-
-    '''
-    def _sin_props(self) -> Iterator[
-        tuple[
-            structs.FieldIinfo,
-            str,
-            Any,
-        ]
-    ]:
-        '''
-        Iterate over all non-@property fields of this struct.
-
-        '''
-        fi: structs.FieldInfo
-        for fi in structs.fields(self):
-            key: str = fi.name
-            val: Any = getattr(self, key)
-            yield fi, key, val
-
-    def to_dict(
-        self,
-        include_non_members: bool = True,
-
-    ) -> dict:
-        '''
-        Like it sounds.. direct delegation to:
-        https://jcristharif.com/msgspec/api.html#msgspec.structs.asdict
-
-        BUT, by default we pop all non-member (aka not defined as
-        struct fields) fields by default.
-
-        '''
-        asdict: dict = structs.asdict(self)
-        if include_non_members:
-            return asdict
-
-        # only return a dict of the struct members
-        # which were provided as input, NOT anything
-        # added as type-defined `@property` methods!
-        sin_props: dict = {}
-        fi: structs.FieldInfo
-        for fi, k, v in self._sin_props():
-            sin_props[k] = asdict[k]
-
-        return sin_props
-
-    def pformat(
-        self,
-        field_indent: int = 2,
-        indent: int = 0,
-
-    ) -> str:
-        '''
-        Recursion-safe `pprint.pformat()` style formatting of
-        a `msgspec.Struct` for sane reading by a human using a REPL.
-
-        '''
-        # global whitespace indent
-        ws: str = ' '*indent
-
-        # field whitespace indent
-        field_ws: str = ' '*(field_indent + indent)
-
-        # qtn: str = ws + self.__class__.__qualname__
-        qtn: str = self.__class__.__qualname__
-
-        obj_str: str = ''  # accumulator
-        fi: structs.FieldInfo
-        k: str
-        v: Any
-        for fi, k, v in self._sin_props():
-
-            # TODO: how can we prefer `Literal['option1',  'option2,
-            # ..]` over .__name__ == `Literal` but still get only the
-            # latter for simple types like `str | int | None` etc..?
-            ft: type = fi.type
-            typ_name: str = getattr(ft, '__name__', str(ft))
-
-            # recurse to get sub-struct's `.pformat()` output Bo
-            if isinstance(v, Struct):
-                val_str: str =  v.pformat(
-                    indent=field_indent + indent,
-                    field_indent=indent + field_indent,
-                )
-
-            else:  # the `pprint` recursion-safe format:
-                # https://docs.python.org/3.11/library/pprint.html#pprint.saferepr
-                val_str: str = saferepr(v)
-
-            # TODO: LOLOL use `textwrap.indent()` instead dawwwwwg!
-            obj_str += (field_ws + f'{k}: {typ_name} = {val_str},\n')
-
-        return (
-            f'{qtn}(\n'
-            f'{obj_str}'
-            f'{ws})'
-        )
-
-    # TODO: use a pprint.PrettyPrinter instance around ONLY rendering
-    # inside a known tty?
-    # def __repr__(self) -> str:
-    #     ...
-
-    # __str__ = __repr__ = pformat
-    __repr__ = pformat
-
-    def copy(
-        self,
-        update: dict | None = None,
-
-    ) -> Struct:
-        '''
-        Validate-typecast all self defined fields, return a copy of
-        us with all such fields.
-
-        NOTE: This is kinda like the default behaviour in
-        `pydantic.BaseModel` except a copy of the object is
-        returned making it compat with `frozen=True`.
-
-        '''
-        if update:
-            for k, v in update.items():
-                setattr(self, k, v)
-
-        # NOTE: roundtrip serialize to validate
-        # - enode to msgpack binary format,
-        # - decode that back to a struct.
-        return msgpack.Decoder(type=type(self)).decode(
-            msgpack.Encoder().encode(self)
-        )
-
-    def typecast(
-        self,
-
-        # TODO: allow only casting a named subset?
-        # fields: set[str] | None = None,
-
-    ) -> None:
-        '''
-        Cast all fields using their declared type annotations
-        (kinda like what `pydantic` does by default).
-
-        NOTE: this of course won't work on frozen types, use
-        ``.copy()`` above in such cases.
-
-        '''
-        # https://jcristharif.com/msgspec/api.html#msgspec.structs.fields
-        fi: structs.FieldInfo
-        for fi in structs.fields(self):
-            setattr(
-                self,
-                fi.name,
-                fi.type(getattr(self, fi.name)),
-            )
-
-    def __sub__(
-        self,
-        other: Struct,
-
-    ) -> DiffDump[tuple[str, Any, Any]]:
-        '''
-        Compare fields/items key-wise and return a ``DiffDump``
-        for easy visual REPL comparison B)
-
-        '''
-        diffs: DiffDump[tuple[str, Any, Any]] = DiffDump()
-        for fi in structs.fields(self):
-            attr_name: str = fi.name
-            ours: Any = getattr(self, attr_name)
-            theirs: Any = getattr(other, attr_name)
-            if ours != theirs:
-                diffs.append((
-                    attr_name,
-                    ours,
-                    theirs,
-                ))
-
-        return diffs

tractor/to_asyncio.py

@@ -217,14 +217,7 @@ def _run_asyncio_task(
         try:
             result = await coro
         except BaseException as aio_err:
-            if isinstance(aio_err, CancelledError):
+            log.exception('asyncio task errored')
-                log.runtime(
-                    '`asyncio` task was cancelled..\n'
-                )
-            else:
-                log.exception(
-                    '`asyncio` task errored\n'
-                )
             chan._aio_err = aio_err
             raise
 
@@ -279,22 +272,12 @@ def _run_asyncio_task(
         except BaseException as terr:
             task_err = terr
 
-            msg: str = (
-                'Infected `asyncio` task {etype_str}\n'
-                f'|_{task}\n'
-            )
             if isinstance(terr, CancelledError):
-                log.cancel(
+                log.cancel(f'`asyncio` task cancelled: {task.get_name()}')
-                    msg.format(etype_str='cancelled')
-                )
             else:
-                log.exception(
+                log.exception(f'`asyncio` task: {task.get_name()} errored')
-                    msg.format(etype_str='cancelled')
-                )
 
-            assert type(terr) is type(aio_err), (
+            assert type(terr) is type(aio_err), 'Asyncio task error mismatch?'
-                '`asyncio` task error mismatch?!?'
-            )
 
         if aio_err is not None:
             # XXX: uhh is this true?
@@ -307,23 +290,19 @@ def _run_asyncio_task(
             # We might want to change this in the future though.
             from_aio.close()
 
-            if task_err is None:
+            if type(aio_err) is CancelledError:
-                assert aio_err
+                log.cancel("infected task was cancelled")
-                aio_err.with_traceback(aio_err.__traceback__)
-                # log.error(
-                #     'infected task errorred'
-                # )
 
                 # 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
 
+            elif task_err is None:
+                assert aio_err
+                aio_err.with_traceback(aio_err.__traceback__)
+                log.error('infected task errorred')
+
             # XXX: alway cancel the scope on error
             # in case the trio task is blocking
             # on a checkpoint.

tractor/trionics/_broadcast.py

@@ -26,6 +26,7 @@ from contextlib import asynccontextmanager
 from functools import partial
 from operator import ne
 from typing import (
+    Optional,
     Callable,
     Awaitable,
     Any,
@@ -44,11 +45,6 @@ from tractor.log import get_logger
 
 log = get_logger(__name__)
 
-# TODO: use new type-vars syntax from 3.12
-# https://realpython.com/python312-new-features/#dedicated-type-variable-syntax
-# https://docs.python.org/3/whatsnew/3.12.html#whatsnew312-pep695
-# https://docs.python.org/3/reference/simple_stmts.html#type
-#
 # A regular invariant generic type
 T = TypeVar("T")
 
@@ -114,7 +110,7 @@ class BroadcastState(Struct):
 
     # broadcast event to wake up all sleeping consumer tasks
     # on a newly produced value from the sender.
-    recv_ready: tuple[int, trio.Event]|None = None
+    recv_ready: Optional[tuple[int, trio.Event]] = None
 
     # if a ``trio.EndOfChannel`` is received on any
     # consumer all consumers should be placed in this state
@@ -168,7 +164,7 @@ class BroadcastReceiver(ReceiveChannel):
 
         rx_chan: AsyncReceiver,
         state: BroadcastState,
-        receive_afunc: Callable[[], Awaitable[Any]]|None = None,
+        receive_afunc: Optional[Callable[[], Awaitable[Any]]] = None,
         raise_on_lag: bool = True,
 
     ) -> None:
@@ -456,7 +452,7 @@ def broadcast_receiver(
 
     recv_chan: AsyncReceiver,
     max_buffer_size: int,
-    receive_afunc: Callable[[], Awaitable[Any]]|None = None,
+    receive_afunc: Optional[Callable[[], Awaitable[Any]]] = None,
     raise_on_lag: bool = True,
 
 ) -> BroadcastReceiver:

tractor/trionics/_mngrs.py

@@ -33,9 +33,10 @@ from typing import (
 )
 
 import trio
+from trio_typing import TaskStatus
 
-from tractor._state import current_actor
+from .._state import current_actor
-from tractor.log import get_logger
+from ..log import get_logger
 
 
 log = get_logger(__name__)
@@ -183,7 +184,7 @@ class _Cache:
         cls,
         mng,
         ctx_key: tuple,
-        task_status: trio.TaskStatus[T] = trio.TASK_STATUS_IGNORED,
+        task_status: TaskStatus[T] = trio.TASK_STATUS_IGNORED,
 
     ) -> None:
         async with mng as value: