Temp Fix pyright issues until base class is propery implemented.

Author: EvieePy

twitchio/client.py

@@ -64,7 +64,7 @@
     from .models.streams import Stream, VideoMarkers
     from .models.videos import Video
     from .types_.eventsub import SubscriptionCreateTransport, SubscriptionResponse, _SubscriptionData
-    from .types_.options import AdapterOT, ClientOptions, WaitPredicateT
+    from .types_.options import ClientOptions, WaitPredicateT
     from .types_.tokens import TokenMappingData
 
 
@@ -134,7 +134,7 @@ def __init__(
             scopes=scopes,
             session=session,
         )
-        adapter: AdapterOT = options.get("adapter", AiohttpAdapter)
+        adapter: BaseAdapter | type[BaseAdapter] = options.get("adapter", AiohttpAdapter)
         if isinstance(adapter, BaseAdapter):
             adapter.client = self
             self._adapter = adapter

twitchio/types_/options.py

@@ -23,32 +23,19 @@
 """
 
 from collections.abc import Callable, Coroutine
-from typing import Any, NotRequired, TypeAlias, TypedDict
+from typing import Any, NotRequired, TypedDict
 
 import aiohttp
 
 from ..authentication import Scopes
-from ..web import AiohttpAdapter
-
-try:
-    from ..web import StarletteAdapter as StarletteAdapter
-
-    has_starlette = True
-except ImportError:
-    has_starlette = False
-
-
-if has_starlette:
-    AdapterOT: TypeAlias = type[StarletteAdapter | AiohttpAdapter] | StarletteAdapter | AiohttpAdapter  # type: ignore
-else:
-    AdapterOT: TypeAlias = type[AiohttpAdapter] | AiohttpAdapter  # type: ignore
+from ..web.utils import BaseAdapter
 
 
 class ClientOptions(TypedDict, total=False):
     redirect_uri: str | None
     scopes: Scopes | None
     session: aiohttp.ClientSession | None
-    adapter: NotRequired[AdapterOT]  # type: ignore
+    adapter: NotRequired[BaseAdapter]
 
 
 WaitPredicateT = Callable[..., Coroutine[Any, Any, bool]]

twitchio/web/utils.py

@@ -34,8 +34,11 @@
 
 
 if TYPE_CHECKING:
+    import asyncio
+
     from starlette.requests import Request
 
+    from ..client import Client
     from ..types_.eventsub import EventSubHeaders
 
 
@@ -46,6 +49,10 @@
 
 
 class BaseAdapter(abc.ABC):
+    client: Client
+    _runner_task: asyncio.Task[None] | None
+    _eventsub_secret: str | None
+
     @abc.abstractmethod
     async def event_startup(self) -> None: ...
 
@@ -70,6 +77,14 @@ async def oauth_callback(self, request: Any) -> Any: ...
     @abc.abstractmethod
     async def oauth_redirect(self, request: Any) -> Any: ...
 
+    @property
+    @abc.abstractmethod
+    def eventsub_url(self) -> str: ...
+
+    @property
+    @abc.abstractmethod
+    def redirect_url(self) -> str: ...
+
 
 async def verify_message(*, request: Request | web.Request, secret: str) -> bytes:
     body: bytes