Merge branch 'main' of https://github.com/PythonistaGuild/TwitchIO

Author: chillymosh

twitchio/client.py

@@ -165,6 +165,38 @@ def __init__(
         self._ready_event.clear()
 
         self.__waiter: asyncio.Event = asyncio.Event()
+        self._setup_called = False
+
+    @property
+    def adapter(self) -> BaseAdapter:
+        """Property returning the :class:`~twitchio.AiohttpAdapter` or :class:`~twitchio.StarlettepAdapter` the bot is
+        currently running."""
+        return self._adapter
+
+    async def set_adapter(self, adapter: BaseAdapter) -> None:
+        """|async|
+
+        Method which sets and starts a new web adapter which inherits from either :class:`~twitchio.AiohttpAdapter` or
+        :class:`~twitchio.StarlettepAdapter` or implements the :class:`~twitchio.BaseAdapter` specifications.
+
+        Parameters
+        ----------
+        adapter: :class:`~twitchio.BaseAdapter`
+            The new adapter to assign and start.
+
+        Returns
+        -------
+        None
+        """
+        if self._adapter:
+            await self._adapter.close(False)
+
+        self._adapter = adapter
+
+        if self._setup_called:
+            await self._adapter.run()
+
+        self._adapter.client = self
 
     @property
     def tokens(self) -> MappingProxyType[str, TokenMappingData]:
@@ -402,6 +434,7 @@ async def login(self, *, token: str | None = None, load_tokens: bool = True, sav
             self._user = await partial.user() if self._fetch_self else partial
 
         await self.setup_hook()
+        self._setup_called = True
 
     async def __aenter__(self) -> Self:
         return self
@@ -459,7 +492,7 @@ async def main() -> None:
         self.__waiter.clear()
         await self.login(token=token, load_tokens=load_tokens, save_tokens=save_tokens)
 
-        if with_adapter:
+        if with_adapter and not self._adapter._running:
             await self._adapter.run()
 
         # Dispatch ready event... May change places in the future.

twitchio/web/aio_adapter.py

@@ -176,6 +176,7 @@ def __init__(
         self.router.add_route("POST", self._eventsub_path, self.eventsub_callback)
 
         self._responded: deque[str] = deque(maxlen=5000)
+        self._running: bool = False
 
     def __init_subclass__(cls: type[AiohttpAdapter]) -> None:
         return
@@ -196,7 +197,7 @@ async def event_startup(self) -> None:
     async def event_shutdown(self) -> None:
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
 
-    async def close(self) -> None:
+    async def close(self, *args: Any, **kwargs: Any) -> None:
         if self._runner_task is not None:
             try:
                 self._runner_task.cancel()
@@ -212,6 +213,7 @@ async def close(self) -> None:
 
         self._runner = None
         self._runner_task = None
+        self._running = False
 
     def _task_callback(self, task: asyncio.Task[None]) -> None:
         if not task.done():
@@ -221,6 +223,8 @@ def _task_callback(self, task: asyncio.Task[None]) -> None:
             raise e
 
     async def run(self, host: str | None = None, port: int | None = None) -> None:
+        self._running = True
+
         self._runner = web.AppRunner(self, access_log=None, handle_signals=True)
         await self._runner.setup()
 

twitchio/web/starlette_adapter.py

@@ -174,6 +174,8 @@ def __init__(
             on_startup=[self.event_startup],
         )
         self._closing: bool = False
+        self._server: uvicorn.Server | None = None
+        self._running: bool = False
 
     def __repr__(self) -> str:
         return f"StarletteAdapter(host={self._host}, port={self._port})"
@@ -194,7 +196,7 @@ async def event_startup(self) -> None:
     async def event_shutdown(self) -> None:
         await self.close()
 
-    async def close(self) -> None:
+    async def close(self, with_client: bool = True) -> None:
         if self._closing:
             return
 
@@ -211,9 +213,16 @@ async def close(self) -> None:
                 )
 
             self._runner_task = None
-            await self.client.close()
+
+            if with_client:
+                await self.client.close()
+
+        if self._server:
+            await self._server.shutdown()
 
         logger.info("Successfully shutdown TwitchIO <%s>.", self.__class__.__qualname__)
+        self._closing = False
+        self._running = False
 
     def _task_callback(self, task: asyncio.Task[None]) -> None:
         if not task.done():
@@ -229,6 +238,8 @@ def _task_callback(self, task: asyncio.Task[None]) -> None:
                 logger.exception(e.__context__)
 
     async def run(self, host: str | None = None, port: int | None = None) -> None:
+        self._running = True
+
         self._host = host or self._host
         self._port = port or self._port
 
@@ -241,8 +252,10 @@ async def run(self, host: str | None = None, port: int | None = None) -> None:
             timeout_graceful_shutdown=3,
         )
 
-        server: uvicorn.Server = uvicorn.Server(config)
-        self._runner_task = asyncio.create_task(server.serve(), name=f"twitchio-web-adapter:{self.__class__.__qualname__}")
+        self._server = uvicorn.Server(config)
+        self._runner_task = asyncio.create_task(
+            self._server.serve(), name=f"twitchio-web-adapter:{self.__class__.__qualname__}"
+        )
         self._runner_task.add_done_callback(self._task_callback)
 
     async def eventsub_callback(self, request: Request) -> Response:

twitchio/web/utils.py

@@ -86,6 +86,7 @@ class BaseAdapter(abc.ABC):
     client: Client
     _runner_task: asyncio.Task[None] | None
     _eventsub_secret: str | None
+    _running: bool
 
     @abc.abstractmethod
     async def event_startup(self) -> None: ...
@@ -94,7 +95,7 @@ async def event_startup(self) -> None: ...
     async def event_shutdown(self) -> None: ...
 
     @abc.abstractmethod
-    async def close(self) -> None: ...
+    async def close(self, *args: Any, **kwargs: Any) -> None: ...
 
     @abc.abstractmethod
     async def run(self, host: str | None = None, port: int | None = None) -> None: ...