disagreement 0.3.0b1__py3-none-any.whl → 0.4.0__py3-none-any.whl

disagreement/event_dispatcher.py

@@ -1,5 +1,3 @@
-# disagreement/event_dispatcher.py
-
 """
 Event dispatcher for handling Discord Gateway events.
 """
@@ -198,7 +196,7 @@ class EventDispatcher:
             try:
                 self._listeners[event_name_upper].remove(coro)
             except ValueError:
-                pass  # Listener not in list
+                pass
 
     def add_waiter(
         self,

disagreement/ext/__init__.py

@@ -0,0 +1 @@
+

disagreement/ext/app_commands/__init__.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/__init__.py
-
 """
 Application Commands Extension for Disagreement.
 

disagreement/ext/app_commands/commands.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/commands.py
-
 import inspect
 from typing import Any, Callable, Dict, List, Optional, Union, TYPE_CHECKING
 

disagreement/ext/app_commands/context.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/context.py
-
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional, List, Union, Any, Dict

disagreement/ext/app_commands/converters.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/converters.py
-
 """
 Converters for transforming application command option values.
 """
@@ -466,8 +464,8 @@ async def run_converters(
 
     # If no specific converter, and it's not a basic type match, raise error or return raw
     # For now, let's raise if no converter found for a specific option type
-    if option_type in DEFAULT_CONVERTERS:  # Should have been handled
-        pass  # This path implies a logic error above or missing converter in DEFAULT_CONVERTERS
+    if option_type in DEFAULT_CONVERTERS:
+        pass
 
     # If it's a model type but no converter yet, this will need to be handled
     # e.g. if param_type is User and option_type is ApplicationCommandOptionType.USER

disagreement/ext/app_commands/decorators.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/decorators.py
-
 import inspect
 import asyncio
 from dataclasses import dataclass
@@ -134,7 +132,7 @@ def _extract_options_from_signature(
         first_param = next(param_iter, None)  # Consume 'self', get next
 
     if first_param and first_param.name == "ctx":  # Consume 'ctx'
-        pass  # ctx is handled, now iterate over actual command options
+        pass
     elif (
         first_param
     ):  # If first_param was not 'self' and not 'ctx', it's a command option
@@ -147,7 +145,7 @@ def _extract_options_from_signature(
         if param.kind == param.VAR_POSITIONAL or param.kind == param.VAR_KEYWORD:
             # *args and **kwargs are not directly supported by slash command options structure.
             # Could raise an error or ignore. For now, ignore.
-            # print(f"Warning: *args/**kwargs ({param.name}) are not supported for slash command options.")
+
             continue
 
         option_name = param.name
@@ -190,7 +188,7 @@ def _extract_options_from_signature(
                 # More complex Unions are not directly supported by a single option type.
                 # Could default to STRING or raise.
                 # For now, let's assume simple Optional[T] or direct types.
-                # print(f"Warning: Complex Union type for '{option_name}' not fully supported, defaulting to STRING.")
+
                 actual_type_for_mapping = str
 
         elif origin is list and len(args) == 1:
@@ -198,7 +196,7 @@ def _extract_options_from_signature(
             # via repeated options or specific component interactions, not directly in slash command options.
             # This might indicate a need for a different interaction pattern or custom parsing.
             # For now, treat List[str] as a string, others might error or default.
-            # print(f"Warning: List type for '{option_name}' not directly supported as a single option. Consider type {args[0]}.")
+
             actual_type_for_mapping = args[
                 0
             ]  # Use the inner type for mapping, but this is a simplification.
@@ -247,7 +245,7 @@ def _extract_options_from_signature(
 
         if not option_type:
             # Fallback or error if type couldn't be mapped
-            # print(f"Warning: Could not map type '{actual_type_for_mapping}' for option '{option_name}'. Defaulting to STRING.")
+
             option_type = ApplicationCommandOptionType.STRING  # Default fallback
 
         required = (param.default == inspect.Parameter.empty) and not is_optional

disagreement/ext/app_commands/handler.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/handler.py
-
 import inspect
 import json
 import logging
@@ -341,7 +339,7 @@ class AppCommandHandler:
                     return value.lower() == "true"
                 return bool(value)
         except (ValueError, TypeError):
-            pass  # Conversion failed
+            pass
         return value  # Return as is if no specific resolution or conversion applied
 
     async def _resolve_value(

disagreement/ext/app_commands/hybrid.py

@@ -1,5 +1,3 @@
-# disagreement/ext/app_commands/hybrid.py
-
 from typing import Any, Callable, List, Optional
 
 from .commands import SlashCommand

disagreement/ext/commands/__init__.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/__init__.py
-
 """
 disagreement.ext.commands - A command framework extension for the Disagreement library.
 """

disagreement/ext/commands/cog.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/cog.py
-
 import inspect
 import logging
 from typing import TYPE_CHECKING, List, Tuple, Callable, Awaitable, Any, Dict, Union

disagreement/ext/commands/converters.py

@@ -1,8 +1,9 @@
-# disagreement/ext/commands/converters.py
+# pyright: reportIncompatibleMethodOverride=false
 
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, TypeVar, Generic
 from abc import ABC, abstractmethod
 import re
+import inspect
 
 from .errors import BadArgument
 from disagreement.models import Member, Guild, Role
@@ -36,6 +37,20 @@ class Converter(ABC, Generic[T]):
         raise NotImplementedError("Converter subclass must implement convert method.")
 
 
+class Greedy(list):
+    """Type hint helper to greedily consume arguments."""
+
+    converter: Any = None
+
+    def __class_getitem__(cls, param: Any) -> type:  # pyright: ignore[override]
+        if isinstance(param, tuple):
+            if len(param) != 1:
+                raise TypeError("Greedy[...] expects a single parameter")
+            param = param[0]
+        name = f"Greedy[{getattr(param, '__name__', str(param))}]"
+        return type(name, (Greedy,), {"converter": param})
+
+
 # --- Built-in Type Converters ---
 
 
@@ -169,7 +184,3 @@ async def run_converters(ctx: "CommandContext", annotation: Any, argument: str)
         raise BadArgument(f"No converter found for type annotation '{annotation}'.")
 
     return argument  # Default to string if no annotation or annotation is str
-
-
-# Need to import inspect for the run_converters function
-import inspect

disagreement/ext/commands/core.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/core.py
-
 from __future__ import annotations
 
 import asyncio
@@ -29,7 +27,7 @@ from .errors import (
     CheckFailure,
     CommandInvokeError,
 )
-from .converters import run_converters, DEFAULT_CONVERTERS, Converter
+from .converters import Greedy, run_converters, DEFAULT_CONVERTERS, Converter
 from disagreement.typing import Typing
 
 logger = logging.getLogger(__name__)
@@ -46,29 +44,39 @@ class GroupMixin:
         self.commands: Dict[str, "Command"] = {}
         self.name: str = ""
 
-    def command(self, **attrs: Any) -> Callable[[Callable[..., Awaitable[None]]], "Command"]:
+    def command(
+        self, **attrs: Any
+    ) -> Callable[[Callable[..., Awaitable[None]]], "Command"]:
         def decorator(func: Callable[..., Awaitable[None]]) -> "Command":
             cmd = Command(func, **attrs)
             cmd.cog = getattr(self, "cog", None)
             self.add_command(cmd)
             return cmd
+
         return decorator
 
-    def group(self, **attrs: Any) -> Callable[[Callable[..., Awaitable[None]]], "Group"]:
+    def group(
+        self, **attrs: Any
+    ) -> Callable[[Callable[..., Awaitable[None]]], "Group"]:
         def decorator(func: Callable[..., Awaitable[None]]) -> "Group":
             cmd = Group(func, **attrs)
             cmd.cog = getattr(self, "cog", None)
             self.add_command(cmd)
             return cmd
+
         return decorator
 
     def add_command(self, command: "Command") -> None:
         if command.name in self.commands:
-            raise ValueError(f"Command '{command.name}' is already registered in group '{self.name}'.")
+            raise ValueError(
+                f"Command '{command.name}' is already registered in group '{self.name}'."
+            )
         self.commands[command.name.lower()] = command
         for alias in command.aliases:
             if alias in self.commands:
-                logger.warning(f"Alias '{alias}' for command '{command.name}' in group '{self.name}' conflicts with an existing command or alias.")
+                logger.warning(
+                    f"Alias '{alias}' for command '{command.name}' in group '{self.name}' conflicts with an existing command or alias."
+                )
             self.commands[alias.lower()] = command
 
     def get_command(self, name: str) -> Optional["Command"]:
@@ -181,6 +189,7 @@ class Command(GroupMixin):
 
 class Group(Command):
     """A command that can have subcommands."""
+
     def __init__(self, callback: Callable[..., Awaitable[None]], **attrs: Any):
         super().__init__(callback, **attrs)
 
@@ -494,7 +503,34 @@ class CommandHandler:
                 None  # Holds the raw string for current param
             )
 
-            if view.eof:  # No more input string
+            annotation = param.annotation
+            if inspect.isclass(annotation) and issubclass(annotation, Greedy):
+                greedy_values = []
+                converter_type = annotation.converter
+                while not view.eof:
+                    view.skip_whitespace()
+                    if view.eof:
+                        break
+                    start = view.index
+                    if view.buffer[view.index] == '"':
+                        arg_str_value = view.get_quoted_string()
+                        if arg_str_value == "" and view.buffer[view.index] == '"':
+                            raise BadArgument(
+                                f"Unterminated quoted string for argument '{param.name}'."
+                            )
+                    else:
+                        arg_str_value = view.get_word()
+                    try:
+                        converted = await run_converters(
+                            ctx, converter_type, arg_str_value
+                        )
+                    except BadArgument:
+                        view.index = start
+                        break
+                    greedy_values.append(converted)
+                final_value_for_param = greedy_values
+                arg_str_value = None
+            elif view.eof:  # No more input string
                 if param.default is not inspect.Parameter.empty:
                     final_value_for_param = param.default
                 elif param.kind != inspect.Parameter.VAR_KEYWORD:
@@ -529,9 +565,7 @@ class CommandHandler:
 
                 # If final_value_for_param was not set by greedy logic, try conversion
                 if final_value_for_param is inspect.Parameter.empty:
-                    if (
-                        arg_str_value is None
-                    ):  # Should not happen if view.get_word/get_quoted_string is robust
+                    if arg_str_value is None:
                         if param.default is not inspect.Parameter.empty:
                             final_value_for_param = param.default
                         else:
@@ -571,7 +605,7 @@ class CommandHandler:
                                     final_value_for_param = None
                                 elif last_err_union:
                                     raise last_err_union
-                                else:  # Should not be reached if logic is correct
+                                else:
                                     raise BadArgument(
                                         f"Could not convert '{arg_str_value}' to any of {union_args} for param '{param.name}'."
                                     )
@@ -656,7 +690,9 @@ class CommandHandler:
                 elif command.invoke_without_command:
                     view.index -= len(potential_subcommand) + view.previous
                 else:
-                    raise CommandNotFound(f"Subcommand '{potential_subcommand}' not found.")
+                    raise CommandNotFound(
+                        f"Subcommand '{potential_subcommand}' not found."
+                    )
 
         ctx = CommandContext(
             message=message,
@@ -681,7 +717,9 @@ class CommandHandler:
             if hasattr(self.client, "on_command_error"):
                 await self.client.on_command_error(ctx, e)
         except Exception as e:
-            logger.error("Unexpected error invoking command '%s': %s", original_command.name, e)
+            logger.error(
+                "Unexpected error invoking command '%s': %s", original_command.name, e
+            )
             exc = CommandInvokeError(e)
             if hasattr(self.client, "on_command_error"):
                 await self.client.on_command_error(ctx, exc)

disagreement/ext/commands/decorators.py

@@ -1,4 +1,3 @@
-# disagreement/ext/commands/decorators.py
 from __future__ import annotations
 
 import asyncio
@@ -218,6 +217,7 @@ def requires_permissions(
 
     return check(predicate)
 
+
 def has_role(
     name_or_id: str | int,
 ) -> Callable[[Callable[..., Awaitable[None]]], Callable[..., Awaitable[None]]]:
@@ -241,9 +241,7 @@ def has_role(
             raise CheckFailure("Could not resolve author to a guild member.")
 
         # Create a list of the member's role objects by looking them up in the guild's roles list
-        member_roles = [
-            role for role in ctx.guild.roles if role.id in author.roles
-        ]
+        member_roles = [role for role in ctx.guild.roles if role.id in author.roles]
 
         if any(
             role.id == str(name_or_id) or role.name == name_or_id
@@ -278,9 +276,7 @@ def has_any_role(
         if not author:
             raise CheckFailure("Could not resolve author to a guild member.")
 
-        member_roles = [
-            role for role in ctx.guild.roles if role.id in author.roles
-        ]
+        member_roles = [role for role in ctx.guild.roles if role.id in author.roles]
         # Convert names_or_ids to a set for efficient lookup
         names_or_ids_set = set(map(str, names_or_ids))
 

disagreement/ext/commands/errors.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/errors.py
-
 """
 Custom exceptions for the command extension.
 """

disagreement/ext/commands/help.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/help.py
-
 from typing import List, Optional
 
 from .core import Command, CommandContext, CommandHandler

disagreement/ext/commands/view.py

@@ -1,5 +1,3 @@
-# disagreement/ext/commands/view.py
-
 import re
 
 
@@ -47,7 +45,7 @@ class StringView:
             word = match.group(0)
             self.index += len(word)
             return word
-        return ""  # Should not happen if not eof and skip_whitespace was called
+        return ""
 
     def get_quoted_string(self) -> str:
         """

disagreement/gateway.py

@@ -1,5 +1,3 @@
-# disagreement/gateway.py
-
 """
 Manages the WebSocket connection to the Discord Gateway.
 """
@@ -14,6 +12,8 @@ import time
 import random
 from typing import Optional, TYPE_CHECKING, Any, Dict
 
+from .models import Activity
+
 from .enums import GatewayOpcode, GatewayIntent
 from .errors import GatewayException, DisagreementException, AuthenticationError
 from .interactions import Interaction
@@ -63,7 +63,11 @@ class GatewayClient:
         self._max_backoff: float = max_backoff
 
         self._ws: Optional[aiohttp.ClientWebSocketResponse] = None
-        self._loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()
+        try:
+            self._loop: asyncio.AbstractEventLoop = asyncio.get_running_loop()
+        except RuntimeError:
+            self._loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(self._loop)
         self._heartbeat_interval: Optional[float] = None
         self._last_sequence: Optional[int] = None
         self._session_id: Optional[str] = None
@@ -146,12 +150,11 @@ class GatewayClient:
         self._last_heartbeat_sent = time.monotonic()
         payload = {"op": GatewayOpcode.HEARTBEAT, "d": self._last_sequence}
         await self._send_json(payload)
-        # print("Sent heartbeat.")
 
     async def _keep_alive(self):
         """Manages the heartbeating loop."""
         if self._heartbeat_interval is None:
-            # This should not happen if HELLO was processed correctly
+
             logger.error("Heartbeat interval not set. Cannot start keep_alive.")
             return
 
@@ -213,26 +216,17 @@ class GatewayClient:
     async def update_presence(
         self,
         status: str,
-        activity_name: Optional[str] = None,
-        activity_type: int = 0,
+        activity: Optional[Activity] = None,
+        *,
         since: int = 0,
         afk: bool = False,
-    ):
+    ) -> None:
         """Sends the presence update payload to the Gateway."""
         payload = {
             "op": GatewayOpcode.PRESENCE_UPDATE,
             "d": {
                 "since": since,
-                "activities": (
-                    [
-                        {
-                            "name": activity_name,
-                            "type": activity_type,
-                        }
-                    ]
-                    if activity_name
-                    else []
-                ),
+                "activities": [activity.to_dict()] if activity else [],
                 "status": status,
                 "afk": afk,
             },
@@ -353,12 +347,15 @@ class GatewayClient:
                         future._members.extend(raw_event_d_payload.get("members", []))  # type: ignore
 
                         # If this is the last chunk, resolve the future
-                        if raw_event_d_payload.get("chunk_index") == raw_event_d_payload.get("chunk_count", 1) - 1:
+                        if (
+                            raw_event_d_payload.get("chunk_index")
+                            == raw_event_d_payload.get("chunk_count", 1) - 1
+                        ):
                             future.set_result(future._members)  # type: ignore
                             del self._member_chunk_requests[nonce]
 
         elif event_name == "INTERACTION_CREATE":
-            # print(f"GATEWAY RECV INTERACTION_CREATE: {raw_event_d_payload}")
+
             if isinstance(raw_event_d_payload, dict):
                 interaction = Interaction(
                     data=raw_event_d_payload, client_instance=self._client_instance
@@ -397,7 +394,7 @@ class GatewayClient:
             event_data_to_dispatch = (
                 raw_event_d_payload if isinstance(raw_event_d_payload, dict) else {}
             )
-            # print(f"GATEWAY RECV EVENT: {event_name} | DATA: {event_data_to_dispatch}")
+
             await self._dispatcher.dispatch(event_name, event_data_to_dispatch)
         else:
             logger.warning("Received dispatch with no event name: %s", data)
@@ -496,8 +493,6 @@ class GatewayClient:
                 await self._identify()
         elif op == GatewayOpcode.HEARTBEAT_ACK:
             self._last_heartbeat_ack = time.monotonic()
-            # print("Received heartbeat ACK.")
-            pass  # Good, connection is alive
         else:
             logger.warning(
                 "Received unhandled Gateway Opcode: %s with data: %s", op, data
@@ -584,7 +579,7 @@ class GatewayClient:
             try:
                 await self._keep_alive_task
             except asyncio.CancelledError:
-                pass  # Expected
+                pass
 
         if self._receive_task and not self._receive_task.done():
             current = asyncio.current_task(loop=self._loop)
@@ -593,7 +588,7 @@ class GatewayClient:
                 try:
                     await self._receive_task
                 except asyncio.CancelledError:
-                    pass  # Expected
+                    pass
 
         if self._ws and not self._ws.closed:
             await self._ws.close(code=code)
@@ -621,6 +616,13 @@ class GatewayClient:
             return None
         return self._last_heartbeat_ack - self._last_heartbeat_sent
 
+    @property
+    def latency_ms(self) -> Optional[float]:
+        """Returns the latency between heartbeat and ACK in milliseconds."""
+        if self._last_heartbeat_sent is None or self._last_heartbeat_ack is None:
+            return None
+        return (self._last_heartbeat_ack - self._last_heartbeat_sent) * 1000
+
     @property
     def last_heartbeat_sent(self) -> Optional[float]:
         return self._last_heartbeat_sent