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

Fix func type checking

stream_contexts
Tyler Goodlet 2021-04-28 11:38:31 -04:00
parent ad9256bcdb
commit 83af295b45
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tractor/_portal.py
View File

@ -110,8 +110,10 @@ class Portal:
return cid, recv_chan, functype, first_msg return cid, recv_chan, functype, first_msg
async def _submit_for_result(self, ns: str, func: str, **kwargs) -> None: async def _submit_for_result(self, ns: str, func: str, **kwargs) -> None:
assert self._expect_result is None, \ assert self._expect_result is None, \
"A pending main result has already been submitted" "A pending main result has already been submitted"
self._expect_result = await self._submit(ns, func, kwargs) self._expect_result = await self._submit(ns, func, kwargs)
async def _return_once( async def _return_once(
@ -266,10 +268,15 @@ class Portal:
assert isinstance(fn_name, str) assert isinstance(fn_name, str)
else: # function reference was passed directly else: # function reference was passed directly
if not ( if (
inspect.iscoroutinefunction(func) not inspect.iscoroutinefunction(func) or
(
inspect.iscoroutinefunction(func) and
getattr(func, '_tractor_stream_function', False)
)
): ):
raise TypeError(f'{func} must be an async function!') raise TypeError(
f'{func} must be a non-streaming async function!')
fn_mod_path, fn_name = func_deats(func) fn_mod_path, fn_name = func_deats(func)
@ -285,8 +292,9 @@ class Portal:
) -> AsyncGenerator[ReceiveMsgStream, None]: ) -> AsyncGenerator[ReceiveMsgStream, None]:
if not inspect.isasyncgenfunction(async_gen_func): if not inspect.isasyncgenfunction(async_gen_func):
if not inspect.iscoroutinefunction(async_gen_func) or ( if not (
not getattr(async_gen_func, '_tractor_stream_function', False) inspect.iscoroutinefunction(async_gen_func) and
getattr(async_gen_func, '_tractor_stream_function', False)
): ):
raise TypeError( raise TypeError(
f'{async_gen_func} must be an async generator function!') f'{async_gen_func} must be an async generator function!')