scurrypy 0.4.1__tar.gz → 0.5__tar.gz

{scurrypy-0.4.1 → scurrypy-0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scurrypy
-Version: 0.4.1
+Version: 0.5
 Summary: Dataclass-driven Discord API Wrapper in Python
 Author: Furmissile
 Requires-Python: >=3.10
@@ -8,7 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# __Welcome to ScurryPy__
+# __ScurryPy__
 
 [![PyPI version](https://badge.fury.io/py/scurrypy.svg)](https://badge.fury.io/py/scurrypy)
 
@@ -20,22 +20,16 @@ A dataclass-driven Discord API wrapper in Python!
 
 While this wrapper is mainly used for various squirrel-related shenanigans, it can also be used for more generic bot purposes.
 
----
-
 ## Features
 * Command and event handling  
 * Declarative style using decorators  
 * Supports both legacy and new features  
 * Respects Discord’s rate limits  
 
----
-
-## Some Things to Consider...
+## Notes & Early Status
 * This is an early version — feedback, ideas, and contributions are very welcome! That said, there may be bumps along the way, so expect occasional bugs and quirks.  
 * Certain features are not yet supported, while others are intentionally omitted. See the [docs](https://furmissile.github.io/scurrypy) for full details.  
 
----
-
 ## Getting Started
 *Note: This section also appears in the documentation, but here are complete examples ready to use with your bot credentials.*
 
@@ -58,7 +52,7 @@ load_dotenv(dotenv_path='./path/to/env')
 
 client = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=APPLICATION_ID  # replace with your bot's user ID
+    application_id=APPLICATION_ID  # your bot’s application ID
 )
 
 @client.command(
@@ -84,7 +78,7 @@ load_dotenv(dotenv_path='./path/to/env')
 
 client = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=APPLICATION_ID,  # replace with your bot's user ID
+    application_id=APPLICATION_ID  # your bot’s application ID
     intents=discord.set_intents(message_content=True),
     prefix='!'  # your custom prefix
 )
@@ -126,5 +120,4 @@ If you plan to make substantial changes or release your own variant:
 See the [License](./LICENSE) for details.
 
 ## Like What You See?
-Check out the full [documentation](https://furmissile.github.io/scurrypy)
- for more examples, guides, and API reference!
+Explore the full [documentation](https://furmissile.github.io/scurrypy) for more examples, guides, and API reference.

{scurrypy-0.4.1 → scurrypy-0.5}/README.md

@@ -1,4 +1,4 @@
-# __Welcome to ScurryPy__
+# __ScurryPy__
 
 [![PyPI version](https://badge.fury.io/py/scurrypy.svg)](https://badge.fury.io/py/scurrypy)
 
@@ -10,22 +10,16 @@ A dataclass-driven Discord API wrapper in Python!
 
 While this wrapper is mainly used for various squirrel-related shenanigans, it can also be used for more generic bot purposes.
 
----
-
 ## Features
 * Command and event handling  
 * Declarative style using decorators  
 * Supports both legacy and new features  
 * Respects Discord’s rate limits  
 
----
-
-## Some Things to Consider...
+## Notes & Early Status
 * This is an early version — feedback, ideas, and contributions are very welcome! That said, there may be bumps along the way, so expect occasional bugs and quirks.  
 * Certain features are not yet supported, while others are intentionally omitted. See the [docs](https://furmissile.github.io/scurrypy) for full details.  
 
----
-
 ## Getting Started
 *Note: This section also appears in the documentation, but here are complete examples ready to use with your bot credentials.*
 
@@ -48,7 +42,7 @@ load_dotenv(dotenv_path='./path/to/env')
 
 client = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=APPLICATION_ID  # replace with your bot's user ID
+    application_id=APPLICATION_ID  # your bot’s application ID
 )
 
 @client.command(
@@ -74,7 +68,7 @@ load_dotenv(dotenv_path='./path/to/env')
 
 client = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=APPLICATION_ID,  # replace with your bot's user ID
+    application_id=APPLICATION_ID  # your bot’s application ID
     intents=discord.set_intents(message_content=True),
     prefix='!'  # your custom prefix
 )
@@ -116,5 +110,4 @@ If you plan to make substantial changes or release your own variant:
 See the [License](./LICENSE) for details.
 
 ## Like What You See?
-Check out the full [documentation](https://furmissile.github.io/scurrypy)
- for more examples, guides, and API reference!
+Explore the full [documentation](https://furmissile.github.io/scurrypy) for more examples, guides, and API reference.

{scurrypy-0.4.1 → scurrypy-0.5}/discord/__init__.py

@@ -4,32 +4,36 @@ import importlib
 from typing import TYPE_CHECKING
 
 __all__ = [
-    # top-level
     "Logger",
     "Client",
     "Intents",
     "set_intents",
     "BaseConfig",
 
-    # events
+    "InteractionTypes",  
+
     "ReadyEvent",
+
     "ReactionAddEvent",
     "ReactionRemoveEvent",
     "ReactionRemoveEmojiEvent",
     "ReactionRemoveAllEvent",
+
     "GuildCreateEvent",
     "GuildUpdateEvent",
     "GuildDeleteEvent",
+
     "MessageCreateEvent",
     "MessageUpdateEvent",
     "MessageDeleteEvent",
+
     "GuildChannelCreateEvent",
     "GuildChannelUpdateEvent",
     "GuildChannelDeleteEvent",
     "ChannelPinsUpdateEvent",
+
     "InteractionEvent",
 
-    # models
     "ApplicationModel",
     "EmojiModel",
     "GuildModel",
@@ -37,34 +41,73 @@ __all__ = [
     "UserModel",
     "RoleModel",
 
-    # parts
+    "ChannelTypes",
     "GuildChannel",
-    "Role",
-    "MessageBuilder",
-    "ModalBuilder",
-    "EmbedBuilder",
-    "ActionRow",
-    "StringSelect",
-    "UserSelect",
-    "RoleSelect",
-    "ChannelSelect",
-    "MentionableSelect",
+
+    "CommandTypes",
+    "CommandOptionTypes",
     "SlashCommand",
-    "MessageCommand",
     "UserCommand",
-    "Container",
-    "Section",
+    "MessageCommand",
+
+    "ComponentV2Types",
+    "SectionPart",
+    "TextDisplay",
+    "Thumbnail",
     "MediaGalleryItem",
+    "MediaGallery",
+    "File",
+    "SeparatorTypes",
+    "Separator",
+    "ContainerPart",
     "Label",
 
-    # resources
-    "Guild",
+    "ComponentTypes",
+    "ActionRowPart",
+    "ButtonStyles",
+    "Button",
+    "SelectOption",
+    "StringSelect",
+    "TextInputStyles",
+    "TextInput",
+    "DefaultValue",
+    "UserSelect",
+    "RoleSelect",
+    "MentionableSelect",
+    "ChannelSelect",
+
+    "EmbedAuthor",
+    "EmbedThumbnail",
+    "EmbedField",
+    "EmbedImage",
+    "EmbedFooter",
+    "EmbedPart",
+    
+    "MessageFlags",
+    "MessageReferenceTypes",
+    "MessageReference",
+    "Attachment",
+    "MessagePart",
+
+    "ModalPart",
+    "Role",
+
+    "ApplicationFlags",
+    "Application",
+
+    "BotEmojis",
+
+    "PinnedMessage",
     "Channel",
+
+    "Guild",
+
+    "InteractionCallbackTypes",
+    "Interaction",
+    
     "Message",
-    "BotEmojis",
+    
     "User",
-    "Interaction",
-    "Application",
 ]
 
 # For editor support / autocomplete
@@ -74,6 +117,8 @@ if TYPE_CHECKING:
     from .intents import Intents, set_intents
     from .config import BaseConfig
 
+    from .dispatch.command_dispatcher import InteractionTypes
+
     # events
     from .events.ready_event import ReadyEvent
     from .events.reaction_events import (
@@ -109,41 +154,105 @@ if TYPE_CHECKING:
     from .models.role import RoleModel
 
     # parts
-    from .parts.channel import GuildChannel
-    from .parts.role import Role
-    from .parts.message import MessageBuilder
-    from .parts.modal import ModalBuilder
-    from .parts.embed import EmbedBuilder
-    from .parts.action_row import (
-        ActionRow, 
-        StringSelect,
-        UserSelect,
-        RoleSelect,
-        ChannelSelect,
-        MentionableSelect
+    from .parts.channel import (
+        ChannelTypes, 
+        GuildChannel
     )
 
     from .parts.command import (
+        CommandTypes,
+        CommandOptionTypes,
         SlashCommand, 
-        MessageCommand, 
-        UserCommand
+        UserCommand,
+        MessageCommand
     )
 
     from .parts.components_v2 import (
-        Container,
-        Section,
+        ComponentV2Types,
+        SectionPart,
+        TextDisplay,
+        Thumbnail,
         MediaGalleryItem,
+        MediaGallery,
+        File,
+        SeparatorTypes,
+        Separator,
+        ContainerPart,
         Label
     )
 
+    from .parts.components import (
+        ComponentTypes,
+        ActionRowPart, 
+        ButtonStyles,
+        Button,
+        SelectOption,
+        StringSelect,
+        TextInputStyles,
+        TextInput,
+        DefaultValue,
+        # SelectMenu,
+        UserSelect,
+        RoleSelect,
+        MentionableSelect,
+        ChannelSelect
+    )
+
+    from .parts.embed import (
+        EmbedAuthor,
+        EmbedThumbnail,
+        EmbedField,
+        EmbedImage,
+        EmbedFooter,
+        EmbedPart
+    )
+
+    from .parts.message import (
+        MessageFlags,
+        # MessageFlagParams,
+        MessageReferenceTypes,
+        MessageReference,
+        Attachment,
+        MessagePart
+    )
+
+    from .parts.modal import ModalPart
+    from .parts.role import Role
+
     # resources
-    from .resources.guild import Guild
-    from .resources.channel import Channel
-    from .resources.message import Message
+    from .resources.application import (
+        ApplicationFlags,
+        Application
+    )
+
     from .resources.bot_emojis import BotEmojis
-    from .resources.user import User
-    from .resources.interaction import Interaction
-    from .resources.application import Application
+
+    from .resources.channel import (
+        # MessagesFetchParams,
+        # PinsFetchParams,
+        # ThreadFromMessageParams,
+        PinnedMessage,
+        Channel
+    )
+
+    from .resources.guild import (
+        # FetchGuildMembersParams,
+        # FetchGuildParams,
+        Guild
+    )
+
+    from .resources.interaction import (
+        # InteractionDataTypes,
+        InteractionCallbackTypes,
+        Interaction
+    )
+
+    from .resources.message import Message
+
+    from .resources.user import (
+        # FetchUserGuildsParams,
+        User
+    )
 
 # Lazy loader
 def __getattr__(name: str):
@@ -158,25 +267,30 @@ def __getattr__(name: str):
         "set_intents": "discord.intents",
         "BaseConfig": "discord.config",
 
-        # events
+        'InteractionTypes': "discord.dispatch.command_dispatcher",
+
         "ReadyEvent": "discord.events.ready_event",
+        
         "ReactionAddEvent": "discord.events.reaction_events",
         "ReactionRemoveEvent": "discord.events.reaction_events",
         "ReactionRemoveEmojiEvent": "discord.events.reaction_events",
         "ReactionRemoveAllEvent": "discord.events.reaction_events",
+
         "GuildCreateEvent": "discord.events.guild_events",
         "GuildUpdateEvent": "discord.events.guild_events",
         "GuildDeleteEvent": "discord.events.guild_events",
+
         "MessageCreateEvent": "discord.events.message_events",
         "MessageUpdateEvent": "discord.events.message_events",
         "MessageDeleteEvent": "discord.events.message_events",
+
         "GuildChannelCreateEvent": "discord.events.channel_events",
         "GuildChannelUpdateEvent": "discord.events.channel_events",
         "GuildChannelDeleteEvent": "discord.events.channel_events",
         "ChannelPinsUpdateEvent": "discord.events.channel_events",
+
         "InteractionEvent": "discord.events.interaction_events",
 
-        # models
         'ApplicationModel': "discord.models.application",
         'EmojiModel': "discord.models.emoji",
         'GuildModel': "discord.models.guild",
@@ -184,34 +298,73 @@ def __getattr__(name: str):
         'UserModel': "discord.models.user",
         'RoleModel': "discord.models.role",
 
-        # parts
+        'ChannelTypes': "discord.parts.channel",
         'GuildChannel': "discord.parts.channel",
-        'Role': "discord.parts.role",
-        'MessageBuilder': "discord.parts.message",
-        'ModalBuilder': "discord.parts.modal",
-        'EmbedBuilder': "discord.parts.embed",
-        'ActionRow': "discord.parts.action_row",
-        'StringSelect': "discord.parts.action_row",
-        'UserSelect': "discord.parts.action_row",
-        'RoleSelect': "discord.parts.action_row",
-        'ChannelSelect': "discord.parts.action_row",
-        'MentionableSelect': "discord.parts.action_row",
+
+        'CommandTypes': "discord.parts.command",
+        'CommandOptionTypes': "discord.parts.command",
         'SlashCommand': "discord.parts.command",
-        'MessageCommand': "discord.parts.command",
         'UserCommand': "discord.parts.command",
-        'Container': "discord.parts.components_v2",
-        'Section': "discord.parts.components_v2",
+        'MessageCommand': "discord.parts.command",
+
+        'ComponentV2Types': "discord.parts.components_v2",
+        'SectionPart': "discord.parts.components_v2",
+        'TextDisplay': "discord.parts.components_v2",
+        'Thumbnail': "discord.parts.components_v2",
         'MediaGalleryItem': "discord.parts.components_v2",
+        'MediaGallery': "discord.parts.components_v2",
+        'File': "discord.parts.components_v2",
+        'SeparatorTypes': "discord.parts.components_v2",
+        'Separator': "discord.parts.components_v2",
+        'ContainerPart': "discord.parts.components_v2",
         'Label': "discord.parts.components_v2",
 
-        # resources
-        'Guild': "discord.resources.guild",
-        'Channel': "discord.resources.channel",
-        'Message': "discord.resources.message",
+        'ComponentTypes': "discord.parts.components",
+        'ActionRowPart': "discord.parts.components",
+        'ButtonStyles': "discord.parts.components",
+        'Button': "discord.parts.components",
+        'SelectOption': "discord.parts.components",
+        'StringSelect': "discord.parts.components",
+        'TextInputStyles': 'discord.parts.components',
+        'TextInput': "discord.parts.components",
+        'DefaultValue': "discord.parts.components",
+        'UserSelect': "discord.parts.components",
+        'RoleSelect': "discord.parts.components",
+        'MentionableSelect': "discord.parts.components",
+        'ChannelSelect': "discord.parts.components",
+        
+        'EmbedAuthor': "discord.parts.embed",
+        'EmbedThumbnail': "discord.parts.embed",
+        'EmbedField': "discord.parts.embed",
+        'EmbedImage': "discord.parts.embed",
+        'EmbedFooter': "discord.parts.embed",
+        'EmbedPart': "discord.parts.embed",
+
+        'MessageFlags': "discord.parts.message",
+        'MessageReferenceTypes': "discord.parts.message",
+        'MessageReference': "discord.parts.message",
+        'Attachment': "discord.parts.message",
+        'MessagePart': "discord.parts.message",
+
+        'ModalPart': "discord.parts.modal",
+        'Role': "discord.parts.role",
+
+        'ApplicationFlags': "discord.resources.application",
+        'Application': "discord.resources.application",
+
         'BotEmojis': "discord.resources.bot_emojis",
-        'User': "discord.resources.user",
+
+        'PinnedMessage': "discord.resources.channel",
+        'Channel': "discord.resources.channel",
+
+        'Guild': "discord.resources.guild",
+
+        'InteractionCallbackTypes': "discord.resources.interaction",
         'Interaction': "discord.resources.interaction",
-        'Application': "discord.resources.application"
+
+        'Message': "discord.resources.message",
+        
+        'User': "discord.resources.user"
     }
 
     module = importlib.import_module(mapping[name])

{scurrypy-0.4.1 → scurrypy-0.5}/discord/dispatch/command_dispatcher.py

@@ -1,3 +1,5 @@
+import fnmatch
+
 from ..client_like import ClientLike
 
 from ..events.interaction_events import ApplicationCommandData, MessageComponentData, ModalData, InteractionEvent
@@ -146,11 +148,17 @@ class CommandDispatcher:
 
             case InteractionTypes.MESSAGE_COMPONENT:
                 name = event.data.custom_id
-                handler = self._component_handlers.get(name)
+                for k, v in self._component_handlers.items():
+                    if fnmatch.fnmatch(name, k) == True:
+                        handler = v
+                # handler = self._component_handlers.get(name)
 
             case InteractionTypes.MODAL_SUBMIT:
                 name = event.data.custom_id
-                handler = self._component_handlers.get(name)
+                for k, v in self._component_handlers.items():
+                    if fnmatch.fnmatch(name, k) == True:
+                        handler = v
+                # handler = self._component_handlers.get(name)
 
         if not handler:
             self._logger.log_warn(f"No handler registered for interaction '{name}'")

{scurrypy-0.4.1 → scurrypy-0.5}/discord/dispatch/prefix_dispatcher.py

@@ -57,8 +57,4 @@ class PrefixDispatcher:
                     self._logger.log_info(f"Prefix Event '{command}' Acknowledged.")
                 except Exception as e:
                     self._logger.log_error(f"Error in prefix command '{command}': {e}")
-
-                    if self._logger.dev_mode:
-                        import traceback
-                        traceback.print_exc()
-                        print("-----------------------------------\n")
+                    self._logger.log_traceback()

{scurrypy-0.4.1 → scurrypy-0.5}/discord/events/channel_events.py

@@ -46,7 +46,7 @@ class GuildChannelDeleteEvent(GuildChannelEvent):
     pass
 
 @dataclass
-class ChannelPinsUpdateEvent:
+class ChannelPinsUpdateEvent(DataModel):
     """Pin update event."""
     channel_id: int
     """ID of channel where the pins were updated."""

{scurrypy-0.4.1 → scurrypy-0.5}/discord/events/interaction_events.py

@@ -3,12 +3,14 @@ from typing import Optional
 from ..model import DataModel
 
 from ..resources.interaction import Interaction
+from ..parts.components import ComponentTypes
 
 # ----- Command Interaction -----
 
 @dataclass
 class ApplicationCommandOptionData(DataModel):
     """Represents the response options from a slash command."""
+    
     name: str
     """Name of the command option."""
 
@@ -21,6 +23,7 @@ class ApplicationCommandOptionData(DataModel):
 @dataclass
 class ApplicationCommandData(DataModel):
     """Represents the response from a command."""
+
     id: int
     """ID of the command."""
 
@@ -39,7 +42,7 @@ class ApplicationCommandData(DataModel):
     options: Optional[list[ApplicationCommandOptionData]] = field(default_factory=list)
     """Options of the command (slash command only)."""
 
-    def get_command_option_value(self, option_name: str):
+    def get_command_option_value(self, option_name: str, default = None):
         """Get the input for a command option by name.
 
         Args:
@@ -52,12 +55,13 @@ class ApplicationCommandData(DataModel):
             (str | int | float | bool): input data of specified option
         """
         for option in self.options:
-            if option_name != option.name:
-                continue
-
-            return option.value
+            if option.name == option_name:
+                return option.value
         
-        raise ValueError(f"Option name '{option_name}' could not be found.")
+        if default is not None:
+            return default
+        
+        raise ValueError(f"Option '{option_name}' not found")
 
 # ----- Component Interaction -----
 
@@ -79,6 +83,7 @@ class MessageComponentData(DataModel):
 @dataclass
 class ModalComponentData(DataModel):
     """Represents the modal field response from a modal."""
+
     type: int
     """Type of component."""
     
@@ -94,6 +99,7 @@ class ModalComponentData(DataModel):
 @dataclass
 class ModalComponent(DataModel):
     """Represents the modal component response from a modal."""
+
     type: int
     """Type of component."""
 
@@ -128,7 +134,13 @@ class ModalData(DataModel):
 
             t = component.component.type
 
-            if t in [3,5,6,7,8]: # select menus (w. possibly many option selects!)
+            if t in [
+                ComponentTypes.STRING_SELECT, 
+                ComponentTypes.USER_SELECT, 
+                ComponentTypes.ROLE_SELECT, 
+                ComponentTypes.MENTIONABLE_SELECT, 
+                ComponentTypes.CHANNEL_SELECT      # select menus (w. possibly many option selects!)
+            ]:
                 return component.component.values
             
             # text input

{scurrypy-0.4.1 → scurrypy-0.5}/discord/http.py

@@ -6,6 +6,7 @@ import json
 from typing import Any, Optional
 
 from .logger import Logger
+from .error import DiscordError
 
 class HTTPException(Exception):
     """Represents an HTTP error response from Discord."""
@@ -151,7 +152,7 @@ class HTTPClient:
                         if data.get("global"):
                             self.global_reset = asyncio.get_event_loop().time() + retry
                         self.logger.log_warn(
-                            f"Rate limited {retry}s ({'global' if data.get('global') else 'bucket'})"
+                            f"Rate limited {retry}s ({endpoint})"
                         )
                         await asyncio.sleep(retry + 0.5)
                         continue
@@ -163,6 +164,9 @@ class HTTPClient:
                             return await resp.json()
                         except aiohttp.ContentTypeError:
                             return await resp.text()
+                        
+                    if resp.status == 400:
+                        raise DiscordError(resp.status, await resp.json())
 
                     text = await resp.text()
                     raise HTTPException(resp, text)

{scurrypy-0.4.1 → scurrypy-0.5}/discord/models/emoji.py

@@ -13,7 +13,7 @@ class EmojiModel(DataModel):
     """ID of the emoji (if custom)."""
 
     animated: bool = False
-    """If the emoji is animated. Defaults to `False`."""
+    """If the emoji is animated. Defaults to False."""
 
     @property
     def mention(self) -> str: