xasyncio 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

xasyncio/__init__.py

@@ -1,4 +1,6 @@
 import asyncio
+import dataclasses
+import logging
 import threading
 import traceback
 
@@ -9,36 +11,48 @@ class ThreadingError(Exception):
     pass
 
 
-class AsyncThread(threading.Thread):
-    def __init__(self, name):
-        super().__init__()
-        self.name = name
-        self.events = {}
-        self.events_out_thread = {}
-        self.loop: asyncio.BaseEventLoop | None = None
-        self.stopped = True
-        self.start()
-        self.create_out_thread_event('loop_started')
-        self.wait_out_thread_event('loop_started')
-
-    def _stop(self):
-        """this function must be called with the thread"""
+@dataclasses.dataclass
+class AsyncThreadBase:
+    # def call_async(self, func, *args):
+    #     raise NotImplementedError
+    #
+    # def call_sync(self, func, *args):
+    #     raise NotImplementedError
+    #
+    # def sync_coroutine(self, coro, timeout=None):
+    #     raise NotImplementedError
+    #
+    # def ensure_coroutine(self, coro):
+    #     raise NotImplementedError
+    #
+    # async def await_coroutine(self, coro):
+    #     raise NotImplementedError
+    #
+    # def stop(self):
+    #     raise NotImplementedError
+    name: str = ''
+    loop: asyncio.AbstractEventLoop | None = None
+    events: dict = dataclasses.field(default_factory=dict)
+    events_out_thread: dict = dataclasses.field(default_factory=dict)
+
+    def _stop_self(self):
+        """this function must be called with this thread"""
         if self.stopped:
             return
         self.loop.stop()
         self.stopped = True
 
-    def stop(self):
+    async def stop(self):
         """thread safe stop function"""
+        # Called in other thread
+
         # thread = threading.current_thread()
         # if thread == self.thread:
         #     print('calling from the loop thread')
         # else:
         #     print('calling from another loop')
         print(f'Threaded loop {self.name} stopping')
-        self.call_sync(self._stop)
-        # self.thread.join(10)
-        self.join(10)
+        await self.call_sync(self._stop_self)
 
     def _mark_running(self, running=True):
         # if running:
@@ -47,25 +61,6 @@ class AsyncThread(threading.Thread):
         #     print('mark stopped')
         self.stopped = not running
 
-    def run(self):
-        self.loop = asyncio.new_event_loop()
-        # Need to call this in the loop, mainly because need to make sure the loop is running
-        # debugging version
-        # self.loop.call_soon_threadsafe(
-        #     lambda: (
-        #         print('notifying loop started'),
-        #         self._mark_running(),
-        #         print(self.stopped),
-        #         self.notify_out_thread_event('loop_started')))
-        self.loop.call_soon_threadsafe(
-            lambda: (
-                self._mark_running(), self.notify_out_thread_event('loop_started')
-            )
-        )
-
-        self.loop.run_forever()
-        print(f'Loop ({self.name}) finished')
-
     def create_out_thread_event(self, name):
         self.events_out_thread[name] = threading.Event()
 
@@ -85,8 +80,44 @@ class AsyncThread(threading.Thread):
     def wait(self, event_name):
         self.events[event_name].wait()
 
-    def call_sync(self, func, *args):
-        blocking_call_w_loop(self.loop, func, *args)
+    # def call_blocking(self, func, *args):
+    # def call_sync(self, func, *args):
+    #     # other thread will be blocked and could result in deadlocks
+    #     pass
+
+    async def call_sync(self, func, *args):
+        # Called in other thread
+        # blocking_call_w_loop(self.loop, func, *args)
+        finish_event = asyncio.Event()
+        caller_loop = asyncio.get_event_loop()
+
+        def _set_finish_event():
+            caller_loop.call_soon_threadsafe(lambda: finish_event.set())
+
+        def _helper():
+            # in self thread
+            try:
+                func(*args)
+                _set_finish_event()
+            except Exception as e:
+                nonlocal exception
+                traceback.print_exc()
+                exception = e
+                _set_finish_event()
+
+        exception = None
+
+        def _ex_handler(e):
+            nonlocal exception
+            exception = e
+            raise exception
+
+        self.loop.set_exception_handler(_ex_handler)
+
+        self.loop.call_soon_threadsafe(_helper)
+        await finish_event.wait()
+        if exception:
+            raise exception
 
     def call_async(self, func, *args):
         self.loop.call_soon_threadsafe(func, *args)
