From 1cc46ce2fd09b50993dee8e25c22e5e9f90434da Mon Sep 17 00:00:00 2001 From: imcompiling Date: Wed, 16 Jul 2025 10:55:15 -0400 Subject: [PATCH] Feat: Rename DakinySettings -> dakiny_settings. Also handle the list error from pylance. --- dakiny_bot/app.py | 2 +- dakiny_bot/classes/election.py | 2 +- dakiny_bot/classes/nominate_highcouncil_views.py | 9 ++++----- dakiny_bot/classes/nominate_views.py | 7 +++---- dakiny_bot/classes/voting_highcouncil_views.py | 11 +++++------ dakiny_bot/classes/voting_views.py | 11 +++++------ dakiny_bot/cogs/clan_messages/__init__.py | 2 +- dakiny_bot/cogs/commands/record.py | 2 +- dakiny_bot/cogs/commands/request.py | 2 +- dakiny_bot/cogs/commands/settings.py | 2 +- dakiny_bot/cogs/commands/test.py | 2 +- dakiny_bot/cogs/loops/daily_loop.py | 2 +- dakiny_bot/{DakinySettings.py => dakiny_settings.py} | 3 ++- dakiny_bot/utils.py | 2 +- 14 files changed, 28 insertions(+), 31 deletions(-) rename dakiny_bot/{DakinySettings.py => dakiny_settings.py} (93%) diff --git a/dakiny_bot/app.py b/dakiny_bot/app.py index 706b048..f034839 100644 --- a/dakiny_bot/app.py +++ b/dakiny_bot/app.py @@ -11,7 +11,7 @@ from dakiny_bot.classes.voting_highcouncil_views import VoteHighcouncilView from dakiny_bot.classes.voting_views import VoteView from dakiny_bot.logger import dakiny_logger -from .DakinySettings import settings +from .dakiny_settings import settings birthday_list: list[int] = [] diff --git a/dakiny_bot/classes/election.py b/dakiny_bot/classes/election.py index 7c360f8..54cf7ce 100644 --- a/dakiny_bot/classes/election.py +++ b/dakiny_bot/classes/election.py @@ -9,7 +9,7 @@ from dakiny_bot.classes.nominate_highcouncil_views import NominateHighCouncilVie from dakiny_bot.classes.nominate_views import NominateView from dakiny_bot.classes.voting_highcouncil_views import VoteHighcouncilView from dakiny_bot.classes.voting_views import VoteView -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import ( CouncilMembers, ElectionInformation, diff --git a/dakiny_bot/classes/nominate_highcouncil_views.py b/dakiny_bot/classes/nominate_highcouncil_views.py index c74a768..3af2540 100644 --- a/dakiny_bot/classes/nominate_highcouncil_views.py +++ b/dakiny_bot/classes/nominate_highcouncil_views.py @@ -1,11 +1,7 @@ """Contains various views to be used in the high council nomination process.""" import nextcord -from nextcord.interactions import Interaction -from sqlalchemy import select -from sqlalchemy.orm import Session - -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import CouncilMembers, engine from dakiny_bot.utils import ( NOMINEE_SPLITTER, @@ -13,6 +9,9 @@ from dakiny_bot.utils import ( decorate_dm_nomination, get_election_name, ) +from nextcord.interactions import Interaction +from sqlalchemy import select +from sqlalchemy.orm import Session class NominateDMModal(nextcord.ui.Modal): diff --git a/dakiny_bot/classes/nominate_views.py b/dakiny_bot/classes/nominate_views.py index 06f5e7e..434f6d5 100644 --- a/dakiny_bot/classes/nominate_views.py +++ b/dakiny_bot/classes/nominate_views.py @@ -1,14 +1,13 @@ """Contains various views to be used in the nomination process.""" import nextcord +from dakiny_bot.dakiny_settings import settings +from dakiny_bot.database.sql_data_classes import CouncilMembers, engine +from dakiny_bot.utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name from nextcord.interactions import Interaction from sqlalchemy import select from sqlalchemy.orm import Session -from dakiny_bot.DakinySettings import settings -from dakiny_bot.database.sql_data_classes import CouncilMembers, engine -from dakiny_bot.utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name - class NominateModal(nextcord.ui.Modal): """ diff --git a/dakiny_bot/classes/voting_highcouncil_views.py b/dakiny_bot/classes/voting_highcouncil_views.py index cc013c2..17c9236 100644 --- a/dakiny_bot/classes/voting_highcouncil_views.py +++ b/dakiny_bot/classes/voting_highcouncil_views.py @@ -1,12 +1,7 @@ """Contains various views to be used while voting for high council. Controls the logic when performing the vote.""" import nextcord -from nextcord import SelectOption -from nextcord.interactions import Interaction -from sqlalchemy import exc, select, update -from sqlalchemy.orm import Session - -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import ( CouncilMembers, ElectionInformation, @@ -14,6 +9,10 @@ from dakiny_bot.database.sql_data_classes import ( engine, ) from dakiny_bot.utils import VoteType, build_highcouncil_votes_str, get_election_name +from nextcord import SelectOption +from nextcord.interactions import Interaction +from sqlalchemy import exc, select, update +from sqlalchemy.orm import Session class VoteSelect(nextcord.ui.StringSelect): diff --git a/dakiny_bot/classes/voting_views.py b/dakiny_bot/classes/voting_views.py index 3c562b0..44b6b4f 100644 --- a/dakiny_bot/classes/voting_views.py +++ b/dakiny_bot/classes/voting_views.py @@ -1,12 +1,7 @@ """Contains various views to be used while voting. Controls the logic when performing the vote.""" import nextcord -from nextcord import SelectOption -from nextcord.interactions import Interaction -from sqlalchemy import exc, select, update -from sqlalchemy.orm import Session - -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import ( CouncilMembers, ElectionInformation, @@ -14,6 +9,10 @@ from dakiny_bot.database.sql_data_classes import ( engine, ) from dakiny_bot.utils import VoteType, build_votes_str, get_election_name +from nextcord import SelectOption +from nextcord.interactions import Interaction +from sqlalchemy import exc, select, update +from sqlalchemy.orm import Session class VoteSelect(nextcord.ui.StringSelect): diff --git a/dakiny_bot/cogs/clan_messages/__init__.py b/dakiny_bot/cogs/clan_messages/__init__.py index e24e709..c6c8a4d 100644 --- a/dakiny_bot/cogs/clan_messages/__init__.py +++ b/dakiny_bot/cogs/clan_messages/__init__.py @@ -10,7 +10,7 @@ from git.exc import GitCommandError from nextcord.ext import commands from dakiny_bot.classes.gitea_webhook import GiteaWebhook -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.logger import dakiny_logger from dakiny_bot.utils import REPO_DIR, edit_clan_council_info, update_clan_messages diff --git a/dakiny_bot/cogs/commands/record.py b/dakiny_bot/cogs/commands/record.py index 070b323..d7cbfc5 100644 --- a/dakiny_bot/cogs/commands/record.py +++ b/dakiny_bot/cogs/commands/record.py @@ -4,7 +4,7 @@ import nextcord from discord import TextInputStyle from nextcord.ext import commands -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, PointType, record_points diff --git a/dakiny_bot/cogs/commands/request.py b/dakiny_bot/cogs/commands/request.py index 004ce8b..3388b15 100644 --- a/dakiny_bot/cogs/commands/request.py +++ b/dakiny_bot/cogs/commands/request.py @@ -4,7 +4,7 @@ import nextcord from nextcord.ext import commands from sqlalchemy.orm import Session -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import Presences, engine diff --git a/dakiny_bot/cogs/commands/settings.py b/dakiny_bot/cogs/commands/settings.py index 05d51f8..3b3b93a 100644 --- a/dakiny_bot/cogs/commands/settings.py +++ b/dakiny_bot/cogs/commands/settings.py @@ -3,7 +3,7 @@ import nextcord from nextcord.ext import commands -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.utils import GUILDS diff --git a/dakiny_bot/cogs/commands/test.py b/dakiny_bot/cogs/commands/test.py index 69315d4..d3ebe76 100644 --- a/dakiny_bot/cogs/commands/test.py +++ b/dakiny_bot/cogs/commands/test.py @@ -5,7 +5,7 @@ from nextcord.ext import application_checks, commands from dakiny_bot.classes.election import Election from dakiny_bot.cogs.loops import daily_loop -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.utils import GUILDS, get_active_election_cycle, get_quarter_name ME = 206602713511886849 diff --git a/dakiny_bot/cogs/loops/daily_loop.py b/dakiny_bot/cogs/loops/daily_loop.py index 9aeaea9..95ea53a 100644 --- a/dakiny_bot/cogs/loops/daily_loop.py +++ b/dakiny_bot/cogs/loops/daily_loop.py @@ -11,7 +11,7 @@ from sqlalchemy.orm import Session from dakiny_bot.app import birthday_list from dakiny_bot.classes.election import Election -from dakiny_bot.DakinySettings import settings +from dakiny_bot.dakiny_settings import settings from dakiny_bot.database.sql_data_classes import UserBirthday, engine from dakiny_bot.logger import dakiny_logger from dakiny_bot.utils import get_active_election_cycle diff --git a/dakiny_bot/DakinySettings.py b/dakiny_bot/dakiny_settings.py similarity index 93% rename from dakiny_bot/DakinySettings.py rename to dakiny_bot/dakiny_settings.py index e0655bb..9fcf22a 100644 --- a/dakiny_bot/DakinySettings.py +++ b/dakiny_bot/dakiny_settings.py @@ -83,4 +83,5 @@ class DakinySettings(YAMLWizard): self.to_yaml_file(CONFIG_LOCATION) -settings = DakinySettings.from_yaml_file(CONFIG_LOCATION) +tmp = DakinySettings.from_yaml_file(CONFIG_LOCATION) +settings: DakinySettings = tmp[0] if isinstance(tmp, list) else tmp diff --git a/dakiny_bot/utils.py b/dakiny_bot/utils.py index 514012e..ec9199c 100644 --- a/dakiny_bot/utils.py +++ b/dakiny_bot/utils.py @@ -22,7 +22,7 @@ from dakiny_bot.database.sql_data_classes import ( ) from dakiny_bot.logger import dakiny_logger -from .DakinySettings import settings +from .dakiny_settings import settings NOMINEE_SPLITTER = "========================================\n\n" REPO_DIR = "./dakiny-messages"