Fix import errors

cogs/add_users_to_threads_and_channels.py

@@ -2,23 +2,26 @@
 
 import logging
 from collections.abc import Iterable
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from typing import TYPE_CHECKING
 
 import discord
 
 from config import settings
 from exceptions import GuestRoleDoesNotExistError, GuildDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 from utils.error_capture_decorators import capture_guild_does_not_exist_error
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
-
 
 __all__: Sequence[str] = ("AddUsersToThreadsAndChannelsCommandsCog",)
 

cogs/annual_handover_and_reset.py

@@ -8,14 +8,14 @@
 
 from config import settings
 from db.core.models import GroupMadeMember
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Collection, Mapping, Sequence
     from logging import Logger
     from typing import Final
 
-    from utils import AllChannelTypes, TeXBotApplicationContext
+    from utils import AllChannelTypes
 
 __all__: Sequence[str] = (
     "AnnualRolesResetCommandCog",

cogs/archive.py

@@ -2,21 +2,26 @@
 
 import logging
 import re
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from typing import TYPE_CHECKING
 
 import discord
 
 from exceptions import EveryoneRoleCouldNotBeRetrievedError
 from exceptions.base import BaseDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import AllChannelTypes, TeXBotApplicationContext, TeXBotAutocompleteContext
+    from utils import AllChannelTypes
 
 __all__: Sequence[str] = ("ArchiveCommandsCog",)
 

cogs/check_su_platform_authorisation.py

@@ -1,6 +1,7 @@
 """Contains cog classes for SU platform access cookie authorisation check interactions."""
 
 import logging
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from enum import Enum
 from typing import TYPE_CHECKING, override
 
@@ -9,19 +10,18 @@
 from discord.ext import tasks
 
 from config import settings
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 from utils.error_capture_decorators import (
     capture_guild_does_not_exist_error,
 )
 from utils.msl import fetch_url_content_with_session
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBot, TeXBotApplicationContext
+    from utils import TeXBot
 
 __all__: Sequence[str] = (
     "CheckSUPlatformAuthorisationCommandCog",

cogs/committee_actions_tracking.py

@@ -4,6 +4,7 @@
 import logging
 import random
 import textwrap
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from enum import Enum
 from typing import TYPE_CHECKING
 
@@ -18,16 +19,18 @@
     InvalidActionDescriptionError,
     InvalidActionTargetError,
 )
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
-
 __all__: Sequence[str] = (
     "CommitteeActionsTrackingBaseCog",
     "CommitteeActionsTrackingContextCommandCog",

cogs/delete_all.py

@@ -11,13 +11,12 @@
     SentGetRolesReminderMember,
     SentOneOffIntroductionReminderMember,
 )
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
     from db.core.models.utils import AsyncBaseModel
-    from utils import TeXBotApplicationContext
 
 __all__: Sequence[str] = ("DeleteAllCommandsCog",)
 

cogs/edit_message.py

@@ -1,19 +1,22 @@
 """Contains cog classes for any edit_message interactions."""
 
 import re
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from typing import TYPE_CHECKING, override
 
 import discord
 
 from exceptions import DiscordMemberNotInMainGuildError
 from exceptions.base import BaseDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
-
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
 
 __all__: Sequence[str] = ("EditMessageCommandCog",)
 

cogs/everest.py

@@ -1,21 +1,23 @@
 """Contains cog classes for any Everest interactions."""
 
 import logging
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from enum import Enum
 from typing import TYPE_CHECKING, override
 
 import discord
 
-from utils import TeXBotBaseCog
+from utils import (  # noqa: TC001
+    TeXBotApplicationContext,
+    TeXBotAutocompleteContext,
+    TeXBotBaseCog,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
-
 __all__: Sequence[str] = ("EverestCommandCog",)
 
 

cogs/induct.py

@@ -3,6 +3,7 @@
 import contextlib
 import logging
 import random
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from typing import TYPE_CHECKING
 
 import discord
@@ -17,16 +18,19 @@
     GuildDoesNotExistError,
     MemberRoleDoesNotExistError,
 )
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 from utils.error_capture_decorators import capture_guild_does_not_exist_error
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final, Literal
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
 
 __all__: Sequence[str] = (
     "BaseInductCog",

cogs/invite_link.py

@@ -5,13 +5,11 @@
 import discord
 
 from config import settings
-from utils import TeXBotBaseCog
+from utils import TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from utils import TeXBotApplicationContext
-
 __all__: Sequence[str] = ("InviteLinkCommandCog",)
 
 

cogs/kill.py

@@ -7,14 +7,13 @@
 from discord.ui import View
 
 from exceptions import CommitteeRoleDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext
 
 __all__: Sequence[str] = ("ConfirmKillView", "KillCommandCog")
 

cogs/make_applicant.py

@@ -6,14 +6,18 @@
 import discord
 
 from exceptions.does_not_exist import ApplicantRoleDoesNotExistError, GuildDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
 
 __all__: Sequence[str] = (
     "BaseMakeApplicantCog",

cogs/make_member.py

@@ -10,16 +10,14 @@
 from config import settings
 from db.core.models import GroupMadeMember
 from exceptions import ApplicantRoleDoesNotExistError, GuestRoleDoesNotExistError
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 from utils.msl import fetch_community_group_members_count, is_id_a_community_group_member
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext
-
 
 __all__: Sequence[str] = ("MakeMemberCommandCog", "MemberCountCommandCog")
 

cogs/ping.py

@@ -6,13 +6,11 @@
 import discord
 
 from config import settings
-from utils import TeXBotBaseCog
+from utils import TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from utils import TeXBotApplicationContext
-
 __all__: Sequence[str] = ("PingCommandCog",)
 
 

cogs/source.py

@@ -4,13 +4,11 @@
 
 import discord
 
-from utils import TeXBotBaseCog
+from utils import TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from utils import TeXBotApplicationContext
-
 __all__: Sequence[str] = ("SourceCommandCog",)
 
 

cogs/stats/__init__.py

@@ -8,7 +8,7 @@
 
 from config import settings
 from db.core.models import LeftDiscordMember
-from utils import CommandChecks, TeXBotBaseCog
+from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog  # noqa: TC001
 from utils.error_capture_decorators import capture_guild_does_not_exist_error
 
 from .counts import get_channel_message_counts, get_server_message_counts
@@ -18,8 +18,6 @@
     from collections.abc import AsyncIterable, Mapping, Sequence
     from typing import Final
 
-    from utils import TeXBotApplicationContext
-
 __all__: Sequence[str] = ("StatsCommandsCog",)
 
 

cogs/strike.py

@@ -5,6 +5,7 @@
 import datetime
 import logging
 import re
+from collections.abc import Set as AbstractSet  # noqa: TC003
 from typing import TYPE_CHECKING
 
 import discord
@@ -18,7 +19,12 @@
     NoAuditLogsStrikeTrackingError,
     StrikeTrackingError,
 )
-from utils import CommandChecks, TeXBotBaseCog
+from utils import (
+    CommandChecks,
+    TeXBotApplicationContext,  # noqa: TC001
+    TeXBotAutocompleteContext,  # noqa: TC001
+    TeXBotBaseCog,
+)
 from utils.error_capture_decorators import (
     capture_guild_does_not_exist_error,
     capture_strike_tracking_error,
@@ -27,11 +33,9 @@
 
 if TYPE_CHECKING:
     from collections.abc import Mapping, Sequence
-    from collections.abc import Set as AbstractSet
     from logging import Logger
     from typing import Final
 
-    from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
     from utils.message_sender_components import MessageSavingSenderComponent
 
 __all__: Sequence[str] = (