disagreement 0.1.0rc1__tar.gz → 0.1.0rc3__tar.gz

disagreement-0.1.0rc3/MANIFEST.in

@@ -0,0 +1,4 @@
+graft docs
+graft examples
+include LICENSE
+include disagreement/py.typed

{disagreement-0.1.0rc1/disagreement.egg-info → disagreement-0.1.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: disagreement
-Version: 0.1.0rc1
+Version: 0.1.0rc3
 Summary: A Python library for the Discord API.
 Author-email: Slipstream <me@slipstreamm.dev>
 License: BSD 3-Clause
@@ -12,22 +12,23 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Internet
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp<4.0.0,>=3.9.0
 Provides-Extra: test
 Requires-Dist: pytest>=8.0.0; extra == "test"
 Requires-Dist: pytest-asyncio>=1.0.0; extra == "test"
-Requires-Dist: hypothesis>=6.89.0; extra == "test"
+Requires-Dist: hypothesis>=6.132.0; extra == "test"
 Provides-Extra: dev
-Requires-Dist: dotenv>=0.0.5; extra == "dev"
+Requires-Dist: python-dotenv>=1.0.0; extra == "dev"
 Dynamic: license-file
 
 # Disagreement
@@ -53,7 +54,7 @@ pip install disagreement
 pip install -e .
 ```
 
-Requires Python 3.11 or newer.
+Requires Python 3.10 or newer.
 
 ## Basic Usage
 

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/README.md

@@ -21,7 +21,7 @@ pip install disagreement
 pip install -e .
 ```
 
-Requires Python 3.11 or newer.
+Requires Python 3.10 or newer.
 
 ## Basic Usage
 

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/__init__.py

@@ -14,7 +14,7 @@ __title__ = "disagreement"
 __author__ = "Slipstream"
 __license__ = "BSD 3-Clause License"
 __copyright__ = "Copyright 2025 Slipstream"
-__version__ = "0.1.0rc1"
+__version__ = "0.1.0rc3"
 
 from .client import Client, AutoShardedClient
 from .models import Message, User, Reaction
@@ -30,12 +30,16 @@ from .errors import (
     NotFound,
 )
 from .color import Color
-from .utils import utcnow
+from .utils import utcnow, message_pager
 from .enums import GatewayIntent, GatewayOpcode  # Export enums
 from .error_handler import setup_global_error_handler
 from .hybrid_context import HybridContext
 from .ext import tasks
+from .logging_config import setup_logging
 
-# Set up logging if desired
-# import logging
-# logging.getLogger(__name__).addHandler(logging.NullHandler())
+import logging
+
+
+# Configure a default logger if none has been configured yet
+if not logging.getLogger().hasHandlers():
+    setup_logging(logging.INFO)

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/client.py

@@ -16,6 +16,7 @@ from typing import (
     List,
     Dict,
 )
+from types import ModuleType
 
 from .http import HTTPClient
 from .gateway import GatewayClient
@@ -28,6 +29,7 @@ from .ext.commands.core import CommandHandler
 from .ext.commands.cog import Cog
 from .ext.app_commands.handler import AppCommandHandler
 from .ext.app_commands.context import AppCommandContext
+from .ext import loader as ext_loader
 from .interactions import Interaction, Snowflake
 from .error_handler import setup_global_error_handler
 from .voice_client import VoiceClient
@@ -121,14 +123,10 @@ class Client:
 
         self._closed: bool = False
         self._ready_event: asyncio.Event = asyncio.Event()
-        self.application_id: Optional[Snowflake] = None  # For Application Commands
         self.user: Optional["User"] = (
             None  # The bot's own user object, populated on READY
         )
 
-        # Initialize AppCommandHandler
-        self.app_command_handler: AppCommandHandler = AppCommandHandler(client=self)
-
         # Internal Caches
         self._guilds: Dict[Snowflake, "Guild"] = {}
         self._channels: Dict[Snowflake, "Channel"] = (
@@ -638,6 +636,23 @@ class Client:
             # import traceback
             # traceback.print_exception(type(error.original), error.original, error.original.__traceback__)
 
+    # --- Extension Management Methods ---
+
+    def load_extension(self, name: str) -> ModuleType:
+        """Load an extension by name using :mod:`disagreement.ext.loader`."""
+
+        return ext_loader.load_extension(name)
+
+    def unload_extension(self, name: str) -> None:
+        """Unload a previously loaded extension."""
+
+        ext_loader.unload_extension(name)
+
+    def reload_extension(self, name: str) -> ModuleType:
+        """Reload an extension by name."""
+
+        return ext_loader.reload_extension(name)
+
     # --- Model Parsing and Fetching ---
 
     def parse_user(self, data: Dict[str, Any]) -> "User":
@@ -920,12 +935,12 @@ class Client:
             await view._start(self)
             components_payload = view.to_components_payload()
         elif components:
-            from .models import ActionRow as ActionRowModel
+            from .models import Component as ComponentModel
 
             components_payload = [
                 comp.to_dict()
                 for comp in components
-                if isinstance(comp, ActionRowModel)
+                if isinstance(comp, ComponentModel)
             ]
 
         message_data = await self._http.send_message(
@@ -1016,6 +1031,26 @@ class Client:
         self._voice_clients[guild_id] = voice
         return voice
 
+    async def add_reaction(self, channel_id: str, message_id: str, emoji: str) -> None:
+        """|coro| Add a reaction to a message."""
+
+        await self.create_reaction(channel_id, message_id, emoji)
+
+    async def remove_reaction(
+        self, channel_id: str, message_id: str, emoji: str
+    ) -> None:
+        """|coro| Remove the bot's reaction from a message."""
+
+        await self.delete_reaction(channel_id, message_id, emoji)
+
+    async def clear_reactions(self, channel_id: str, message_id: str) -> None:
+        """|coro| Remove all reactions from a message."""
+
+        if self._closed:
+            raise DisagreementException("Client is closed.")
+
+        await self._http.clear_reactions(channel_id, message_id)
+
     async def create_reaction(
         self, channel_id: str, message_id: str, emoji: str
     ) -> None:

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/color.py

@@ -48,3 +48,31 @@ class Color:
 
     def to_rgb(self) -> tuple[int, int, int]:
         return ((self.value >> 16) & 0xFF, (self.value >> 8) & 0xFF, self.value & 0xFF)
+
+    @classmethod
+    def parse(cls, value: "Color | int | str | tuple[int, int, int] | None") -> "Color | None":
+        """Convert ``value`` to a :class:`Color` instance.
+
+        Parameters
+        ----------
+        value:
+            The value to convert. May be ``None``, an existing ``Color``, an
+            integer in the ``0xRRGGBB`` format, or a hex string like ``"#RRGGBB"``.
+
+        Returns
+        -------
+        Optional[Color]
+            A ``Color`` object if ``value`` is not ``None``.
+        """
+
+        if value is None:
+            return None
+        if isinstance(value, cls):
+            return value
+        if isinstance(value, int):
+            return cls(value)
+        if isinstance(value, str):
+            return cls.from_hex(value)
+        if isinstance(value, tuple) and len(value) == 3:
+            return cls.from_rgb(*value)
+        raise TypeError("Color value must be Color, int, str, tuple, or None")

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/enums.py

@@ -49,6 +49,11 @@ class GatewayIntent(IntEnum):
     AUTO_MODERATION_CONFIGURATION = 1 << 20
     AUTO_MODERATION_EXECUTION = 1 << 21
 
+    @classmethod
+    def none(cls) -> int:
+        """Return a bitmask representing no intents."""
+        return 0
+
     @classmethod
     def default(cls) -> int:
         """Returns default intents (excluding privileged ones like members, presences, message content)."""

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/ext/app_commands/__init__.py

@@ -44,3 +44,5 @@ __all__ = [
     "OptionMetadata",
     "AppCommandContext",  # To be defined
 ]
+
+from .hybrid import *

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/ext/app_commands/commands.py

@@ -1,58 +1,25 @@
 # disagreement/ext/app_commands/commands.py
 
 import inspect
-from typing import Callable, Optional, List, Dict, Any, Union, TYPE_CHECKING
+from typing import Any, Callable, Dict, List, Optional, Union, TYPE_CHECKING
 
+from disagreement.enums import (
+    ApplicationCommandType,
+    ApplicationCommandOptionType,
+    IntegrationType,
+    InteractionContextType,
+)
+from disagreement.interactions import ApplicationCommandOption, Snowflake
 
 if TYPE_CHECKING:
-    from disagreement.ext.commands.core import (
-        Command as PrefixCommand,
-    )  # Alias to avoid name clash
-    from disagreement.interactions import ApplicationCommandOption, Snowflake
-    from disagreement.enums import (
-        ApplicationCommandType,
-        IntegrationType,
-        InteractionContextType,
-        ApplicationCommandOptionType,  # Added
-    )
-    from disagreement.ext.commands.cog import Cog  # Corrected import path
-
-# Placeholder for Cog if not using the existing one or if it needs adaptation
+    from disagreement.ext.commands.core import Command as PrefixCommand
+    from disagreement.ext.commands.cog import Cog
+
 if not TYPE_CHECKING:
-    # This dynamic Cog = Any might not be ideal if Cog is used in runtime type checks.
-    # However, for type hinting purposes when TYPE_CHECKING is false, it avoids import.
-    # If Cog is needed at runtime by this module (it is, for AppCommand.cog type hint),
-    # it should be imported directly.
-    # For now, the TYPE_CHECKING block handles the proper import for static analysis.
-    # Let's ensure Cog is available at runtime if AppCommand.cog is accessed.
-    # A simple way is to import it outside TYPE_CHECKING too, if it doesn't cause circularity.
-    # Given its usage, a forward reference string 'Cog' might be better in AppCommand.cog type hint.
-    # Let's try importing it directly for runtime, assuming no circularity with this specific module.
-    try:
-        from disagreement.ext.commands.cog import Cog
-    except ImportError:
-        Cog = Any  # Fallback if direct import fails (e.g. during partial builds/tests)
-    # Import PrefixCommand at runtime for HybridCommand
     try:
         from disagreement.ext.commands.core import Command as PrefixCommand
-    except Exception:  # pragma: no cover - safeguard against unusual import issues
-        PrefixCommand = Any  # type: ignore
-    # Import enums used at runtime
-    try:
-        from disagreement.enums import (
-            ApplicationCommandType,
-            IntegrationType,
-            InteractionContextType,
-            ApplicationCommandOptionType,
-        )
-        from disagreement.interactions import ApplicationCommandOption, Snowflake
-    except Exception:  # pragma: no cover
-        ApplicationCommandType = ApplicationCommandOptionType = IntegrationType = (
-            InteractionContextType
-        ) = Any  # type: ignore
-        ApplicationCommandOption = Snowflake = Any  # type: ignore
-else:  # When TYPE_CHECKING is true, Cog and PrefixCommand are already imported above.
-    pass
+    except ImportError:
+        PrefixCommand = Any
 
 
 class AppCommand:
@@ -235,59 +202,6 @@ class MessageCommand(AppCommand):
         super().__init__(callback, type=ApplicationCommandType.MESSAGE, **kwargs)
 
 
-class HybridCommand(SlashCommand, PrefixCommand):  # Inherit from both
-    """
-    Represents a command that can be invoked as both a slash command
-    and a traditional prefix-based command.
-    """
-
-    def __init__(self, callback: Callable[..., Any], **kwargs: Any):
-        # Initialize SlashCommand part (which calls AppCommand.__init__)
-        # We need to ensure 'type' is correctly passed for AppCommand
-        # kwargs for SlashCommand: name, description, guild_ids, default_member_permissions, nsfw, parent, cog, etc.
-        # kwargs for PrefixCommand: name, aliases, brief, description, cog
-
-        # Pop prefix-specific args before passing to SlashCommand constructor
-        prefix_aliases = kwargs.pop("aliases", [])
-        prefix_brief = kwargs.pop("brief", None)
-        # Description is used by both, AppCommand's constructor will handle it.
-        # Name is used by both. Cog is used by both.
-
-        # Call SlashCommand's __init__
-        # This will set up name, description, callback, type=CHAT_INPUT, options, etc.
-        super().__init__(callback, **kwargs)  # This is SlashCommand.__init__
-
-        # Now, explicitly initialize the PrefixCommand parts that SlashCommand didn't cover
-        # or that need specific values for the prefix version.
-        # PrefixCommand.__init__(self, callback, name=self.name, aliases=prefix_aliases, brief=prefix_brief, description=self.description, cog=self.cog)
-        # However, PrefixCommand.__init__ also sets self.params, which AppCommand already did.
-        # We need to be careful not to re-initialize things unnecessarily or incorrectly.
-        # Let's manually set the distinct attributes for the PrefixCommand aspect.
-
-        # Attributes from PrefixCommand:
-        # self.callback is already set by AppCommand
-        # self.name is already set by AppCommand
-        self.aliases: List[str] = (
-            prefix_aliases  # This was specific to HybridCommand before, now aligns with PrefixCommand
-        )
-        self.brief: Optional[str] = prefix_brief
-        # self.description is already set by AppCommand (SlashCommand ensures it exists)
-        # self.cog is already set by AppCommand
-        # self.params is already set by AppCommand
-
-        # Ensure the MRO is handled correctly. Python's MRO (C3 linearization)
-        # should call SlashCommand's __init__ then AppCommand's __init__.
-        # PrefixCommand.__init__ won't be called automatically unless we explicitly call it.
-        # By setting attributes directly, we avoid potential issues with multiple __init__ calls
-        # if their logic overlaps too much (e.g., both trying to set self.params).
-
-    # We might need to override invoke if the context or argument passing differs significantly
-    # between app command invocation and prefix command invocation.
-    # For now, SlashCommand.invoke and PrefixCommand.invoke are separate.
-    # The correct one will be called depending on how the command is dispatched.
-    # The AppCommandHandler will use AppCommand.invoke (via SlashCommand).
-    # The prefix CommandHandler will use PrefixCommand.invoke.
-    # This seems acceptable.
 
 
 class AppCommandGroup:

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/ext/app_commands/decorators.py

@@ -26,8 +26,8 @@ from .commands import (
     MessageCommand,
     AppCommand,
     AppCommandGroup,
-    HybridCommand,
 )
+from .hybrid import HybridCommand
 from disagreement.interactions import (
     ApplicationCommandOption,
     ApplicationCommandOptionChoice,

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/ext/app_commands/handler.py

@@ -1,6 +1,7 @@
 # disagreement/ext/app_commands/handler.py
 
 import inspect
+import logging
 from typing import (
     TYPE_CHECKING,
     Dict,
@@ -64,6 +65,9 @@ if not TYPE_CHECKING:
     Message = Any
 
 
+logger = logging.getLogger(__name__)
+
+
 class AppCommandHandler:
     """
     Manages application command registration, parsing, and dispatching.
@@ -544,7 +548,7 @@ class AppCommandHandler:
                 await command.invoke(ctx, *parsed_args, **parsed_kwargs)
 
         except Exception as e:
-            print(f"Error invoking app command '{command.name}': {e}")
+            logger.error("Error invoking app command '%s': %s", command.name, e)
             await self.dispatch_app_command_error(ctx, e)
             # else:
             #     # Default error reply if no handler on client
@@ -594,34 +598,43 @@ class AppCommandHandler:
                 payload = cmd_or_group.to_dict()
                 commands_to_sync.append(payload)
             except AttributeError:
-                print(
-                    f"Warning: Command or group '{cmd_or_group.name}' does not have a to_dict() method. Skipping."
+                logger.warning(
+                    "Command or group '%s' does not have a to_dict() method. Skipping.",
+                    cmd_or_group.name,
                 )
             except Exception as e:
-                print(
-                    f"Error converting command/group '{cmd_or_group.name}' to dict: {e}. Skipping."
+                logger.error(
+                    "Error converting command/group '%s' to dict: %s. Skipping.",
+                    cmd_or_group.name,
+                    e,
                 )
 
         if not commands_to_sync:
-            print(
-                f"No commands to sync for {'guild ' + str(guild_id) if guild_id else 'global'} scope."
+            logger.info(
+                "No commands to sync for %s scope.",
+                f"guild {guild_id}" if guild_id else "global",
             )
             return
 
         try:
             if guild_id:
-                print(
-                    f"Syncing {len(commands_to_sync)} commands for guild {guild_id}..."
+                logger.info(
+                    "Syncing %s commands for guild %s...",
+                    len(commands_to_sync),
+                    guild_id,
                 )
                 await self.client._http.bulk_overwrite_guild_application_commands(
                     application_id, guild_id, commands_to_sync
                 )
             else:
-                print(f"Syncing {len(commands_to_sync)} global commands...")
+                logger.info(
+                    "Syncing %s global commands...",
+                    len(commands_to_sync),
+                )
                 await self.client._http.bulk_overwrite_global_application_commands(
                     application_id, commands_to_sync
                 )
-            print("Command sync successful.")
+            logger.info("Command sync successful.")
         except Exception as e:
-            print(f"Error syncing application commands: {e}")
+            logger.error("Error syncing application commands: %s", e)
             # Consider re-raising or specific error handling

disagreement-0.1.0rc3/disagreement/ext/app_commands/hybrid.py

@@ -0,0 +1,61 @@
+# disagreement/ext/app_commands/hybrid.py
+
+from typing import Any, Callable, List, Optional
+
+from .commands import SlashCommand
+from disagreement.ext.commands.core import PrefixCommand
+
+
+class HybridCommand(SlashCommand, PrefixCommand):  # Inherit from both
+    """
+    Represents a command that can be invoked as both a slash command
+    and a traditional prefix-based command.
+    """
+
+    def __init__(self, callback: Callable[..., Any], **kwargs: Any):
+        # Initialize SlashCommand part (which calls AppCommand.__init__)
+        # We need to ensure 'type' is correctly passed for AppCommand
+        # kwargs for SlashCommand: name, description, guild_ids, default_member_permissions, nsfw, parent, cog, etc.
+        # kwargs for PrefixCommand: name, aliases, brief, description, cog
+
+        # Pop prefix-specific args before passing to SlashCommand constructor
+        prefix_aliases = kwargs.pop("aliases", [])
+        prefix_brief = kwargs.pop("brief", None)
+        # Description is used by both, AppCommand's constructor will handle it.
+        # Name is used by both. Cog is used by both.
+
+        # Call SlashCommand's __init__
+        # This will set up name, description, callback, type=CHAT_INPUT, options, etc.
+        super().__init__(callback, **kwargs)  # This is SlashCommand.__init__
+
+        # Now, explicitly initialize the PrefixCommand parts that SlashCommand didn't cover
+        # or that need specific values for the prefix version.
+        # PrefixCommand.__init__(self, callback, name=self.name, aliases=prefix_aliases, brief=prefix_brief, description=self.description, cog=self.cog)
+        # However, PrefixCommand.__init__ also sets self.params, which AppCommand already did.
+        # We need to be careful not to re-initialize things unnecessarily or incorrectly.
+        # Let's manually set the distinct attributes for the PrefixCommand aspect.
+
+        # Attributes from PrefixCommand:
+        # self.callback is already set by AppCommand
+        # self.name is already set by AppCommand
+        self.aliases: List[str] = (
+            prefix_aliases  # This was specific to HybridCommand before, now aligns with PrefixCommand
+        )
+        self.brief: Optional[str] = prefix_brief
+        # self.description is already set by AppCommand (SlashCommand ensures it exists)
+        # self.cog is already set by AppCommand
+        # self.params is already set by AppCommand
+
+        # Ensure the MRO is handled correctly. Python's MRO (C3 linearization)
+        # should call SlashCommand's __init__ then AppCommand's __init__.
+        # PrefixCommand.__init__ won't be called automatically unless we explicitly call it.
+        # By setting attributes directly, we avoid potential issues with multiple __init__ calls
+        # if their logic overlaps too much (e.g., both trying to set self.params).
+
+    # We might need to override invoke if the context or argument passing differs significantly
+    # between app command invocation and prefix command invocation.
+    # For now, SlashCommand.invoke and PrefixCommand.invoke are separate.
+    # The correct one will be called depending on how the command is dispatched.
+    # The AppCommandHandler will use AppCommand.invoke (via SlashCommand).
+    # The prefix CommandHandler will use PrefixCommand.invoke.
+    # This seems acceptable.

{disagreement-0.1.0rc1 → disagreement-0.1.0rc3}/disagreement/ext/commands/cog.py

@@ -1,6 +1,7 @@
 # disagreement/ext/commands/cog.py
 
 import inspect
+import logging
 from typing import TYPE_CHECKING, List, Tuple, Callable, Awaitable, Any, Dict, Union
 
 if TYPE_CHECKING:
@@ -16,6 +17,8 @@ else:  # pragma: no cover - runtime imports for isinstance checks
     # EventDispatcher might be needed if cogs register listeners directly
     # from disagreement.event_dispatcher import EventDispatcher
 
+logger = logging.getLogger(__name__)
+
 
 class Cog:
     """
@@ -59,8 +62,10 @@ class Cog:
                 cmd.cog = self  # Assign the cog instance to the command
                 if cmd.name in self._commands:
                     # This should ideally be caught earlier or handled by CommandHandler
-                    print(
-                        f"Warning: Duplicate command name '{cmd.name}' in cog '{self.cog_name}'. Overwriting."
+                    logger.warning(
+                        "Duplicate command name '%s' in cog '%s'. Overwriting.",
+                        cmd.name,
+                        self.cog_name,
                     )
                 self._commands[cmd.name.lower()] = cmd
                 # Also register aliases
@@ -79,8 +84,10 @@ class Cog:
                     # For AppCommandGroup, its commands will have cog set individually if they are AppCommands
                     self._app_commands_and_groups.append(app_cmd_obj)
                 else:
-                    print(
-                        f"Warning: Member '{member_name}' in cog '{self.cog_name}' has '__app_command_object__' but it's not an AppCommand or AppCommandGroup."
+                    logger.warning(
+                        "Member '%s' in cog '%s' has '__app_command_object__' but it's not an AppCommand or AppCommandGroup.",
+                        member_name,
+                        self.cog_name,
                     )
 
             elif isinstance(member, (AppCommand, AppCommandGroup)):
@@ -92,8 +99,10 @@ class Cog:
                 # This is a method decorated with @commands.Cog.listener or @commands.listener
                 if not inspect.iscoroutinefunction(member):
                     # Decorator should have caught this, but double check
-                    print(
-                        f"Warning: Listener '{member_name}' in cog '{self.cog_name}' is not a coroutine. Skipping."
+                    logger.warning(
+                        "Listener '%s' in cog '%s' is not a coroutine. Skipping.",
+                        member_name,
+                        self.cog_name,
                     )
                     continue