@@ -95,117 +126,104 @@ class AsyncThread(threading.Thread):
     #     if threading.current_thread() != self.thread:
     #         raise ThreadingError('Invalid thread: this function must be called in the loop thread')
 
-    def await_coroutine(self, coro, timeout=None):
+    def sync_coroutine(self, coro, timeout=None):
         return asyncio.run_coroutine_threadsafe(coro, self.loop).result(timeout)
 
-        # finish_event = threading.Event()
-        #
-        # async def _helper():
-        #     try:
-        #         await coro
-        #     except Exception as e:
-        #         traceback.print_exc()
-        #
-        #     finish_event.set()
-        #
-        # self.loop.call_soon_threadsafe(self.loop.create_task, _helper())
-        # finish_event.wait()
-
-
-class AsyncedThread:
-    def __init__(self, name, thread):
-        self.thread = thread
-        self.loop = asyncio.get_event_loop()
-        assert self.loop.is_running()  # we require the loop already running
-        self.name = name
-        self.events = {}
-        self.events_out_thread = {}
-        self.stopped = True
+    def ensure_coroutine(self, coro):
+        return asyncio.run_coroutine_threadsafe(coro, self.loop)
 
-    def _stop(self):
-        """this function must be called with the thread"""
-        if self.stopped:
-            return
-        self.loop.stop()
-        self.stopped = True
+    async def run_coroutine(self, coro):
+        return await asyncio.wrap_future(asyncio.run_coroutine_threadsafe(coro, self.loop))
 
-    def stop(self):
-        """thread safe stop function"""
-        # thread = threading.current_thread()
-        # if thread == self.thread:
-        #     print('calling from the loop thread')
-        # else:
-        #     print('calling from another loop')
-        print(f'Threaded loop {self.name} stopping')
-        self.call_sync(self._stop)
-        # self.thread.join(10)
-        self.join(10)
+    def blocking_call_w_loop(self, loop, func, *args):
+        pass
 
-    def _mark_running(self, running=True):
-        # if running:
-        #     print('mark running')
-        # else:
-        #     print('mark stopped')
-        self.stopped = not running
+    # def sync_coroutine_deadlock(self, coro, timeout=None):
+    #     finish_event = threading.Event()
+    #
+    #     async def _helper():
+    #         try:
+    #             await coro
+    #         except Exception as e:
+    #             traceback.print_exc()
+    #
+    #         finish_event.set()
+    #
+    #     self.loop.call_soon_threadsafe(self.loop.create_task, _helper())
+    #     finish_event.wait()
 
-    def create_out_thread_event(self, name):
-        self.events_out_thread[name] = threading.Event()
 
-    def wait_out_thread_event(self, name):
-        self.events_out_thread[name].wait()
-
-    def notify_out_thread_event(self, name):
-        # print('notify event', name)
-        self.events_out_thread[name].set()
+class AsyncThread(threading.Thread, AsyncThreadBase):
+    def __init__(self, name):
+        # super(AsyncThread, self).__init__()
+        threading.Thread.__init__(self)
+        AsyncThreadBase.__init__(self)
+        self.name = name
+        self.events = {}
+        self.events_out_thread = {}
+        self.loop: asyncio.BaseEventLoop | None = None
+        self.stopped = True
+        self.create_out_thread_event('loop_started')
+        self.start()
+        self.wait_out_thread_event('loop_started')
+        logging.debug('AsyncThread init finished and running')
 
-    def create_event(self, name):
-        self.events[name] = threading.Event()
+    def __repr__(self):
+        return f'<AsyncThread {self.name}>'
 
-    def notify(self, event_name):
-        self.events[event_name].set()
+    async def stop(self):
+        # Called in other thread
+        await super().stop()
+        res = self.join(1)
+        print(res)
 
-    def wait(self, event_name):
-        self.events[event_name].wait()
+    def run(self):
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
 
