jc211
/
tractor
forked from goodboy/tractor
1
0
Fork 0
Code Pull Requests Activity

Parameterize the `return_msg_type` in `._invoke()` 

Since we also handle a runtime-specific `CancelAck`, allow the
caller-scheduler to pass in the expected return-type msg per the RPC msg
endpoint loop.
runtime_to_msgspec
Tyler Goodlet 2024-05-28 09:36:26 -04:00
parent 8b860f4245
commit 582144830f
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tractor/_rpc.py
View File

@ -64,6 +64,7 @@ from .log import get_logger
from .msg import ( from .msg import (
current_codec, current_codec,
MsgCodec, MsgCodec,
PayloadT,
NamespacePath, NamespacePath,
pretty_struct, pretty_struct,
) )
@ -98,7 +99,7 @@ async def _invoke_non_context(
treat_as_gen: bool, treat_as_gen: bool,
is_rpc: bool, is_rpc: bool,
return_msg: Return|CancelAck = Return, return_msg_type: Return|CancelAck = Return,
task_status: TaskStatus[ task_status: TaskStatus[
Context | BaseException Context | BaseException
@ -220,7 +221,7 @@ async def _invoke_non_context(
and chan.connected() and chan.connected()
): ):
try: try:
ret_msg = return_msg( ret_msg = return_msg_type(
cid=cid, cid=cid,
pld=result, pld=result,
) )
@ -419,7 +420,7 @@ async def _invoke(
is_rpc: bool = True, is_rpc: bool = True,
hide_tb: bool = True, hide_tb: bool = True,
return_msg: Return|CancelAck = Return, return_msg_type: Return|CancelAck = Return,
task_status: TaskStatus[ task_status: TaskStatus[
Context | BaseException Context | BaseException
@ -533,7 +534,7 @@ async def _invoke(
kwargs, kwargs,
treat_as_gen, treat_as_gen,
is_rpc, is_rpc,
return_msg, return_msg_type,
task_status, task_status,
) )
# XXX below fallthrough is ONLY for `@context` eps # XXX below fallthrough is ONLY for `@context` eps
@ -593,18 +594,21 @@ async def _invoke(
ctx._scope = tn.cancel_scope ctx._scope = tn.cancel_scope
task_status.started(ctx) task_status.started(ctx)
# TODO: should would be nice to have our # TODO: better `trionics` tooling:
# `TaskMngr` nursery here! # -[ ] should would be nice to have our `TaskMngr`
res: Any = await coro # nursery here!
ctx._result = res # -[ ] payload value checking like we do with
# `.started()` such that the debbuger can engage
# deliver final result to caller side. # here in the child task instead of waiting for the
await chan.send( # parent to crash with it's own MTE..
return_msg( res: Any|PayloadT = await coro
cid=cid, return_msg: Return|CancelAck = return_msg_type(
pld=res, cid=cid,
) pld=res,
) )
# set and shuttle final result to "parent"-side task.
ctx._result = res
await chan.send(return_msg)
# NOTE: this happens IFF `ctx._scope.cancel()` is # NOTE: this happens IFF `ctx._scope.cancel()` is
# called by any of, # called by any of,
@ -940,7 +944,7 @@ async def process_messages(
actor.cancel, actor.cancel,
kwargs, kwargs,
is_rpc=False, is_rpc=False,
return_msg=CancelAck, return_msg_type=CancelAck,
) )
log.runtime( log.runtime(
@ -974,7 +978,7 @@ async def process_messages(
actor._cancel_task, actor._cancel_task,
kwargs, kwargs,
is_rpc=False, is_rpc=False,
return_msg=CancelAck, return_msg_type=CancelAck,
) )
except BaseException: except BaseException:
log.exception( log.exception(