update requirements.txt, add new command decorators, update utils.py

Author: Mega-JC

requirements.txt

@@ -1,3 +1,3 @@
 black>=22.1
-discord.py @ git+https://github.com/Rapptz/discord.py.git@master#egg=discord.py-2.0.0
+discord.py>=2.0.0
 python-dotenv>=0.19

snakecore/commands/__init__.py

@@ -11,7 +11,7 @@
 
 from snakecore import config
 from . import converters, decorators, parser
-from .bot import AutoShardedBot, Bot
+from .bot import *
 
 
 def init(global_client: Optional[discord.Client] = None):

snakecore/commands/_types.py

@@ -0,0 +1,15 @@
+from typing import TypeVar
+
+from discord import app_commands
+from discord.ext import commands
+
+
+AnyCommandType = TypeVar(
+    "AnyCommandType",
+    commands.Command,
+    commands.Group,
+    commands.HybridCommand,
+    commands.HybridGroup,
+    app_commands.Command,
+    app_commands.Group,
+)

snakecore/commands/bot.py

@@ -15,6 +15,8 @@
 from discord.ext.commands import errors
 
 __all__ = (
+    "ExtBot",
+    "ExtAutoShardedBot",
     "Bot",
     "AutoShardedBot",
 )

snakecore/commands/decorators.py

@@ -8,11 +8,14 @@
 
 import functools
 import inspect
-from typing import Any, Callable, Coroutine, Optional
+from typing import Any, Callable, Coroutine, Optional, TypeVar, Union
 
 import discord
 from discord.ext import commands
+from discord import app_commands
+
 from snakecore.commands.parser import parse_command_str
+from ._types import AnyCommandType
 
 
 def kwarg_command(
@@ -153,7 +156,7 @@ async def kwarg_command_wrapper(
 
 def custom_parsing(
     *, inside_class: bool = False, inject_message_reference: bool = False
-):
+) -> Callable[[Callable[..., Coroutine[Any, Any, Any]]], Any]:
     """A decorator that registers a `discord.ext.commands` command function to
     use snakecore's custom argument parser. This returns a wrapper function that
     bypasses `discord.ext.commands` parsing system, parses the input string from
@@ -237,3 +240,18 @@ async def cmd_func_wrapper(
         return cmd_func_wrapper
 
     return custom_parsing_inner_deco
+
+
+def with_extras(**extras: Any) -> AnyCommandType:
+    """A convenience decorator for adding data into the `extras`
+    attribute of a command object.
+
+    Args:
+        **extras: The extras.
+    """
+
+    def inner_with_extras(cmd: AnyCommandType) -> AnyCommandType:
+        cmd.extras.update(extras)
+        return cmd
+
+    return inner_with_extras

snakecore/utils/embed_utils.py

@@ -15,7 +15,7 @@
 import black
 import discord
 
-from .utils import recursive_dict_update
+from .utils import recursive_mapping_update
 
 
 EMBED_TOP_LEVEL_ATTRIBUTES_MASK_DICT = {
@@ -1355,7 +1355,7 @@ def edit_embed(
                     for i in range(len(update_embed_dict["fields"]))
                 }
 
-        recursive_dict_update(old_embed_dict, update_embed_dict, add_new_keys=True)
+        recursive_mapping_update(old_embed_dict, update_embed_dict, add_new_keys=True)
 
         if edit_inner_fields:
             if "fields" in old_embed_dict:
@@ -2035,7 +2035,7 @@ def edit_embed_dict_from_dict(
                 for i in range(len(update_embed_dict["fields"]))
             }
 
-    recursive_dict_update(
+    recursive_mapping_update(
         old_embed_dict, update_embed_dict, add_new_keys=add_attributes
     )
 

snakecore/utils/serializers.py

@@ -14,7 +14,7 @@
 from snakecore import config
 from snakecore.constants import NoneType
 from snakecore.exceptions import DeserializationError
-from snakecore.utils import recursive_dict_compare
+from snakecore.utils import recursive_mapping_compare
 
 _DISCORD_MODEL_SERIAL_MAP = {}
 
@@ -47,7 +47,7 @@ def __setstate__(self, state):
     @classmethod
     def is_valid_data(cls, data: dict):
         if cls.DATA_FORMAT:
-            return recursive_dict_compare(
+            return recursive_mapping_compare(
                 data,
                 cls.DATA_FORMAT,
                 compare_func=lambda src, target: isinstance(src, target),