Merge branch 'main' into qt/github-rewrite

Author: onerandomusername

.github/actions/setup-env/action.yaml

@@ -17,7 +17,7 @@ runs:
   steps:
     - name: Set up uv with Python ${{ inputs.python-version }}
       id: setup-python
-      uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
+      uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
       with:
         version: '0.8.14'
         enable-cache: true

monty/exts/info/github/__init__.py

@@ -7,7 +7,6 @@
 from collections.abc import Mapping
 from typing import Any, overload
 
-import attrs
 import cachingutils
 import disnake
 import ghretos
@@ -616,13 +615,10 @@ async def ratelimits_command(self, ctx: commands.Context, refresh: bool = False)
         use_inline = len(monty.utils.services.GITHUB_RATELIMITS) <= 18  # 25 fields, 3 per line, 1 for the seperator.
         for i, (resource_name, rate_limit) in enumerate(monty.utils.services.GITHUB_RATELIMITS.items()):
             embed_value = ""
-            for name, value in attrs.asdict(rate_limit).items():
-                if name == "reset":
-                    value = f"<t:{value}:R>"
-                else:
-                    value = f"`{value}`"
-
-                embed_value += f"**`{name}`**: {value}\n"
+            embed_value += f"**`limit`**: `{rate_limit.limit}`\n"
+            embed_value += f"**`remaining`**: `{rate_limit.remaining}`\n"
+            embed_value += f"**`reset`**: <t:{rate_limit.reset}:R>\n"
+            embed_value += f"**`used`**: `{rate_limit.used}`\n"
             embed.add_field(name=resource_name, value=embed_value, inline=use_inline)
 
             # add a "newline" after every 3 fields

monty/utils/extensions.py

@@ -28,8 +28,10 @@ def walk_extensions() -> Generator[tuple[str, "ExtMetadata"], None, None]:
     def on_error(name: str) -> NoReturn:
         raise ImportError(name=name)  # pragma: no cover
 
+    skip_modules: set[str] = set()
+
     for module in pkgutil.walk_packages(exts.__path__, f"{exts.__name__}.", onerror=on_error):
-        if unqualify(module.name).startswith("_"):
+        if unqualify(module.name).startswith("_") or module.name in skip_modules:
             # Ignore module/package names starting with an underscore.
             continue
 
@@ -38,6 +40,11 @@ def on_error(name: str) -> NoReturn:
             # If it lacks a setup function, it's not an extension.
             continue
 
+        # This check only excludes init files which add an extension.
+        if module.name.endswith(".__init__"):
+            # Add all submodules to skip list to avoid re-processing.
+            skip_modules.add(module.name)
+
         ext_metadata = getattr(imported, "EXT_METADATA", None)
         if ext_metadata is not None:
             if not isinstance(ext_metadata, ExtMetadata):