style: autofix "ALL" ruff rules + S110 (#671)

Co-authored-by: arielle <[email protected]>

Author: CoderJoshDK

monty/__main__.py

@@ -17,7 +17,7 @@
 log = logging.getLogger(__name__)
 
 try:
-    import uvloop  # noqa: F401 # pyright: ignore[reportMissingImports]
+    import uvloop  # pyright: ignore[reportMissingImports]
 
     uvloop.install()
     log.info("Using uvloop as event loop.")

monty/aiohttp_session.py

@@ -80,7 +80,7 @@ async def _request(
     ) -> aiohttp.ClientResponse:
         """Do the same thing as aiohttp does, but always cache the response."""
         method = method.upper().strip()
-        cache_key = f"{method}:{str(str_or_url)}"
+        cache_key = f"{method}:{str_or_url!s}"
         async with self.cache.lock(cache_key):
             cached = await self.cache.get(cache_key)
             if cached and use_cache:

monty/bot.py

@@ -50,7 +50,7 @@ class Monty(commands.Bot):
 
     name = constants.Client.name
 
-    def __init__(self, redis_session: redis.asyncio.Redis, proxy: str = None, **kwargs) -> None:
+    def __init__(self, redis_session: redis.asyncio.Redis, proxy: str | None = None, **kwargs) -> None:
         if TEST_GUILDS:
             kwargs["test_guilds"] = TEST_GUILDS
             log.warning("registering as test_guilds")
@@ -87,7 +87,7 @@ def db(self) -> async_sessionmaker[AsyncSession]:
         """Alias of `bot.db_session`."""
         return self.db_session
 
-    def create_http_session(self, proxy: str = None) -> None:
+    def create_http_session(self, proxy: str | None = None) -> None:
         """Create the bot's aiohttp session."""
         self.http_session = CachingClientSession(proxy=proxy)
 
@@ -163,17 +163,16 @@ async def _create_features(self) -> None:
         """Update the database with all features defined immediately upon launch. No more lazy creation."""
         await self.wait_until_first_connect()
 
-        async with self._feature_db_lock:
-            async with self.db.begin() as session:
-                stmt = sa.select(Feature).options(selectinload(Feature.rollout))
-                result = await session.scalars(stmt)
-                existing_feature_names = {feature.name for feature in result.all()}
-                for feature_enum in constants.Feature:
-                    if feature_enum.value in existing_feature_names:
-                        continue
-                    feature_instance = Feature(feature_enum.value)
-                    session.add(feature_instance)
-                await session.commit()  # this will error out if it cannot be made
+        async with self._feature_db_lock, self.db.begin() as session:
+            stmt = sa.select(Feature).options(selectinload(Feature.rollout))
+            result = await session.scalars(stmt)
+            existing_feature_names = {feature.name for feature in result.all()}
+            for feature_enum in constants.Feature:
+                if feature_enum.value in existing_feature_names:
+                    continue
+                feature_instance = Feature(feature_enum.value)
+                session.add(feature_instance)
+            await session.commit()  # this will error out if it cannot be made
 
         await self.refresh_features()
 
@@ -228,9 +227,8 @@ async def guild_has_feature(
                             self.features[feature] = feature_instance
         # we're defaulting to non-existing features as None, rather than False.
         # this might change later.
-        if include_feature_status and feature_instance:
-            if feature_instance.enabled is not None:
-                return feature_instance.enabled
+        if include_feature_status and feature_instance and feature_instance.enabled is not None:
+            return feature_instance.enabled
 
         # the feature's enabled status is None, so we should check the guild
         # support the guild being None to make it easier to use
@@ -353,7 +351,7 @@ def remove_command(self, name: str) -> commands.Command | None:
         command = super().remove_command(name)
         if command is None:
             # Even if it's a root alias, there's no way to get the Bot instance to remove the alias.
-            return
+            return None
 
         self.dispatch("command_remove", command)
         self._remove_root_aliases(command)

monty/config/__init__.py

@@ -5,13 +5,13 @@
 
 
 __all__ = (
-    "METADATA",
-    "GROUP_TO_ATTR",
     "CATEGORY_TO_ATTR",
+    "GROUP_TO_ATTR",
+    "METADATA",
     "Category",
     "ConfigAttrMetadata",
-    "SelectGroup",
     "FreeResponseMetadata",
+    "SelectGroup",
     "SelectOptionMetadata",
     "get_category_choices",
 )

monty/config/_validate_metadata.py

@@ -13,10 +13,12 @@ def _check_config_metadata(metadata: dict[str, ConfigAttrMetadata]) -> None:
             assert isinstance(m.select_option, SelectOptionMetadata)
             assert m.type is bool
         if m.modal:
-            assert m.description and len(m.description) <= 45
+            assert m.description
+            assert len(m.description) <= 45
         if m.depends_on_features:
             for feature in m.depends_on_features:
                 assert feature in constants.Feature
     for c in Category:
         if not any(c in m.categories for m in metadata.values()):
-            raise ValueError(f"Category {c} has no associated config attributes")
+            msg = f"Category {c} has no associated config attributes"
+            raise ValueError(msg)

monty/config/metadata.py

@@ -9,9 +9,9 @@
 
 
 __all__ = (
-    "METADATA",
     "CATEGORY_TO_ATTR",
     "GROUP_TO_ATTR",
+    "METADATA",
 )
 
 

monty/constants.py

@@ -83,7 +83,7 @@ class Client:
 
 class Database:
     postgres_bind: str = environ.get("DB_BIND", "")
-    run_migrations: bool = not (environ.get("DB_RUN_MIGRATIONS", "true").lower() == "false")
+    run_migrations: bool = environ.get("DB_RUN_MIGRATIONS", "true").lower() != "false"
     migration_target: str = environ.get("DB_MIGRATION_TARGET", "head")
 
 
@@ -97,7 +97,7 @@ class Monitoring:
     debug_logging = environ.get("LOG_DEBUG", "true").lower() == "true"
     sentry_enabled = bool(environ.get("SENTRY_DSN"))
     trace_loggers = environ.get("BOT_TRACE_LOGGERS")
-    log_mode: Literal["daily", "dev"] = "daily" if "daily" == environ.get("BOT_LOG_MODE", "dev").lower() else "dev"
+    log_mode: Literal["daily", "dev"] = "daily" if environ.get("BOT_LOG_MODE", "dev").lower() == "daily" else "dev"
 
     public_status_page: str | None = environ.get("UPTIME_STATUS_PAGE") or None
     ping_url: str = environ.get("UPTIME_URL", "")
@@ -207,7 +207,7 @@ class Icons:
         "%3Fv%3D1/https/cdn.discordapp.com/emojis/654080405988966419.png?width=20&height=20"
     )
     github_avatar_url = "https://avatars1.githubusercontent.com/u/9919"
-    python_discourse = "https://global.discourse-cdn.com/business6/uploads/python1/optimized/1X/4c06143de7870c35963b818b15b395092a434991_2_180x180.png"  # noqa: E501
+    python_discourse = "https://global.discourse-cdn.com/business6/uploads/python1/optimized/1X/4c06143de7870c35963b818b15b395092a434991_2_180x180.png"
 
 
 ## Authentication and Endpoint management for external services

monty/database/feature.py

@@ -26,6 +26,6 @@ class Feature(MappedAsDataclass, Base):
     def validate_name(self, key: str, name: str) -> str:
         """Validate the `name` attribute meets the regex requirement."""
         if not NAME_REGEX.fullmatch(name):
-            err = f"The provided feature name '{name}' does not match the name regex {str(NAME_REGEX)}"
+            err = f"The provided feature name '{name}' does not match the name regex {NAME_REGEX!s}"
             raise ValueError(err)
         return name

monty/database/guild.py

@@ -11,7 +11,7 @@ class Guild(Base):
     __tablename__ = "guilds"
 
     id: Mapped[int] = mapped_column(sa.BigInteger, primary_key=True, autoincrement=False)
-    # todo: this should be a many to many relationship
+    # TODO: this should be a many to many relationship
     feature_ids: Mapped[list[str]] = mapped_column(
         MutableList.as_mutable(sa.ARRAY(sa.String(length=50))),
         name="features",

monty/database/package.py

@@ -55,6 +55,6 @@ def base_url(self, value: str | None) -> None:
     def validate_name(self, key: str, name: str) -> str:
         """Validate all names are of the format of valid python package names."""
         if not NAME_REGEX.fullmatch(name):
-            err = f"The provided package name '{name}' does not match the name regex {str(NAME_REGEX)}"
+            err = f"The provided package name '{name}' does not match the name regex {NAME_REGEX!s}"
             raise ValueError(err)
         return name