-    def call_sync(self, func, *args):
-        blocking_call_w_loop(self.loop, func, *args)
+        # Need to call this in the loop, mainly because need to make sure the loop is running
+        # debugging version
+        # self.loop.call_soon_threadsafe(
+        #     lambda: (
+        #         print('notifying loop started'),
+        #         self._mark_running(),
+        #         print(self.stopped),
+        #         self.notify_out_thread_event('loop_started')))
 
-    def call_async(self, func, *args):
-        self.loop.call_soon_threadsafe(func, *args)
+        # self.loop.call_soon_threadsafe(
+        # self.loop.call_soon(
+        #     lambda: (
+        #         self._mark_running(), self.notify_out_thread_event('loop_started')
+        #     )
+        # )
 
-    # def _sync_coro(self, coro):
-    #     if threading.current_thread() != self.thread:
-    #         raise ThreadingError('Invalid thread: this function must be called in the loop thread')
+        async def _notify_running():
+            logging.debug('notify running')
+            self._mark_running()
+            self.notify_out_thread_event('loop_started')
 
-    def await_coroutine(self, coro, timeout=None):
-        return asyncio.run_coroutine_threadsafe(coro, self.loop).result(timeout)
+        asyncio.ensure_future(_notify_running())
 
-        # finish_event = threading.Event()
-        #
-        # async def _helper():
-        #     try:
-        #         await coro
-        #     except Exception as e:
-        #         traceback.print_exc()
-        #
-        #     finish_event.set()
-        #
-        # self.loop.call_soon_threadsafe(self.loop.create_task, _helper())
-        # finish_event.wait()
+        logging.info('running loop')
+        self.loop.run_forever()
+        print(f'Loop ({self.name}) finished')
 
+    def __hash__(self):
+        return 0
 
-def blocking_call_w_loop(loop, func, *args):
-    finish_event = threading.Event()
+    def __eq__(self, other):
+        return self is other
 
-    def _helper():
-        try:
-            func(*args)
-            finish_event.set()
-        except Exception:
-            traceback.print_exc()
 
-    loop.call_soon_threadsafe(_helper)
-    finish_event.wait()
+class AsyncedThread(AsyncThreadBase):
+    def __init__(self, name, thread):
+        self.thread = thread
+        self.loop = asyncio.get_event_loop()
+        assert self.loop.is_running()  # we require the loop already running
+        self.name = name
+        self.events = {}
+        self.events_out_thread = {}
+        self.stopped = True
 
 
 class ThreadSafeEvent(asyncio.Event):

{xasyncio-0.2.2.dist-info → xasyncio-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xasyncio
-Version: 0.2.2
+Version: 0.2.4
 Summary: A package to simiplify multithreaded asyncio event loops
 Project-URL: Homepage, https://github.com/shawn-peng/xasyncio
 Project-URL: Bug Tracker, https://github.com/shawn-peng/xasyncio/issues

xasyncio-0.2.4.dist-info/RECORD

@@ -0,0 +1,5 @@
+xasyncio/__init__.py,sha256=mOXELsId4vjBp379YVnpMFBS41w4lyBGwraAGdzumpw,7195
+xasyncio-0.2.4.dist-info/METADATA,sha256=j-4Hyv-7SujFH2FL1JWv63uefV7imZTt_haObhP1K_Q,488
+xasyncio-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+xasyncio-0.2.4.dist-info/licenses/LICENSE,sha256=fHWKRzBMuHQa8EYpadXv8pSmA8XnR8FlirkvLoayV1I,1066
+xasyncio-0.2.4.dist-info/RECORD,,

xasyncio-0.2.2.dist-info/RECORD

@@ -1,5 +0,0 @@
-xasyncio/__init__.py,sha256=8_wK431-8KTNTQXMiSahopLFqfgoD-tRByiTh_W3tDQ,6672
-xasyncio-0.2.2.dist-info/METADATA,sha256=0QCfV_eS4CKgwQ0Uc8sk4XUctmSR8FXpBilBx_l8sAU,488
-xasyncio-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xasyncio-0.2.2.dist-info/licenses/LICENSE,sha256=fHWKRzBMuHQa8EYpadXv8pSmA8XnR8FlirkvLoayV1I,1066
-xasyncio-0.2.2.dist-info/RECORD,,