Move interaction models into wumpy.models

wumpyproject · Mar 9, 2022 · c16c998 · c16c998
1 parent cc9c47f
commit c16c998
Show file tree

Hide file tree

Showing 15 changed files with 272 additions and 343 deletions.
diff --git a/library/wumpy-interactions/wumpy/interactions/app.py b/library/wumpy-interactions/wumpy/interactions/app.py
@@ -2,9 +2,11 @@
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Tuple
 
 import anyio
+from wumpy.models import (
+    CommandInteraction, ComponentInteraction, InteractionType
+)
 from wumpy.rest import ApplicationCommandRequester, InteractionRequester
 
-from .base import CommandInteraction, ComponentInteraction, InteractionType
 from .commands import CommandRegistrar, SlashCommand
 from .components.handler import ComponentHandler
 from .utils import DiscordRequestVerifier

diff --git a/library/wumpy-interactions/wumpy/interactions/base.py b/library/wumpy-interactions/wumpy/interactions/base.py
diff --git a/library/wumpy-interactions/wumpy/interactions/commands/base.py b/library/wumpy-interactions/wumpy/interactions/commands/base.py
@@ -4,8 +4,7 @@
 
 import anyio.abc
 from typing_extensions import ParamSpec
-
-from ..base import CommandInteraction
+from wumpy.models import CommandInteraction
 
 __all__ = ('Callback', 'CommandCallback')
 

diff --git a/library/wumpy-interactions/wumpy/interactions/commands/context.py b/library/wumpy-interactions/wumpy/interactions/commands/context.py
@@ -4,9 +4,8 @@
 
 import anyio.abc
 from typing_extensions import ParamSpec
-from wumpy.models import InteractionMember, Message, User
+from wumpy.models import CommandInteraction, InteractionMember, Message, User
 
-from ..base import CommandInteraction
 from ..errors import CommandSetupError
 from .base import Callback, CommandCallback
 from .option import CommandType

diff --git a/library/wumpy-interactions/wumpy/interactions/commands/option.py b/library/wumpy-interactions/wumpy/interactions/commands/option.py
@@ -5,11 +5,11 @@
 )
 
 from typing_extensions import Annotated, Literal, get_args, get_origin
-from wumpy.models import InteractionChannel, InteractionMember, User
-
-from ..base import (
-    ApplicationCommandOption, CommandInteraction, CommandInteractionOption
+from wumpy.models import (
+    ApplicationCommandOption, CommandInteraction, CommandInteractionOption,
+    InteractionChannel, InteractionMember, User
 )
+
 from ..errors import CommandSetupError
 
 __all__ = ('CommandType', 'OptionClass')

diff --git a/library/wumpy-interactions/wumpy/interactions/commands/registrar.py b/library/wumpy-interactions/wumpy/interactions/commands/registrar.py
@@ -2,8 +2,8 @@
 
 import anyio.abc
 from typing_extensions import Literal, ParamSpec
+from wumpy.models import CommandInteraction
 
-from ..base import CommandInteraction
 from .base import Callback
 from .context import MessageCommand, UserCommand
 from .option import CommandType

diff --git a/library/wumpy-interactions/wumpy/interactions/commands/slash.py b/library/wumpy-interactions/wumpy/interactions/commands/slash.py
@@ -6,10 +6,10 @@
 
 import anyio.abc
 from typing_extensions import ParamSpec
-
-from ..base import (
+from wumpy.models import (
     ApplicationCommandOption, CommandInteraction, CommandInteractionOption
 )
+
 from ..errors import CommandSetupError
 from ..utils import _eval_annotations
 from .base import Callback, CommandCallback