[BotLoop] run with custom timeout

Author: Guillaume De Saint Martin

octobot/octobot.pxd

@@ -52,7 +52,7 @@ cdef class OctoBot:
     cdef public octobot_channel_consumer.OctoBotChannelGlobalConsumer global_consumer
     cdef public configuration_manager.ConfigurationManager configuration_manager
 
-    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*)
+    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*, object timeout=*)
     cpdef void set_watcher(self, object watcher)
     cpdef object get_aiohttp_session(self)
     cpdef object get_edited_config(self, str config_key, bint dict_only=*)

octobot/octobot.py

@@ -19,6 +19,7 @@
 import aiohttp
 
 import octobot_commons.enums as enums
+import octobot_commons.constants as commons_constants
 import octobot_commons.logging as logging
 import octobot_commons.configuration as configuration
 import octobot_commons.signals as signals
@@ -170,8 +171,9 @@ def get_trading_mode(self):
         except StopIteration:
             return None
 
-    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True):
-        return self.task_manager.run_in_main_asyncio_loop(coroutine, log_exceptions=log_exceptions)
+    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True,
+                                 timeout=commons_constants.DEFAULT_FUTURE_TIMEOUT):
+        return self.task_manager.run_in_main_asyncio_loop(coroutine, log_exceptions=log_exceptions, timeout=timeout)
 
     def set_watcher(self, watcher):
         self.task_manager.watcher = watcher

octobot/octobot_api.pxd

@@ -33,7 +33,7 @@ cdef class OctoBotAPI:
     cpdef str get_bot_id(self)
     cpdef str get_matrix_id(self)
     cpdef object get_aiohttp_session(self)
-    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*)
+    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*, object timeout=*)
     cpdef void stop_tasks(self)
     cpdef void stop_bot(self)
     cpdef void update_bot(self)

octobot/octobot_api.py

@@ -15,7 +15,7 @@
 #  License along with OctoBot. If not, see <https://www.gnu.org/licenses/>.
 import octobot.constants as constants
 import octobot.commands as commands
-import octobot.community
+import octobot_commons.constants as commons_constants
 
 
 class OctoBotAPI:
@@ -65,8 +65,9 @@ def get_matrix_id(self) -> str:
     def get_aiohttp_session(self) -> object:
         return self._octobot.get_aiohttp_session()
 
-    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True):
-        return self._octobot.run_in_main_asyncio_loop(coroutine, log_exceptions=log_exceptions)
+    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True,
+                                 timeout=commons_constants.DEFAULT_FUTURE_TIMEOUT):
+        return self._octobot.run_in_main_asyncio_loop(coroutine, log_exceptions=log_exceptions, timeout=timeout)
 
     def run_in_async_executor(self, coroutine):
         return self._octobot.task_manager.run_in_async_executor(coroutine)

octobot/task_manager.pxd

@@ -36,4 +36,4 @@ cdef class TaskManager:
     cpdef void run_forever(self, object coroutine)
     cpdef void create_pool_executor(self, int workers=*)
     cpdef void init_async_loop(self)
-    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*)
+    cpdef object run_in_main_asyncio_loop(self, object coroutine, bint log_exceptions=*, object timeout=*)

octobot/task_manager.py

@@ -20,6 +20,7 @@
 
 import octobot_commons.asyncio_tools as asyncio_tools
 import octobot_commons.logging as logging
+import octobot_commons.constants as commons_constants
 
 import octobot.constants as constants
 
@@ -130,8 +131,10 @@ def _create_new_asyncio_main_loop(self):
                                                     name=f"{self.get_name()} new asyncio main loop")
         self.current_loop_thread.start()
 
-    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True):
-        return asyncio_tools.run_coroutine_in_asyncio_loop(coroutine, self.async_loop, log_exceptions=log_exceptions)
+    def run_in_main_asyncio_loop(self, coroutine, log_exceptions=True,
+                                 timeout=commons_constants.DEFAULT_FUTURE_TIMEOUT):
+        return asyncio_tools.run_coroutine_in_asyncio_loop(coroutine, self.async_loop,
+                                                           log_exceptions=log_exceptions, timeout=timeout)
 
     def run_in_async_executor(self, coroutine):
         if self.executors is not None: