Move types around

Author: EvieePy

twitchio/ext/commands/bot.py

@@ -25,7 +25,7 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any, Unpack
+from typing import TYPE_CHECKING, Any, TypeAlias, Unpack
 
 from twitchio.client import Client
 
@@ -36,8 +36,9 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Coroutine, Iterable
+
     from models.eventsub_ import ChatMessage
-    from types_.options import Prefix_T
 
     from twitchio.eventsub.subscriptions import SubscriptionPayload
     from twitchio.types_.eventsub import SubscriptionResponse
@@ -46,6 +47,8 @@
 
     from .components import Component
 
+    PrefixT: TypeAlias = str | Iterable[str] | Callable[["Bot", ChatMessage], Coroutine[Any, Any, str | Iterable[str]]]
+
 
 logger: logging.Logger = logging.getLogger(__name__)
 
@@ -154,7 +157,7 @@ def __init__(
         client_secret: str,
         bot_id: str,
         owner_id: str | None = None,
-        prefix: Prefix_T,
+        prefix: PrefixT,
         **options: Unpack[ClientOptions],
     ) -> None:
         super().__init__(
@@ -165,7 +168,7 @@ def __init__(
         )
 
         self._owner_id: str | None = owner_id
-        self._get_prefix: Prefix_T = prefix
+        self._get_prefix: PrefixT = prefix
         self._components: dict[str, Component] = {}
         self._base_converter: _BaseConverter = _BaseConverter(self)
 

twitchio/ext/commands/context.py

@@ -25,7 +25,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias
 
 from twitchio.ext.commands.core import CommandErrorPayload
 
@@ -37,15 +37,18 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Coroutine
+
     from models import SentMessage
     from models.eventsub_ import ChatMessage
-    from types_.options import Prefix_T
     from user import Chatter, PartialUser
 
     from .bot import Bot
     from .components import Component
     from .core import Command
 
+    PrefixT: TypeAlias = str | Iterable[str] | Callable[[Bot, ChatMessage], Coroutine[Any, Any, str | Iterable[str]]]
+
 
 class Context:
     """The Context class constructed when a message is received and processed via the :func:`~twitchio.event_message`
@@ -241,7 +244,7 @@ def _validate_prefix(self, potential: str | Iterable[str]) -> None:
                 return
 
     async def _get_prefix(self) -> None:
-        assigned: Prefix_T = self._bot._get_prefix
+        assigned: PrefixT = self._bot._get_prefix
         potential: str | Iterable[str]
 
         if callable(assigned):

twitchio/types_/__init__.py

@@ -21,5 +21,3 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-
-from .options import *

twitchio/types_/options.py

@@ -22,20 +22,15 @@
 SOFTWARE.
 """
 
-from collections.abc import Callable, Coroutine, Iterable
+from collections.abc import Callable, Coroutine
 from typing import Any, NotRequired, TypeAlias, TypedDict
 
 import aiohttp
 
 from ..authentication import Scopes
-from ..ext.commands import Bot
-from ..models import ChatMessage
 from ..web import *
 
 
-__all__ = ("AdapterOT", "ClientOptions", "WaitPredicateT", "Prefix_T")
-
-
 AdapterOT: TypeAlias = type[StarletteAdapter | AiohttpAdapter] | StarletteAdapter | AiohttpAdapter
 
 
@@ -47,4 +42,3 @@ class ClientOptions(TypedDict, total=False):
 
 
 WaitPredicateT = Callable[..., Coroutine[Any, Any, bool]]
-Prefix_T = str | Iterable[str] | Callable[[Bot, ChatMessage], Coroutine[Any, Any, str | Iterable[str]]]