adjust code

pywebio/demos/overview-zh.py

@@ -6,7 +6,8 @@ import asyncio
 from datetime import datetime
 from functools import partial
 from pywebio.input import *
-from pywebio.ioloop import start_ioloop, run_async
+from pywebio.ioloop import start_ioloop
+from pywebio.session import *
 from pywebio.output import *
 
 

pywebio/ioloop.py

@@ -1,12 +1,11 @@
 import tornado.websocket
 from tornado.web import StaticFileHandler
-from .session.asyncbased import AsyncBasedSession
+from .session import AsyncBasedSession, get_session_implement
 from .platform import STATIC_PATH
 from .platform.tornado import webio_handler
 
 
-def run_async(coro_obj):
-    AsyncBasedSession.get_current_session().run_async(coro_obj)
+
 
 
 def start_ioloop(coro_func, port=8080, debug=True, tornado_app_args=None):

pywebio/session/__init__.py

@@ -1,9 +1,14 @@
-from .base import AbstractSession
+import threading
+
 from .asyncbased import AsyncBasedSession
+from .base import AbstractSession
 from .threadbased import ThreadBasedWebIOSession
+from functools import wraps
 
 _session_type = AsyncBasedSession
 
+__all__ = ['set_session_implement', 'run_async', 'asyncio_coroutine', 'register_thread']
+
 
 def set_session_implement(session_type):
     global _session_type
@@ -22,3 +27,51 @@ def get_current_session() -> "AbstractSession":
 
 def get_current_task_id():
     return _session_type.get_current_task_id()
+
+
+def check_session_impl(session_type):
+    def decorator(func):
+        @wraps(func)
+        def inner(*args, **kwargs):
+            now_impl = get_session_implement()
+            if now_impl is not session_type:
+                func_name = getattr(func, '__name__', str(func))
+                require = getattr(session_type, '__name__', str(session_type))
+                now = getattr(now_impl, '__name__', str(now_impl))
+
+                raise RuntimeError("Only can invoke `{func_name:s}` in {require:s} context."
+                                   " You are now in {now:s} context".format(func_name=func_name, require=require,
+                                                                            now=now))
+            return func(*args, **kwargs)
+
+        return inner
+
+    return decorator
+
+
+@check_session_impl(AsyncBasedSession)
+def run_async(coro_obj):
+    """异步运行协程对象，协程中依然可以调用 PyWebIO 交互函数。 仅能在 AsyncBasedSession 会话上下文中调用
+
+    :param coro_obj: 协程对象
+    """
+    AsyncBasedSession.get_current_session().run_async(coro_obj)
+
+
+@check_session_impl(AsyncBasedSession)
+async def asyncio_coroutine(coro):
+    """若会话线程和运行事件的线程不是同一个线程，需要用 asyncio_coroutine 来运行asyncio中的协程
+
+    :param coro_obj: 协程对象
+    """
+    return await AsyncBasedSession.get_current_session().asyncio_coroutine(coro)
+
+
+@check_session_impl(ThreadBasedWebIOSession)
+def register_thread(thread: threading.Thread, as_daemon=True):
+    """注册线程，以便在线程内调用 PyWebIO 交互函数。仅能在 ThreadBasedWebIOSession 会话上下文中调用
+
+    :param threading.Thread thread: 线程对象
+    :param bool as_daemon: 是否将线程设置为 daemon 线程. 默认为 True
+    """
+    return ThreadBasedWebIOSession.get_current_session().register_thread(thread, as_daemon=as_daemon)