fix(runner): refactor SessionRunner to pass channel explicitly in process_message and _run methods

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

src/bub/channels/manager.py

@@ -69,9 +69,8 @@ async def _process_input[T](self, channel: BaseChannel[T], message: T) -> None:
         session_id, _ = await channel.get_session_prompt(message)
         if session_id not in self._session_runners:
             self._session_runners[session_id] = SessionRunner(
-                channel,
                 session_id,
                 self.runtime.settings.message_debounce_seconds,
                 self.runtime.settings.message_delay_seconds,
             )
-        await self._session_runners[session_id].process_message(message)
+        await self._session_runners[session_id].process_message(channel, message)

src/bub/channels/runner.py

@@ -7,11 +7,8 @@
 
 
 class SessionRunner:
-    def __init__(
-        self, channel: BaseChannel, session_id: str, debounce_seconds: int, message_delay_seconds: int
-    ) -> None:
+    def __init__(self, session_id: str, debounce_seconds: int, message_delay_seconds: int) -> None:
         self.session_id = session_id
-        self.channel = channel
         self.debounce_seconds = debounce_seconds
         self.message_delay_seconds = message_delay_seconds
         self._prompts: list[str] = []
@@ -21,9 +18,9 @@ def __init__(
         self._running_task: asyncio.Task[None] | None = None
         self._loop = asyncio.get_running_loop()
 
-    async def _run(self) -> None:
+    async def _run(self, channel: BaseChannel) -> None:
         await self._event.wait()
-        prompt = f"channel: ${self.channel.output_channel}\n" + "\n".join(self._prompts)
+        prompt = f"channel: ${channel.output_channel}\n" + "\n".join(self._prompts)
         self._prompts.clear()
         self._running_task = None
         if (
@@ -32,8 +29,8 @@ async def _run(self) -> None:
         ):
             self._last_received_at = None
         try:
-            result = await self.channel.run_prompt(self.session_id, prompt)
-            await self.channel.process_output(self.session_id, result)
+            result = await channel.run_prompt(self.session_id, prompt)
+            await channel.process_output(self.session_id, result)
         except Exception:
             logger.exception("session.run.error session_id={}", self.session_id)
 
@@ -43,9 +40,9 @@ def reset_timer(self, timeout: int) -> None:
             self._timer.cancel()
         self._timer = self._loop.call_later(timeout, self._event.set)
 
-    async def process_message(self, message: Any) -> None:
-        is_mentioned = self.channel.is_mentioned(message)
-        _, prompt = await self.channel.get_session_prompt(message)
+    async def process_message(self, channel: BaseChannel, message: Any) -> None:
+        is_mentioned = channel.is_mentioned(message)
+        _, prompt = await channel.get_session_prompt(message)
         now = self._loop.time()
         if not is_mentioned and self._last_received_at is None:
             logger.info("session.receive ignored session_id={} message={}", self.session_id, prompt)
@@ -54,8 +51,8 @@ async def process_message(self, message: Any) -> None:
         if prompt.startswith(","):
             logger.info("session.receive.command session_id={} message={}", self.session_id, prompt)
             try:
-                result = await self.channel.run_prompt(self.session_id, prompt)
-                await self.channel.process_output(self.session_id, result)
+                result = await channel.run_prompt(self.session_id, prompt)
+                await channel.process_output(self.session_id, result)
             except Exception:
                 logger.exception("session.run.error session_id={}", self.session_id)
         elif is_mentioned:
@@ -64,11 +61,11 @@ async def process_message(self, message: Any) -> None:
             logger.info("session.receive.mentioned session_id={} message={}", self.session_id, prompt)
             self.reset_timer(self.debounce_seconds)
             if self._running_task is None:
-                self._running_task = asyncio.create_task(self._run())
+                self._running_task = asyncio.create_task(self._run(channel))
             return await self._running_task
         elif self._last_received_at is not None and self._running_task is None:
             # Otherwise if bot is mentioned before, we will keep reading messages for at most 30 seconds.
             logger.info("session.receive followup session_id={} message={}", self.session_id, prompt)
             self.reset_timer(self.message_delay_seconds)
-            self._running_task = asyncio.create_task(self._run())
+            self._running_task = asyncio.create_task(self._run(channel))
             return await self._running_task