Move models into their own folder

twitchio/__init__.py

@@ -32,6 +32,6 @@
 from .assets import Asset as Asset
 from .client import Client as Client
 from .exceptions import *
-from .models import Game as Game
+from .models import *
 from .payloads import *
 from .utils import Color as Color, Colour as Colour

twitchio/client.py

@@ -33,21 +33,12 @@
 
 from .authentication import ManagedHTTPClient, Scopes
 from .conduits import Conduit, ConduitPool
-from .models import (
-    ChannelInfo,
-    ChatBadge,
-    ChatterColor,
-    CheerEmote,
-    Clip,
-    ContentClassificationLabel,
-    ExtensionTransaction,
-    Game,
-    GlobalEmote,
-    SearchChannel,
-    Stream,
-    Team,
-    Video,
-)
+from .models.bits import CheerEmote, ExtensionTransaction
+from .models.ccls import ContentClassificationLabel
+from .models.channels import ChannelInfo
+from .models.chat import ChatBadge, ChatterColor, GlobalEmote
+from .models.games import Game
+from .models.teams import Team
 from .payloads import EventErrorPayload
 from .web import AiohttpAdapter
 
@@ -61,6 +52,10 @@
 
     from .authentication import ClientCredentialsPayload, ValidateTokenPayload
     from .http import HTTPAsyncIterator
+    from .models.clips import Clip
+    from .models.search import SearchChannel
+    from .models.streams import Stream
+    from .models.videos import Video
     from .types_.options import ClientOptions
     from .types_.responses import ConduitPayload
 

twitchio/http.py

@@ -37,18 +37,15 @@
 from . import __version__
 from .conduits import Shard
 from .exceptions import HTTPException
-from .models import (
-    ChannelFollowedEvent,
-    ChannelFollowerEvent,
-    Clip,
-    ExtensionTransaction,
-    Game,
-    SearchChannel,
-    Stream,
-    Video,
-)
-from .models_test.channel_points import CustomRewardRedemption
-from .models_test.charity import CharityDonation
+from .models.bits import ExtensionTransaction
+from .models.channel_points import CustomRewardRedemption
+from .models.channels import ChannelFollowedEvent, ChannelFollowerEvent
+from .models.charity import CharityDonation
+from .models.clips import Clip
+from .models.games import Game
+from .models.search import SearchChannel
+from .models.streams import Stream
+from .models.videos import Video
 from .utils import Colour, _from_json  # type: ignore
 
 
@@ -59,7 +56,7 @@
     from typing_extensions import Self, Unpack
 
     from .assets import Asset
-    from .models_test.channel_points import CustomReward
+    from .models.channel_points import CustomReward
     from .types_.conduits import ShardData
     from .types_.requests import APIRequestKwargs, HTTPMethod, ParamMapping
     from .types_.responses import (