tests/test_ext_types_msgspec.py

@@ -454,7 +454,7 @@ async def send_back_values(
     with (
         maybe_apply_codec(nsp_codec) as codec,
         limit_plds(
-            spec=rent_pld_spec,
+            rent_pld_spec,
             dec_hook=dec_nsp if add_hooks else None,
             ext_types=[NamespacePath]  if add_hooks else None,
         ) as pld_dec,
@@ -665,9 +665,7 @@ def test_ext_types_over_ipc(
                     expect_codec=nsp_codec,
                     enter_value=codec,
                 )
-                rent_pld_spec_type_strs: list[str] = _exts.enc_type_union(
+                rent_pld_spec_type_strs: list[str] = _exts.enc_type_union(pld_spec)
-                    pld_spec
-                )
 
                 # XXX should raise an mte (`MsgTypeError`)
                 # when `add_hooks == False` bc the input
@@ -697,7 +695,7 @@ def test_ext_types_over_ipc(
                             limit_plds(
                                 pld_spec,
                                 dec_hook=dec_nsp if add_hooks else None,
-                                ext_types=[NamespacePath] if add_hooks else None,
+                                ext_types=[NamespacePath]  if add_hooks else None,
                             ) as pld_dec,
                         ):
                             ctx_pld_dec: MsgDec = ctx._pld_rx._pld_dec
@@ -745,10 +743,204 @@ def test_ext_types_over_ipc(
         assert exc.boxed_type is TypeError
 
 
-# TODO: further SC-msg-specific verification that the overridden
+# def chk_pld_type(
-# subtypes DO NOT have modified type-annots from original!
+#     payload_spec: Type[Struct]|Any,
-# 'Start',  .pld: FuncSpec
+#     pld: Any,
-# 'StartAck',  .pld: IpcCtxSpec
+
-# 'Stop',  .pld: UNSEt
+#     expect_roundtrip: bool|None = None,
-# 'Error',  .pld: ErrorData
+
-# def test_per_msg_payload_spec_limits():
+# ) -> bool:
+
+#     pld_val_type: Type = type(pld)
+
+#     # TODO: verify that the overridden subtypes
+#     # DO NOT have modified type-annots from original!
+#     # 'Start',  .pld: FuncSpec
+#     # 'StartAck',  .pld: IpcCtxSpec
+#     # 'Stop',  .pld: UNSEt
+#     # 'Error',  .pld: ErrorData
+
+#     codec: MsgCodec = mk_codec(
+#         # NOTE: this ONLY accepts `PayloadMsg.pld` fields of a specified
+#         # type union.
+#         ipc_pld_spec=payload_spec,
+#     )
+
+#     # make a one-off dec to compare with our `MsgCodec` instance
+#     # which does the below `mk_msg_spec()` call internally
+#     ipc_msg_spec: Union[Type[Struct]]
+#     msg_types: list[PayloadMsg[payload_spec]]
+#     (
+#         ipc_msg_spec,
+#         msg_types,
+#     ) = mk_msg_spec(
+#         payload_type_union=payload_spec,
+#     )
+#     _enc = msgpack.Encoder()
+#     _dec = msgpack.Decoder(
+#         type=ipc_msg_spec or Any,  # like `PayloadMsg[Any]`
+#     )
+
+#     assert (
+#         payload_spec
+#         ==
+#         codec.pld_spec
+#     )
+
+#     # assert codec.dec == dec
+#     #
+#     # ^-XXX-^ not sure why these aren't "equal" but when cast
+#     # to `str` they seem to match ?? .. kk
+
+#     assert (
+#         str(ipc_msg_spec)
+#         ==
+#         str(codec.msg_spec)
+#         ==
+#         str(_dec.type)
+#         ==
+#         str(codec.dec.type)
+#     )
+
+#     # verify the boxed-type for all variable payload-type msgs.
+#     if not msg_types:
+#         breakpoint()
+
+#     roundtrip: bool|None = None
+#     pld_spec_msg_names: list[str] = [
+#         td.__name__ for td in _payload_msgs
+#     ]
+#     for typedef in msg_types:
+
+#         skip_runtime_msg: bool = typedef.__name__ not in pld_spec_msg_names
+#         if skip_runtime_msg:
+#             continue
+
+#         pld_field = structs.fields(typedef)[1]
+#         assert pld_field.type is payload_spec # TODO-^ does this need to work to get all subtypes to adhere?
+
+#         kwargs: dict[str, Any] = {
+#             'cid': '666',
+#             'pld': pld,
+#         }
+#         enc_msg: PayloadMsg = typedef(**kwargs)
+
+#         _wire_bytes: bytes = _enc.encode(enc_msg)
+#         wire_bytes: bytes = codec.enc.encode(enc_msg)
+#         assert _wire_bytes == wire_bytes
+
+#         ve: ValidationError|None = None
+#         try:
+#             dec_msg = codec.dec.decode(wire_bytes)
+#             _dec_msg = _dec.decode(wire_bytes)
+
+#             # decoded msg and thus payload should be exactly same!
+#             assert (roundtrip := (
+#                 _dec_msg
+#                 ==
+#                 dec_msg
+#                 ==
+#                 enc_msg
+#             ))
+
+#             if (
+#                 expect_roundtrip is not None
+#                 and expect_roundtrip != roundtrip
+#             ):
+#                 breakpoint()
+
+#             assert (
+#                 pld
+#                 ==
+#                 dec_msg.pld
+#                 ==
+#                 enc_msg.pld
+#             )
+#             # assert (roundtrip := (_dec_msg == enc_msg))
+
+#         except ValidationError as _ve:
+#             ve = _ve
+#             roundtrip: bool = False
+#             if pld_val_type is payload_spec:
+#                 raise ValueError(
+#                    'Got `ValidationError` despite type-var match!?\n'
+#                     f'pld_val_type: {pld_val_type}\n'
+#                     f'payload_type: {payload_spec}\n'
+#                 ) from ve
+
+#             else:
+#                 # ow we good cuz the pld spec mismatched.
+#                 print(
+#                     'Got expected `ValidationError` since,\n'
+#                     f'{pld_val_type} is not {payload_spec}\n'
+#                 )
+#         else:
+#             if (
+#                 payload_spec is not Any
+#                 and
+#                 pld_val_type is not payload_spec
+#             ):
+#                 raise ValueError(
+#                    'DID NOT `ValidationError` despite expected type match!?\n'
+#                     f'pld_val_type: {pld_val_type}\n'
+#                     f'payload_type: {payload_spec}\n'
+#                 )
+
+#     # full code decode should always be attempted!
+#     if roundtrip is None:
+#         breakpoint()
+
+#     return roundtrip
+
+
+# ?TODO? maybe remove since covered in the newer `test_pldrx_limiting`
+# via end-2-end testing of all this?
+# -[ ] IOW do we really NEED this lowlevel unit testing?
+#
+# def test_limit_msgspec(
+#     debug_mode: bool,
+# ):
+#     '''
+#     Internals unit testing to verify that type-limiting an IPC ctx's
+#     msg spec with `Pldrx.limit_plds()` results in various
+#     encapsulated `msgspec` object settings and state.
+
+#     '''
+#     async def main():
+#         async with tractor.open_root_actor(
+#             debug_mode=debug_mode,
+#         ):
+#             # ensure we can round-trip a boxing `PayloadMsg`
+#             assert chk_pld_type(
+#                 payload_spec=Any,
+#                 pld=None,
+#                 expect_roundtrip=True,
+#             )
+
+#             # verify that a mis-typed payload value won't decode
+#             assert not chk_pld_type(
+#                 payload_spec=int,
+#                 pld='doggy',
+#             )
+
+#             # parametrize the boxed `.pld` type as a custom-struct
+#             # and ensure that parametrization propagates
+#             # to all payload-msg-spec-able subtypes!
+#             class CustomPayload(Struct):
+#                 name: str
+#                 value: Any
+
+#             assert not chk_pld_type(
+#                 payload_spec=CustomPayload,
+#                 pld='doggy',
+#             )
+
+#             assert chk_pld_type(
+#                 payload_spec=CustomPayload,
+#                 pld=CustomPayload(name='doggy', value='urmom')
+#             )
+
+#             # yah, we can `.pause_from_sync()` now!
+#             # breakpoint()
+
+#     trio.run(main)

tests/test_infected_asyncio.py

@@ -732,21 +732,15 @@ def test_aio_errors_and_channel_propagates_and_closes(
 
 
 async def aio_echo_server(
-    chan: to_asyncio.LinkedTaskChannel,
+    to_trio: trio.MemorySendChannel,
+    from_trio: asyncio.Queue,
 ) -> None:
-    '''
-    An IPC-msg "echo server" with msgs received and relayed by
-    a parent `trio.Task` into a child `asyncio.Task`
-    and then repeated back to that local parent (`trio.Task`)
-    and sent again back to the original calling remote actor.
 
-    '''
+    to_trio.send_nowait('start')
-    # same semantics as `trio.TaskStatus.started()`
-    chan.started_nowait('start')
 
     while True:
         try:
-            msg = await chan.get()
+            msg = await from_trio.get()
         except to_asyncio.TrioTaskExited:
             print(
                 'breaking aio echo loop due to `trio` exit!'
@@ -754,7 +748,7 @@ async def aio_echo_server(
             break
 
         # echo the msg back
-        chan.send_nowait(msg)
+        to_trio.send_nowait(msg)
 
         # if we get the terminate sentinel
         # break the echo loop
@@ -771,10 +765,7 @@ async def trio_to_aio_echo_server(
 ):
     async with to_asyncio.open_channel_from(
         aio_echo_server,
-    ) as (
+    ) as (first, chan):
-        first,  # value from `chan.started_nowait()` above
-        chan,
-    ):
         assert first == 'start'
 
         await ctx.started(first)
@@ -785,8 +776,7 @@ async def trio_to_aio_echo_server(
                 await chan.send(msg)
 
                 out = await chan.receive()
-
+                # echo back to parent actor-task
-                # echo back to parent-actor's remote parent-ctx-task!
                 await stream.send(out)
 
                 if out is None:
@@ -1100,12 +1090,14 @@ def test_sigint_closes_lifetime_stack(
 
 
 # ?TODO asyncio.Task fn-deco?
+# -[ ] do sig checkingat import time like @context?
+# -[ ] maybe name it @aio_task ??
 # -[ ] chan: to_asyncio.InterloopChannel ??
-# -[ ] do fn-sig checking at import time like @context?
-#  |_[ ] maybe name it @a(sync)io_task ??
-# @asyncio_task  <- not bad ??
 async def raise_before_started(
+    # from_trio: asyncio.Queue,
+    # to_trio: trio.abc.SendChannel,
     chan: to_asyncio.LinkedTaskChannel,
+
 ) -> None:
     '''
     `asyncio.Task` entry point which RTEs before calling

tests/test_log_sys.py

@@ -1,150 +0,0 @@
-'''
-`tractor.log`-wrapping unit tests.
-
-'''
-from pathlib import Path
-import shutil
-
-import pytest
-import tractor
-from tractor import _code_load
-
-
-def test_root_pkg_not_duplicated_in_logger_name():
-    '''
-    When both `pkg_name` and `name` are passed and they have
-    a common `<root_name>.< >` prefix, ensure that it is not
-    duplicated in the child's `StackLevelAdapter.name: str`.
-
-    '''
-    project_name: str = 'pylib'
-    pkg_path: str = 'pylib.subpkg.mod'
-
-    proj_log = tractor.log.get_logger(
-        pkg_name=project_name,
-        mk_sublog=False,
-    )
-
-    sublog = tractor.log.get_logger(
-        pkg_name=project_name,
-        name=pkg_path,
-    )
-
-    assert proj_log is not sublog
-    assert sublog.name.count(proj_log.name) == 1
-    assert 'mod' not in sublog.name
-
-
-def test_implicit_mod_name_applied_for_child(
-    testdir: pytest.Pytester,
-    loglevel: str,
-):
-    '''
-    Verify that when `.log.get_logger(pkg_name='pylib')` is called
-    from a given sub-mod from within the `pylib` pkg-path, we
-    implicitly set the equiv of `name=__name__` from the caller's
-    module.
-
-    '''
-    # tractor.log.get_console_log(level=loglevel)
-    proj_name: str = 'snakelib'
-    mod_code: str = (
-        f'import tractor\n'
-        f'\n'
-        f'log = tractor.log.get_logger(pkg_name="{proj_name}")\n'
-    )
-
-    # create a sub-module for each pkg layer
-    _lib = testdir.mkpydir(proj_name)
-    pkg: Path = Path(_lib)
-    subpkg: Path = pkg / 'subpkg'
-    subpkg.mkdir()
-
-    pkgmod: Path = subpkg / "__init__.py"
-    pkgmod.touch()
-
-    _submod: Path = testdir.makepyfile(
-        _mod=mod_code,
-    )
-
-    pkg_mod = pkg / 'mod.py'
-    pkg_subpkg_submod = subpkg / 'submod.py'
-    shutil.copyfile(
-        _submod,
-        pkg_mod,
-    )
-    shutil.copyfile(
-        _submod,
-        pkg_subpkg_submod,
-    )
-    testdir.chdir()
-
-    # XXX NOTE, once the "top level" pkg mod has been
-    # imported, we can then use `import` syntax to
-    # import it's sub-pkgs and modules.
-    pkgmod = _code_load.load_module_from_path(
-        Path(pkg / '__init__.py'),
-        module_name=proj_name,
-    )
-    pkg_root_log = tractor.log.get_logger(
-        pkg_name=proj_name,
-        mk_sublog=False,
-    )
-    assert pkg_root_log.name == proj_name
-    assert not pkg_root_log.logger.getChildren()
-
-    from snakelib import mod
-    assert mod.log.name == proj_name
-
-    from snakelib.subpkg import submod
-    assert (
-        submod.log.name
-        ==
-        submod.__package__  # ?TODO, use this in `.get_logger()` instead?
-        ==
-        f'{proj_name}.subpkg'
-    )
-
-    sub_logs = pkg_root_log.logger.getChildren()
-    assert len(sub_logs) == 1  # only one nested sub-pkg module
-    assert submod.log.logger in sub_logs
-
-    # breakpoint()
-
-
-# TODO, moar tests against existing feats:
-# ------ - ------
-# - [ ] color settings?
-# - [ ] header contents like,
-#   - actor + thread + task names from various conc-primitives,
-# - [ ] `StackLevelAdapter` extensions,
-#   - our custom levels/methods: `transport|runtime|cance|pdb|devx`
-# - [ ] custom-headers support?
-#
-
-# TODO, test driven dev of new-ideas/long-wanted feats,
-# ------ - ------
-# - [ ] https://github.com/goodboy/tractor/issues/244
-#  - [ ] @catern mentioned using a sync / deterministic sys
-#       and in particular `svlogd`?
-#       |_ https://smarden.org/runit/svlogd.8
-
-# - [ ] using adapter vs. filters?
-#    - https://stackoverflow.com/questions/60691759/add-information-to-every-log-message-in-python-logging/61830838#61830838
-
-# - [ ] `.at_least_level()` optimization which short circuits wtv
-#      `logging` is doing behind the scenes when the level filters
-#      the emission..?
-
-# - [ ] use of `.log.get_console_log()` in subactors and the
-#    subtleties of ensuring it actually emits from a subproc.
-
-# - [ ] this idea of activating per-subsys emissions with some
-#    kind of `.name` filter passed to the runtime or maybe configured
-#    via the root `StackLevelAdapter`?
-
-# - [ ] use of `logging.dict.dictConfig()` to simplify the impl
-#      of any of ^^ ??
-#    - https://stackoverflow.com/questions/7507825/where-is-a-complete-example-of-logging-config-dictconfig
-#    - https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
-#    - https://docs.python.org/3/library/logging.config.html#logging.config.dictConfig

tests/test_pldrx_limiting.py

@@ -7,15 +7,7 @@ related settings around IPC contexts.
 from contextlib import (
     asynccontextmanager as acm,
 )
-import sys
-import types
-from typing import (
-    Any,
-    Union,
-    Type,
-)
 
-import msgspec
 from msgspec import (
     Struct,
 )
@@ -30,10 +22,11 @@ from tractor import (
     Portal,
 )
 from tractor.msg import (
-    _codec,
     _ops as msgops,
     Return,
-    _exts,
+)
+from tractor.msg import (
+    _codec,
 )
 from tractor.msg.types import (
     log,
@@ -48,22 +41,13 @@ class PldMsg(
     #      case of these details?
     #
     # https://jcristharif.com/msgspec/structs.html#tagged-unions
-    tag=True,
+    # tag=True,
-    tag_field='msg_type',
+    # tag_field='msg_type',
 ):
     field: str
 
 
-class Msg1(PldMsg):
+maybe_msg_spec = PldMsg|None
-    field: str
-
-
-class Msg2(PldMsg):
-    field: int
-
-
-class AnyFieldMsg(PldMsg):
-    field: Any
 
 
 @acm
@@ -120,15 +104,9 @@ async def maybe_expect_raises(
                 )
 
 
-# NOTE, this decorator is applied dynamically by both the root and
+@tractor.context(
-# 'sub' actor such that we can dynamically apply various cases from
+    pld_spec=maybe_msg_spec,
-# a parametrized test.
+)
-#
-# maybe_msg_spec = PldMsg|None
-#
-# @tractor.context(
-#     pld_spec=maybe_msg_spec,
-# )
 async def child(
     ctx: Context,
     started_value: int|PldMsg|None,
@@ -136,13 +114,13 @@ async def child(
     validate_pld_spec: bool,
     raise_on_started_mte: bool = True,
 
-    pack_any_field: bool = False,
-
 ) -> None:
     '''
     Call ``Context.started()`` more then once (an error).
 
     '''
+    expect_started_mte: bool = started_value == 10
+
     # sanaity check that child RPC context is the current one
     curr_ctx: Context = current_ipc_ctx()
     assert ctx is curr_ctx
@@ -150,7 +128,6 @@ async def child(
     rx: msgops.PldRx = ctx._pld_rx
     curr_pldec: _codec.MsgDec = rx.pld_dec
 
-
     ctx_meta: dict = getattr(
         child,
         '_tractor_context_meta',
@@ -159,28 +136,10 @@ async def child(
     if ctx_meta:
         assert (
             ctx_meta['pld_spec']
-            is
+            is curr_pldec.spec
-            curr_pldec.spec
+            is curr_pldec.pld_spec
-            is
-            curr_pldec.pld_spec
         )
 
-    pld_types: set[Type] = _codec.unpack_spec_types(
-        curr_pldec.pld_spec,
-    )
-    if (
-        AnyFieldMsg in pld_types
-        and
-        pack_any_field
-    ):
-        started_value = AnyFieldMsg(field=started_value)
-
-    expect_started_mte: bool = (
-        started_value == 10
-        and
-        not pack_any_field
-    )
-
     # 2 cases: hdndle send-side and recv-only validation
     # - when `raise_on_started_mte == True`, send validate
     # - else, parent-recv-side only validation
@@ -260,65 +219,16 @@ async def child(
     # msg-type-error from this RPC task ;)
     return return_value
 
-def decorate_child_ep(
-    pld_spec: Union[Type],
-) -> types.ModuleType:
-    '''
-    Apply parametrized pld_spec to ctx ep like,
-
-        @tractor.context(
-            pld_spec=maybe_msg_spec,
-        )(child)
-
-    '''
-    this_mod = sys.modules[__name__]
-    global child  # a mod-fn defined above
-    assert this_mod.child is child
-    this_mod.child = tractor.context(
-        pld_spec=pld_spec,
-    )(child)
-    return this_mod
-
-
-@tractor.context
-async def set_chld_pldspec(
-    ctx: tractor.Context,
-    pld_spec_strs: list[str],
-):
-    '''
-    Dynamically apply the `@context(pld_spec=pld_spec)` deco to the
-    current actor's in-mem instance of this test module.
-
-    Allows dynamically applying the "payload-spec" in both a parent
-    and child actor after spawn.
-
-    '''
-    this_mod = sys.modules[__name__]
-    pld_spec: list[str] = _exts.dec_type_union(
-        pld_spec_strs,
-        mods=[
-            this_mod,
-            msgspec.inspect,
-        ],
-    )
-    decorate_child_ep(pld_spec)
-    await ctx.started()
-    await trio.sleep_forever()
-
 
 @pytest.mark.parametrize(
     'return_value',
     [
         'yo',
         None,
-        Msg2(field=10),
-        AnyFieldMsg(field='yo'),
     ],
     ids=[
         'return[invalid-"yo"]',
-        'return[maybe-valid-None]',
+        'return[valid-None]',
-        'return[maybe-valid-Msg2]',
-        'return[maybe-valid-any-packed-yo]',
     ],
 )
 @pytest.mark.parametrize(
@@ -326,14 +236,10 @@ async def set_chld_pldspec(
     [
         10,
         PldMsg(field='yo'),
-        Msg1(field='yo'),
-        AnyFieldMsg(field=10),
     ],
     ids=[
         'Started[invalid-10]',
-        'Started[maybe-valid-PldMsg]',
+        'Started[valid-PldMsg]',
-        'Started[maybe-valid-Msg1]',
-        'Started[maybe-valid-any-packed-10]',
     ],
 )
 @pytest.mark.parametrize(
@@ -347,31 +253,12 @@ async def set_chld_pldspec(
         'no-started-pld-validate',
     ],
 )
-@pytest.mark.parametrize(
-    'pld_spec',
-    [
-        PldMsg|None,
-
-        # demo how to have strict msgs alongside all other supported
-        # py-types by embedding the any-types inside a shuttle msg.
-        Msg1|Msg2|AnyFieldMsg,
-
-        # XXX, will never work since Struct overrides dict.
-        # https://jcristharif.com/msgspec/usage.html#typed-decoding
-        # Msg1|Msg2|msgspec.inspect.AnyType,
-    ],
-    ids=[
-        'maybe_PldMsg_spec',
-        'Msg1_or_Msg2_or_AnyFieldMsg_spec',
-    ]
-)
 def test_basic_payload_spec(
     debug_mode: bool,
     loglevel: str,
     return_value: str|None,
     started_value: int|PldMsg,
     pld_check_started_value: bool,
-    pld_spec: Union[Type],
 ):
     '''
     Validate the most basic `PldRx` msg-type-spec semantics around
@@ -380,33 +267,16 @@ def test_basic_payload_spec(
     pld-spec.
 
     '''
-    pld_types: set[Type] = _codec.unpack_spec_types(pld_spec)
+    invalid_return: bool = return_value == 'yo'
-    invalid_return: bool = (
+    invalid_started: bool = started_value == 10
-        return_value == 'yo'
-    )
-    invalid_started: bool = (
-        started_value == 10
-    )
-
-    # dynamically apply ep's pld-spec in 'root'.
-    decorate_child_ep(pld_spec)
-    assert (
-        child._tractor_context_meta['pld_spec'] == pld_spec
-    )
-    pld_spec_strs: list[str] = _exts.enc_type_union(
-        pld_spec,
-    )
-    assert len(pld_types) > 1
 
     async def main():
-        nonlocal pld_spec
-
         async with tractor.open_nursery(
             debug_mode=debug_mode,
             loglevel=loglevel,
         ) as an:
             p: Portal = await an.start_actor(
-                'sub',
+                'child',
                 enable_modules=[__name__],
             )
 
@@ -416,11 +286,9 @@ def test_basic_payload_spec(
             if invalid_started:
                 msg_type_str: str = 'Started'
                 bad_value: int = 10
-
             elif invalid_return:
                 msg_type_str: str = 'Return'
                 bad_value: str = 'yo'
-
             else:
                 # XXX but should never be used below then..
                 msg_type_str: str = ''
@@ -434,7 +302,6 @@ def test_basic_payload_spec(
                     invalid_started
                 ) else None
             )
-
             async with (
                 maybe_expect_raises(
                     raises=should_raise,
@@ -448,11 +315,6 @@ def test_basic_payload_spec(
                     # only for debug
                     # post_mortem=True,
                 ),
-                p.open_context(
-                    set_chld_pldspec,
-                    pld_spec_strs=pld_spec_strs,
-                ) as (deco_ctx, _),
-
                 p.open_context(
                     child,
                     return_value=return_value,
@@ -463,18 +325,12 @@ def test_basic_payload_spec(
                 # now opened with 'child' sub
                 assert current_ipc_ctx() is ctx
 
-                # assert type(first) is PldMsg
+                assert type(first) is PldMsg
-                assert isinstance(first, PldMsg)
                 assert first.field == 'yo'
 
                 try:
                     res: None|PldMsg = await ctx.result(hide_tb=False)
-                    assert res == return_value
+                    assert res is None
-                    if res is None:
-                        await tractor.pause()
-                    if isinstance(res, PldMsg):
-                        assert res.field == 10
-
                 except MsgTypeError as mte:
                     maybe_mte = mte
                     if not invalid_return:
@@ -500,9 +356,6 @@ def test_basic_payload_spec(
                         ctx.outcome
                     )
 
-                if should_raise is None:
-                    await deco_ctx.cancel()
-
             if should_raise is None:
                 assert maybe_mte is None
 

tractor/_code_load.py

@@ -1,48 +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/>.
-
-'''
-(Hot) coad (re-)load utils for python.
-
-'''
-import importlib
-from pathlib import Path
-import sys
-from types import ModuleType
-
-# ?TODO, move this into internal libs?
-# -[ ] we already use it in `modden.config._pymod` as well
-def load_module_from_path(
-    path: Path,
-    module_name: str|None = None,
-) -> ModuleType:
-    '''
-    Taken from SO,
-    https://stackoverflow.com/a/67208147
-
-    which is based on stdlib docs,
-    https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
-
-    '''
-    module_name = module_name or path.stem
-    spec = importlib.util.spec_from_file_location(
-        module_name,
-        str(path),
-    )
-    module = importlib.util.module_from_spec(spec)
-    sys.modules[module_name] = module
-    spec.loader.exec_module(module)
-    return module

tractor/_rpc.py

@@ -284,10 +284,6 @@ async def _errors_relayed_via_ipc(
     try:
         yield  # run RPC invoke body
 
-    except TransportClosed:
-        log.exception('Tpt disconnect during remote-exc relay?')
-        raise
-
     # box and ship RPC errors for wire-transit via
     # the task's requesting parent IPC-channel.
     except (
@@ -323,9 +319,6 @@ async def _errors_relayed_via_ipc(
                         and debug_kbis
                     )
                 )
-                # TODO? better then `debug_filter` below?
-                and
-                not isinstance(err, TransportClosed)
             ):
                 # XXX QUESTION XXX: is there any case where we'll
                 # want to debug IPC disconnects as a default?
@@ -334,25 +327,13 @@ async def _errors_relayed_via_ipc(
                 # recovery logic - the only case is some kind of
                 # strange bug in our transport layer itself? Going
                 # to keep this open ended for now.
-
+                log.debug(
-                if _state.debug_mode():
+                    'RPC task crashed, attempting to enter debugger\n'
-                    log.exception(
+                    f'|_{ctx}'
-                        f'RPC task crashed!\n'
+                )
-                        f'Attempting to enter debugger\n'
-                        f'\n'
-                        f'{ctx}'
-                    )
-
                 entered_debug = await debug._maybe_enter_pm(
                     err,
                     api_frame=inspect.currentframe(),
-
-                    # don't REPL any psuedo-expected tpt-disconnect
-                    # debug_filter=lambda exc: (
-                    #     type (exc) not in {
-                    #         TransportClosed,
-                    #     }
-                    # ),
                 )
                 if not entered_debug:
                     # if we prolly should have entered the REPL but
@@ -694,22 +675,6 @@ async def _invoke(
                     f'{pretty_struct.pformat(return_msg)}\n'
                 )
                 await chan.send(return_msg)
-                # ?TODO, remove the below since .send() already
-                # doesn't raise on tpt-closed?
-                # try:
-                #     await chan.send(return_msg)
-                # except TransportClosed:
-                #     log.exception(
-                #         f"Failed send final result to 'parent'-side of IPC-ctx!\n"
-                #         f'\n'
-                #         f'{chan}\n'
-                #         f'Channel already disconnected ??\n'
-                #         f'\n'
-                #         f'{pretty_struct.pformat(return_msg)}'
-                #     )
-                #     # ?TODO? will this ever be true though?
-                #     if chan.connected():
-                #         raise
 
             # NOTE: this happens IFF `ctx._scope.cancel()` is
             # called by any of,

tractor/devx/debug/_trace.py

@@ -561,9 +561,6 @@ async def _pause(
             return
 
         elif isinstance(pause_err, trio.Cancelled):
-            __tracebackhide__: bool = False
-            # XXX, unmask to REPL it.
-            # mk_pdb().set_trace(frame=inspect.currentframe())
             _repl_fail_report += (
                 'You called `tractor.pause()` from an already cancelled scope!\n\n'
                 'Consider `await tractor.pause(shield=True)` to make it work B)\n'

tractor/log.py

@@ -14,22 +14,11 @@
 # 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/>.
 
-'''
+"""
-An enhanced logging subsys.
+Log like a forester!
 
-An extended logging layer using (for now) the stdlib's `logging`
+"""
-+ `colorlog` which embeds concurrency-primitive/runtime info into
-records (headers) to help you better grok your distributed systems
-built on `tractor`.
-
-
-'''
 from collections.abc import Mapping
-from inspect import (
-    FrameInfo,
-    getmodule,
-    stack,
-)
 import sys
 import logging
 from logging import (
@@ -37,10 +26,8 @@ from logging import (
     Logger,
     StreamHandler,
 )
-from types import ModuleType
-import warnings
-
 import colorlog  # type: ignore
+
 import trio
 
 from ._state import current_actor
@@ -52,7 +39,7 @@ _default_loglevel: str = 'ERROR'
 # Super sexy formatting thanks to ``colorlog``.
 # (NOTE: we use the '{' format style)
 # Here, `thin_white` is just the layperson's gray.
-LOG_FORMAT: str = (
+LOG_FORMAT = (
     # "{bold_white}{log_color}{asctime}{reset}"
     "{log_color}{asctime}{reset}"
     " {bold_white}{thin_white}({reset}"
@@ -64,7 +51,7 @@ LOG_FORMAT: str = (
     " {reset}{bold_white}{thin_white}{message}"
 )
 
-DATE_FORMAT: str = '%b %d %H:%M:%S'
+DATE_FORMAT = '%b %d %H:%M:%S'
 
 # FYI, ERROR is 40
 # TODO: use a `bidict` to avoid the :155 check?
@@ -88,10 +75,7 @@ STD_PALETTE = {
     'TRANSPORT': 'cyan',
 }
 
-BOLD_PALETTE: dict[
+BOLD_PALETTE = {
-    str,
-    dict[int, str],
-] = {
     'bold': {
         level: f"bold_{color}" for level, color in STD_PALETTE.items()}
 }
@@ -113,17 +97,10 @@ def at_least_level(
     return False
 
 
-# TODO, compare with using a "filter" instead?
+# TODO: this isn't showing the correct '{filename}'
-# - https://stackoverflow.com/questions/60691759/add-information-to-every-log-message-in-python-logging/61830838#61830838
+# as it did before..
-#  |_corresponding dict-config,
-#    https://stackoverflow.com/questions/7507825/where-is-a-complete-example-of-logging-config-dictconfig/7507842#7507842
-#  - [ ] what's the benefit/tradeoffs?
-#
 class StackLevelAdapter(LoggerAdapter):
-    '''
-    A (software) stack oriented logger "adapter".
 
-    '''
     def at_least_level(
         self,
         level: str,
@@ -307,9 +284,7 @@ class ActorContextInfo(Mapping):
 
 def get_logger(
     name: str|None = None,
-    pkg_name: str = _proj_name,
+    _root_name: str = _proj_name,
-    # XXX, deprecated, use ^
-    _root_name: str|None = None,
 
     logger: Logger|None = None,
 
@@ -318,89 +293,22 @@ def get_logger(
     #  |_https://stackoverflow.com/questions/7507825/where-is-a-complete-example-of-logging-config-dictconfig
     #  |_https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
     subsys_spec: str|None = None,
-    mk_sublog: bool = True,
 
 ) -> StackLevelAdapter:
     '''
     Return the `tractor`-library root logger or a sub-logger for
     `name` if provided.
 
-    When `name` is left null we try to auto-detect the caller's
-    `mod.__name__` and use that as a the sub-logger key.
-    This allows for example creating a module level instance like,
-
-    .. code:: python
-
-        log = tractor.log.get_logger(_root_name='mylib')
-
-    and by default all console record headers will show the caller's
-    (of any `log.<level>()`-method) correct sub-pkg's
-    + py-module-file.
-
     '''
-    if _root_name:
-        msg: str = (
-            'The `_root_name: str` param of `get_logger()` is now deprecated.\n'
-            'Use the new `pkg_name: str` instead, it is the same usage.\n'
-        )
-        warnings.warn(
-            msg,
-            DeprecationWarning,
-            stacklevel=2,
-        )
-    pkg_name: str = _root_name or pkg_name
     log: Logger
-    log = rlog = logger or logging.getLogger(pkg_name)
+    log = rlog = logger or logging.getLogger(_root_name)
-
-    # Implicitly introspect the caller's module-name whenever `name`
-    # if left as the null default.
-    #
-    # When the `pkg_name` is `in` in the `mod.__name__` we presume
-    # this instance can be created as a sub-`StackLevelAdapter` and
-    # that the intention is get free module-path tracing and
-    # filtering (well once we implement that) oriented around the
-    # py-module code hierarchy of the consuming project.
-    if (
-        pkg_name != _proj_name
-        and
-        name is None
-        and
-        mk_sublog
-    ):
-        callstack: list[FrameInfo] = stack()
-        caller_fi: FrameInfo = callstack[1]
-        caller_mod: ModuleType = getmodule(caller_fi.frame)
-        if caller_mod:
-            # ?how is this `mod.__name__` defined?
-            # -> well by how the mod is imported..
-            # |_https://stackoverflow.com/a/15883682
-            mod_name: str = caller_mod.__name__
-            mod_pkg: str = caller_mod.__package__
-            log.info(
-                f'Generating sub-logger name,\n'
-                f'{mod_pkg}.{mod_name}\n'
-            )
-            # if pkg_name in caller_mod.__package__:
-            #     from tractor.devx.debug import mk_pdb
-            #     mk_pdb().set_trace()
-
-            if (
-                pkg_name
-                # and
-                # pkg_name in mod_name
-            ):
-                name = mod_name
-
-    # XXX, lowlevel debuggin..
-    # if pkg_name != _proj_name:
-        # from tractor.devx.debug import mk_pdb
-        # mk_pdb().set_trace()
 
     if (
-        name != _proj_name
-        and
         name
+        and
+        name != _proj_name
     ):
+
         # NOTE: for handling for modules that use `get_logger(__name__)`
         # we make the following stylistic choice:
         # - always avoid duplicate project-package token
@@ -410,63 +318,24 @@ def get_logger(
         #   since in python the {filename} is always this same
         #   module-file.
 
-        rname: str = pkg_name
+        sub_name: None|str = None
-        pkg_path: str = name
+        rname, _, sub_name = name.partition('.')
+        pkgpath, _, modfilename = sub_name.rpartition('.')
 
-        # ex. modden.runtime.progman
+        # NOTE: for tractor itself never include the last level
-        # -> rname='modden', _, pkg_path='runtime.progman'
+        # module key in the name such that something like: eg.
-        if pkg_name in name:
+        # 'tractor.trionics._broadcast` only includes the first
-            rname, _, pkg_path = name.partition('.')
+        # 2 tokens in the (coloured) name part.
+        if rname == 'tractor':
+            sub_name = pkgpath
 
-        # ex. modden.runtime.progman
+        if _root_name in sub_name:
-        # -> pkgpath='runtime', _, leaf_mod='progman'
+            duplicate, _, sub_name = sub_name.partition('.')
-        subpkg_path, _, leaf_mod = pkg_path.rpartition('.')
 
-        # NOTE: special usage for passing `name=__name__`,
+        if not sub_name:
-        #
-        # - remove duplication of any root-pkg-name in the
-        #   (sub/child-)logger name; i.e. never include the
-        #   `pkg_name` *twice* in the top-most-pkg-name/level
-        #
-        # -> this happens normally since it is added to `.getChild()`
-        #   and as the name of its root-logger.
-        #
-        # => So for ex. (module key in the name) something like
-        #   `name='tractor.trionics._broadcast` is passed,
-        #   only includes the first 2 sub-pkg name-tokens in the
-        #   child-logger's name; the colored "pkg-namespace" header
-        #   will then correctly show the same value as `name`.
-        if rname == pkg_name:
-            pkg_path = subpkg_path
-
-        # XXX, do some double-checks for duplication of,
-        # - root-pkg-name, already in root logger
-        # - leaf-module-name already in `{filename}` header-field
-        if pkg_name in pkg_path:
-            _duplicate, _, pkg_path = pkg_path.partition('.')
-            if _duplicate:
-                # assert _duplicate == rname
-                _root_log.warning(
-                    f'Duplicate pkg-name in sub-logger key?\n'
-                    f'pkg_name = {pkg_name!r}\n'
-                    f'pkg_path = {pkg_path!r}\n'
-                )
-
-        if (
-            leaf_mod
-            and
-            leaf_mod in pkg_path
-        ):
-            _root_log.warning(
-                f'Duplicate leaf-module-name in sub-logger key?\n'
-                f'leaf_mod = {leaf_mod!r}\n'
-                f'pkg_path = {pkg_path!r}\n'
-            )
-
-        if not pkg_path:
             log = rlog
-        elif mk_sublog:
+        else:
-            log = rlog.getChild(pkg_path)
+            log = rlog.getChild(sub_name)
 
         log.level = rlog.level
 
@@ -481,13 +350,8 @@ def get_logger(
     for name, val in CUSTOM_LEVELS.items():
         logging.addLevelName(val, name)
 
-        # ensure our custom adapter levels exist as methods
+        # ensure customs levels exist as methods
-        assert getattr(
+        assert getattr(logger, name.lower()), f'Logger does not define {name}'
-            logger,
-            name.lower()
-        ), (
-            f'Logger does not define {name}'
-        )
 
     return logger
 
@@ -561,4 +425,4 @@ def get_loglevel() -> str:
 
 
 # global module logger for tractor itself
-_root_log: StackLevelAdapter = get_logger('tractor')
+log: StackLevelAdapter = get_logger('tractor')

tractor/msg/_codec.py

@@ -181,11 +181,7 @@ class MsgDec(Struct):
 
 
 def mk_dec(
-    spec: (
+    spec: Union[Type[Struct]]|Type|None,
-        Union[Type[Struct]]
-        |Type  # lone type
-        |None # implying `Union[*ext_types]|None`
-    ),
 
     # NOTE, required for ad-hoc type extensions to the underlying
     # serialization proto (which is default `msgpack`),
@@ -198,18 +194,16 @@ def mk_dec(
     Create an IPC msg decoder, a slightly higher level wrapper around
     a `msgspec.msgpack.Decoder` which provides,
 
-    - easier introspection of the underlying type spec via the
+    - easier introspection of the underlying type spec via
-      `.spec` and `.spec_str` attrs,
+      the `.spec` and `.spec_str` attrs,
     - `.hook` access to the `Decoder.dec_hook()`,
     - automatic custom extension-types decode support when
       `dec_hook()` is provided such that any `PayloadMsg.pld` tagged
-      as a type from from `ext_types` (presuming the
+      as a type from from `ext_types` (presuming the `MsgCodec.encode()` also used
-      `MsgCodec.encode()` also used a `.enc_hook()`) is processed and
+      a `.enc_hook()`) is processed and constructed by a `PldRx` implicitily.
-      constructed by a `PldRx` implicitily.
 
-    NOTE, as mentioned a `MsgDec` is normally used for
+    NOTE, as mentioned a `MsgDec` is normally used for `PayloadMsg.pld: PayloadT` field
-    `PayloadMsg.pld: PayloadT` field decoding inside an
+    decoding inside an IPC-ctx-oriented `PldRx`.
-    IPC-ctx-oriented `PldRx`.
 
     '''
     if (
@@ -254,16 +248,12 @@ def mk_dec(
         # will work? kk B)
         #
         # maybe_box_struct = mk_boxed_ext_struct(ext_types)
-
+        spec = Raw | Union[*ext_types]
-        spec = spec | Union[*ext_types]
 
     return MsgDec(
         _dec=msgpack.Decoder(
-            type=spec,
+            type=spec,  # like `MsgType[Any]`
             dec_hook=dec_hook,
-            # ?TODO, support it?
-            # https://jcristharif.com/msgspec/usage.html#strict-vs-lax-mode
-            # strict=False,
         ),
     )
 

tractor/msg/_exts.py

@@ -33,7 +33,9 @@ converters,
   |_ https://jcristharif.com/msgspec/changelog.html
 
 '''
-import types
+from types import (
+    ModuleType,
+)
 import typing
 from typing import (
     Type,
@@ -42,51 +44,35 @@ from typing import (
 
 def dec_type_union(
     type_names: list[str],
-    mods: list[types.ModuleType] = []
+    mods: list[ModuleType] = []
 ) -> Type|Union[Type]:
     '''
     Look up types by name, compile into a list and then create and
     return a `typing.Union` from the full set.
 
     '''
-    _types: list[Type] = []
+    # import importlib
+    types: list[Type] = []
     for type_name in type_names:
         for mod in [
             typing,
-            types,
+            # importlib.import_module(__name__),
         ] + mods:
             if type_ref := getattr(
                 mod,
                 type_name,
                 False,
             ):
-                _types.append(type_ref)
+                types.append(type_ref)
-                break
 
-    report: str = ''
+    # special case handling only..
-    if not _types:
+    # ipc_pld_spec: Union[Type] = eval(
-        report: str = 'No type-instances could be resolved from `type_names` ??\n'
+    #     pld_spec_str,
+    #     {},  # globals
+    #     {'typing': typing},  # locals
+    # )
 
-    elif len(type_names) != len(_types):
+    return Union[*types]
-        report: str = (
-            f'Some type-instances could not be resolved from `type_names` ??\n'
-            f'_types: {_types!r}\n'
-        )
-
-    if report:
-        raise ValueError(
-            report
-            +
-            f'type_names: {type_names!r}\n'
-        )
-
-    if not _types:
-        raise ValueError(
-            f'No type-instance could be resolved from `type_names` ??\n'
-            f'type_names: {type_names!r}\n'
-        )
-
-    return Union[*_types]
 
 
 def enc_type_union(

tractor/msg/_ops.py

@@ -119,7 +119,7 @@ class PldRx(Struct):
     def limit_plds(
         self,
         spec: Union[Type[Struct]],
-        **mk_dec_kwargs,
+        **dec_kwargs,
 
     ) -> MsgDec:
         '''
@@ -135,7 +135,7 @@ class PldRx(Struct):
         orig_dec: MsgDec = self._pld_dec
         limit_dec: MsgDec = mk_dec(
             spec=spec,
-            **mk_dec_kwargs,
+            **dec_kwargs,
         )
         try:
             self._pld_dec = limit_dec
@@ -582,7 +582,6 @@ async def drain_to_final_msg(
     even after ctx closure and the `.open_context()` block exit.
 
     '''
-    __tracebackhide__: bool = hide_tb
     raise_overrun: bool = not ctx._allow_overruns
     parent_never_opened_stream: bool = ctx._stream is None
 
@@ -835,8 +834,7 @@ async def drain_to_final_msg(
             f'{ctx.outcome}\n'
         )
 
-    # ?TODO? why was this here and not above?
+    __tracebackhide__: bool = hide_tb
-    # __tracebackhide__: bool = hide_tb
     return (
         result_msg,
         pre_result_drained,

tractor/to_asyncio.py

@@ -94,14 +94,10 @@ else:
     QueueShutDown = False
 
 
-# TODO, generally speaking we can generalize this abstraction as,
+# TODO, generally speaking we can generalize this abstraction, a "SC linked
-#
+# parent->child task pair", as the same "supervision scope primitive"
-# > A "SC linked, inter-event-loop" channel for comms between
+# **that is** our `._context.Context` with the only difference being
-# > a `parent: trio.Task` -> `child: asyncio.Task` pair.
+# in how the tasks conduct msg-passing comms.
-#
-# It is **very similar** in terms of its operation as a "supervision
-# scope primitive" to that of our `._context.Context` with the only
-# difference being in how the tasks conduct msg-passing comms.
 #
 # For `LinkedTaskChannel` we are passing the equivalent of (once you
 # include all the recently added  `._trio/aio_to_raise`
@@ -126,7 +122,6 @@ class LinkedTaskChannel(
     task scheduled in the host loop.
 
     '''
-    # ?TODO, rename as `._aio_q` since it's 2-way?
     _to_aio: asyncio.Queue
     _from_aio: trio.MemoryReceiveChannel
 
@@ -240,11 +235,9 @@ class LinkedTaskChannel(
     #
     async def receive(self) -> Any:
         '''
-        Receive a value `trio.Task` <- `asyncio.Task`.
+        Receive a value from the paired `asyncio.Task` with
-
-        Note the tasks in each loop are "SC linked" as a pair with
         exception/cancel handling to teardown both sides on any
-        unexpected error or cancellation.
+        unexpected error.
 
         '''
         try:
@@ -268,42 +261,15 @@ class LinkedTaskChannel(
             ):
                 raise err
 
-    async def get(self) -> Any:
-        '''
-        Receive a value `asyncio.Task` <- `trio.Task`.
-
-        This is equiv to `await self._from_trio.get()`.
-
-        '''
-        return await self._to_aio.get()
-
     async def send(self, item: Any) -> None:
         '''
-        Send a value through `trio.Task` -> `asyncio.Task`
+        Send a value through to the asyncio task presuming
-        presuming
+        it defines a ``from_trio`` argument, if it does not
-        it defines a `from_trio` argument or makes calls
-        to `chan.get()` , if it does not
         this method will raise an error.
 
         '''
         self._to_aio.put_nowait(item)
 
-    # TODO? could we only compile-in this method on an instance
-    # handed to the `asyncio`-side, i.e. the fn invoked with
-    # `.open_channel_from()`.
-    def send_nowait(
-        self,
-        item: Any,
-    ) -> None:
-        '''
-        Send a value through FROM the `asyncio.Task` to
-        the `trio.Task` NON-BLOCKING.
-
-        This is equiv to `self._to_trio.send_nowait()`.
-
-        '''
-        self._to_trio.send_nowait(item)
-
     # TODO? needed?
     # async def wait_aio_complete(self) -> None:
     #     await self._aio_task_complete.wait()
@@ -371,12 +337,9 @@ def _run_asyncio_task(
 
     '''
     __tracebackhide__: bool = hide_tb
-    if not (actor := tractor.current_actor()).is_infected_aio():
+    if not tractor.current_actor().is_infected_aio():
         raise RuntimeError(
-            f'`infect_asyncio: bool` mode is not enabled ??\n'
+            "`infect_asyncio` mode is not enabled!?"
-            f'Ensure you pass `ActorNursery.start_actor(infect_asyncio=True)`\n'
-            f'\n'
-            f'{actor}\n'
         )
 
     # ITC (inter task comms), these channel/queue names are mostly from
@@ -1703,7 +1666,7 @@ def run_as_asyncio_guest(
                 # asyncio.CancelledError,
                 # ^^XXX `.shield()` call above prevents this??
 
-            ) as state_err:
+            )as state_err:
 
                 # XXX be super dupere noisy about abandonment issues!
                 aio_task: asyncio.Task = asyncio.current_task()