Merge branch '21-edit-configs-from-discord'

.dockerignore

@@ -1,6 +0,0 @@
-.*
-Dockerfile
-LICENSE
-README.md
-renovate.json
-permissions_required.txt

.editorconfig

@@ -1,16 +0,0 @@
-# see https://editorconfig.org/
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2

.gitea/workflows/build_develop.yml

@@ -5,21 +5,19 @@ on:
     branches:
       - '*'
       - '!main'
-    paths-ignore:
-        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_latest.yml

@@ -3,21 +3,19 @@ name: build_latest
 on:
   push:
     branches: [main]
-    paths-ignore:
-        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_release.yml

@@ -9,13 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitignore

@@ -105,6 +105,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+poetry.lock
 
 # Spyder project settings
 .spyderproject
@@ -136,5 +137,5 @@ TODO.txt
 sql_tester.py
 conf
 outputs
-/database
+database
 dakiny-messages/

.vscode/extensions.json

@@ -4,7 +4,6 @@
         "ms-python.python",
         "ms-python.debugpy",
         "charliermarsh.ruff",
-        "alexcvzz.vscode-sqlite",
+        "alexcvzz.vscode-sqlite"
-        "editorconfig.editorconfig"
     ]
 }

.vscode/launch.json

@@ -8,11 +8,8 @@
             "name": "Python: Module",
             "type": "debugpy",
             "request": "launch",
-            "module": "dakiny_bot",
+            "module": "main",
-            "justMyCode": true,
+            "justMyCode": true
-            "env": {
-                "DEBUG": "true"
-            }
         }
     ]
 }

.vscode/settings.json

@@ -3,15 +3,9 @@
         "aiofiles",
         "autofilled",
         "blurple",
-        "CAKEDAY",
-        "cakedays",
         "CLANLEADER",
         "Dakiny",
         "DISCORDMANAGER",
-        "gitea",
+        "highcouncil"
-        "highcouncil",
-        "imcompiling",
-        "nextcord",
-        "ondelete"
     ]
 }

DakinySettings.py

@@ -12,24 +12,22 @@ class ChannelIds:
     """Class holds all channel ids needed by bot."""
 
     admin: int  # might want to rename this...
-    announcement: int
+    announcement_category: int
     clan_info: int
     event_post: int
     general: int
-    voting: int
+    voting_parent: int
-    ban: int
 
 
 @dataclass
 class Election:
     """Class defines relevant election dates."""
 
-    active: bool
+    name: str
     election_start: str
     highcouncil_election_announce: str
     highcouncil_election_end: str
     highcouncil_election_start: str
-    name: str
     term_end: str
     term_start: str
     voting_end: str
@@ -45,38 +43,34 @@ class Params:
     guild_id: int
 
 
-@dataclass
-class PointSettings:
-    """Class defines point settings editable by Clan Council."""
-
-    clan_points: int
-    clan_points_weekly_limit: int
-    events_weekly_limit: int
-    host_points: int
-    participate_points: int
-    verify_clan_points: bool
-    verify_events: bool
-
-
 @dataclass
 class RoleIds:
     """Class holds all role ids needed by bot."""
 
-    clan_council: int
     clan_council_elect: int
+    clan_council: int
     clan_member: int
     event_host: int
     high_council: int
 
 
+@dataclass
+class EventSettings:
+    """Class defines settings editable by Clan Council."""
+
+    host_points: int
+    participate_points: int
+    weekly_limit: int
+
+
 @dataclass
 class DakinySettings(YAMLWizard):
     """Class defines all configs required for Dakiny Bot."""
 
     channel_ids: ChannelIds
     election_cycles: list[Election]
+    event_settings: EventSettings
     params: Params
-    point_settings: PointSettings
     role_ids: RoleIds
 
     def save(self) -> None:
@@ -84,5 +78,5 @@ class DakinySettings(YAMLWizard):
         self.to_yaml_file(CONFIG_LOCATION)
 
 
-tmp = DakinySettings.from_yaml_file(CONFIG_LOCATION)
+settings = DakinySettings.from_yaml_file(CONFIG_LOCATION)
-settings: DakinySettings = tmp[0] if isinstance(tmp, list) else tmp
+settings.save()

Dockerfile

@@ -1,15 +1,19 @@
-FROM python:3.13.5-slim
+FROM python:3.12.3-slim
 
 # install dependencies
 RUN apt-get update && apt-get -y upgrade && apt-get -y install git sqlite3
 
-# install uv
-COPY --from=ghcr.io/astral-sh/uv:0.7.20 /uv /uvx /bin/
-
-COPY . /home
-
-# Sync the project into a new environment, using the frozen lockfile
 WORKDIR /home
-RUN uv sync --frozen --no-dev
 
-CMD ["uv", "run", "--frozen", "--no-dev", "-m", "dakiny_bot"]
+COPY DakinySettings.py DakinySettings.py
+COPY main.py main.py
+COPY utils.py utils.py
+COPY pyproject.toml pyproject.toml
+
+COPY classes classes/
+COPY cogs cogs/
+COPY database_setup database_setup/
+
+RUN pip install --upgrade pip && pip install poetry && poetry export -f requirements.txt --output requirements.txt && pip install -r requirements.txt
+
+CMD ["python3", "-u", "./main.py"]

classes/election.py

@@ -5,19 +5,20 @@ from datetime import UTC, datetime, timedelta
 from pathlib import Path
 
 import nextcord
-from sqlalchemy import select, update
+from classes.nominate_highcouncil_views import NominateHighCouncilView
+from classes.nominate_views import NominateView
+from classes.voting_highcouncil_views import VoteHighcouncilView
+from classes.voting_views import VoteView
+from DakinySettings import settings
+from database_setup.sql_data_classes import (
+    CouncilMembers,
+    ElectionInformation,
+    Votes,
+    engine,
+)
+from sqlalchemy import select, true, update
 from sqlalchemy.orm import Session
-from sqlmodel import col
+from utils import (
-
-from dakiny_bot.classes.nominate_highcouncil_views import NominateHighCouncilView
-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.dakiny_settings import settings
-from dakiny_bot.database.db import engine
-from dakiny_bot.database.models import CouncilMember, ElectionInformation, Vote
-from dakiny_bot.logger import dakiny_logger
-from dakiny_bot.utils import (
     TEMPLATES_DIR,
     VoteType,
     build_highcouncil_votes_str,
@@ -48,7 +49,6 @@ class Election:
         """
         self.cycle = cycle
         self.election_cycle = settings.election_cycles[self.cycle]
-        self.active = self.election_cycle.active
         self.election_start: datetime = get_datetime(self.election_cycle.election_start)
         self.term_start: datetime = get_datetime(self.election_cycle.term_start)
         self.term_end: datetime = get_datetime(self.election_cycle.term_end)
@@ -68,7 +68,7 @@ class Election:
             list[str]: A list of message contents in the correct order. Must be a string because the message is too
             long.
         """
-        with Path(f"{TEMPLATES_DIR}/election_announcement.txt").open() as file:
+        with Path(f"{TEMPLATES_DIR}/election_announcement.txt", encoding="utf8").open() as file:
             message = file.read()
 
             next_election = get_datetime(
@@ -96,7 +96,7 @@ class Election:
         Returns:
             str: Message to send.
         """
-        with Path(f"{TEMPLATES_DIR}/highcouncil_election.txt").open() as file:
+        with Path(f"{TEMPLATES_DIR}/highcouncil_election.txt", encoding="utf8").open() as file:
             message = file.read()
 
             return message.format(
@@ -114,7 +114,7 @@ class Election:
         Returns:
             str: Message to send.
         """
-        with Path(f"{TEMPLATES_DIR}/highcouncil_vote.txt").open() as file:
+        with Path(f"{TEMPLATES_DIR}/highcouncil_vote.txt", encoding="utf8").open() as file:
             message = file.read()
 
             return message.format(
@@ -129,7 +129,7 @@ class Election:
         Returns:
             str: Message to send
         """
-        with Path(f"{TEMPLATES_DIR}/vote_start.txt").open() as file:
+        with Path(f"{TEMPLATES_DIR}/vote_start.txt", encoding="utf8").open() as file:
             message = file.read()
             vote_end: datetime = get_datetime(settings.election_cycles[self.cycle].voting_end)
 
@@ -142,37 +142,25 @@ class Election:
     async def check_date(self) -> None:
         """Function checks current date to see if something needs to be run."""
         today = datetime.now(tz=UTC)
-        dakiny_logger.debug("Checking date.")
 
         # check all dates if action is needed
         if today.date() == self.election_start.date():
-            dakiny_logger.debug("Election start.")
             await self.election_start_action()
         elif today.date() == self.voting_start.date():
-            dakiny_logger.debug("Voting start.")
             await self.voting_start_action()
         elif (self.voting_end - timedelta(3)).date() <= today.date() < self.voting_end.date():
-            dakiny_logger.debug("Election reminder.")
             await self.election_reminder()
         elif today.date() == self.voting_end.date():
-            dakiny_logger.debug("Voting end.")
             await self.voting_end_action()
         elif today.date() == self.highcouncil_election_start.date():
-            dakiny_logger.debug("Highcouncil election start.")
             await self.highcouncil_election_start_action()
         elif today.date() == self.term_start.date():
-            dakiny_logger.debug("Term start")
             await self.term_start_action()
-        else:
-            dakiny_logger.warning("Check date didn't do anything. This should never happen.")
 
     async def election_start_action(self) -> None:
         """Performs required actions for when the election cycle starts."""
         # create new channel for election
-        parent = self.guild.get_channel(settings.channel_ids.voting)
+        parent: nextcord.TextChannel = self.guild.get_channel(settings.channel_ids.voting_parent)
-        if not isinstance(parent, nextcord.TextChannel):
-            dakiny_logger.error("Voting channel (id: %s) is not a text channel.", settings.channel_ids.voting)
-            return
         quarter_name: str = get_election_name()
 
         thread_msg: nextcord.Message = await parent.send(content=quarter_name)
@@ -193,9 +181,9 @@ class Election:
         # create new entry into database.
         with Session(engine) as session:
             new_cycle = ElectionInformation(
-                name=quarter_name,
+                ElectionName=quarter_name,
-                thread_id=thread.id,
+                ThreadId=thread.id,
-                council_nomination_msg_id=nominate_msg.id,
+                CouncilNominationMsgId=nominate_msg.id,
             )
             session.add(new_cycle)
             session.commit()
@@ -208,98 +196,64 @@ class Election:
         Removes write permission from the general clan member role.
         """
         message = self.build_vote_start()
-
+        election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
-        with Session(engine) as session:
-            stmt = select(ElectionInformation).where(col(ElectionInformation.name == get_election_name()))
-            if (election_info := session.scalar(stmt)) is None:
-                dakiny_logger.error("Unable to find election %s", get_election_name())
-                return
-            if (election_thread := self.guild.get_thread(election_info.thread_id)) is None:
-                dakiny_logger.error("Recorded thread id %s does not result in a thread.", election_info.thread_id)
-                return
-
         await election_thread.send(message)
-
         vote_msg = await election_thread.send(
-                build_votes_str(self.guild),
+            build_votes_str(settings, self.guild),
             view=VoteView(self.guild),
         )
 
-            election_info.council_vote_msg_id = vote_msg.id
+        with Session(engine) as session:
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name())
+            info = session.scalar(stmt)
+            info.CouncilVoteMsgId = vote_msg.id
             session.commit()
 
-            if election_info.council_nomination_msg_id is None:
+            thread: nextcord.Thread = self.guild.get_thread(info.ThreadId)
-                dakiny_logger.error("Election doesn't have a nomination message set.")
+            nominate_msg: nextcord.Message = await thread.fetch_message(info.CouncilNominationMsgId)
-                return
-
-            nominate_msg: nextcord.Message = await election_thread.fetch_message(
-                election_info.council_nomination_msg_id
-            )
             await nominate_msg.edit(view=None)
 
     async def voting_end_action(self) -> None:
         """Performs required actions for when voting time has ended."""
         message = self.build_highcouncil_election_announce()
-        if (council_elect_role := self.guild.get_role(settings.role_ids.clan_council_elect)) is None:
+        council_elect_role: nextcord.Role = self.guild.get_role(settings.role_ids.clan_council_elect)
-            dakiny_logger.error("Clan council elect role not found (id: %s).", settings.role_ids.clan_council_elect)
+        election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
-            return
+
+        nominate_msg: nextcord.Message = await election_thread.send(message, view=NominateHighCouncilView(self.guild))
 
         election_name = get_election_name()
 
         with Session(engine) as session:
-            stmt = select(ElectionInformation).where(col(ElectionInformation.name == election_name))
-            if (info := session.scalar(stmt)) is None:
-                dakiny_logger.error("Unable to find election %s", election_name)
-                return
-
-            if (election_thread := self.guild.get_thread(info.thread_id)) is None:
-                dakiny_logger.error("Recorded thread id %s does not result in a thread.", info.thread_id)
-                return
-
-            nominate_msg: nextcord.Message = await election_thread.send(
-                message, view=NominateHighCouncilView(self.guild)
-            )
-
             # remove vote button from vote message
-            if not info.council_vote_msg_id:
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == election_name)
-                dakiny_logger.error("Council vote message id not set.")
+            info = session.scalar(stmt)
-                return
+            vote_msg: nextcord.Message = await election_thread.fetch_message(info.CouncilVoteMsgId)
-            vote_msg: nextcord.Message = await election_thread.fetch_message(info.council_vote_msg_id)
             await vote_msg.edit(view=None)
 
             # add the highcouncil nomination message to election information
-            info.high_council_nomination_msg_id = nominate_msg.id
+            info.HighCouncilNominationMsgId = nominate_msg.id
             session.commit()
 
             # add the highcouncil role to everyone with 3 or more votes. set elected to true in database
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.type == VoteType.COUNCIL))
+                .where(Votes.Type == VoteType.COUNCIL)
             )
             vote_count = collections.Counter(session.scalars(stmt))
 
             for user_id, votes in vote_count.items():
-                if user_id is None:
-                    # Abstained votes, ignore
-                    continue
                 if votes >= REQUIRED_VOTES_TO_BE_ELECTED:
                     stmt = (
-                        select(CouncilMember)
+                        select(CouncilMembers)
-                        .where(col(CouncilMember.election_name == election_name))
+                        .where(CouncilMembers.ElectionName == election_name)
-                        .where(col(CouncilMember.member_id == user_id))
+                        .where(CouncilMembers.MemberId == user_id)
                     )
-                    if (council_member := session.scalar(stmt)) is None:
+                    council_member = session.scalar(stmt)
-                        dakiny_logger.error(
+                    council_member.Elected = True
-                            "Council member (id: %s) for election %s not found.", user_id, election_name
-                        )
-                        return
-                    council_member.elected = True
                     session.commit()
 
-                    if (member := self.guild.get_member(user_id)) is None:
+                    member: nextcord.Member = self.guild.get_member(user_id)
-                        dakiny_logger.error("Member (id: %s) not found in guild.", user_id)
-                        return
 
                     await member.add_roles(
                         council_elect_role,
@@ -309,58 +263,42 @@ class Election:
     async def highcouncil_election_start_action(self) -> None:
         """Performs required actions for when the highcouncil is elected."""
         message = self.build_highcouncil_vote_start()
-        with Session(engine) as session:
+        election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
-            stmt = select(ElectionInformation).where(col(ElectionInformation.name == get_election_name()))
-            if (info := session.scalar(stmt)) is None:
-                dakiny_logger.error("Unknown election name %s.", get_election_name())
-                return
-
-            if (election_thread := self.guild.get_thread(info.thread_id)) is None:
-                dakiny_logger.error("Recorded thread id %s does not result in a thread.", info.thread_id)
-                return
-
         await election_thread.send(message)
         vote_msg = await election_thread.send(
             build_highcouncil_votes_str(self.guild),
             view=VoteHighcouncilView(self.guild),
         )
 
-            info.high_council_vote_msg_id = vote_msg.id
+        with Session(engine) as session:
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name())
+            info = session.scalar(stmt)
+            info.HighCouncilVoteMsgId = vote_msg.id
             session.commit()
 
             # remove highcouncil nomination view
-            if info.high_council_nomination_msg_id is None:
+            nomination_msg: nextcord.Message = await election_thread.fetch_message(info.HighCouncilNominationMsgId)
-                dakiny_logger.error("Election doesn't have a nomination message set.")
-                return
-
-            nomination_msg: nextcord.Message = await election_thread.fetch_message(info.high_council_nomination_msg_id)
             await nomination_msg.edit(view=None)
 
     async def term_start_action(self) -> None:
         """Marks the election as over."""
         self.election_over = True
 
-        if (elect_role := self.guild.get_role(settings.role_ids.clan_council_elect)) is None:
+        elect_role: nextcord.Role = self.guild.get_role(settings.role_ids.clan_council_elect)
-            dakiny_logger.error("Cannot find Elect Role.")
+        council_role: nextcord.Role = self.guild.get_role(settings.role_ids.clan_council)
-            return
-        if (council_role := self.guild.get_role(settings.role_ids.clan_council)) is None:
-            dakiny_logger.error("Cannot find Council Role.")
-            return
 
         election_name = get_election_name()
 
         with Session(engine) as session:
             # role management
             stmt = (
-                select(col(CouncilMember.member_id))
+                select(CouncilMembers.MemberId)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.elected))
+                .where(CouncilMembers.Elected == true())
             )
 
             for member_id in session.scalars(stmt):
-                if (member := self.guild.get_member(member_id)) is None:
+                member = self.guild.get_member(member_id)
-                    dakiny_logger.warning("Cannot find member (id: %s) to manage roles.", member_id)
-                    continue
                 await member.remove_roles(
                     elect_role,
                     reason=f"{member.display_name} no longer needs the elect role.",
@@ -373,36 +311,35 @@ class Election:
             # announce high council members
             # ties are undefined behavior.
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.type == VoteType.DISCORDMANAGER))
+                .where(Votes.Type == VoteType.DISCORDMANAGER)
             )
             dm_votes = collections.Counter(session.scalars(stmt))
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.type == VoteType.CLANLEADER))
+                .where(Votes.Type == VoteType.CLANLEADER)
             )
             cl_votes = collections.Counter(session.scalars(stmt))
-            cl_votes.most_common()
 
             try:
-                dm_winner = dm_votes.most_common(1).pop()[0]
+                dm_winner = max(dm_votes, key=dm_votes.get)
                 stmt = (
-                    update(CouncilMember)
+                    update(CouncilMembers)
-                    .where(col(CouncilMember.election_name == election_name))
+                    .where(CouncilMembers.ElectionName == election_name)
-                    .where(col(CouncilMember.member_id == dm_winner))
+                    .where(CouncilMembers.MemberId == dm_winner)
                     .values(DiscordManager=True)
                 )
                 session.execute(stmt)
             except ValueError:
                 dm_winner = "No winner"
             try:
-                cl_winner = cl_votes.most_common(1).pop()[0]
+                cl_winner = max(cl_votes, key=cl_votes.get)
                 stmt = (
-                    update(CouncilMember)
+                    update(CouncilMembers)
-                    .where(col(CouncilMember.election_name == election_name))
+                    .where(CouncilMembers.ElectionName == election_name)
-                    .where(col(CouncilMember.member_id == cl_winner))
+                    .where(CouncilMembers.MemberId == cl_winner)
                     .values(ClanLeader=True)
                 )
                 session.execute(stmt)
@@ -411,21 +348,14 @@ class Election:
 
             session.commit()
 
-        stmt = select(ElectionInformation).where(col(ElectionInformation.name == election_name))
+        election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
-        if (info := session.scalar(stmt)) is None:
-            dakiny_logger.error("Could not find information for this election (%s).", election_name)
-            return
-
-        if (election_thread := self.guild.get_thread(info.thread_id)) is None:
-            dakiny_logger.error("Recorded thread id %s does not result in a thread.", info.thread_id)
-            return
-
-        if info.high_council_vote_msg_id is None:
-            dakiny_logger.error("No recorded High Council Voting Message.")
-            return
 
         # clear view from vote message
-        vote_msg: nextcord.Message = await election_thread.fetch_message(info.high_council_vote_msg_id)
+        stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
+            ElectionInformation.ElectionName == get_election_name()
+        )
+        vote_msg_id = session.scalar(stmt)
+        vote_msg: nextcord.Message = await election_thread.fetch_message(vote_msg_id)
         await vote_msg.edit(view=None)
 
         highcouncil_msg: str = f"Congratulations for our high council members!\nClan Leader: <@{cl_winner}>\n"
@@ -437,23 +367,22 @@ class Election:
         await election_thread.edit(archived=True, locked=True)
         await edit_clan_council_info(self.guild)
 
+    def get_election_info(self) -> ElectionInformation:
+        """
+        Gets information for current election.
+
+        Returns:
+            ElectionInformation: The information from the database about the current election.
+        """
+        with Session(engine) as session:
+            stmt = select(ElectionInformation).where(ElectionInformation.ElectionName == get_election_name())
+            return session.scalar(stmt)
+
     async def election_reminder(self) -> None:
         """Sends a message to general chat reminder clan about election."""
-        general = self.guild.get_channel(settings.channel_ids.general)
+        general: nextcord.TextChannel = self.guild.get_channel(settings.channel_ids.general)
-
-        if not isinstance(general, nextcord.TextChannel):
-            dakiny_logger.error(
-                "Recorded general channel (id: %s) is not a text channel.", settings.channel_ids.general
-            )
-            return
-
-        with Session(engine) as session:
-            stmt = select(ElectionInformation).where(col(ElectionInformation.name == get_election_name()))
-            if (info := session.scalar(stmt)) is None:
-                dakiny_logger.error("Could not find election %s.", get_election_name())
-                return
 
         message = f"Reminder to <@&{settings.role_ids.clan_member}>! Clan elections are happening! Head over "
-            message += f"to <#{info.thread_id}> to cast your vote!"
+        message += f"to <#{self.get_election_info().ThreadId}> to cast your vote!"
 
         await general.send(content=message)

classes/nominate_highcouncil_views.py

@@ -1,16 +1,12 @@
 """Contains various views to be used in the high council nomination process."""
 
 import nextcord
+from DakinySettings import settings
+from database_setup.sql_data_classes import CouncilMembers, engine
 from nextcord.interactions import Interaction
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from sqlmodel import col
+from utils import (
-
-from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.database.db import engine
-from dakiny_bot.database.models import CouncilMember
-from dakiny_bot.logger import dakiny_logger
-from dakiny_bot.utils import (
     NOMINEE_SPLITTER,
     decorate_cl_nomination,
     decorate_dm_nomination,
@@ -56,35 +52,26 @@ class NominateDMModal(nextcord.ui.Modal):
             interaction (Interaction): Interaction with user.
 
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+        speech = decorate_dm_nomination(interaction.user.id, self.speech.value)
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
-        speech = decorate_dm_nomination(interaction.user.id, self.speech.value if self.speech.value else "")
 
         with Session(engine) as session:
             # user already in table
             election_name = get_election_name()
             stmt = (
-                select(CouncilMember)
+                select(CouncilMembers)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.member_id == self.usr_id))
+                .where(CouncilMembers.MemberId == self.usr_id)
             )
             council_elect = session.scalar(stmt)
 
-            if council_elect is None:
+            if not self.usr_nominated:
-                dakiny_logger.error("Did not find member (id: %s) in election %s.", self.usr_id, election_name)
-                return
-
-            if not self.usr_nominated or council_elect.discord_manager_speech_id is None:
                 msg = await interaction.channel.send(speech)
 
-                council_elect.discord_manager_speech_id = msg.id
+                council_elect.DiscordManagerSpeechId = msg.id
                 session.commit()
             else:
-                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.discord_manager_speech_id)
+                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.DiscordManagerSpeechId)
-                await msg.edit(content=speech)
+                await msg.edit(content=decorate_dm_nomination(interaction.user.id, self.speech.value))
 
 
 class NominateCLModal(nextcord.ui.Modal):
@@ -125,35 +112,26 @@ class NominateCLModal(nextcord.ui.Modal):
             interaction (Interaction): Interaction with user.
 
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+        speech = decorate_cl_nomination(interaction.user.id, self.speech.value)
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
-        speech = decorate_cl_nomination(interaction.user.id, self.speech.value if self.speech.value else "")
 
         with Session(engine) as session:
             # user already in table
             election_name = get_election_name()
             stmt = (
-                select(CouncilMember)
+                select(CouncilMembers)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.member_id == self.usr_id))
+                .where(CouncilMembers.MemberId == self.usr_id)
             )
             council_elect = session.scalar(stmt)
 
-            if council_elect is None:
+            if not self.usr_nominated:
-                dakiny_logger.error("Did not find member (id: %s) in election %s.", self.usr_id, election_name)
-                return
-
-            if not self.usr_nominated or council_elect.clan_leader_speech_id is None:
                 msg = await interaction.channel.send(speech)
 
-                council_elect.clan_leader_speech_id = msg.id
+                council_elect.ClanLeaderSpeechId = msg.id
                 session.commit()
             else:
-                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.clan_leader_speech_id)
+                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.ClanLeaderSpeechId)
-                await msg.edit(content=speech)
+                await msg.edit(content=decorate_cl_nomination(interaction.user.id, self.speech.value))
 
 
 class NominateHighCouncilView(nextcord.ui.View):
@@ -179,16 +157,8 @@ class NominateHighCouncilView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
         # enforce council elect only
-        if (
+        if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
-            isinstance(interaction.user, nextcord.User)
-            or self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles
-        ):
             await interaction.response.send_message(
                 f"You must have the <@&{settings.role_ids.clan_council_elect}> role to vote.",
                 ephemeral=True,
@@ -200,15 +170,16 @@ class NominateHighCouncilView(nextcord.ui.View):
         speech_content = ""
         with Session(engine) as session:
             stmt = (
-                select(CouncilMember)
+                select(CouncilMembers)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.member_id == interaction.user.id))
+                .where(CouncilMembers.MemberId == interaction.user.id)
             )
-            council_elect = session.scalar(stmt)
+            obj = session.scalar(stmt)
 
-            if council_elect is not None and council_elect.discord_manager_speech_id is not None:
+            # user needs to exist to get here anyways...
+            if obj.DiscordManagerSpeechId is not None:
                 usr_nominated = True
-                msg = await interaction.channel.fetch_message(council_elect.discord_manager_speech_id)
+                msg = await interaction.channel.fetch_message(obj.DiscordManagerSpeechId)
                 speech_content = msg.content.split(NOMINEE_SPLITTER)[1]
 
         await interaction.response.send_modal(NominateDMModal(interaction.user.id, usr_nominated, speech_content))
@@ -229,16 +200,8 @@ class NominateHighCouncilView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
         # enforce council elect only
-        if (
+        if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
-            isinstance(interaction.user, nextcord.User)
-            or self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles
-        ):
             await interaction.response.send_message(
                 f"You must have the <@&{settings.role_ids.clan_council_elect}> role to vote.",
                 ephemeral=True,
@@ -250,15 +213,16 @@ class NominateHighCouncilView(nextcord.ui.View):
         speech_content = ""
         with Session(engine) as session:
             stmt = (
-                select(CouncilMember)
+                select(CouncilMembers)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.member_id == interaction.user.id))
+                .where(CouncilMembers.MemberId == interaction.user.id)
             )
-            council_elect = session.scalar(stmt)
+            obj = session.scalar(stmt)
 
-            if council_elect is not None and council_elect.clan_leader_speech_id is not None:
+            # user needs to exist to get here anyways...
+            if obj.ClanLeaderSpeechId is not None:
                 usr_nominated = True
-                msg = await interaction.channel.fetch_message(council_elect.clan_leader_speech_id)
+                msg = await interaction.channel.fetch_message(obj.ClanLeaderSpeechId)
                 speech_content = msg.content.split(NOMINEE_SPLITTER)[1]
 
         await interaction.response.send_modal(NominateCLModal(interaction.user.id, usr_nominated, speech_content))

classes/nominate_views.py

@@ -1,16 +1,12 @@
 """Contains various views to be used in the nomination process."""
 
 import nextcord
+from DakinySettings import settings
+from database_setup.sql_data_classes import CouncilMembers, engine
 from nextcord.interactions import Interaction
 from sqlalchemy import select
 from sqlalchemy.orm import Session
-from sqlmodel import col
+from utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name
-
-from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.database.db import engine
-from dakiny_bot.database.models import CouncilMember
-from dakiny_bot.logger import dakiny_logger
-from dakiny_bot.utils import NOMINEE_SPLITTER, decorate_nomination, get_election_name
 
 
 class NominateModal(nextcord.ui.Modal):
@@ -51,45 +47,31 @@ class NominateModal(nextcord.ui.Modal):
             interaction (Interaction): Interaction with user.
 
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+        speech = decorate_nomination(interaction.user.id, self.speech.value)
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
-        speech = decorate_nomination(interaction.user.id, self.speech.value if self.speech.value else "")
         election_name = get_election_name()
 
         with Session(engine) as session:
             if not self.usr_nominated:
                 msg = await interaction.channel.send(speech)
 
-                council_member = CouncilMember(
+                council_member = CouncilMembers(
-                    election_name=election_name,
+                    ElectionName=election_name,
-                    member_id=interaction.user.id,
+                    MemberId=interaction.user.id,
-                    speech_msg_id=msg.id,
+                    SpeechMsgId=msg.id,
                 )
                 session.add(council_member)
                 session.commit()
             else:
                 # user already nominated, just need to update the election speech
                 stmt = (
-                    select(CouncilMember)
+                    select(CouncilMembers)
-                    .where(col(CouncilMember.election_name == election_name))
+                    .where(CouncilMembers.ElectionName == election_name)
-                    .where(col(CouncilMember.member_id == self.usr_id))
+                    .where(CouncilMembers.MemberId == self.usr_id)
                 )
-                council_elect = session.scalar(stmt)
+                obj = session.scalar(stmt)
 
-                if council_elect is None:
+                msg: nextcord.Message = await interaction.channel.fetch_message(obj.SpeechMsgId)
-                    dakiny_logger.error("Did not find member (id: %s) in election %s.", self.usr_id, election_name)
+                await msg.edit(content=decorate_nomination(interaction.user.id, self.speech.value))
-                    return
-
-                if council_elect.speech_msg_id is None:
-                    msg = await interaction.channel.send(speech)
-                    council_elect.speech_msg_id = msg.id
-                    session.commit()
-                else:
-                    msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.speech_msg_id)
-                    await msg.edit(content=speech)
 
 
 class NominateView(nextcord.ui.View):
@@ -115,16 +97,8 @@ class NominateView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            return
-
         # enforce members only
-        if (
+        if self.guild.get_role(settings.role_ids.clan_member) not in interaction.user.roles:
-            isinstance(interaction.user, nextcord.User)
-            or self.guild.get_role(settings.role_ids.clan_member) not in interaction.user.roles
-        ):
             await interaction.response.send_message(
                 f"You must have the <@&{settings.role_ids.clan_member}> role to vote.",
                 ephemeral=True,
@@ -136,14 +110,14 @@ class NominateView(nextcord.ui.View):
         speech_content = ""
         with Session(engine) as session:
             stmt = (
-                select(CouncilMember)
+                select(CouncilMembers)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .where(col(CouncilMember.member_id == interaction.user.id))
+                .where(CouncilMembers.MemberId == interaction.user.id)
             )
             obj = session.scalar(stmt)
-            if obj is not None and obj.speech_msg_id is not None:
+            if obj is not None:
                 usr_nominated = True
-                msg = await interaction.channel.fetch_message(obj.speech_msg_id)
+                msg = await interaction.channel.fetch_message(obj.SpeechMsgId)
                 speech_content = msg.content.split(NOMINEE_SPLITTER)[1]
 
         await interaction.response.send_modal(NominateModal(interaction.user.id, usr_nominated, speech_content))

classes/pyproject.toml

@@ -1,6 +1,10 @@
 [tool.ruff]
 # Extend the `pyproject.toml` file in the parent directory...
-extend = "../../pyproject.toml"
+extend = "../pyproject.toml"
 
 # Exclude a variety of commonly ignored directories.
 exclude = ["gitea_webhook.py"]
+
+[tool.ruff.lint]
+# ignore implicit-namespace-package in this directory.
+ignore = ["INP001"]

classes/voting_highcouncil_views.py

@@ -1,17 +1,18 @@
 """Contains various views to be used while voting for high council. Controls the logic when performing the vote."""
 
 import nextcord
+from DakinySettings import settings
+from database_setup.sql_data_classes import (
+    CouncilMembers,
+    ElectionInformation,
+    Votes,
+    engine,
+)
 from nextcord import SelectOption
 from nextcord.interactions import Interaction
 from sqlalchemy import exc, select, update
 from sqlalchemy.orm import Session
-from sqlmodel import col
+from utils import VoteType, build_highcouncil_votes_str, get_election_name
-
-from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.database.db import engine
-from dakiny_bot.database.models import CouncilMember, ElectionInformation, Vote
-from dakiny_bot.logger import dakiny_logger
-from dakiny_bot.utils import VoteType, build_highcouncil_votes_str, get_election_name
 
 
 class VoteSelect(nextcord.ui.StringSelect):
@@ -36,32 +37,20 @@ class VoteSelect(nextcord.ui.StringSelect):
         Args:
             interaction (Interaction): Interaction with this callback.
         """
-        if (
-            interaction.user is None
-            or not isinstance(interaction.channel, nextcord.TextChannel)
-            or interaction.guild is None
-        ):
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            # if no guild, is problem because should only be in guild.
-            return
-
         election_name: str = get_election_name()
         with Session(engine) as session:
-            stmt = select(col(ElectionInformation.high_council_vote_msg_id)).where(
+            stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
-                col(ElectionInformation.name == election_name)
+                ElectionInformation.ElectionName == election_name
             )
-            if (vote_msg_id := session.scalar(stmt)) is None:
+            vote_msg_id = session.scalar(stmt)
-                dakiny_logger.error("Unable to find a Highcouncil Vote Message ID in database.")
-                return
 
             voted_for = None if self.values[0] == "Abstain" else int(self.values[0])
 
-            new_vote = Vote(
+            new_vote = Votes(
-                election_name=election_name,
+                ElectionName=election_name,
-                voter_id=interaction.user.id,
+                VoterId=interaction.user.id,
-                voted_for_id=voted_for,
+                VotedForId=voted_for,
-                type=self.election_type,
+                Type=self.election_type,
             )
 
             try:
@@ -72,10 +61,10 @@ class VoteSelect(nextcord.ui.StringSelect):
                 # user already has a vote in the election and election type
                 session.rollback()
                 stmt = (
-                    update(Vote)
+                    update(Votes)
-                    .where(col(Vote.election_name == election_name))
+                    .where(Votes.ElectionName == election_name)
-                    .where(col(Vote.voter_id == interaction.user.id))
+                    .where(Votes.VoterId == interaction.user.id)
-                    .where(col(Vote.type == self.election_type))
+                    .where(Votes.Type == self.election_type)
                     .values(VotedForId=voted_for)
                 )
                 session.execute(stmt)
@@ -114,10 +103,6 @@ class VoteHighcouncilView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if not isinstance(interaction.user, nextcord.Member):
-            # the user should only be a member of the guild.
-            return
-
         # enforce council elect only
         if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
             await interaction.response.send_message(
@@ -130,29 +115,32 @@ class VoteHighcouncilView(nextcord.ui.View):
 
         with Session(engine) as session:
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.voter_id == interaction.user.id))
+                .where(Votes.VoterId == interaction.user.id)
-                .where(col(Vote.type == VoteType.CLANLEADER))
+                .where(Votes.Type == VoteType.CLANLEADER)
             )
             voted_for = session.scalar(stmt)
 
             stmt = (
-                select(col(CouncilMember.member_id))
+                select(CouncilMembers.MemberId)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .filter(col(CouncilMember.clan_leader_speech_id is not None))
+                .filter(CouncilMembers.ClanLeaderSpeechId.is_not(None))
             )
 
             options = [
                 SelectOption(
-                    label=(f"{member.display_name} ☑️" if voted_for == nominee else f"{member.display_name}"),
+                    label=(
+                        f"{self.guild.get_member(nominee).display_name} ☑️"
+                        if voted_for == nominee
+                        else f"{self.guild.get_member(nominee).display_name}"
+                    ),
                     value=str(nominee),
                 )
                 for nominee in sorted(
                     session.scalars(stmt),
-                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
+                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),
                 )
-                if (member := self.guild.get_member(nominee)) is not None
             ]
             options.append(
                 SelectOption(
@@ -187,10 +175,6 @@ class VoteHighcouncilView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if not isinstance(interaction.user, nextcord.Member):
-            # the user should only be a member of the guild.
-            return
-
         # enforce council elect only
         if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
             await interaction.response.send_message(
@@ -203,29 +187,32 @@ class VoteHighcouncilView(nextcord.ui.View):
 
         with Session(engine) as session:
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.voter_id == interaction.user.id))
+                .where(Votes.VoterId == interaction.user.id)
-                .where(col(Vote.type == VoteType.DISCORDMANAGER))
+                .where(Votes.Type == VoteType.DISCORDMANAGER)
             )
             voted_for = session.scalar(stmt)
 
             stmt = (
-                select(col(CouncilMember.member_id))
+                select(CouncilMembers.MemberId)
-                .where(col(CouncilMember.election_name == election_name))
+                .where(CouncilMembers.ElectionName == election_name)
-                .filter(col(CouncilMember.discord_manager_speech_id is not None))
+                .filter(CouncilMembers.DiscordManagerSpeechId.is_not(None))
             )
 
             options = [
                 SelectOption(
-                    label=(f"{member.display_name} ☑️" if voted_for == nominee else f"{member.display_name}"),
+                    label=(
+                        f"{self.guild.get_member(nominee).display_name} ☑️"
+                        if voted_for == nominee
+                        else f"{self.guild.get_member(nominee).display_name}"
+                    ),
                     value=str(nominee),
                 )
                 for nominee in sorted(
                     session.scalars(stmt),
-                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
+                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),
                 )
-                if (member := self.guild.get_member(nominee)) is not None
             ]
             options.append(
                 SelectOption(

classes/voting_views.py

@@ -1,17 +1,18 @@
 """Contains various views to be used while voting. Controls the logic when performing the vote."""
 
 import nextcord
+from DakinySettings import settings
+from database_setup.sql_data_classes import (
+    CouncilMembers,
+    ElectionInformation,
+    Votes,
+    engine,
+)
 from nextcord import SelectOption
 from nextcord.interactions import Interaction
 from sqlalchemy import exc, select, update
 from sqlalchemy.orm import Session
-from sqlmodel import col
+from utils import VoteType, build_votes_str, get_election_name
-
-from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.database.db import engine
-from dakiny_bot.database.models import CouncilMember, ElectionInformation, Vote
-from dakiny_bot.logger import dakiny_logger
-from dakiny_bot.utils import VoteType, build_votes_str, get_election_name
 
 
 class VoteSelect(nextcord.ui.StringSelect):
@@ -35,32 +36,18 @@ class VoteSelect(nextcord.ui.StringSelect):
         Args:
             interaction (Interaction): Interaction with this callback.
         """
-        if (
-            interaction.user is None
-            or not isinstance(interaction.channel, nextcord.TextChannel)
-            or interaction.guild is None
-        ):
-            # ignore none... Don't know what situation this is.
-            # if not textchannel, don't know how callback happened
-            # if no guild, is problem because should only be in guild.
-            return
-
         election_name = get_election_name()
         with Session(engine) as session:
-            stmt = select(col(ElectionInformation.council_vote_msg_id)).where(
+            stmt = select(ElectionInformation.CouncilVoteMsgId).where(ElectionInformation.ElectionName == election_name)
-                col(ElectionInformation.name == election_name)
+            vote_msg_id = session.scalar(stmt)
-            )
-            if (vote_msg_id := session.scalar(stmt)) is None:
-                dakiny_logger.error("Unable to find a Vote Message ID in database.")
-                return
 
             voted_for = None if self.values[0] == "Abstain" else int(self.values[0])
 
-            new_vote = Vote(
+            new_vote = Votes(
-                election_name=election_name,
+                ElectionName=election_name,
-                voter_id=interaction.user.id,
+                VoterId=interaction.user.id,
-                voted_for_id=voted_for,
+                VotedForId=voted_for,
-                type=VoteType.COUNCIL,
+                Type=VoteType.COUNCIL,
             )
 
             try:
@@ -70,16 +57,16 @@ class VoteSelect(nextcord.ui.StringSelect):
             except exc.IntegrityError:
                 session.rollback()
                 stmt = (
-                    update(Vote)
+                    update(Votes)
-                    .where(col(Vote.election_name == election_name))
+                    .where(Votes.ElectionName == election_name)
-                    .where(col(Vote.voter_id == interaction.user.id))
+                    .where(Votes.VoterId == interaction.user.id)
-                    .where(col(Vote.type == VoteType.COUNCIL))
+                    .where(Votes.Type == VoteType.COUNCIL)
                     .values(VotedForId=voted_for)
                 )
                 session.execute(stmt)
                 session.commit()
 
-        vote_message_str = build_votes_str(interaction.guild)
+        vote_message_str = build_votes_str(settings, interaction.guild)
         vote_msg: nextcord.Message = await interaction.channel.fetch_message(vote_msg_id)
         await vote_msg.edit(content=vote_message_str)
 
@@ -107,10 +94,6 @@ class VoteView(nextcord.ui.View):
             button (nextcord.ui.Button): Unused. idk why its needed in the decorator
             interaction (nextcord.Interaction): Interaction of user who pressed the button
         """
-        if not isinstance(interaction.user, nextcord.Member):
-            # the user should only be a member of the guild.
-            return
-
         # enforce members only
         if self.guild.get_role(settings.role_ids.clan_member) not in interaction.user.roles:
             await interaction.response.send_message(
@@ -123,25 +106,28 @@ class VoteView(nextcord.ui.View):
 
         with Session(engine) as session:
             stmt = (
-                select(col(Vote.voted_for_id))
+                select(Votes.VotedForId)
-                .where(col(Vote.election_name == election_name))
+                .where(Votes.ElectionName == election_name)
-                .where(col(Vote.voter_id == interaction.user.id))
+                .where(Votes.VoterId == interaction.user.id)
-                .where(col(Vote.type == VoteType.COUNCIL))
+                .where(Votes.Type == VoteType.COUNCIL)
             )
             voted_for = session.scalar(stmt)
 
-            stmt = select(col(CouncilMember.member_id)).where(col(CouncilMember.election_name == election_name))
+            stmt = select(CouncilMembers.MemberId).where(CouncilMembers.ElectionName == election_name)
 
             options = [
                 SelectOption(
-                    label=(f"{member.display_name} ☑️" if voted_for == nominee else f"{member.display_name}"),
+                    label=(
+                        f"{self.guild.get_member(nominee).display_name} ☑️"
+                        if voted_for == nominee
+                        else f"{self.guild.get_member(nominee).display_name}"
+                    ),
                     value=str(nominee),
                 )
                 for nominee in sorted(
                     session.scalars(stmt),
-                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
+                    key=lambda nominee: self.guild.get_member(nominee).display_name.lower(),
                 )
-                if (member := self.guild.get_member(nominee)) is not None
             ]
             options.append(
                 SelectOption(

cogs/clan_messages/__init__.py

@@ -6,13 +6,11 @@ from typing import TYPE_CHECKING
 import uvicorn
 from fastapi import FastAPI
 from git import Repo
-from git.exc import GitCommandError
 from nextcord.ext import commands
 
-from dakiny_bot.classes.gitea_webhook import GiteaWebhook
+from classes.gitea_webhook import GiteaWebhook
-from dakiny_bot.dakiny_settings import settings
+from DakinySettings import settings
-from dakiny_bot.logger import dakiny_logger
+from utils import REPO_DIR, edit_clan_council_info, update_clan_messages
-from dakiny_bot.utils import REPO_DIR, edit_clan_council_info, update_clan_messages
 
 if TYPE_CHECKING:
     import nextcord
@@ -57,12 +55,7 @@ class ClanMessages(commands.Cog, name="Clan Messages"):
         template_updates = {file.split("/")[1] for file in modified_files if "message_templates" in file}
         channel_updates = {file.split("/")[1] for file in modified_files if file.split("/")[1] not in template_updates}
 
-        try:
         self.origin.pull()
-        except GitCommandError:
-            # I think the git connection timed out. Get a new one.
-            dakiny_logger.info("Refreshing git connection.")
-            self.repo_setup()
         guild: nextcord.Guild = self.bot.get_guild(settings.params.guild_id)
 
         await update_clan_messages(guild, channel_updates)

cogs/commands/__init__.py

@@ -2,15 +2,14 @@
 
 from nextcord.ext import commands
 
-from dakiny_bot.cogs.commands.record import RecordCog
+from cogs.commands.record import RecordCog
-from dakiny_bot.cogs.commands.refresh import RefreshCog
+from cogs.commands.refresh import RefreshCog
-from dakiny_bot.cogs.commands.remove import RemoveCog
+from cogs.commands.remove import RemoveCog
-from dakiny_bot.cogs.commands.request import RequestCog
+from cogs.commands.request import RequestCog
-from dakiny_bot.cogs.commands.set import SetCog
+from cogs.commands.set import SetCog
-from dakiny_bot.cogs.commands.settings import SettingsCog
+from cogs.commands.test import TestCog
-from dakiny_bot.cogs.commands.test import TestCog
+from cogs.commands.time import TimeCog
-from dakiny_bot.cogs.commands.time import TimeCog
+from cogs.commands.view import ViewCog
-from dakiny_bot.cogs.commands.view import ViewCog
 
 
 # This function will be called when this extension is loaded.
@@ -22,7 +21,6 @@ def setup(bot: commands.Bot) -> None:
     bot.add_cog(RemoveCog())
     bot.add_cog(RequestCog(bot))
     bot.add_cog(SetCog())
-    bot.add_cog(SettingsCog())
     bot.add_cog(TestCog(bot))
     bot.add_cog(TimeCog())
     bot.add_cog(ViewCog())

cogs/commands/record.py

@@ -4,8 +4,8 @@ import nextcord
 from discord import TextInputStyle
 from nextcord.ext import commands
 
-from dakiny_bot.dakiny_settings import settings
+from DakinySettings import settings
-from dakiny_bot.utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, PointType, record_points
+from utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, record_event_points
 
 
 class RecordCog(commands.Cog, name="Record Commands"):
@@ -117,18 +117,16 @@ class RecordCog(commands.Cog, name="Record Commands"):
             await interaction.response.send_message("Please only provide 1 recipient.", ephemeral=True)
             return
         elif recipient is not None:  # noqa: RET505
-            record_points(
+            record_event_points(
                 [str(recipient.id)],
-                settings.point_settings.clan_points,
+                settings.event_settings.participate_points,
-                PointType.CLAN,
                 is_member=True,
             )
             recipient_str = f"<@{recipient.id}>"
         elif non_discord_recipient is not None:
-            record_points(
+            record_event_points(
                 [non_discord_recipient],
-                settings.point_settings.clan_points,
+                settings.event_settings.participate_points,
-                PointType.CLAN,
                 is_member=False,
             )
             recipient_str = f'"{non_discord_recipient}"'
@@ -154,7 +152,7 @@ class EventView(nextcord.ui.View):
     """
 
     def __init__(self, name: str, host_id: int):
-        super().__init__(timeout=60 * 60 * 2)  # timeout 2 hours
+        super().__init__()
 
         self.name: str = name
         self.host_id: int = host_id
@@ -182,76 +180,33 @@ class EventView(nextcord.ui.View):
         Removes view and embed from recording message.
         Sends point information to database.
         """
-        if settings.point_settings.verify_events:
+        discord_users = self.event_participants.values.members  # noqa: PD011 not a pandas object
-            verification_channel: nextcord.TextChannel = interaction.guild.get_channel(settings.channel_ids.admin)
+        if discord_users:
-            verification_view = EventVerification(
+            discord_users_list: list[str] = [str(user.id) for user in discord_users if user.id is not self.host_id]
-                self.event_participants.values.members, interaction.message.embeds[0].fields[1].value, self.host_id
+            record_event_points(
+                discord_users_list,
+                settings.event_settings.participate_points,
+                is_member=True,
             )
-            await verification_channel.send(
+
-                content="Event record request.", embed=interaction.message.embeds[0], view=verification_view
+        non_discord_users = interaction.message.embeds[0].fields[1].value
-            )
+        if non_discord_users:
-            submission_response = "Event has been submitted to admins for approval."
+            non_discord_users_list: list[str] = non_discord_users.split("\n")
-        else:
+            record_event_points(
-            process_event(
+                non_discord_users_list,
-                self.event_participants.values.members,
+                settings.event_settings.participate_points,
-                interaction.message.embeds[0].fields[1].value,
+                is_member=False,
-                self.host_id,
             )
 
+        record_event_points([self.host_id], settings.event_settings.host_points, is_member=True)
+
         event_channel: nextcord.TextChannel = interaction.guild.get_channel(settings.channel_ids.event_post)
         await event_channel.send(embed=interaction.message.embeds[0])
-            submission_response = "Event has been submitted."
+        await interaction.response.edit_message(content="Event has been submitted.", view=None, embed=None)
 
-        await interaction.response.edit_message(content=submission_response, view=None, embed=None)
         self.stop()
 
 
-class EventVerification(nextcord.ui.View):
-    """Class contains code to approve/deny event submissions."""
-
-    def __init__(
-        self,
-        discord_users: list[nextcord.Member],
-        non_discord_users: str,
-        host_id: int,
-    ):
-        super().__init__(timeout=None, auto_defer=True)
-        self.discord_users: list[nextcord.Member] = discord_users
-        self.non_discord_users: str = non_discord_users
-        self.host_id: int = host_id
-
-    @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green)
-    async def approve(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
-        """
-        Approve button for an event submission.
-
-        Calls the process event function. Records who approved the event.
-        Removes the view from the interaction message.
-
-        Args:
-            button (nextcord.ui.Button): Unused.
-            interaction (nextcord.Interaction): The interaction of the user clicking the button.
-        """
-        process_event(self.discord_users, self.non_discord_users, self.host_id)
-        event_channel: nextcord.TextChannel = interaction.guild.get_channel(settings.channel_ids.event_post)
-        await event_channel.send(embed=interaction.message.embeds[0])
-
-        content = f"\nApproved by <@{interaction.user.id}>."
-        await interaction.response.edit_message(content=content, view=None)
-
-    @nextcord.ui.button(label="Deny", style=nextcord.ButtonStyle.red)
-    async def deny(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None:  # noqa: ARG002
-        """
-        Deny button for an event submission. Just removes the view and logs who denied the request.
-
-        Args:
-            button (nextcord.ui.Button): Unused.
-            interaction (nextcord.Interaction): The interaction of the user clicking the button.
-        """
-        content = f"\nDenied by <@{interaction.user.id}>."
-        await interaction.response.edit_message(content=content, view=None)
-
-
 class ParticipantModal(nextcord.ui.Modal):
     """
     This modal contains all the text edits for an event.
@@ -326,33 +281,3 @@ class ParticipantSelect(nextcord.ui.UserSelect):
         participants: str = "\n".join([f"<@{participant.id}>" for participant in self.values.members])
         embed.set_field_at(0, name="Participants", value=participants)
         await interaction.response.edit_message(embed=embed)
-
-
-def process_event(discord_users: list[nextcord.Member], non_discord_users: str, host_id: int) -> None:
-    """
-    Processes all points to give to participants and host for an event.
-
-    Args:
-        discord_users (list[nextcord.Member]): List of discord members that participated in event.
-        non_discord_users (str): Newline separated list of non discord members that participated in event.
-        host_id (int): Discord ID of host.
-    """
-    if discord_users:
-        discord_users_list: list[str] = [str(user.id) for user in discord_users if user.id is not host_id]
-        record_points(
-            discord_users_list,
-            settings.point_settings.participate_points,
-            PointType.EVENT,
-            is_member=True,
-        )
-
-    if non_discord_users:
-        non_discord_users_list: list[str] = non_discord_users.split("\n")
-        record_points(
-            non_discord_users_list,
-            settings.point_settings.participate_points,
-            PointType.EVENT,
-            is_member=False,
-        )
-
-    record_points([host_id], settings.point_settings.host_points, PointType.EVENT, is_member=True)

cogs/commands/refresh.py

@@ -6,7 +6,7 @@ from pathlib import Path
 import nextcord
 from nextcord.ext import commands
 
-from dakiny_bot.utils import MESSAGES_DIR, edit_clan_council_info, update_clan_messages
+from utils import MESSAGES_DIR, edit_clan_council_info, update_clan_messages
 
 
 class RefreshCog(commands.Cog, name="Refresh Commands"):

cogs/commands/remove.py

@@ -5,7 +5,7 @@ from nextcord.ext import commands
 from sqlalchemy import delete, select
 from sqlalchemy.orm import Session
 
-from dakiny_bot.database.sql_data_classes import Presences, engine
+from database_setup.sql_data_classes import Presences, engine
 
 
 class RemoveCog(commands.Cog, name="Remove Commands"):
@@ -54,14 +54,14 @@ class RemoveCog(commands.Cog, name="Remove Commands"):
         """
         with Session(engine) as session:
             stmt = select(Presences)
-            presences_dict: dict[str, str] = {pres.Presence: str(pres.Id) for pres in session.scalars(stmt)}
+            presences_dict: dict[str,str] = {pres.Presence: str(pres.Id) for pres in session.scalars(stmt)}
 
             # if empty compare string
             if not presence_str:
                 await interaction.response.send_autocomplete(dict(list(presences_dict.items())[:25]))
                 return
 
-            autofilled_presences: dict[str, str] = {
+            autofilled_presences: dict[str,str] = {
                 pres: pres_id for pres, pres_id in presences_dict.items() if presence_str.lower() in pres.lower()
             }
             await interaction.response.send_autocomplete(autofilled_presences[:25])

cogs/commands/request.py

@@ -4,8 +4,8 @@ import nextcord
 from nextcord.ext import commands
 from sqlalchemy.orm import Session
 
-from dakiny_bot.dakiny_settings import settings
+from DakinySettings import settings
-from dakiny_bot.database.sql_data_classes import Presences, engine
+from database_setup.sql_data_classes import Presences, engine
 
 
 class RequestCog(commands.Cog, name="Request Commands"):
@@ -109,7 +109,7 @@ class UsernameRequest(nextcord.ui.View):
                 await interaction.followup.edit_message(interaction.message.id, content=content, view=None)
         else:
             await interaction.response.edit_message(
-                content="An error occurred while changing the user's nickname.",
+                content="An error occured while changing the user's nickname.",
                 view=None,
             )
 

cogs/commands/set.py

@@ -8,8 +8,8 @@ from sqlalchemy import delete, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
-from dakiny_bot.app import birthday_list
+from database_setup.sql_data_classes import UserBirthday, engine
-from dakiny_bot.database.sql_data_classes import UserBirthday, engine
+from main import birthday_list
 
 
 class SetCog(commands.Cog, name="Set Commands"):

cogs/commands/test.py

@@ -3,10 +3,9 @@
 import nextcord
 from nextcord.ext import application_checks, commands
 
-from dakiny_bot.classes.election import Election
+from classes.election import Election
-from dakiny_bot.cogs.loops import daily_loop
+from DakinySettings import settings
-from dakiny_bot.dakiny_settings import settings
+from utils import GUILDS, get_current_election_cycle
-from dakiny_bot.utils import GUILDS, get_active_election_cycle, get_quarter_name
 
 ME = 206602713511886849
 
@@ -41,7 +40,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.election_start_action()
@@ -57,7 +56,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.voting_start_action()
@@ -73,7 +72,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.voting_end_action()
@@ -89,7 +88,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.highcouncil_election_start_action()
@@ -105,7 +104,7 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.election_reminder()
@@ -120,8 +119,11 @@ class TestCog(commands.Cog, name="Test commands."):
         Args:
             interaction (nextcord.Interaction): Interaction with the message.
         """
-        dl = daily_loop.DailyLoop(self.bot)
+        cycle = Election(
-        await dl.daily_loop()
+            get_current_election_cycle(),
+            self.bot.get_guild(settings.params.guild_id),
+        )
+        await cycle.check_date()
         await interaction.send("Test command sent.", ephemeral=True)
 
     @test.subcommand()
@@ -134,20 +136,8 @@ class TestCog(commands.Cog, name="Test commands."):
             interaction (nextcord.Interaction): Interaction with the message.
         """
         cycle = Election(
-            get_active_election_cycle(),
+            get_current_election_cycle(),
             self.bot.get_guild(settings.params.guild_id),
         )
         await cycle.term_start_action()
         await interaction.send("Test command sent.", ephemeral=True)
-
-    @test.subcommand()
-    @is_me()
-    async def get_quarter_name(self, interaction: nextcord.Interaction) -> None:
-        """
-        Tests getting the quarter name.
-
-        Args:
-            interaction (nextcord.Interaction): Interaction with the message.
-        """
-        name = get_quarter_name()
-        await interaction.send(name)

cogs/commands/time.py

@@ -5,7 +5,7 @@ from datetime import MAXYEAR, MINYEAR, UTC, datetime
 import nextcord
 from nextcord.ext import commands
 
-from dakiny_bot.utils import GUILDS
+from utils import GUILDS
 
 
 class TimeCog(commands.Cog, name="Time Commands"):

cogs/commands/view.py

@@ -6,13 +6,13 @@ from nextcord.ext import commands
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from dakiny_bot.database.sql_data_classes import (
+from database_setup.sql_data_classes import (
-    Points,
+    EventPoints,
     Presences,
     Votes,
     engine,
 )
-from dakiny_bot.utils import GUILDS, MAX_DISCORD_MESSAGE_LENGTH, PointType, VoteType
+from utils import MAX_DISCORD_MESSAGE_LENGTH, VoteType
 
 
 class ViewCog(commands.Cog, name="View Commands"):
@@ -21,7 +21,7 @@ class ViewCog(commands.Cog, name="View Commands"):
     def __init__(self) -> None:
         """Default constructor for ViewCog class. Does nothing."""
 
-    @nextcord.slash_command(guild_ids=GUILDS)
+    @nextcord.slash_command()
     async def view(self, interaction: nextcord.Interaction) -> None:
         """Parent slash command for set. Never called."""
 
@@ -49,12 +49,12 @@ class ViewCog(commands.Cog, name="View Commands"):
         with Session(engine) as session:
             if quarter_name:
                 ppdf = pd.read_sql_query(
-                    sql=session.query(Points).where(Points.QuarterName.startswith(quarter_name)).statement,
+                    sql=session.query(EventPoints).where(EventPoints.QuarterName.startswith(quarter_name)).statement,
                     con=engine,
                 )
             else:
                 ppdf = pd.read_sql_query(
-                    sql=session.query(Points).statement,
+                    sql=session.query(EventPoints).statement,
                     con=engine,
                 )
 
@@ -63,53 +63,30 @@ class ViewCog(commands.Cog, name="View Commands"):
                 return
 
             quarters = ppdf.groupby("QuarterName")
-            content = create_points_string(interaction, quarters, PointType.EVENT)
+            content = ""
+            for quarter in quarters.groups:
+                content += f"**{quarter}**\n"
+                unsorted_all = quarters.get_group(quarter).groupby("DiscordMember")
+                members = unsorted_all.get_group(name=True)
 
-            if len(content) > MAX_DISCORD_MESSAGE_LENGTH:
+                # there can be no non-discord members sometimes.
-                await interaction.followup.send("Message length is too long, please select search to limit results.")
+                try:
-                return
+                    sorted_non_members = unsorted_all.get_group(name=False).sort_values(by="UserId")
-
+                except KeyError:
-            await interaction.followup.send(content=content, ephemeral=True)
+                    sorted_non_members = None
-
+                sorted_members = members.sort_values(
-    @view.subcommand(description="Show event points.")
+                    by="UserId",
-    async def clan_points(
+                    key=lambda user_ids: (
-        self,
+                        [interaction.guild.get_member(int(user_id)).display_name.lower() for user_id in user_ids]
-        interaction: nextcord.Interaction,
-        quarter_name: str = nextcord.SlashOption(
-            description="The quarter to view",
-            required=False,
                     ),
-    ) -> None:
-        """
-        View the clan points.
-
-        Builds a message with the clan points for the quarter that matches with quarter_name.
-
-        Args:
-            interaction (nextcord.Interaction): Interaction with the message.
-            quarter_name (str, optional): Same of quarter to autofill with. Is SlashOption.
-        """
-        # just in case
-        await interaction.response.defer(ephemeral=True)
-
-        with Session(engine) as session:
-            if quarter_name:
-                ppdf = pd.read_sql_query(
-                    sql=session.query(Points).where(Points.QuarterName.startswith(quarter_name)).statement,
-                    con=engine,
                 )
-            else:
+                sorted_all = pd.concat([sorted_members, sorted_non_members], ignore_index=True, sort=False)
-                ppdf = pd.read_sql_query(
+                for row in sorted_all.itertuples():
-                    sql=session.query(Points).statement,
+                    userid = row.UserId
-                    con=engine,
+                    points = row.Points
-                )
+                    discord_member = row.DiscordMember
-
+                    content += f"<@{userid}>: {points}\n" if discord_member else f"{userid}: {points}\n"
-            if ppdf.empty:
+                content += "\n"
-                await interaction.followup.send(f'Quarter "{quarter_name}" is invalid.', ephemeral=True)
-                return
-
-            quarters = ppdf.groupby("QuarterName")
-            content = create_points_string(interaction, quarters, PointType.CLAN)
 
             if len(content) > MAX_DISCORD_MESSAGE_LENGTH:
                 await interaction.followup.send("Message length is too long, please select search to limit results.")
@@ -215,7 +192,6 @@ class ViewCog(commands.Cog, name="View Commands"):
             await interaction.response.send_autocomplete(autofilled_elections[:25])
 
     @event_points.on_autocomplete("quarter_name")
-    @clan_points.on_autocomplete("quarter_name")
     async def event_points_autocomplete(self, interaction: nextcord.Interaction, quarter_name: str) -> None:
         """
         Collects all elections that start with the election string.
@@ -225,7 +201,7 @@ class ViewCog(commands.Cog, name="View Commands"):
             quarter_name (str): String to run autocomplete on.
         """
         with Session(engine) as session:
-            stmt = select(Points.QuarterName).distinct()
+            stmt = select(EventPoints.QuarterName).distinct()
             quarters = session.scalars(stmt)
 
             # if empty compare string
@@ -237,61 +213,3 @@ class ViewCog(commands.Cog, name="View Commands"):
                 quarter for quarter in quarters if quarter.lower().startswith(quarter_name.lower())
             ]
             await interaction.response.send_autocomplete(autofilled_quarters[:25])
-
-
-def create_points_string(interaction: nextcord.Interaction, quarters: any, point_type: PointType) -> str:
-    """
-    Creates the string to show how many clan/event points users have.
-
-    Args:
-        interaction (nextcord.Interaction): Discord interaction of the command.
-        quarters (any): Pandas objects grouped by quarters.
-        point_type (PointType): The type of points to create the message for.
-
-    Returns:
-        str: The string with the message content.
-    """
-    content: str = ""
-    for quarter in quarters.groups:
-        content += f"**{quarter}**\n"
-        unsorted_all = quarters.get_group(quarter).groupby("DiscordMember")
-        members = unsorted_all.get_group(name=True)
-
-        # there can be no non-discord members sometimes.
-        try:
-            sorted_non_members = unsorted_all.get_group(name=False).sort_values(by="UserId")
-        except KeyError:
-            sorted_non_members = None
-        sorted_members = members.sort_values(
-            by="UserId",
-            key=lambda user_ids: ([member_lambda_string(interaction.guild, user_id) for user_id in user_ids]),
-        )
-        sorted_all = pd.concat([sorted_members, sorted_non_members], ignore_index=True, sort=False)
-        for row in sorted_all.itertuples():
-            points = row.EventPoints if point_type == PointType.EVENT else row.ClanPoints
-            discord_member = row.DiscordMember
-            if points > 0:
-                content += f"<@{row.UserId}>: {points}\n" if discord_member else f"{row.UserId}: {points}\n"
-        content += "\n"
-    return content
-
-
-def member_lambda_string(guild: nextcord.Guild, user_id: int) -> str:
-    """
-    Finds a user in a guild and returns the display name.
-
-    Returns the user id in string form if user is no longer in guild.
-    I don't know if I like this name very much.
-
-    Args:
-        guild (nextcord.Guild): Guild object to find the user in.
-        user_id (int): User id to get display name of.
-
-    Returns:
-        str: String to use for sorting.
-    """
-    try:
-        return guild.get_member(int(user_id)).display_name.lower()
-    except AttributeError:
-        # The user is no longer a part of the guild
-        return str(user_id)

cogs/loops/__init__.py

@@ -2,8 +2,8 @@
 
 from nextcord.ext import commands
 
-from dakiny_bot.cogs.loops.bot_presence import BotPresence
+from cogs.loops.bot_presence import BotPresence
-from dakiny_bot.cogs.loops.daily_loop import DailyLoop
+from cogs.loops.daily_loop import DailyLoop
 
 
 def setup(bot: commands.Bot) -> None:

cogs/loops/bot_presence.py

@@ -5,7 +5,7 @@ from nextcord.ext import commands, tasks
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
-from dakiny_bot.database.sql_data_classes import Presences, engine
+from database_setup.sql_data_classes import Presences, engine
 
 
 class BotPresence(commands.Cog, name="Bot Presence"):

cogs/loops/daily_loop.py

@@ -9,20 +9,17 @@ from pytz import timezone
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-from dakiny_bot.app import birthday_list
+from classes.election import Election
-from dakiny_bot.classes.election import Election
+from DakinySettings import settings
-from dakiny_bot.dakiny_settings import settings
+from database_setup.sql_data_classes import UserBirthday, engine
-from dakiny_bot.database.sql_data_classes import UserBirthday, engine
+from main import birthday_list
-from dakiny_bot.logger import dakiny_logger
+from utils import get_current_election_cycle
-from dakiny_bot.utils import get_active_election_cycle
 
 if TYPE_CHECKING:
     import nextcord
 
 KANDY = 239547993106284544
 
-IGNORE_CAKEDAY = [266378407682506754]
-
 
 class DailyLoop(commands.Cog, name="Daily Loop"):
     """Class for performing daily functions."""
@@ -44,10 +41,8 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         an active election, runs the check_date() function for the election to perform actions. Finally checks if the
         election is over to delete the current election object.
         """
-        dakiny_logger.debug("Daily loop. Current election: %s.", self.current_election)
         if self.current_election is None:
             self.current_election = self.get_election()
-            dakiny_logger.debug("Current election: %s.", self.current_election)
 
         if self.current_election is not None:
             await self.current_election.check_date()
@@ -80,19 +75,13 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         Returns:
             Election: Current election cycle, None if there is no election happening.
         """
-        cycle = get_active_election_cycle()
+        cycle = get_current_election_cycle()
-        dakiny_logger.debug("Current cycle: %s.", cycle)
 
         # prevent exception from using cycle as an Int in an array
         if cycle is None:
-            dakiny_logger.info("Cycle was None. Returning without an election.")
             return None
 
-        election = Election(cycle, self.bot.get_guild(settings.params.guild_id))
+        return Election(cycle, self.bot.get_guild(settings.params.guild_id))
-
-        dakiny_logger.debug("Election active: %s", election.active)
-
-        return election if election.active else None
 
     def update_birthdays(self) -> None:
         """Goes through database to collect all birthdays that are today. Adds user's id to birthday list."""
@@ -121,11 +110,7 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         announce_channel: nextcord.TextChannel = guild.get_channel(settings.channel_ids.general)
 
         cakedays: list[nextcord.Member] = [
-            human
+            human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
-            for human in guild.humans
-            if human.joined_at.month == today.month
-            and human.joined_at.day == today.day
-            and human.id not in IGNORE_CAKEDAY
         ]
 
         for member in cakedays:

cogs/message_listener/__init__.py

@@ -3,8 +3,7 @@
 import nextcord
 from nextcord.ext import commands
 
-from dakiny_bot.app import birthday_list
+from main import birthday_list
-from dakiny_bot.dakiny_settings import settings
 
 
 class SubmissionListener(commands.Cog, name="Message Listener"):
@@ -17,15 +16,7 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
     async def on_message(self, message: nextcord.Message) -> None:
         """Listener for message creation. Adds score and attachments to submission."""
         # don't want to process any messages from bot.
-        if message.author.id == self.bot.user.id:  # pyright: ignore[reportOptionalMemberAccess]
+        if message.author.id == self.bot.user.id:
-            return
-
-        # Ban all members who message in this channel. Everyone in guild is a member, so shouldn't miss a ban
-        # due to message.author not being a nextcord.Member object.
-        if message.channel.id == settings.channel_ids.ban and isinstance(message.author, nextcord.Member):
-            await message.author.ban(
-                delete_message_seconds=30 * 60, reason="Probable spam. The ban channel was messaged."
-            )
             return
 
         await birthday_action(message)
@@ -40,7 +31,7 @@ def setup(bot: commands.Bot) -> None:
 
 async def birthday_action(message: nextcord.Message) -> None:
     """
-    Checks a message's author and mentions to see if they are in the birthday list.
+    Checks a message's auther and mentions to see if they are in the birthday list.
 
     Args:
         message (nextcord.Message): The message to check for a birthday person.

dakiny_bot/__init__.py

@@ -1 +0,0 @@
-"""Empty init file for dakiny_bot module."""

dakiny_bot/__main__.py

@@ -1,14 +0,0 @@
-"""Starts the app for dakiny_bot."""
-
-import logging
-
-from .app import run
-
-nextcord_logger = logging.getLogger("nextcord")
-nextcord_logger.setLevel(logging.DEBUG)
-nextcord_handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
-nextcord_handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
-nextcord_logger.addHandler(nextcord_handler)
-
-if __name__ == "__main__":
-    run()

dakiny_bot/app.py

@@ -1,55 +0,0 @@
-"""Main file for bot."""
-
-import pathlib
-
-import nextcord
-from nextcord.ext import commands
-
-from dakiny_bot.classes.nominate_highcouncil_views import NominateHighCouncilView
-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.logger import dakiny_logger
-
-from .dakiny_settings import settings
-
-birthday_list: list[int] = []
-
-
-def run() -> None:
-    """Builds and runs bot."""
-    # Allows privileged intents for monitoring members joining, roles editing, and role assignments
-    # These need to be enabled in the developer portal as well
-    intents = nextcord.Intents.default()
-
-    # Required in order to read messages (eg. prefix commands)
-    intents.message_content = True
-
-    # To enable the members privileged intent:
-    intents.members = True
-
-    bot = commands.Bot(intents=intents)
-
-    # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
-    for folder in pathlib.Path("dakiny_bot/cogs").iterdir():
-        bot.load_extension(f"dakiny_bot.cogs.{folder.name}")
-
-    @bot.listen()
-    async def on_ready() -> None:
-        """When Discord is connected."""
-        if bot.user is None:
-            dakiny_logger.error("Discord connection failed.")
-            return
-
-        if (guild := bot.get_guild(settings.params.guild_id)) is None:
-            dakiny_logger.error("Could not find Dakiny guild object.")
-            return
-
-        bot.add_view(NominateView(guild))
-        bot.add_view(NominateHighCouncilView(guild))
-        bot.add_view(VoteView(guild))
-        bot.add_view(VoteHighcouncilView(guild))
-        dakiny_logger.info("%s has connected to Discord!", bot.user.name)
-
-    # Run Discord bot
-    bot.run(settings.params.discord_token)

dakiny_bot/classes/__init__.py

@@ -1 +0,0 @@
-"""Empty init file for classes module."""

dakiny_bot/cogs/commands/settings.py

@@ -1,379 +0,0 @@
-"""Contains commands and views for settings commands."""
-
-import nextcord
-from nextcord.ext import commands
-
-from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.utils import GUILDS
-
-
-class SettingsCog(commands.Cog, name="Settings Commands"):
-    """Class holds settings commands."""
-
-    def __init__(self) -> None:
-        """Default constructor for SettingsCog class. Does nothing."""
-
-    @nextcord.slash_command(guild_ids=GUILDS, default_member_permissions=nextcord.Permissions(administrator=True))
-    async def settings(self, interaction: nextcord.Interaction) -> None:
-        """Parent slash command for settings. Never called."""
-
-    @settings.subcommand()
-    async def channel_ids(self, interaction: nextcord.Interaction) -> None:
-        """Subcommand parent. Never called."""
-
-    @channel_ids.subcommand(description="Sets channel that bot sends verification requests to admins.")
-    async def admin(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.admin value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.admin = channel_id
-        settings.save()
-        await interaction.response.send_message(f"Admin verification channel set to <#{channel_id}>.", ephemeral=True)
-
-    @channel_ids.subcommand(description="Sets announcement channel.")
-    async def announcement(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.announcement value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.announcement = channel_id
-        settings.save()
-        await interaction.response.send_message(f"Announcement channel set to <#{channel_id}>.", ephemeral=True)
-
-    @channel_ids.subcommand(description="Sets clan info channel. Channel used for tracking current council.")
-    async def clan_info(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.clan_info value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.clan_info = channel_id
-        settings.save()
-        await interaction.response.send_message(f"Clan information channel set to <#{channel_id}>.", ephemeral=True)
-
-    @channel_ids.subcommand(
-        description="Sets event post channel. Channel is where event tracking information is posted."
-    )
-    async def event_post(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.event_post value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.event_post = channel_id
-        settings.save()
-        await interaction.response.send_message(f"Event posting channel set to <#{channel_id}>.", ephemeral=True)
-
-    @channel_ids.subcommand(description="Sets general channel.")
-    async def general(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.general value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.general = channel_id
-        settings.save()
-        await interaction.response.send_message(f"General channel set to <#{channel_id}>.", ephemeral=True)
-
-    @channel_ids.subcommand(description="Sets voting channel. Channel used as parent for voting threads.")
-    async def voting(
-        self,
-        interaction: nextcord.Interaction,
-        channel: nextcord.TextChannel = nextcord.SlashOption(
-            required=False, description="Channel to set to. If left blank, uses current channel."
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings channel_ids.voting value to given channel id or current channel id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            channel (nextcord.TextChannel, optional): Channel to set in settings.
-        """
-        channel_id = interaction.channel_id if channel is None else channel.id
-        settings.channel_ids.voting = channel_id
-        settings.save()
-        await interaction.response.send_message(f"Voting channel set to <#{channel_id}>.", ephemeral=True)
-
-    @settings.subcommand()
-    async def point_settings(self, interaction: nextcord.Interaction) -> None:
-        """Subcommand parent. Never called."""
-
-    @point_settings.subcommand(description="Sets Points value.")
-    async def clan_points(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Clan Points the recipient earns.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.clan_points to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to assign to PointSettings.points.
-        """
-        settings.point_settings.clan_points = points
-        settings.save()
-        await interaction.response.send_message(f"Points set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Weekly Limit value for Clan Points.")
-    async def clan_points_weekly_limit(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Clan Points a clan member can earn in a week.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.clan_points_weekly_limit to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.clan_points_weekly_limit = points
-        settings.save()
-        await interaction.response.send_message(f"Clan Points Weekly Limit set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Weekly Limit value.")
-    async def events_weekly_limit(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Event Points a clan member can earn in a week.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.events_weekly_limit to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.events_weekly_limit = points
-        settings.save()
-        await interaction.response.send_message(f"Event Weekly Limit set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Host Points value.")
-    async def host_points(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True, description="Number of Event Points a host earns when hosting event.", min_value=0
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.host_points to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.host_points = points
-        settings.save()
-        await interaction.response.send_message(f"Event Host Points set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets Event Participation Points value.")
-    async def participate_points(
-        self,
-        interaction: nextcord.Interaction,
-        points: int = nextcord.SlashOption(
-            required=True,
-            description="Number of Event Points a participant earns when attending an event.",
-            min_value=0,
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.participate_points to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            points (int): Number of points to set.
-        """
-        settings.point_settings.participate_points = points
-        settings.save()
-        await interaction.response.send_message(f"Event Participation Points set to {points}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets whether to verify a clan point entry.")
-    async def verify_clan_points(
-        self,
-        interaction: nextcord.Interaction,
-        do_verification: bool = nextcord.SlashOption(  # noqa: FBT001
-            required=True,
-            description="Whether an event should be verified or not.",
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.verify_clan_points to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            do_verification (bool): If the bot should verify events.
-        """
-        settings.point_settings.verify_clan_points = do_verification
-        settings.save()
-        await interaction.response.send_message(f"Event verification set to {do_verification}.", ephemeral=True)
-
-    @point_settings.subcommand(description="Sets whether an event.")
-    async def verify_events(
-        self,
-        interaction: nextcord.Interaction,
-        do_verification: bool = nextcord.SlashOption(  # noqa: FBT001
-            required=True,
-            description="Whether an event should be verified or not.",
-        ),
-    ) -> None:
-        """
-        Sets DakinySettings point_settings.verify_events to the given number of points.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            do_verification (bool): If the bot should verify events.
-        """
-        settings.point_settings.verify_events = do_verification
-        settings.save()
-        await interaction.response.send_message(f"Event verification set to {do_verification}.", ephemeral=True)
-
-    @settings.subcommand()
-    async def role_ids(self, interaction: nextcord.Interaction) -> None:
-        """Subcommand parent. Never called."""
-
-    @role_ids.subcommand(description="Sets Clan Council role id.")
-    async def clan_council(
-        self,
-        interaction: nextcord.Interaction,
-        role: nextcord.Role = nextcord.SlashOption(required=True, description="Role to set."),
-    ) -> None:
-        """
-        Sets DakinySettings role_ids.clan_council to the given role id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            role (nextcord.TextChannel): Role to set in settings.
-        """
-        role_id = role.id
-        settings.role_ids.clan_council = role_id
-        settings.save()
-        await interaction.response.send_message(f"Clan Council role set to <@&{role_id}>.", ephemeral=True)
-
-    @role_ids.subcommand(description="Sets Clan Council Elect role id.")
-    async def clan_council_elect(
-        self,
-        interaction: nextcord.Interaction,
-        role: nextcord.Role = nextcord.SlashOption(required=True, description="Role to set."),
-    ) -> None:
-        """
-        Sets DakinySettings role_ids.clan_council_elect to the given role id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            role (nextcord.TextChannel): Role to set in settings.
-        """
-        role_id = role.id
-        settings.role_ids.clan_council_elect = role_id
-        settings.save()
-        await interaction.response.send_message(f"Clan Council Elect role set to <@&{role_id}>.", ephemeral=True)
-
-    @role_ids.subcommand(description="Sets Clan Member role id.")
-    async def clan_member(
-        self,
-        interaction: nextcord.Interaction,
-        role: nextcord.Role = nextcord.SlashOption(required=True, description="Role to set."),
-    ) -> None:
-        """
-        Sets DakinySettings role_ids.clan_member to the given role id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            role (nextcord.TextChannel): Role to set in settings.
-        """
-        role_id = role.id
-        settings.role_ids.clan_member = role_id
-        settings.save()
-        await interaction.response.send_message(f"Clan Member role set to <@&{role_id}>.", ephemeral=True)
-
-    @role_ids.subcommand(description="Sets Event Host role id.")
-    async def event_host(
-        self,
-        interaction: nextcord.Interaction,
-        role: nextcord.Role = nextcord.SlashOption(required=True, description="Role to set."),
-    ) -> None:
-        """
-        Sets DakinySettings role_ids.event_host to the given role id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            role (nextcord.TextChannel): Role to set in settings.
-        """
-        role_id = role.id
-        settings.role_ids.event_host = role_id
-        settings.save()
-        await interaction.response.send_message(f"Event Host role set to <@&{role_id}>.", ephemeral=True)
-
-    @role_ids.subcommand(description="Sets High Council role id.")
-    async def high_council(
-        self,
-        interaction: nextcord.Interaction,
-        role: nextcord.Role = nextcord.SlashOption(required=True, description="Role to set."),
-    ) -> None:
-        """
-        Sets DakinySettings role_ids.high_council to the given role id.
-
-        Args:
-            interaction (nextcord.Interaction): Discord interaction of command.
-            role (nextcord.TextChannel): Role to set in settings.
-        """
-        role_id = role.id
-        settings.role_ids.high_council = role_id
-        settings.save()
-        await interaction.response.send_message(f"High Council role set to <@&{role_id}>.", ephemeral=True)

dakiny_bot/database/__init__.py

@@ -1 +0,0 @@
-"""Module controls connection to Dakiny bot database."""

dakiny_bot/database/db.py

@@ -1,13 +0,0 @@
-"""Simple file to set up the sqlmodel connection to database."""
-
-from sqlmodel import SQLModel, create_engine
-
-from dakiny_bot.logger import dakiny_logger
-
-from . import models  # noqa: F401 - Need this import for creating the models.
-
-url = "sqlite:///database/dakiny.db"
-dakiny_logger.info("Connected to local dev database.")
-engine = create_engine(url)
-
-SQLModel.metadata.create_all(engine)

dakiny_bot/database/models.py

@@ -1,218 +0,0 @@
-"""File holds all model definitions of SQL tables."""
-
-from sqlalchemy.dialects.mysql import BIGINT, BOOLEAN, INTEGER, VARCHAR
-from sqlmodel import Column, Field, ForeignKey, Relationship, SQLModel
-
-
-class ElectionInformation(SQLModel, table=True):
-    """
-    Represents all required information for an election.
-
-    Attributes:
-        name: Name of the election.
-        thread_id: Thread of where all the election related messages take place.
-        council_vote_msg_id: Message where the council vote is presented.
-        high_council_vote_msg_id: Message where the high council vote is presented.
-        council_nomination_msg_id: Message where council nomination button is held.
-        high_council_nomination_msg_id: Message where high council nomination button is held.
-        council_members: List of council members who ran during this election.
-        votes: All votes cast during this election.
-    """
-
-    __tablename__: str = "ElectionInformation"
-
-    name: str = Field(sa_column=Column("ElectionName", VARCHAR, primary_key=True, unique=True), max_length=30)
-    thread_id: int = Field(sa_column=Column("ThreadId", BIGINT(unsigned=True), nullable=False))
-    council_vote_msg_id: int | None = Field(
-        sa_column=Column("CouncilVoteMsgId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-    high_council_vote_msg_id: int | None = Field(
-        sa_column=Column("HighCouncilVoteMsgId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-    council_nomination_msg_id: int | None = Field(
-        sa_column=Column("CouncilNominationMsgId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-    high_council_nomination_msg_id: int | None = Field(
-        sa_column=Column("HighCouncilNominationMsgId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-
-    council_members: list["CouncilMember"] = Relationship(back_populates="election", cascade_delete=True)
-    votes: list["Vote"] = Relationship(back_populates="election", cascade_delete=True)
-
-
-class CouncilMember(SQLModel, table=True):
-    """
-    Represents members involved in a given election.
-
-    Records speech message ids for general election and high council position. Booleans record if the user was elected
-    to a council/high council position.
-
-    Attributes:
-        member_id: User that is running for council's discord id.
-        speech_msg_id: Message id of user's speech.
-        elected: Whether the user got elected to council.
-        discord_manager: Whether the user got elected to the Discord Manager position.
-        clan_leader: Whether the user got elected to the Clan Leader position.
-        discord_manager_speech_id: Message id of the user's Discord Manager speech.
-        clan_leader_speech_id: Message id of the user's Clan Leader speech.
-        election: The election this user object is for.
-        votes: A list of votes for this user.
-    """
-
-    __tablename__: str = "CouncilMembers"
-
-    election_name: str = Field(
-        sa_column=Column(
-            "ElectionName",
-            VARCHAR,
-            ForeignKey("ElectionInformation.ElectionName", ondelete="CASCADE"),
-            primary_key=True,
-        ),
-        max_length=30,
-    )
-    member_id: int = Field(sa_column=Column("MemberId", BIGINT(unsigned=True), primary_key=True, nullable=False))
-    speech_msg_id: int | None = Field(
-        sa_column=Column("SpeechMsgId", BIGINT(unsigned=True), nullable=False), default=None
-    )
-    elected: bool = Field(sa_column=Column("Elected", BOOLEAN), default=False)
-    discord_manager: bool = Field(sa_column=Column("DiscordManager", BOOLEAN), default=False)
-    clan_leader: bool = Field(sa_column=Column("ClanLeader", BOOLEAN), default=False)
-    discord_manager_speech_id: int | None = Field(
-        sa_column=Column("DiscordManagerSpeechId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-    clan_leader_speech_id: int | None = Field(
-        sa_column=Column("ClanLeaderSpeechId", BIGINT(unsigned=True), nullable=True), default=None
-    )
-
-    election: ElectionInformation | None = Relationship(back_populates="council_members")
-    votes: list["Vote"] = Relationship(back_populates="council_member")
-
-
-class Vote(SQLModel, table=True):
-    """
-    Represents a vote cast during an election.
-
-    Attributes:
-        election_name: Election this vote was cast in.
-        voter_id: User id that cast the vote.
-        voted_for_id: User id that was voted for.
-        type: Type of election, council, discordmanager, or clanleader.
-        election: A link to the ElectionInformation object that the vote was cast in.
-        council_member: A link to the CouncilMember object that the vote is for.
-    """
-
-    __tablename__: str = "Votes"
-
-    election_name: str = Field(
-        sa_column=Column(
-            "ElectionName",
-            VARCHAR,
-            ForeignKey("ElectionInformation.ElectionName", ondelete="CASCADE"),
-            primary_key=True,
-        ),
-        max_length=30,
-    )
-    voter_id: int = Field(sa_column=Column("VoterId", BIGINT(unsigned=True), primary_key=True, nullable=False))
-    # might have to set this foreign key later with alembic migration...
-    voted_for_id: int | None = Field(
-        sa_column=Column("VotedForId", BIGINT(unsigned=True), ForeignKey("CouncilMembers.MemberId"), nullable=True)
-    )
-    type: str = Field(
-        sa_column=Column("Type", VARCHAR, primary_key=True, nullable=False, default="council"), max_length=14
-    )
-
-    election: ElectionInformation | None = Relationship(back_populates="votes")
-    council_member: CouncilMember | None = Relationship(back_populates="votes")
-
-
-class UserBirthday(SQLModel, table=True):
-    """
-    Represents a user's birth month and day.
-
-    Attributes:
-        id: User's discord id.
-        birthday: Month/day that is a user's birthday.
-    """
-
-    id: int = Field(sa_column=Column("UserId", BIGINT(unsigned=True), primary_key=True, nullable=False))
-
-    # TODO(imcompiling): split into month and day. Also relies on Alembic migration.
-    # https://gitea.cheezers.org/imcompiling/dakiny-bot/issues/93
-    birthday: str = Field(sa_column=Column("Birthday", VARCHAR, nullable=False), max_length=5)
-
-
-class Presence(SQLModel, table=True):
-    """
-    Stores presences for the bot to pull and use.
-
-    Attributes:
-        id: Auto-incremented id for each entry.
-        presence: The presence itself.
-    """
-
-    __tablename__: str = "Presences"
-
-    id: int | None = Field(sa_column=Column("Id", INTEGER, primary_key=True), default=None)
-    presence: str = Field(sa_column=Column("Presence", VARCHAR, nullable=False), max_length=100)
-
-
-class Points(SQLModel, table=True):
-    """
-    Stores activity points a user can gain by participating in clan activities.
-
-    Event points and clan points were separated out.
-
-    Attributes:
-        quarter_name: Name of the quarter the points were earned in.
-        user_id: The user that earned them. Is a discord id if the user is a discord member, otherwise their rsn.
-        discord_member: Boolean on whether the user is a discord member or not. Used to know what the user_id
-            represents.
-        event_points: Event points earned during the quarter.
-        clan_points: Clan points earned during the quarter.
-    """
-
-    quarter_name: str = Field(sa_column=Column("QuarterName", VARCHAR, primary_key=True, nullable=False), max_length=30)
-    user_id: str = Field(sa_column=Column("UserId", VARCHAR, primary_key=True, nullable=False), max_length=32)
-    discord_member: bool = Field(sa_column=Column("DiscordMember", BOOLEAN, nullable=False))
-    event_points: int = Field(sa_column=Column("EventPoints", INTEGER(unsigned=True), nullable=False), default=0)
-    clan_points: int = Field(sa_column=Column("ClanPoints", INTEGER(unsigned=True), nullable=False), default=0)
-
-
-class Message(SQLModel, table=True):
-    """
-    Table is used to map folders and files to channels and messages in discord.
-
-    If folder name is stored in path, the corresponding id is a channel id. If the path is to a file, the id is for a
-        message.
-
-    Attributes:
-        path: Either directory or file pathname.
-        id: Channel or message id depending on the path.
-    """
-
-    __tablename__: str = "Messages"
-
-    path: str = Field(sa_column=Column("Path", VARCHAR, primary_key=True, nullable=False), max_length=100)
-    id: int = Field(sa_column=Column("Id", BIGINT(unsigned=True), nullable=False))
-
-
-class PointsLimit(SQLModel, table=True):
-    """
-    Table tracks how many points a user has gained in a week.
-
-    Council didn't want users spamming points, so they added a limit to how many can be gained in a week. This table
-    tracks point gain per week.
-
-    Attributes:
-        user_id: The user that earned points. Is a discord id if the user is a discord member, otherwise their rsn.
-        week: week number/year representation of the week. Ex: 04/2025.
-        event_points: Number of event points earned during this week.
-        clan_points: Number of clan points earned during this week.
-    """
-
-    user_id: str = Field(sa_column=Column("UserId", VARCHAR, primary_key=True, nullable=False), max_length=32)
-
-    # Maybe should break this out into two columns, week and year. Better data validation and more clear.
-    week: str = Field(sa_column=Column("Week", VARCHAR, primary_key=True, nullable=False), max_length=7)
-    event_points: int = Field(sa_column=Column("EventPoints", INTEGER(unsigned=True), nullable=False), default=0)
-    clan_points: int = Field(sa_column=Column("ClanPoints", INTEGER(unsigned=True), nullable=False), default=0)

dakiny_bot/logger.py

@@ -1,13 +0,0 @@
-"""Creates logger for Dakiny bot."""
-
-import logging
-import os
-import sys
-
-dakiny_logger = logging.getLogger("default")
-dakiny_logger.setLevel(logging.DEBUG if os.getenv("DEBUG") == "true" else logging.INFO)
-handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(
-    logging.Formatter("%(asctime)s:%(levelname)s [%(filename)s:%(lineno)s - %(funcName)20s() ] %(message)s")
-)
-dakiny_logger.addHandler(handler)

database_setup/create_database.py

@@ -0,0 +1,13 @@
+"""Small script to create the database if it doesn't already exist."""
+
+import sqlite3
+from pathlib import Path
+
+if not Path("database/dakiny.db").exists():
+    with sqlite3.connect("database/dakiny.db") as con:
+        cur = con.cursor()
+
+        with Path("database_setup/database.sql", encoding="utf-8").open() as file:
+            database_script = file.read()
+            cur.executescript(database_script)
+            con.commit()

database_setup/database.sql

@@ -41,12 +41,11 @@ CREATE TABLE Presences (
     Presence varchar(100) not null
 );
 
-CREATE TABLE Points (
+CREATE TABLE EventPoints (
     QuarterName varchar(30) not null,
     UserId varchar(32) not null,
     DiscordMember boolean not null,
-    EventPoints int unsigned DEFAULT 0,
+    Points int unsigned DEFAULT 0,
-    ClanPoints int unsigned DEFAULT 0,
     PRIMARY KEY (QuarterName, UserId)
 );
 
@@ -55,10 +54,9 @@ CREATE TABLE Messages (
     Id bigint unsigned not null
 );
 
-CREATE TABLE PointsLimit (
+CREATE TABLE EventPointsLimit (
     UserId varchar(32) not null,
-    EventPoints int unsigned DEFAULT 0,
+    Points int unsigned DEFAULT 0,
-    ClanPoints int unsigned DEFAULT 0,
     Week varchar(7) not null,
     PRIMARY KEY (UserId, Week)
 );

database_setup/pyproject.toml

@@ -0,0 +1,7 @@
+[tool.ruff]
+# Extend the `pyproject.toml` file in the parent directory...
+extend = "../pyproject.toml"
+
+[tool.ruff.lint]
+# ignore implicit-namespace-package in this directory.
+ignore = ["INP001"]

database_setup/sql_data_classes.py

@@ -0,0 +1,20 @@
+"""Simple file to set up the sqlalchemy connection to database."""
+
+from sqlalchemy import create_engine
+from sqlalchemy.ext.automap import automap_base
+
+# connect with sql alchemy and autoload schema
+URL = "sqlite+pysqlite:///database/dakiny.db"
+engine = create_engine(URL)
+Base = automap_base()
+Base.prepare(autoload_with=engine)
+
+# define the classes
+CouncilMembers = Base.classes.CouncilMembers
+ElectionInformation = Base.classes.ElectionInformation
+EventPointsLimit = Base.classes.EventPointsLimit
+Messages = Base.classes.Messages
+EventPoints = Base.classes.EventPoints
+Presences = Base.classes.Presences
+UserBirthday = Base.classes.UserBirthday
+Votes = Base.classes.Votes

main.py

@@ -0,0 +1,59 @@
+"""Main file for bot."""
+
+import logging
+import os
+
+import nextcord
+from nextcord.ext import commands
+
+from classes.nominate_highcouncil_views import NominateHighCouncilView
+from classes.nominate_views import NominateView
+from classes.voting_highcouncil_views import VoteHighcouncilView
+from classes.voting_views import VoteView
+from DakinySettings import settings
+from database_setup import create_database
+
+birthday_list: list[int] = []
+
+logger = logging.getLogger("nextcord")
+logger.setLevel(logging.DEBUG)
+handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
+handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+logger.addHandler(handler)
+
+
+def main() -> None:
+    """Builds and runs bot."""
+    # Allows privileged intents for monitoring members joining, roles editing, and role assignments
+    # These need to be enabled in the developer portal as well
+    intents = nextcord.Intents.default()
+
+    # Required in order to read messages (eg. prefix commands)
+    intents.message_content = True
+
+    # To enable the members privileged intent:
+    intents.members = True
+
+    bot = commands.Bot(intents=intents)
+
+    # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
+    for folder in os.listdir("cogs"):
+        bot.load_extension(f"cogs.{folder}")
+
+    @bot.listen()
+    async def on_ready() -> None:
+        """When Discord is connected."""
+        assert bot.user is not None  # noqa: S101 documentation does this
+        create_database  # noqa: B018
+        bot.add_view(NominateView(bot.get_guild(settings.params.guild_id)))
+        bot.add_view(NominateHighCouncilView(bot.get_guild(settings.params.guild_id)))
+        bot.add_view(VoteView(bot.get_guild(settings.params.guild_id)))
+        bot.add_view(VoteHighcouncilView(bot.get_guild(settings.params.guild_id)))
+        print(f"{bot.user.name} has connected to Discord!")  # noqa: T201 TODO make logging to print my stuff to console
+
+    # Run Discord bot
+    bot.run(settings.params.discord_token)
+
+
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -1,27 +1,30 @@
-[project]
+[tool.poetry]
-authors = [{ name = "imcompiling", email = "[email protected]" }]
-requires-python = "<4.0,>=3.13"
-dependencies = [
-    "gitpython<4.0.0,>=3.1.43",
-    "fastapi<1.0.0,>=0.111.0",
-    "nextcord<3.0.0,>=2.6.0",
-    "pandas<3.0.0,>=2.2.2",
-    "pytz<2025.3,>=2025.2",
-    "sqlalchemy<3.0.0,>=2.0.30",
-    "aiofiles<24.0.0,>=23.2.1",
-    "setuptools<80.9.1,>=80.9.0",
-    "dataclass-wizard[yaml]>=0.22.3,<1.0.0",
-    "uvicorn>=0.34.0",
-    "audioop-lts>=0.2.1",
-    "sqlmodel>=0.0.24",
-]
 name = "dakiny-bot"
 version = "0.1.0"
 description = "Dakiny's Discord Bot."
+authors = ["imcompiling <[email protected]>"]
 readme = "README.md"
+package-mode = false
 
-[dependency-groups]
+[tool.poetry.dependencies]
-dev = ["ruff<1.0.0,>=0.6.9"]
+python = "^3.12"
+gitpython = "^3.1.43"
+fastapi = "^0.111.0"
+nextcord = "^2.6.0"
+pandas = "^2.2.2"
+pytz = "^2024.1"
+sqlalchemy = "^2.0.30"
+aiofiles = "^23.2.1"
+setuptools = "^70.0.0"
+dataclass-wizard = "^0.22.3"
+
+
+[tool.poetry.group.dev.dependencies]
+ruff = "^0.6.3"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 # Exclude a variety of commonly ignored directories.
@@ -68,6 +71,7 @@ target-version = "py312"
 # McCabe complexity (`C901`) by default.
 select = ["ALL"]
 ignore = [
+    "ANN101",
     "B008",   # I build SlashOptions as arguments.
     "COM812",
     "COM819",
@@ -81,7 +85,6 @@ ignore = [
     "E117",
     "ISC001",
     "ISC002",
-    "PD011",  # doesn't like me using '.values' on embeds....
     "Q000",
     "Q001",
     "Q002",

renovate.json

@@ -1,29 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "lockFileMaintenance": {
-        "automerge": true
-    },
-    "major": {
-        "automerge": false,
-        "automergeType": "pr"
-    },
-    "minor": {
-        "automerge": true,
-        "automergeType": "branch"
-    },
-    "patch": {
-        "automerge": true,
-        "automergeType": "branch"
-    },
-    "pin": {
-        "automerge": true,
-        "automergeType": "branch"
-    },
-    "ignoreTests": true,
-    "dockerfile": {
-        "minor": {
-            "automerge": false,
-            "automergeType": "pr"
-        }
-    }
-}

utils.py

@@ -1,7 +1,7 @@
 """File contains util functions."""
 
 import calendar
-import pathlib
+import os
 from collections.abc import Sequence
 from datetime import UTC, datetime
 from enum import StrEnum
@@ -9,15 +9,18 @@ from pathlib import Path
 
 import aiofiles
 import nextcord
-from sqlalchemy import select, update
+from sqlalchemy import select, true, update
 from sqlalchemy.orm import Session
-from sqlmodel import col
 
-from dakiny_bot.database.db import engine
+from DakinySettings import settings
-from dakiny_bot.database.models import CouncilMember, Message, Points, PointsLimit, Vote
+from database_setup.sql_data_classes import (
-from dakiny_bot.logger import dakiny_logger
+    CouncilMembers,
-
+    EventPoints,
-from .dakiny_settings import settings
+    EventPointsLimit,
+    Messages,
+    Votes,
+    engine,
+)
 
 NOMINEE_SPLITTER = "========================================\n\n"
 REPO_DIR = "./dakiny-messages"
@@ -27,36 +30,31 @@ MAX_DISCORD_MESSAGE_LENGTH = 2000
 GUILDS = [1000247361639030804, 239758371358638080]
 
 VoteType = StrEnum("VoteType", ["COUNCIL", "DISCORDMANAGER", "CLANLEADER"])
-PointType = StrEnum("PointType", ["CLAN", "EVENT"])
 
 
-# TODO(imcompiling): resolve returning None from this function
+def get_datetime(day: str) -> datetime:
-# https://gitea.cheezers.org/imcompiling/dakiny-bot/issues/102
-def get_datetime(month_day: str) -> datetime:  # pyright: ignore[reportReturnType]
     """
     Takes in a string month and day and returns a datetime object of that Month/Day this year.
 
     Args:
-        month_day (str): Month/Day in that format.
+        day (str): Month/Day in that format.
 
     Returns:
         datetime: Datetime representation of Month/Day.
     """
     today = datetime.now(tz=UTC).date()
     year = today.year
-    month = int(month_day.split("/")[0])
+    month = int(day.split("/")[0])
-    day = int(month_day.split("/")[1])
+    day = int(day.split("/")[1])
 
     # ensure that year rolls over if current month is December and the next month is less than 12.
-    if today.month == calendar.DECEMBER and month < calendar.OCTOBER:
+    if today.month == calendar.DECEMBER and month < calendar.DECEMBER:
         year += 1
 
-    if today.month == calendar.JANUARY and month > calendar.MARCH:
+    if today.month == calendar.JANUARY and month > calendar.JANUARY:
         year -= 1
-    try:
+
     return datetime(year, month, day, tzinfo=UTC)
-    except ValueError:
-        dakiny_logger.warning("Invalid month day: %s.", month_day)
 
 
 def get_election_name() -> str:
@@ -66,7 +64,7 @@ def get_election_name() -> str:
     Returns:
         str: the name of the election cycle
     """
-    cycle = get_active_election_cycle()
+    cycle = get_current_election_cycle()
     current_cycle = settings.election_cycles[cycle]
     return f"vote-{get_datetime(current_cycle.term_start).year}-{current_cycle.name}"
 
@@ -84,7 +82,7 @@ def get_quarter_name() -> str:
     return f"{get_datetime(current_cycle.term_start).year}-{current_cycle.name}"
 
 
-def get_active_election_cycle() -> int:
+def get_current_election_cycle() -> int:
     """
     Returns index for active election. An election is considered active between the election start and the term start.
 
@@ -92,14 +90,12 @@ def get_active_election_cycle() -> int:
         int: cycle index for active election. None for no active cycle
     """
     today = datetime.now(tz=UTC)
-    dakiny_logger.debug("Today is %s", today)
 
     for cycle, election in enumerate(settings.election_cycles):
         if (
             today.date() >= get_datetime(election.election_start).date()
             and today.date() <= get_datetime(election.term_start).date()
         ):
-            dakiny_logger.debug("Cycle is %d", cycle)
             return cycle
 
     # It isn't a current election, get the quarter
@@ -108,27 +104,20 @@ def get_active_election_cycle() -> int:
 
 def get_quarter_cycle() -> int:
     """
-    Returns the index for the current cycle/quarter. Defined as between term start and end.
+    Returns the index for the current cycle/quarter. Defined as between term start and end. Shouldn't return none.
-
-    Can return None if entire year isn't covered by cycles.
 
     Returns:
         int: cycle index for current cycle.
     """
     today = datetime.now(tz=UTC)
-    dakiny_logger.debug("Today is %s", today)
     for cycle, election in enumerate(settings.election_cycles):
         if (
             today.date() >= get_datetime(election.term_start).date()
             and today.date() <= get_datetime(election.term_end).date()
         ):
-            dakiny_logger.debug("Cycle is %d", cycle)
             return cycle
 
-    dakiny_logger.debug("Quarter cycle is None.")
+    return None
-    # TODO(imcompiling) Add None to return signature or find better return value
-    # https://gitea.cheezers.org/imcompiling/dakiny-bot/issues/102
-    return None  # pyright: ignore[reportReturnType]
 
 
 def build_votes_str(guild: nextcord.Guild) -> str:
@@ -146,20 +135,19 @@ def build_votes_str(guild: nextcord.Guild) -> str:
     election_name = get_election_name()
 
     with Session(engine) as session:
-        stmt = select(CouncilMember).where(col(CouncilMember.election_name == election_name))
+        stmt = select(CouncilMembers).where(CouncilMembers.ElectionName == election_name)
 
         for nominee in sorted(
             session.scalars(stmt),
-            # Unsure how to None check in the lambda.
+            key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(),
-            key=lambda nominee: guild.get_member(nominee.member_id).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
         ):
-            votes[nominee.member_id] = 0
+            votes[nominee.MemberId] = 0
 
-        stmt = select(Vote).where(col(Vote.election_name == election_name)).where(col(Vote.type == VoteType.COUNCIL))
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.COUNCIL)
 
         for vote in session.scalars(stmt):
-            if vote.voted_for_id is not None:
+            if vote.VotedForId is not None:
-                votes[vote.voted_for_id] += 1
+                votes[vote.VotedForId] += 1
 
     votes_str: str = "===================="
     votes_str += user_vote_str(votes)
@@ -184,52 +172,46 @@ def build_highcouncil_votes_str(guild: nextcord.Guild) -> str:
 
     with Session(engine) as session:
         stmt = (
-            select(CouncilMember)
+            select(CouncilMembers)
-            .where(col(CouncilMember.election_name == election_name))
+            .where(CouncilMembers.ElectionName == election_name)
-            .filter(col(CouncilMember.clan_leader_speech_id is not None))
+            .filter(CouncilMembers.ClanLeaderSpeechId.is_not(None))
         )
 
         for nominee in sorted(
             session.scalars(stmt),
-            # Unsure how to None check in the lambda.
+            key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(),
-            key=lambda nominee: guild.get_member(nominee.member_id).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
         ):
-            cl_votes[nominee.member_id] = 0
+            cl_votes[nominee.MemberId] = 0
 
-        stmt = select(Vote).where(col(Vote.election_name == election_name)).where(col(Vote.type == VoteType.CLANLEADER))
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.CLANLEADER)
 
         for vote in session.scalars(stmt):
-            if vote.voted_for_id is not None:
+            if vote.VotedForId is not None:
-                cl_votes[vote.voted_for_id] += 1
+                cl_votes[vote.VotedForId] += 1
 
         stmt = (
-            select(CouncilMember)
+            select(CouncilMembers)
-            .where(col(CouncilMember.election_name == election_name))
+            .where(CouncilMembers.ElectionName == election_name)
-            .filter(col(CouncilMember.discord_manager_speech_id is not None))
+            .filter(CouncilMembers.DiscordManagerSpeechId.is_not(None))
         )
 
         for nominee in sorted(
             session.scalars(stmt),
-            # Unsure how to None check in the lambda.
+            key=lambda nominee: guild.get_member(nominee.MemberId).display_name.lower(),
-            key=lambda nominee: guild.get_member(nominee.member_id).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
         ):
-            dm_votes[nominee.member_id] = 0
+            dm_votes[nominee.MemberId] = 0
 
-        stmt = (
+        stmt = select(Votes).where(Votes.ElectionName == election_name).where(Votes.Type == VoteType.DISCORDMANAGER)
-            select(Vote)
-            .where(col(Vote.election_name == election_name))
-            .where(col(Vote.type == VoteType.DISCORDMANAGER))
-        )
 
         for vote in session.scalars(stmt):
-            if vote.voted_for_id is not None:
+            if vote.VotedForId is not None:
-                dm_votes[vote.voted_for_id] += 1
+                dm_votes[vote.VotedForId] += 1
 
     # build the votes string
-    votes_str: str = "Clan Leader Vote\n===================="
+    votes_str: str = "Clan Leader Votes\n===================="
     votes_str += user_vote_str(cl_votes)
 
-    votes_str += "\n\nDiscord Manager Vote\n===================="
+    votes_str += "\n\nDiscord Manager Votes\n===================="
     votes_str += user_vote_str(dm_votes)
 
     return votes_str
@@ -306,46 +288,41 @@ def decorate_dm_nomination(user_id: int, speech: str) -> str:
     return msg
 
 
-def record_points(users: Sequence[str], add_points: int, point_type: PointType, *, is_member: bool) -> None:
+def record_event_points(users: Sequence[str], add_points: int, *, is_member: bool) -> None:
     """
-    Adds points to all users listed.
+    Adds event points to all users listed.
 
     Checks if they don't exist in order to make a new entry, otherwise
-    adds points to the existing value. Can be used for hosting or participating in events or for the clan
+    adds points to the existing value. Can be used for hosting or participating.
-    points.
 
     Args:
         users (Sequence[int]): users that participated and need points.
         add_points (int): number of points to add
-        point_type (PointType): which point type to add to
         is_member (bool): whether the users are a discord member or not
     """
     quarter_name = get_quarter_name()
     with Session(engine) as session:
         for user in users:
-            stmt = select(Points).where(col(Points.user_id == user)).where(col(Points.quarter_name == quarter_name))
+            stmt = select(EventPoints).where(EventPoints.UserId == user).where(EventPoints.QuarterName == quarter_name)
 
-            points_obj = session.scalar(stmt)
+            points = session.scalar(stmt)
-            add_points = get_allowed_points(session, point_type, user, add_points)
+            if points is None:
-            add_clan_points = add_points if point_type == PointType.CLAN else 0
+                add_points = get_allowed_points(session, settings.event_settings.weekly_limit, user, add_points)
-            add_event_points = add_points if point_type == PointType.EVENT else 0
+                new_points = EventPoints(
-            if points_obj is None:
+                    QuarterName=quarter_name,
-                new_points = Points(
+                    UserId=user,
-                    quarter_name=quarter_name,
+                    DiscordMember=is_member,
-                    user_id=user,
+                    Points=add_points,
-                    discord_member=is_member,
-                    event_points=add_event_points,
-                    clan_points=add_clan_points,
                 )
                 session.add(new_points)
             else:
-                points_obj.event_points += add_event_points
+                add_points = get_allowed_points(session, settings.event_settings.weekly_limit, user, add_points)
-                points_obj.clan_points += add_clan_points
+                points.Points += add_points
 
         session.commit()
 
 
-def get_allowed_points(session: Session, point_type: PointType, user: str, points: int) -> int:
+def get_allowed_points(session: Session, points_limit: int, user: str, points: int) -> int:
     """
     Gets the maximum number of points a user can be given.
 
@@ -355,7 +332,7 @@ def get_allowed_points(session: Session, point_type: PointType, user: str, point
 
     Args:
         session (Session): Open connection to database.
-        point_type (PointType): Which type of points to check the limit for.
+        points_limit (int): Maximum number of points a user can be given in a week.
         user (str): user to be given points. Used to check a user's limit.
         points (int): maximum number of points to give to user.
 
@@ -365,29 +342,18 @@ def get_allowed_points(session: Session, point_type: PointType, user: str, point
     # check for limit
     today = datetime.now(tz=UTC).date()
     this_week = f"{today.isocalendar().year}-{today.isocalendar().week}"
-    points_limit = (
+    stmt = select(EventPointsLimit).where(EventPointsLimit.UserId == user).where(EventPointsLimit.Week == this_week)
-        settings.point_settings.events_weekly_limit
-        if point_type == PointType.EVENT
-        else settings.point_settings.clan_points_weekly_limit
-    )
-    stmt = select(PointsLimit).where(col(PointsLimit.user_id == user)).where(col(PointsLimit.week == this_week))
 
     # if under limit, can add up to however many points would make the current limit equal to the
     # allowed limit.
-    limit_obj = session.scalar(stmt)
+    limit = session.scalar(stmt)
-    if limit_obj is None:
+    if limit is None:
-        clan_points = points if point_type == PointType.CLAN else 0
+        new_limit = EventPointsLimit(UserId=user, Points=points, Week=this_week)
-        event_points = points if point_type == PointType.EVENT else 0
-        new_limit = PointsLimit(user_id=user, week=this_week, event_points=event_points, clan_points=clan_points)
         add_points = points
         session.add(new_limit)
     else:
-        curr_points = limit_obj.event_points if point_type == PointType.EVENT else limit_obj.clan_points
+        add_points = points if limit.Points + points <= points_limit else (max(0, points_limit - limit.Points))
-        add_points = points if curr_points + points <= points_limit else (max(0, points_limit - curr_points))
+        limit.Points += add_points
-        if point_type == PointType.EVENT:
-            limit_obj.event_points += add_points
-        else:
-            limit_obj.clan_points += add_points
 
     session.commit()
 
@@ -416,8 +382,8 @@ async def update_clan_messages(guild: nextcord.Guild, channel_updates: Sequence[
             dir_path = f"{MESSAGES_DIR}/{dir_name}"
             channel = await get_clan_message_channel(session, dir_name, guild)
             sorted_files = sorted(
-                pathlib.Path(dir_path).iterdir(),
+                os.listdir(dir_path),
-                key=lambda file: int(file.name.split(".")[0]),
+                key=lambda filename: int(filename.split(".")[0]),
             )
 
             for file_name in sorted_files:
@@ -446,48 +412,40 @@ async def get_clan_message_channel(session: Session, channel_name: str, guild: n
     Returns:
         nextcord.TextChannel: Channel object with name channel_name.
     """
-    stmt = select(col(Message.id)).where(col(Message.path == channel_name))
+    stmt = select(Messages.Id).where(Messages.Path == channel_name)
     channel_id = session.scalar(stmt)
-    ret_channel = None
     if channel_id is None:
+        ret_channel = None
         # channel is not tracked. see if it exists
         channels = await guild.fetch_channels()
         for channel in channels:
-            if channel.name == channel_name and isinstance(channel, nextcord.TextChannel):
+            if channel.name == channel_name and channel.__class__ is nextcord.TextChannel:
                 ret_channel = channel
 
         if ret_channel is None:
             # channel doesn't exist, we must create it
             ret_channel = await guild.create_text_channel(
                 channel_name,
-                reason="Creating channel as required for by design of Dakiny-Message repo.",
+                reason="Creating channel as required for by design of Dakiny-Messages repo.",
             )
 
         # record channel information
-        new_item = Message(path=channel_name, id=ret_channel.id)
+        new_item = Messages(Path=channel_name, Id=ret_channel.id)
         session.add(new_item)
         session.commit()
+        return ret_channel
 
-    else:
     try:
-            ret_channel = await guild.fetch_channel(channel_id)
+        return await guild.fetch_channel(channel_id)
-            if not isinstance(ret_channel, nextcord.TextChannel):
-                dakiny_logger.warning(
-                    "Channel %s is not a text channel. Does not work for clan messages.", ret_channel.name
-                )
-                # TODO(imcompiling) Figure out how to handle returning None here. Maybe delete channel and remake it?
-                # https://gitea.cheezers.org/imcompiling/dakiny-bot/issues/102
-                return None  # pyright: ignore[reportReturnType]
     except nextcord.NotFound:
         # the channel was deleted for some reason
         ret_channel = await guild.create_text_channel(
             channel_name,
-                reason="Creating channel as required for by design of Dakiny-Message repo.",
+            reason="Creating channel as required for by design of Dakiny-Messages repo.",
         )
-            stmt = update(Message).where(col(Message.path == channel_name)).values(id=ret_channel.id)
+        stmt = update(Messages).where(Messages.Path == channel_name).values(Id=ret_channel.id)
         session.execute(stmt)
         session.commit()
-
         return ret_channel
 
 
@@ -510,21 +468,21 @@ async def edit_clan_message(
         message_name (str): Name of the message. Corresponds to the file that contains message content.
         message_content (str): Content of the message to edit/send.
     """
-    stmt = select(col(Message.id)).where(col(Message.path == message_name))
+    stmt = select(Messages.Id).where(Messages.Path == message_name)
     msg_id = session.scalar(stmt)
     if msg_id is None:
         # don't have a message for this file
         msg = await channel.send(message_content)
-        new_message = Message(path=message_name, id=msg.id)
+        new_message = Messages(Path=message_name, Id=msg.id)
         session.add(new_message)
         session.commit()
     else:
         try:
             msg: nextcord.Message = await channel.fetch_message(msg_id)
-            await msg.edit(content=message_content)
+            await msg.edit(message_content)
         except nextcord.NotFound:
             msg = await channel.send(message_content)
-            stmt = update(Message).where(col(Message.path == message_name)).values(id=msg.id)
+            stmt = update(Messages).where(Messages.Path == message_name).values(Id=msg.id)
             session.execute(stmt)
             session.commit()
 
@@ -536,35 +494,30 @@ async def edit_clan_council_info(guild: nextcord.Guild) -> None:
     Args:
         guild (nextcord.Guild): Guild object that to use to get channel.
     """
-    clan_info_channel = await guild.fetch_channel(settings.channel_ids.clan_info)
+    clan_info_channel: nextcord.TextChannel = await guild.fetch_channel(settings.channel_ids.clan_info)
-
-    if not isinstance(clan_info_channel, nextcord.TextChannel):
-        return
 
     election_name = get_election_name()
     with Session(engine) as session:
         stmt = (
-            select(col(CouncilMember.member_id))
+            select(CouncilMembers.MemberId)
-            .where(col(CouncilMember.election_name == election_name))
+            .where(CouncilMembers.ElectionName == election_name)
-            .where(col(CouncilMember.discord_manager is True))
+            .where(CouncilMembers.DiscordManager == true())
         )
         discord_manager = session.scalar(stmt)
         stmt = (
-            select(col(CouncilMember.member_id))
+            select(CouncilMembers.MemberId)
-            .where(col(CouncilMember.election_name == election_name))
+            .where(CouncilMembers.ElectionName == election_name)
-            .where(col(CouncilMember.clan_leader is True))
+            .where(CouncilMembers.ClanLeader == true())
         )
         clan_leader = session.scalar(stmt)
         stmt = (
-            select(col(CouncilMember.member_id))
+            select(CouncilMembers.MemberId)
-            .where(col(CouncilMember.election_name == election_name))
+            .where(CouncilMembers.ElectionName == election_name)
-            .where(col(CouncilMember.elected is True))
+            .where(CouncilMembers.Elected == true())
         )
 
         council_member_ids = sorted(
-            session.scalars(stmt),
+            session.scalars(stmt), key=lambda user_id: guild.get_member(user_id).display_name.lower()
-            # Unsure how to None check in the lambda.
-            key=lambda user_id: guild.get_member(user_id).display_name.lower(),  # pyright: ignore[reportOptionalMemberAccess]
         )
 
         council_members_strs = [

uv.lock

@@ -1,651 +0,0 @@
-version = 1
-requires-python = ">=3.13, <4.0"
-
-[[package]]
-name = "aiofiles"
-version = "23.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641/aiofiles-23.2.1.tar.gz", hash = "sha256:84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a", size = 32072 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/c5/19/5af6804c4cc0fed83f47bff6e413a98a36618e7d40185cd36e69737f3b0e/aiofiles-23.2.1-py3-none-any.whl", hash = "sha256:19297512c647d4b27a2cf7c34caa7e405c0d60b5560618a29a9fe027b18b0107", size = 15727 },
-]
-
-[[package]]
-name = "aiohappyeyeballs"
-version = "2.4.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/7f/55/e4373e888fdacb15563ef6fa9fa8c8252476ea071e96fb46defac9f18bf2/aiohappyeyeballs-2.4.4.tar.gz", hash = "sha256:5fdd7d87889c63183afc18ce9271f9b0a7d32c2303e394468dd45d514a757745", size = 21977 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b9/74/fbb6559de3607b3300b9be3cc64e97548d55678e44623db17820dbd20002/aiohappyeyeballs-2.4.4-py3-none-any.whl", hash = "sha256:a980909d50efcd44795c4afeca523296716d50cd756ddca6af8c65b996e27de8", size = 14756 },
-]
-
-[[package]]
-name = "aiohttp"
-version = "3.11.11"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "aiohappyeyeballs" },
-    { name = "aiosignal" },
-    { name = "attrs" },
-    { name = "frozenlist" },
-    { name = "multidict" },
-    { name = "propcache" },
-    { name = "yarl" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/fe/ed/f26db39d29cd3cb2f5a3374304c713fe5ab5a0e4c8ee25a0c45cc6adf844/aiohttp-3.11.11.tar.gz", hash = "sha256:bb49c7f1e6ebf3821a42d81d494f538107610c3a705987f53068546b0e90303e", size = 7669618 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/49/d1/d8af164f400bad432b63e1ac857d74a09311a8334b0481f2f64b158b50eb/aiohttp-3.11.11-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:541d823548ab69d13d23730a06f97460f4238ad2e5ed966aaf850d7c369782d9", size = 697982 },
-    { url = "https://files.pythonhosted.org/packages/92/d1/faad3bf9fa4bfd26b95c69fc2e98937d52b1ff44f7e28131855a98d23a17/aiohttp-3.11.11-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:929f3ed33743a49ab127c58c3e0a827de0664bfcda566108989a14068f820194", size = 460662 },
-    { url = "https://files.pythonhosted.org/packages/db/61/0d71cc66d63909dabc4590f74eba71f91873a77ea52424401c2498d47536/aiohttp-3.11.11-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0882c2820fd0132240edbb4a51eb8ceb6eef8181db9ad5291ab3332e0d71df5f", size = 452950 },
-    { url = "https://files.pythonhosted.org/packages/07/db/6d04bc7fd92784900704e16b745484ef45b77bd04e25f58f6febaadf7983/aiohttp-3.11.11-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b63de12e44935d5aca7ed7ed98a255a11e5cb47f83a9fded7a5e41c40277d104", size = 1665178 },
-    { url = "https://files.pythonhosted.org/packages/54/5c/e95ade9ae29f375411884d9fd98e50535bf9fe316c9feb0f30cd2ac8f508/aiohttp-3.11.11-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa54f8ef31d23c506910c21163f22b124facb573bff73930735cf9fe38bf7dff", size = 1717939 },
-    { url = "https://files.pythonhosted.org/packages/6f/1c/1e7d5c5daea9e409ed70f7986001b8c9e3a49a50b28404498d30860edab6/aiohttp-3.11.11-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a344d5dc18074e3872777b62f5f7d584ae4344cd6006c17ba12103759d407af3", size = 1775125 },
-    { url = "https://files.pythonhosted.org/packages/5d/66/890987e44f7d2f33a130e37e01a164168e6aff06fce15217b6eaf14df4f6/aiohttp-3.11.11-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b7fb429ab1aafa1f48578eb315ca45bd46e9c37de11fe45c7f5f4138091e2f1", size = 1677176 },
-    { url = "https://files.pythonhosted.org/packages/8f/dc/e2ba57d7a52df6cdf1072fd5fa9c6301a68e1cd67415f189805d3eeb031d/aiohttp-3.11.11-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c341c7d868750e31961d6d8e60ff040fb9d3d3a46d77fd85e1ab8e76c3e9a5c4", size = 1603192 },
-    { url = "https://files.pythonhosted.org/packages/6c/9e/8d08a57de79ca3a358da449405555e668f2c8871a7777ecd2f0e3912c272/aiohttp-3.11.11-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ed9ee95614a71e87f1a70bc81603f6c6760128b140bc4030abe6abaa988f1c3d", size = 1618296 },
-    { url = "https://files.pythonhosted.org/packages/56/51/89822e3ec72db352c32e7fc1c690370e24e231837d9abd056490f3a49886/aiohttp-3.11.11-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:de8d38f1c2810fa2a4f1d995a2e9c70bb8737b18da04ac2afbf3971f65781d87", size = 1616524 },
-    { url = "https://files.pythonhosted.org/packages/2c/fa/e2e6d9398f462ffaa095e84717c1732916a57f1814502929ed67dd7568ef/aiohttp-3.11.11-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:a9b7371665d4f00deb8f32208c7c5e652059b0fda41cf6dbcac6114a041f1cc2", size = 1685471 },
-    { url = "https://files.pythonhosted.org/packages/ae/5f/6bb976e619ca28a052e2c0ca7b0251ccd893f93d7c24a96abea38e332bf6/aiohttp-3.11.11-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:620598717fce1b3bd14dd09947ea53e1ad510317c85dda2c9c65b622edc96b12", size = 1715312 },
-    { url = "https://files.pythonhosted.org/packages/79/c1/756a7e65aa087c7fac724d6c4c038f2faaa2a42fe56dbc1dd62a33ca7213/aiohttp-3.11.11-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:bf8d9bfee991d8acc72d060d53860f356e07a50f0e0d09a8dfedea1c554dd0d5", size = 1672783 },
-    { url = "https://files.pythonhosted.org/packages/73/ba/a6190ebb02176c7f75e6308da31f5d49f6477b651a3dcfaaaca865a298e2/aiohttp-3.11.11-cp313-cp313-win32.whl", hash = "sha256:9d73ee3725b7a737ad86c2eac5c57a4a97793d9f442599bea5ec67ac9f4bdc3d", size = 410229 },
-    { url = "https://files.pythonhosted.org/packages/b8/62/c9fa5bafe03186a0e4699150a7fed9b1e73240996d0d2f0e5f70f3fdf471/aiohttp-3.11.11-cp313-cp313-win_amd64.whl", hash = "sha256:c7a06301c2fb096bdb0bd25fe2011531c1453b9f2c163c8031600ec73af1cc99", size = 436081 },
-]
-
-[[package]]
-name = "aiosignal"
-version = "1.3.2"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "frozenlist" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/ba/b5/6d55e80f6d8a08ce22b982eafa278d823b541c925f11ee774b0b9c43473d/aiosignal-1.3.2.tar.gz", hash = "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54", size = 19424 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ec/6a/bc7e17a3e87a2985d3e8f4da4cd0f481060eb78fb08596c42be62c90a4d9/aiosignal-1.3.2-py2.py3-none-any.whl", hash = "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5", size = 7597 },
-]
-
-[[package]]
-name = "annotated-types"
-version = "0.7.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643 },
-]
-
-[[package]]
-name = "anyio"
-version = "4.7.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "idna" },
-    { name = "sniffio" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/f6/40/318e58f669b1a9e00f5c4453910682e2d9dd594334539c7b7817dabb765f/anyio-4.7.0.tar.gz", hash = "sha256:2f834749c602966b7d456a7567cafcb309f96482b5081d14ac93ccd457f9dd48", size = 177076 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a0/7a/4daaf3b6c08ad7ceffea4634ec206faeff697526421c20f07628c7372156/anyio-4.7.0-py3-none-any.whl", hash = "sha256:ea60c3723ab42ba6fff7e8ccb0488c898ec538ff4df1f1d5e642c3601d07e352", size = 93052 },
-]
-
-[[package]]
-name = "attrs"
-version = "24.3.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/48/c8/6260f8ccc11f0917360fc0da435c5c9c7504e3db174d5a12a1494887b045/attrs-24.3.0.tar.gz", hash = "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff", size = 805984 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/89/aa/ab0f7891a01eeb2d2e338ae8fecbe57fcebea1a24dbb64d45801bfab481d/attrs-24.3.0-py3-none-any.whl", hash = "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308", size = 63397 },
-]
-
-[[package]]
-name = "audioop-lts"
-version = "0.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/dd/3b/69ff8a885e4c1c42014c2765275c4bd91fe7bc9847e9d8543dbcbb09f820/audioop_lts-0.2.1.tar.gz", hash = "sha256:e81268da0baa880431b68b1308ab7257eb33f356e57a5f9b1f915dfb13dd1387", size = 30204 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/01/91/a219253cc6e92db2ebeaf5cf8197f71d995df6f6b16091d1f3ce62cb169d/audioop_lts-0.2.1-cp313-abi3-macosx_10_13_universal2.whl", hash = "sha256:fd1345ae99e17e6910f47ce7d52673c6a1a70820d78b67de1b7abb3af29c426a", size = 46252 },
-    { url = "https://files.pythonhosted.org/packages/ec/f6/3cb21e0accd9e112d27cee3b1477cd04dafe88675c54ad8b0d56226c1e0b/audioop_lts-0.2.1-cp313-abi3-macosx_10_13_x86_64.whl", hash = "sha256:e175350da05d2087e12cea8e72a70a1a8b14a17e92ed2022952a4419689ede5e", size = 27183 },
-    { url = "https://files.pythonhosted.org/packages/ea/7e/f94c8a6a8b2571694375b4cf94d3e5e0f529e8e6ba280fad4d8c70621f27/audioop_lts-0.2.1-cp313-abi3-macosx_11_0_arm64.whl", hash = "sha256:4a8dd6a81770f6ecf019c4b6d659e000dc26571b273953cef7cd1d5ce2ff3ae6", size = 26726 },
-    { url = "https://files.pythonhosted.org/packages/ef/f8/a0e8e7a033b03fae2b16bc5aa48100b461c4f3a8a38af56d5ad579924a3a/audioop_lts-0.2.1-cp313-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1cd3c0b6f2ca25c7d2b1c3adeecbe23e65689839ba73331ebc7d893fcda7ffe", size = 80718 },
-    { url = "https://files.pythonhosted.org/packages/8f/ea/a98ebd4ed631c93b8b8f2368862cd8084d75c77a697248c24437c36a6f7e/audioop_lts-0.2.1-cp313-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff3f97b3372c97782e9c6d3d7fdbe83bce8f70de719605bd7ee1839cd1ab360a", size = 88326 },
-    { url = "https://files.pythonhosted.org/packages/33/79/e97a9f9daac0982aa92db1199339bd393594d9a4196ad95ae088635a105f/audioop_lts-0.2.1-cp313-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a351af79edefc2a1bd2234bfd8b339935f389209943043913a919df4b0f13300", size = 80539 },
-    { url = "https://files.pythonhosted.org/packages/b2/d3/1051d80e6f2d6f4773f90c07e73743a1e19fcd31af58ff4e8ef0375d3a80/audioop_lts-0.2.1-cp313-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aeb6f96f7f6da80354330470b9134d81b4cf544cdd1c549f2f45fe964d28059", size = 78577 },
-    { url = "https://files.pythonhosted.org/packages/7a/1d/54f4c58bae8dc8c64a75071c7e98e105ddaca35449376fcb0180f6e3c9df/audioop_lts-0.2.1-cp313-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c589f06407e8340e81962575fcffbba1e92671879a221186c3d4662de9fe804e", size = 82074 },
-    { url = "https://files.pythonhosted.org/packages/36/89/2e78daa7cebbea57e72c0e1927413be4db675548a537cfba6a19040d52fa/audioop_lts-0.2.1-cp313-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fbae5d6925d7c26e712f0beda5ed69ebb40e14212c185d129b8dfbfcc335eb48", size = 84210 },
-    { url = "https://files.pythonhosted.org/packages/a5/57/3ff8a74df2ec2fa6d2ae06ac86e4a27d6412dbb7d0e0d41024222744c7e0/audioop_lts-0.2.1-cp313-abi3-musllinux_1_2_i686.whl", hash = "sha256:d2d5434717f33117f29b5691fbdf142d36573d751716249a288fbb96ba26a281", size = 85664 },
-    { url = "https://files.pythonhosted.org/packages/16/01/21cc4e5878f6edbc8e54be4c108d7cb9cb6202313cfe98e4ece6064580dd/audioop_lts-0.2.1-cp313-abi3-musllinux_1_2_ppc64le.whl", hash = "sha256:f626a01c0a186b08f7ff61431c01c055961ee28769591efa8800beadd27a2959", size = 93255 },
-    { url = "https://files.pythonhosted.org/packages/3e/28/7f7418c362a899ac3b0bf13b1fde2d4ffccfdeb6a859abd26f2d142a1d58/audioop_lts-0.2.1-cp313-abi3-musllinux_1_2_s390x.whl", hash = "sha256:05da64e73837f88ee5c6217d732d2584cf638003ac72df124740460531e95e47", size = 87760 },
-    { url = "https://files.pythonhosted.org/packages/6d/d8/577a8be87dc7dd2ba568895045cee7d32e81d85a7e44a29000fe02c4d9d4/audioop_lts-0.2.1-cp313-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:56b7a0a4dba8e353436f31a932f3045d108a67b5943b30f85a5563f4d8488d77", size = 84992 },
-    { url = "https://files.pythonhosted.org/packages/ef/9a/4699b0c4fcf89936d2bfb5425f55f1a8b86dff4237cfcc104946c9cd9858/audioop_lts-0.2.1-cp313-abi3-win32.whl", hash = "sha256:6e899eb8874dc2413b11926b5fb3857ec0ab55222840e38016a6ba2ea9b7d5e3", size = 26059 },
-    { url = "https://files.pythonhosted.org/packages/3a/1c/1f88e9c5dd4785a547ce5fd1eb83fff832c00cc0e15c04c1119b02582d06/audioop_lts-0.2.1-cp313-abi3-win_amd64.whl", hash = "sha256:64562c5c771fb0a8b6262829b9b4f37a7b886c01b4d3ecdbae1d629717db08b4", size = 30412 },
-    { url = "https://files.pythonhosted.org/packages/c4/e9/c123fd29d89a6402ad261516f848437472ccc602abb59bba522af45e281b/audioop_lts-0.2.1-cp313-abi3-win_arm64.whl", hash = "sha256:c45317debeb64002e980077642afbd977773a25fa3dfd7ed0c84dccfc1fafcb0", size = 23578 },
-    { url = "https://files.pythonhosted.org/packages/7a/99/bb664a99561fd4266687e5cb8965e6ec31ba4ff7002c3fce3dc5ef2709db/audioop_lts-0.2.1-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:3827e3fce6fee4d69d96a3d00cd2ab07f3c0d844cb1e44e26f719b34a5b15455", size = 46827 },
-    { url = "https://files.pythonhosted.org/packages/c4/e3/f664171e867e0768ab982715e744430cf323f1282eb2e11ebfb6ee4c4551/audioop_lts-0.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:161249db9343b3c9780ca92c0be0d1ccbfecdbccac6844f3d0d44b9c4a00a17f", size = 27479 },
-    { url = "https://files.pythonhosted.org/packages/a6/0d/2a79231ff54eb20e83b47e7610462ad6a2bea4e113fae5aa91c6547e7764/audioop_lts-0.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:5b7b4ff9de7a44e0ad2618afdc2ac920b91f4a6d3509520ee65339d4acde5abf", size = 27056 },
-    { url = "https://files.pythonhosted.org/packages/86/46/342471398283bb0634f5a6df947806a423ba74b2e29e250c7ec0e3720e4f/audioop_lts-0.2.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:72e37f416adb43b0ced93419de0122b42753ee74e87070777b53c5d2241e7fab", size = 87802 },
-    { url = "https://files.pythonhosted.org/packages/56/44/7a85b08d4ed55517634ff19ddfbd0af05bf8bfd39a204e4445cd0e6f0cc9/audioop_lts-0.2.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:534ce808e6bab6adb65548723c8cbe189a3379245db89b9d555c4210b4aaa9b6", size = 95016 },
-    { url = "https://files.pythonhosted.org/packages/a8/2a/45edbca97ea9ee9e6bbbdb8d25613a36e16a4d1e14ae01557392f15cc8d3/audioop_lts-0.2.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2de9b6fb8b1cf9f03990b299a9112bfdf8b86b6987003ca9e8a6c4f56d39543", size = 87394 },
-    { url = "https://files.pythonhosted.org/packages/14/ae/832bcbbef2c510629593bf46739374174606e25ac7d106b08d396b74c964/audioop_lts-0.2.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f24865991b5ed4b038add5edbf424639d1358144f4e2a3e7a84bc6ba23e35074", size = 84874 },
-    { url = "https://files.pythonhosted.org/packages/26/1c/8023c3490798ed2f90dfe58ec3b26d7520a243ae9c0fc751ed3c9d8dbb69/audioop_lts-0.2.1-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bdb3b7912ccd57ea53197943f1bbc67262dcf29802c4a6df79ec1c715d45a78", size = 88698 },
-    { url = "https://files.pythonhosted.org/packages/2c/db/5379d953d4918278b1f04a5a64b2c112bd7aae8f81021009da0dcb77173c/audioop_lts-0.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:120678b208cca1158f0a12d667af592e067f7a50df9adc4dc8f6ad8d065a93fb", size = 90401 },
-    { url = "https://files.pythonhosted.org/packages/99/6e/3c45d316705ab1aec2e69543a5b5e458d0d112a93d08994347fafef03d50/audioop_lts-0.2.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:54cd4520fc830b23c7d223693ed3e1b4d464997dd3abc7c15dce9a1f9bd76ab2", size = 91864 },
-    { url = "https://files.pythonhosted.org/packages/08/58/6a371d8fed4f34debdb532c0b00942a84ebf3e7ad368e5edc26931d0e251/audioop_lts-0.2.1-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:d6bd20c7a10abcb0fb3d8aaa7508c0bf3d40dfad7515c572014da4b979d3310a", size = 98796 },
-    { url = "https://files.pythonhosted.org/packages/ee/77/d637aa35497e0034ff846fd3330d1db26bc6fd9dd79c406e1341188b06a2/audioop_lts-0.2.1-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:f0ed1ad9bd862539ea875fb339ecb18fcc4148f8d9908f4502df28f94d23491a", size = 94116 },
-    { url = "https://files.pythonhosted.org/packages/1a/60/7afc2abf46bbcf525a6ebc0305d85ab08dc2d1e2da72c48dbb35eee5b62c/audioop_lts-0.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:e1af3ff32b8c38a7d900382646e91f2fc515fd19dea37e9392275a5cbfdbff63", size = 91520 },
-    { url = "https://files.pythonhosted.org/packages/65/6d/42d40da100be1afb661fd77c2b1c0dfab08af1540df57533621aea3db52a/audioop_lts-0.2.1-cp313-cp313t-win32.whl", hash = "sha256:f51bb55122a89f7a0817d7ac2319744b4640b5b446c4c3efcea5764ea99ae509", size = 26482 },
-    { url = "https://files.pythonhosted.org/packages/01/09/f08494dca79f65212f5b273aecc5a2f96691bf3307cac29acfcf84300c01/audioop_lts-0.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:f0f2f336aa2aee2bce0b0dcc32bbba9178995454c7b979cf6ce086a8801e14c7", size = 30780 },
-    { url = "https://files.pythonhosted.org/packages/5d/35/be73b6015511aa0173ec595fc579133b797ad532996f2998fd6b8d1bbe6b/audioop_lts-0.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:78bfb3703388c780edf900be66e07de5a3d4105ca8e8720c5c4d67927e0b15d0", size = 23918 },
-]
-
-[[package]]
-name = "click"
-version = "8.1.8"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "colorama", marker = "sys_platform == 'win32'" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188 },
-]
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335 },
-]
-
-[[package]]
-name = "dakiny-bot"
-version = "0.1.0"
-source = { virtual = "." }
-dependencies = [
-    { name = "aiofiles" },
-    { name = "audioop-lts" },
-    { name = "dataclass-wizard", extra = ["yaml"] },
-    { name = "fastapi" },
-    { name = "gitpython" },
-    { name = "nextcord" },
-    { name = "pandas" },
-    { name = "pytz" },
-    { name = "setuptools" },
-    { name = "sqlalchemy" },
-    { name = "sqlmodel" },
-    { name = "uvicorn" },
-]
-
-[package.dev-dependencies]
-dev = [
-    { name = "ruff" },
-]
-
-[package.metadata]
-requires-dist = [
-    { name = "aiofiles", specifier = ">=23.2.1,<24.0.0" },
-    { name = "audioop-lts", specifier = ">=0.2.1" },
-    { name = "dataclass-wizard", extras = ["yaml"], specifier = ">=0.22.3,<1.0.0" },
-    { name = "fastapi", specifier = ">=0.111.0,<1.0.0" },
-    { name = "gitpython", specifier = ">=3.1.43,<4.0.0" },
-    { name = "nextcord", specifier = ">=2.6.0,<3.0.0" },
-    { name = "pandas", specifier = ">=2.2.2,<3.0.0" },
-    { name = "pytz", specifier = ">=2025.2,<2025.3" },
-    { name = "setuptools", specifier = ">=80.9.0,<80.9.1" },
-    { name = "sqlalchemy", specifier = ">=2.0.30,<3.0.0" },
-    { name = "sqlmodel", specifier = ">=0.0.24" },
-    { name = "uvicorn", specifier = ">=0.34.0" },
-]
-
-[package.metadata.requires-dev]
-dev = [{ name = "ruff", specifier = ">=0.6.9,<1.0.0" }]
-
-[[package]]
-name = "dataclass-wizard"
-version = "0.33.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0a/2a/6ae6638cd5ca919b73d393cdb4a4e53c8c3dcacc003a79d9480ecad46798/dataclass-wizard-0.33.0.tar.gz", hash = "sha256:10edbac626c390ed1f3be4f972303bc2c25c162fd453d55adfe22b05b263ee6d", size = 269911 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f8/e6/fa8b6615f988a271b1ab990f0086f90c936608762f02d02db9164cfd7ff9/dataclass_wizard-0.33.0-py2.py3-none-any.whl", hash = "sha256:d257d65a707f6ea76140ad5442189ffe6fc68e1d678dc6b3fa25754e3106160d", size = 164545 },
-]
-
-[package.optional-dependencies]
-yaml = [
-    { name = "pyyaml" },
-]
-
-[[package]]
-name = "fastapi"
-version = "0.115.6"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "pydantic" },
-    { name = "starlette" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/93/72/d83b98cd106541e8f5e5bfab8ef2974ab45a62e8a6c5b5e6940f26d2ed4b/fastapi-0.115.6.tar.gz", hash = "sha256:9ec46f7addc14ea472958a96aae5b5de65f39721a46aaf5705c480d9a8b76654", size = 301336 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/52/b3/7e4df40e585df024fac2f80d1a2d579c854ac37109675db2b0cc22c0bb9e/fastapi-0.115.6-py3-none-any.whl", hash = "sha256:e9240b29e36fa8f4bb7290316988e90c381e5092e0cbe84e7818cc3713bcf305", size = 94843 },
-]
-
-[[package]]
-name = "frozenlist"
-version = "1.5.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/8f/ed/0f4cec13a93c02c47ec32d81d11c0c1efbadf4a471e3f3ce7cad366cbbd3/frozenlist-1.5.0.tar.gz", hash = "sha256:81d5af29e61b9c8348e876d442253723928dce6433e0e76cd925cd83f1b4b817", size = 39930 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/3b/915f0bca8a7ea04483622e84a9bd90033bab54bdf485479556c74fd5eaf5/frozenlist-1.5.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7a1a048f9215c90973402e26c01d1cff8a209e1f1b53f72b95c13db61b00f953", size = 91538 },
-    { url = "https://files.pythonhosted.org/packages/c7/d1/a7c98aad7e44afe5306a2b068434a5830f1470675f0e715abb86eb15f15b/frozenlist-1.5.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:dd47a5181ce5fcb463b5d9e17ecfdb02b678cca31280639255ce9d0e5aa67af0", size = 52849 },
-    { url = "https://files.pythonhosted.org/packages/3a/c8/76f23bf9ab15d5f760eb48701909645f686f9c64fbb8982674c241fbef14/frozenlist-1.5.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1431d60b36d15cda188ea222033eec8e0eab488f39a272461f2e6d9e1a8e63c2", size = 50583 },
-    { url = "https://files.pythonhosted.org/packages/1f/22/462a3dd093d11df623179d7754a3b3269de3b42de2808cddef50ee0f4f48/frozenlist-1.5.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6482a5851f5d72767fbd0e507e80737f9c8646ae7fd303def99bfe813f76cf7f", size = 265636 },
-    { url = "https://files.pythonhosted.org/packages/80/cf/e075e407fc2ae7328155a1cd7e22f932773c8073c1fc78016607d19cc3e5/frozenlist-1.5.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:44c49271a937625619e862baacbd037a7ef86dd1ee215afc298a417ff3270608", size = 270214 },
-    { url = "https://files.pythonhosted.org/packages/a1/58/0642d061d5de779f39c50cbb00df49682832923f3d2ebfb0fedf02d05f7f/frozenlist-1.5.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:12f78f98c2f1c2429d42e6a485f433722b0061d5c0b0139efa64f396efb5886b", size = 273905 },
-    { url = "https://files.pythonhosted.org/packages/ab/66/3fe0f5f8f2add5b4ab7aa4e199f767fd3b55da26e3ca4ce2cc36698e50c4/frozenlist-1.5.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce3aa154c452d2467487765e3adc730a8c153af77ad84096bc19ce19a2400840", size = 250542 },
-    { url = "https://files.pythonhosted.org/packages/f6/b8/260791bde9198c87a465224e0e2bb62c4e716f5d198fc3a1dacc4895dbd1/frozenlist-1.5.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9b7dc0c4338e6b8b091e8faf0db3168a37101943e687f373dce00959583f7439", size = 267026 },
-    { url = "https://files.pythonhosted.org/packages/2e/a4/3d24f88c527f08f8d44ade24eaee83b2627793fa62fa07cbb7ff7a2f7d42/frozenlist-1.5.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:45e0896250900b5aa25180f9aec243e84e92ac84bd4a74d9ad4138ef3f5c97de", size = 257690 },
-    { url = "https://files.pythonhosted.org/packages/de/9a/d311d660420b2beeff3459b6626f2ab4fb236d07afbdac034a4371fe696e/frozenlist-1.5.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:561eb1c9579d495fddb6da8959fd2a1fca2c6d060d4113f5844b433fc02f2641", size = 253893 },
-    { url = "https://files.pythonhosted.org/packages/c6/23/e491aadc25b56eabd0f18c53bb19f3cdc6de30b2129ee0bc39cd387cd560/frozenlist-1.5.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:df6e2f325bfee1f49f81aaac97d2aa757c7646534a06f8f577ce184afe2f0a9e", size = 267006 },
-    { url = "https://files.pythonhosted.org/packages/08/c4/ab918ce636a35fb974d13d666dcbe03969592aeca6c3ab3835acff01f79c/frozenlist-1.5.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:140228863501b44b809fb39ec56b5d4071f4d0aa6d216c19cbb08b8c5a7eadb9", size = 276157 },
-    { url = "https://files.pythonhosted.org/packages/c0/29/3b7a0bbbbe5a34833ba26f686aabfe982924adbdcafdc294a7a129c31688/frozenlist-1.5.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7707a25d6a77f5d27ea7dc7d1fc608aa0a478193823f88511ef5e6b8a48f9d03", size = 264642 },
-    { url = "https://files.pythonhosted.org/packages/ab/42/0595b3dbffc2e82d7fe658c12d5a5bafcd7516c6bf2d1d1feb5387caa9c1/frozenlist-1.5.0-cp313-cp313-win32.whl", hash = "sha256:31a9ac2b38ab9b5a8933b693db4939764ad3f299fcaa931a3e605bc3460e693c", size = 44914 },
-    { url = "https://files.pythonhosted.org/packages/17/c4/b7db1206a3fea44bf3b838ca61deb6f74424a8a5db1dd53ecb21da669be6/frozenlist-1.5.0-cp313-cp313-win_amd64.whl", hash = "sha256:11aabdd62b8b9c4b84081a3c246506d1cddd2dd93ff0ad53ede5defec7886b28", size = 51167 },
-    { url = "https://files.pythonhosted.org/packages/c6/c8/a5be5b7550c10858fcf9b0ea054baccab474da77d37f1e828ce043a3a5d4/frozenlist-1.5.0-py3-none-any.whl", hash = "sha256:d994863bba198a4a518b467bb971c56e1db3f180a25c6cf7bb1949c267f748c3", size = 11901 },
-]
-
-[[package]]
-name = "gitdb"
-version = "4.0.11"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "smmap" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/19/0d/bbb5b5ee188dec84647a4664f3e11b06ade2bde568dbd489d9d64adef8ed/gitdb-4.0.11.tar.gz", hash = "sha256:bf5421126136d6d0af55bc1e7c1af1c397a34f5b7bd79e776cd3e89785c2b04b", size = 394469 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/fd/5b/8f0c4a5bb9fd491c277c21eff7ccae71b47d43c4446c9d0c6cff2fe8c2c4/gitdb-4.0.11-py3-none-any.whl", hash = "sha256:81a3407ddd2ee8df444cbacea00e2d038e40150acfa3001696fe0dcf1d3adfa4", size = 62721 },
-]
-
-[[package]]
-name = "gitpython"
-version = "3.1.43"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "gitdb" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b6/a1/106fd9fa2dd989b6fb36e5893961f82992cf676381707253e0bf93eb1662/GitPython-3.1.43.tar.gz", hash = "sha256:35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c", size = 214149 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e9/bd/cc3a402a6439c15c3d4294333e13042b915bbeab54edc457c723931fed3f/GitPython-3.1.43-py3-none-any.whl", hash = "sha256:eec7ec56b92aad751f9912a73404bc02ba212a23adb2c7098ee668417051a1ff", size = 207337 },
-]
-
-[[package]]
-name = "h11"
-version = "0.14.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03/h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d", size = 100418 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/95/04/ff642e65ad6b90db43e668d70ffb6736436c7ce41fcc549f4e9472234127/h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761", size = 58259 },
-]
-
-[[package]]
-name = "idna"
-version = "3.10"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442 },
-]
-
-[[package]]
-name = "multidict"
-version = "6.1.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d6/be/504b89a5e9ca731cd47487e91c469064f8ae5af93b7259758dcfc2b9c848/multidict-6.1.0.tar.gz", hash = "sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a", size = 64002 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/22/67/1c7c0f39fe069aa4e5d794f323be24bf4d33d62d2a348acdb7991f8f30db/multidict-6.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008", size = 48771 },
-    { url = "https://files.pythonhosted.org/packages/3c/25/c186ee7b212bdf0df2519eacfb1981a017bda34392c67542c274651daf23/multidict-6.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f", size = 29533 },
-    { url = "https://files.pythonhosted.org/packages/67/5e/04575fd837e0958e324ca035b339cea174554f6f641d3fb2b4f2e7ff44a2/multidict-6.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28", size = 29595 },
-    { url = "https://files.pythonhosted.org/packages/d3/b2/e56388f86663810c07cfe4a3c3d87227f3811eeb2d08450b9e5d19d78876/multidict-6.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b", size = 130094 },
-    { url = "https://files.pythonhosted.org/packages/6c/ee/30ae9b4186a644d284543d55d491fbd4239b015d36b23fea43b4c94f7052/multidict-6.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c", size = 134876 },
-    { url = "https://files.pythonhosted.org/packages/84/c7/70461c13ba8ce3c779503c70ec9d0345ae84de04521c1f45a04d5f48943d/multidict-6.1.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3", size = 133500 },
-    { url = "https://files.pythonhosted.org/packages/4a/9f/002af221253f10f99959561123fae676148dd730e2daa2cd053846a58507/multidict-6.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44", size = 131099 },
-    { url = "https://files.pythonhosted.org/packages/82/42/d1c7a7301d52af79d88548a97e297f9d99c961ad76bbe6f67442bb77f097/multidict-6.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2", size = 120403 },
-    { url = "https://files.pythonhosted.org/packages/68/f3/471985c2c7ac707547553e8f37cff5158030d36bdec4414cb825fbaa5327/multidict-6.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3", size = 125348 },
-    { url = "https://files.pythonhosted.org/packages/67/2c/e6df05c77e0e433c214ec1d21ddd203d9a4770a1f2866a8ca40a545869a0/multidict-6.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa", size = 119673 },
-    { url = "https://files.pythonhosted.org/packages/c5/cd/bc8608fff06239c9fb333f9db7743a1b2eafe98c2666c9a196e867a3a0a4/multidict-6.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa", size = 129927 },
-    { url = "https://files.pythonhosted.org/packages/44/8e/281b69b7bc84fc963a44dc6e0bbcc7150e517b91df368a27834299a526ac/multidict-6.1.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4", size = 128711 },
-    { url = "https://files.pythonhosted.org/packages/12/a4/63e7cd38ed29dd9f1881d5119f272c898ca92536cdb53ffe0843197f6c85/multidict-6.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6", size = 125519 },
-    { url = "https://files.pythonhosted.org/packages/38/e0/4f5855037a72cd8a7a2f60a3952d9aa45feedb37ae7831642102604e8a37/multidict-6.1.0-cp313-cp313-win32.whl", hash = "sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81", size = 26426 },
-    { url = "https://files.pythonhosted.org/packages/7e/a5/17ee3a4db1e310b7405f5d25834460073a8ccd86198ce044dfaf69eac073/multidict-6.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774", size = 28531 },
-    { url = "https://files.pythonhosted.org/packages/99/b7/b9e70fde2c0f0c9af4cc5277782a89b66d35948ea3369ec9f598358c3ac5/multidict-6.1.0-py3-none-any.whl", hash = "sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506", size = 10051 },
-]
-
-[[package]]
-name = "nextcord"
-version = "2.6.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "aiohttp" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/f2/0e/347795cec6bc841ed426bc5e112380335869e9ba0922c5ed7ec7bb8ab1a5/nextcord-2.6.0.tar.gz", hash = "sha256:ccf461157be682cbceaa474e8df4afa302351b8d6ced632f9ccb7aa647b092e7", size = 932913 }
-
-[[package]]
-name = "numpy"
-version = "2.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f2/a5/fdbf6a7871703df6160b5cf3dd774074b086d278172285c52c2758b76305/numpy-2.2.1.tar.gz", hash = "sha256:45681fd7128c8ad1c379f0ca0776a8b0c6583d2f69889ddac01559dfe4390918", size = 20227662 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/20/d6/91a26e671c396e0c10e327b763485ee295f5a5a7a48c553f18417e5a0ed5/numpy-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f1d09e520217618e76396377c81fba6f290d5f926f50c35f3a5f72b01a0da780", size = 20896464 },
-    { url = "https://files.pythonhosted.org/packages/8c/40/5792ccccd91d45e87d9e00033abc4f6ca8a828467b193f711139ff1f1cd9/numpy-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3ecc47cd7f6ea0336042be87d9e7da378e5c7e9b3c8ad0f7c966f714fc10d821", size = 14111350 },
-    { url = "https://files.pythonhosted.org/packages/c0/2a/fb0a27f846cb857cef0c4c92bef89f133a3a1abb4e16bba1c4dace2e9b49/numpy-2.2.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:f419290bc8968a46c4933158c91a0012b7a99bb2e465d5ef5293879742f8797e", size = 5111629 },
-    { url = "https://files.pythonhosted.org/packages/eb/e5/8e81bb9d84db88b047baf4e8b681a3e48d6390bc4d4e4453eca428ecbb49/numpy-2.2.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:5b6c390bfaef8c45a260554888966618328d30e72173697e5cabe6b285fb2348", size = 6645865 },
-    { url = "https://files.pythonhosted.org/packages/7a/1a/a90ceb191dd2f9e2897c69dde93ccc2d57dd21ce2acbd7b0333e8eea4e8d/numpy-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:526fc406ab991a340744aad7e25251dd47a6720a685fa3331e5c59fef5282a59", size = 14043508 },
-    { url = "https://files.pythonhosted.org/packages/f1/5a/e572284c86a59dec0871a49cd4e5351e20b9c751399d5f1d79628c0542cb/numpy-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f74e6fdeb9a265624ec3a3918430205dff1df7e95a230779746a6af78bc615af", size = 16094100 },
-    { url = "https://files.pythonhosted.org/packages/0c/2c/a79d24f364788386d85899dd280a94f30b0950be4b4a545f4fa4ed1d4ca7/numpy-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:53c09385ff0b72ba79d8715683c1168c12e0b6e84fb0372e97553d1ea91efe51", size = 15239691 },
-    { url = "https://files.pythonhosted.org/packages/cf/79/1e20fd1c9ce5a932111f964b544facc5bb9bde7865f5b42f00b4a6a9192b/numpy-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f3eac17d9ec51be534685ba877b6ab5edc3ab7ec95c8f163e5d7b39859524716", size = 17856571 },
-    { url = "https://files.pythonhosted.org/packages/be/5b/cc155e107f75d694f562bdc84a26cc930569f3dfdfbccb3420b626065777/numpy-2.2.1-cp313-cp313-win32.whl", hash = "sha256:9ad014faa93dbb52c80d8f4d3dcf855865c876c9660cb9bd7553843dd03a4b1e", size = 6270841 },
-    { url = "https://files.pythonhosted.org/packages/44/be/0e5cd009d2162e4138d79a5afb3b5d2341f0fe4777ab6e675aa3d4a42e21/numpy-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:164a829b6aacf79ca47ba4814b130c4020b202522a93d7bff2202bfb33b61c60", size = 12606618 },
-    { url = "https://files.pythonhosted.org/packages/a8/87/04ddf02dd86fb17c7485a5f87b605c4437966d53de1e3745d450343a6f56/numpy-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:4dfda918a13cc4f81e9118dea249e192ab167a0bb1966272d5503e39234d694e", size = 20921004 },
-    { url = "https://files.pythonhosted.org/packages/6e/3e/d0e9e32ab14005425d180ef950badf31b862f3839c5b927796648b11f88a/numpy-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:733585f9f4b62e9b3528dd1070ec4f52b8acf64215b60a845fa13ebd73cd0712", size = 14119910 },
-    { url = "https://files.pythonhosted.org/packages/b5/5b/aa2d1905b04a8fb681e08742bb79a7bddfc160c7ce8e1ff6d5c821be0236/numpy-2.2.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:89b16a18e7bba224ce5114db863e7029803c179979e1af6ad6a6b11f70545008", size = 5153612 },
-    { url = "https://files.pythonhosted.org/packages/ce/35/6831808028df0648d9b43c5df7e1051129aa0d562525bacb70019c5f5030/numpy-2.2.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:676f4eebf6b2d430300f1f4f4c2461685f8269f94c89698d832cdf9277f30b84", size = 6668401 },
-    { url = "https://files.pythonhosted.org/packages/b1/38/10ef509ad63a5946cc042f98d838daebfe7eaf45b9daaf13df2086b15ff9/numpy-2.2.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27f5cdf9f493b35f7e41e8368e7d7b4bbafaf9660cba53fb21d2cd174ec09631", size = 14014198 },
-    { url = "https://files.pythonhosted.org/packages/df/f8/c80968ae01df23e249ee0a4487fae55a4c0fe2f838dfe9cc907aa8aea0fa/numpy-2.2.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1ad395cf254c4fbb5b2132fee391f361a6e8c1adbd28f2cd8e79308a615fe9d", size = 16076211 },
-    { url = "https://files.pythonhosted.org/packages/09/69/05c169376016a0b614b432967ac46ff14269eaffab80040ec03ae1ae8e2c/numpy-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:08ef779aed40dbc52729d6ffe7dd51df85796a702afbf68a4f4e41fafdc8bda5", size = 15220266 },
-    { url = "https://files.pythonhosted.org/packages/f1/ff/94a4ce67ea909f41cf7ea712aebbe832dc67decad22944a1020bb398a5ee/numpy-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:26c9c4382b19fcfbbed3238a14abf7ff223890ea1936b8890f058e7ba35e8d71", size = 17852844 },
-    { url = "https://files.pythonhosted.org/packages/46/72/8a5dbce4020dfc595592333ef2fbb0a187d084ca243b67766d29d03e0096/numpy-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:93cf4e045bae74c90ca833cba583c14b62cb4ba2cba0abd2b141ab52548247e2", size = 6326007 },
-    { url = "https://files.pythonhosted.org/packages/7b/9c/4fce9cf39dde2562584e4cfd351a0140240f82c0e3569ce25a250f47037d/numpy-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:bff7d8ec20f5f42607599f9994770fa65d76edca264a87b5e4ea5629bce12268", size = 12693107 },
-]
-
-[[package]]
-name = "pandas"
-version = "2.2.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "numpy" },
-    { name = "python-dateutil" },
-    { name = "pytz" },
-    { name = "tzdata" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/9c/d6/9f8431bacc2e19dca897724cd097b1bb224a6ad5433784a44b587c7c13af/pandas-2.2.3.tar.gz", hash = "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667", size = 4399213 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/64/22/3b8f4e0ed70644e85cfdcd57454686b9057c6c38d2f74fe4b8bc2527214a/pandas-2.2.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015", size = 12477643 },
-    { url = "https://files.pythonhosted.org/packages/e4/93/b3f5d1838500e22c8d793625da672f3eec046b1a99257666c94446969282/pandas-2.2.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28", size = 11281573 },
-    { url = "https://files.pythonhosted.org/packages/f5/94/6c79b07f0e5aab1dcfa35a75f4817f5c4f677931d4234afcd75f0e6a66ca/pandas-2.2.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0", size = 15196085 },
-    { url = "https://files.pythonhosted.org/packages/e8/31/aa8da88ca0eadbabd0a639788a6da13bb2ff6edbbb9f29aa786450a30a91/pandas-2.2.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24", size = 12711809 },
-    { url = "https://files.pythonhosted.org/packages/ee/7c/c6dbdb0cb2a4344cacfb8de1c5808ca885b2e4dcfde8008266608f9372af/pandas-2.2.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659", size = 16356316 },
-    { url = "https://files.pythonhosted.org/packages/57/b7/8b757e7d92023b832869fa8881a992696a0bfe2e26f72c9ae9f255988d42/pandas-2.2.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb", size = 14022055 },
-    { url = "https://files.pythonhosted.org/packages/3b/bc/4b18e2b8c002572c5a441a64826252ce5da2aa738855747247a971988043/pandas-2.2.3-cp313-cp313-win_amd64.whl", hash = "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d", size = 11481175 },
-    { url = "https://files.pythonhosted.org/packages/76/a3/a5d88146815e972d40d19247b2c162e88213ef51c7c25993942c39dbf41d/pandas-2.2.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468", size = 12615650 },
-    { url = "https://files.pythonhosted.org/packages/9c/8c/f0fd18f6140ddafc0c24122c8a964e48294acc579d47def376fef12bcb4a/pandas-2.2.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18", size = 11290177 },
-    { url = "https://files.pythonhosted.org/packages/ed/f9/e995754eab9c0f14c6777401f7eece0943840b7a9fc932221c19d1abee9f/pandas-2.2.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2", size = 14651526 },
-    { url = "https://files.pythonhosted.org/packages/25/b0/98d6ae2e1abac4f35230aa756005e8654649d305df9a28b16b9ae4353bff/pandas-2.2.3-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4", size = 11871013 },
-    { url = "https://files.pythonhosted.org/packages/cc/57/0f72a10f9db6a4628744c8e8f0df4e6e21de01212c7c981d31e50ffc8328/pandas-2.2.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d", size = 15711620 },
-    { url = "https://files.pythonhosted.org/packages/ab/5f/b38085618b950b79d2d9164a711c52b10aefc0ae6833b96f626b7021b2ed/pandas-2.2.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a", size = 13098436 },
-]
-
-[[package]]
-name = "propcache"
-version = "0.2.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/20/c8/2a13f78d82211490855b2fb303b6721348d0787fdd9a12ac46d99d3acde1/propcache-0.2.1.tar.gz", hash = "sha256:3f77ce728b19cb537714499928fe800c3dda29e8d9428778fc7c186da4c09a64", size = 41735 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/0f/2a/329e0547cf2def8857157f9477669043e75524cc3e6251cef332b3ff256f/propcache-0.2.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:aca405706e0b0a44cc6bfd41fbe89919a6a56999157f6de7e182a990c36e37bc", size = 77002 },
-    { url = "https://files.pythonhosted.org/packages/12/2d/c4df5415e2382f840dc2ecbca0eeb2293024bc28e57a80392f2012b4708c/propcache-0.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:12d1083f001ace206fe34b6bdc2cb94be66d57a850866f0b908972f90996b3e9", size = 44639 },
-    { url = "https://files.pythonhosted.org/packages/d0/5a/21aaa4ea2f326edaa4e240959ac8b8386ea31dedfdaa636a3544d9e7a408/propcache-0.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d93f3307ad32a27bda2e88ec81134b823c240aa3abb55821a8da553eed8d9439", size = 44049 },
-    { url = "https://files.pythonhosted.org/packages/4e/3e/021b6cd86c0acc90d74784ccbb66808b0bd36067a1bf3e2deb0f3845f618/propcache-0.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba278acf14471d36316159c94a802933d10b6a1e117b8554fe0d0d9b75c9d536", size = 224819 },
-    { url = "https://files.pythonhosted.org/packages/3c/57/c2fdeed1b3b8918b1770a133ba5c43ad3d78e18285b0c06364861ef5cc38/propcache-0.2.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4e6281aedfca15301c41f74d7005e6e3f4ca143584ba696ac69df4f02f40d629", size = 229625 },
-    { url = "https://files.pythonhosted.org/packages/9d/81/70d4ff57bf2877b5780b466471bebf5892f851a7e2ca0ae7ffd728220281/propcache-0.2.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5b750a8e5a1262434fb1517ddf64b5de58327f1adc3524a5e44c2ca43305eb0b", size = 232934 },
-    { url = "https://files.pythonhosted.org/packages/3c/b9/bb51ea95d73b3fb4100cb95adbd4e1acaf2cbb1fd1083f5468eeb4a099a8/propcache-0.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf72af5e0fb40e9babf594308911436c8efde3cb5e75b6f206c34ad18be5c052", size = 227361 },
-    { url = "https://files.pythonhosted.org/packages/f1/20/3c6d696cd6fd70b29445960cc803b1851a1131e7a2e4ee261ee48e002bcd/propcache-0.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b2d0a12018b04f4cb820781ec0dffb5f7c7c1d2a5cd22bff7fb055a2cb19ebce", size = 213904 },
-    { url = "https://files.pythonhosted.org/packages/a1/cb/1593bfc5ac6d40c010fa823f128056d6bc25b667f5393781e37d62f12005/propcache-0.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e800776a79a5aabdb17dcc2346a7d66d0777e942e4cd251defeb084762ecd17d", size = 212632 },
-    { url = "https://files.pythonhosted.org/packages/6d/5c/e95617e222be14a34c709442a0ec179f3207f8a2b900273720501a70ec5e/propcache-0.2.1-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:4160d9283bd382fa6c0c2b5e017acc95bc183570cd70968b9202ad6d8fc48dce", size = 207897 },
-    { url = "https://files.pythonhosted.org/packages/8e/3b/56c5ab3dc00f6375fbcdeefdede5adf9bee94f1fab04adc8db118f0f9e25/propcache-0.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:30b43e74f1359353341a7adb783c8f1b1c676367b011709f466f42fda2045e95", size = 208118 },
-    { url = "https://files.pythonhosted.org/packages/86/25/d7ef738323fbc6ebcbce33eb2a19c5e07a89a3df2fded206065bd5e868a9/propcache-0.2.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:58791550b27d5488b1bb52bc96328456095d96206a250d28d874fafe11b3dfaf", size = 217851 },
-    { url = "https://files.pythonhosted.org/packages/b3/77/763e6cef1852cf1ba740590364ec50309b89d1c818e3256d3929eb92fabf/propcache-0.2.1-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:0f022d381747f0dfe27e99d928e31bc51a18b65bb9e481ae0af1380a6725dd1f", size = 222630 },
-    { url = "https://files.pythonhosted.org/packages/4f/e9/0f86be33602089c701696fbed8d8c4c07b6ee9605c5b7536fd27ed540c5b/propcache-0.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:297878dc9d0a334358f9b608b56d02e72899f3b8499fc6044133f0d319e2ec30", size = 216269 },
-    { url = "https://files.pythonhosted.org/packages/cc/02/5ac83217d522394b6a2e81a2e888167e7ca629ef6569a3f09852d6dcb01a/propcache-0.2.1-cp313-cp313-win32.whl", hash = "sha256:ddfab44e4489bd79bda09d84c430677fc7f0a4939a73d2bba3073036f487a0a6", size = 39472 },
-    { url = "https://files.pythonhosted.org/packages/f4/33/d6f5420252a36034bc8a3a01171bc55b4bff5df50d1c63d9caa50693662f/propcache-0.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:556fc6c10989f19a179e4321e5d678db8eb2924131e64652a51fe83e4c3db0e1", size = 43363 },
-    { url = "https://files.pythonhosted.org/packages/41/b6/c5319caea262f4821995dca2107483b94a3345d4607ad797c76cb9c36bcc/propcache-0.2.1-py3-none-any.whl", hash = "sha256:52277518d6aae65536e9cea52d4e7fd2f7a66f4aa2d30ed3f2fcea620ace3c54", size = 11818 },
-]
-
-[[package]]
-name = "pydantic"
-version = "2.10.4"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "annotated-types" },
-    { name = "pydantic-core" },
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/70/7e/fb60e6fee04d0ef8f15e4e01ff187a196fa976eb0f0ab524af4599e5754c/pydantic-2.10.4.tar.gz", hash = "sha256:82f12e9723da6de4fe2ba888b5971157b3be7ad914267dea8f05f82b28254f06", size = 762094 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/f3/26/3e1bbe954fde7ee22a6e7d31582c642aad9e84ffe4b5fb61e63b87cd326f/pydantic-2.10.4-py3-none-any.whl", hash = "sha256:597e135ea68be3a37552fb524bc7d0d66dcf93d395acd93a00682f1efcb8ee3d", size = 431765 },
-]
-
-[[package]]
-name = "pydantic-core"
-version = "2.27.2"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/fc/01/f3e5ac5e7c25833db5eb555f7b7ab24cd6f8c322d3a3ad2d67a952dc0abc/pydantic_core-2.27.2.tar.gz", hash = "sha256:eb026e5a4c1fee05726072337ff51d1efb6f59090b7da90d30ea58625b1ffb39", size = 413443 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/41/b1/9bc383f48f8002f99104e3acff6cba1231b29ef76cfa45d1506a5cad1f84/pydantic_core-2.27.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7d14bd329640e63852364c306f4d23eb744e0f8193148d4044dd3dacdaacbd8b", size = 1892709 },
-    { url = "https://files.pythonhosted.org/packages/10/6c/e62b8657b834f3eb2961b49ec8e301eb99946245e70bf42c8817350cbefc/pydantic_core-2.27.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:82f91663004eb8ed30ff478d77c4d1179b3563df6cdb15c0817cd1cdaf34d154", size = 1811273 },
-    { url = "https://files.pythonhosted.org/packages/ba/15/52cfe49c8c986e081b863b102d6b859d9defc63446b642ccbbb3742bf371/pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71b24c7d61131bb83df10cc7e687433609963a944ccf45190cfc21e0887b08c9", size = 1823027 },
-    { url = "https://files.pythonhosted.org/packages/b1/1c/b6f402cfc18ec0024120602bdbcebc7bdd5b856528c013bd4d13865ca473/pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fa8e459d4954f608fa26116118bb67f56b93b209c39b008277ace29937453dc9", size = 1868888 },
-    { url = "https://files.pythonhosted.org/packages/bd/7b/8cb75b66ac37bc2975a3b7de99f3c6f355fcc4d89820b61dffa8f1e81677/pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce8918cbebc8da707ba805b7fd0b382816858728ae7fe19a942080c24e5b7cd1", size = 2037738 },
-    { url = "https://files.pythonhosted.org/packages/c8/f1/786d8fe78970a06f61df22cba58e365ce304bf9b9f46cc71c8c424e0c334/pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:eda3f5c2a021bbc5d976107bb302e0131351c2ba54343f8a496dc8783d3d3a6a", size = 2685138 },
-    { url = "https://files.pythonhosted.org/packages/a6/74/d12b2cd841d8724dc8ffb13fc5cef86566a53ed358103150209ecd5d1999/pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd8086fa684c4775c27f03f062cbb9eaa6e17f064307e86b21b9e0abc9c0f02e", size = 1997025 },
-    { url = "https://files.pythonhosted.org/packages/a0/6e/940bcd631bc4d9a06c9539b51f070b66e8f370ed0933f392db6ff350d873/pydantic_core-2.27.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8d9b3388db186ba0c099a6d20f0604a44eabdeef1777ddd94786cdae158729e4", size = 2004633 },
-    { url = "https://files.pythonhosted.org/packages/50/cc/a46b34f1708d82498c227d5d80ce615b2dd502ddcfd8376fc14a36655af1/pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7a66efda2387de898c8f38c0cf7f14fca0b51a8ef0b24bfea5849f1b3c95af27", size = 1999404 },
-    { url = "https://files.pythonhosted.org/packages/ca/2d/c365cfa930ed23bc58c41463bae347d1005537dc8db79e998af8ba28d35e/pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:18a101c168e4e092ab40dbc2503bdc0f62010e95d292b27827871dc85450d7ee", size = 2130130 },
-    { url = "https://files.pythonhosted.org/packages/f4/d7/eb64d015c350b7cdb371145b54d96c919d4db516817f31cd1c650cae3b21/pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ba5dd002f88b78a4215ed2f8ddbdf85e8513382820ba15ad5ad8955ce0ca19a1", size = 2157946 },
-    { url = "https://files.pythonhosted.org/packages/a4/99/bddde3ddde76c03b65dfd5a66ab436c4e58ffc42927d4ff1198ffbf96f5f/pydantic_core-2.27.2-cp313-cp313-win32.whl", hash = "sha256:1ebaf1d0481914d004a573394f4be3a7616334be70261007e47c2a6fe7e50130", size = 1834387 },
-    { url = "https://files.pythonhosted.org/packages/71/47/82b5e846e01b26ac6f1893d3c5f9f3a2eb6ba79be26eef0b759b4fe72946/pydantic_core-2.27.2-cp313-cp313-win_amd64.whl", hash = "sha256:953101387ecf2f5652883208769a79e48db18c6df442568a0b5ccd8c2723abee", size = 1990453 },
-    { url = "https://files.pythonhosted.org/packages/51/b2/b2b50d5ecf21acf870190ae5d093602d95f66c9c31f9d5de6062eb329ad1/pydantic_core-2.27.2-cp313-cp313-win_arm64.whl", hash = "sha256:ac4dbfd1691affb8f48c2c13241a2e3b60ff23247cbcf981759c768b6633cf8b", size = 1885186 },
-]
-
-[[package]]
-name = "python-dateutil"
-version = "2.9.0.post0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "six" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892 },
-]
-
-[[package]]
-name = "pytz"
-version = "2025.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f8/bf/abbd3cdfb8fbc7fb3d4d38d320f2441b1e7cbe29be4f23797b4a2b5d8aac/pytz-2025.2.tar.gz", hash = "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3", size = 320884 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/81/c4/34e93fe5f5429d7570ec1fa436f1986fb1f00c3e0f43a589fe2bbcd22c3f/pytz-2025.2-py2.py3-none-any.whl", hash = "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00", size = 509225 },
-]
-
-[[package]]
-name = "pyyaml"
-version = "6.0.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz", hash = "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e", size = 130631 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ef/e3/3af305b830494fa85d95f6d95ef7fa73f2ee1cc8ef5b495c7c3269fb835f/PyYAML-6.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba", size = 181309 },
-    { url = "https://files.pythonhosted.org/packages/45/9f/3b1c20a0b7a3200524eb0076cc027a970d320bd3a6592873c85c92a08731/PyYAML-6.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1", size = 171679 },
-    { url = "https://files.pythonhosted.org/packages/7c/9a/337322f27005c33bcb656c655fa78325b730324c78620e8328ae28b64d0c/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133", size = 733428 },
-    { url = "https://files.pythonhosted.org/packages/a3/69/864fbe19e6c18ea3cc196cbe5d392175b4cf3d5d0ac1403ec3f2d237ebb5/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484", size = 763361 },
-    { url = "https://files.pythonhosted.org/packages/04/24/b7721e4845c2f162d26f50521b825fb061bc0a5afcf9a386840f23ea19fa/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5", size = 759523 },
-    { url = "https://files.pythonhosted.org/packages/2b/b2/e3234f59ba06559c6ff63c4e10baea10e5e7df868092bf9ab40e5b9c56b6/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc", size = 726660 },
-    { url = "https://files.pythonhosted.org/packages/fe/0f/25911a9f080464c59fab9027482f822b86bf0608957a5fcc6eaac85aa515/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652", size = 751597 },
-    { url = "https://files.pythonhosted.org/packages/14/0d/e2c3b43bbce3cf6bd97c840b46088a3031085179e596d4929729d8d68270/PyYAML-6.0.2-cp313-cp313-win32.whl", hash = "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183", size = 140527 },
-    { url = "https://files.pythonhosted.org/packages/fa/de/02b54f42487e3d3c6efb3f89428677074ca7bf43aae402517bc7cca949f3/PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563", size = 156446 },
-]
-
-[[package]]
-name = "ruff"
-version = "0.8.4"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/34/37/9c02181ef38d55b77d97c68b78e705fd14c0de0e5d085202bb2b52ce5be9/ruff-0.8.4.tar.gz", hash = "sha256:0d5f89f254836799af1615798caa5f80b7f935d7a670fad66c5007928e57ace8", size = 3402103 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/05/67/f480bf2f2723b2e49af38ed2be75ccdb2798fca7d56279b585c8f553aaab/ruff-0.8.4-py3-none-linux_armv6l.whl", hash = "sha256:58072f0c06080276804c6a4e21a9045a706584a958e644353603d36ca1eb8a60", size = 10546415 },
-    { url = "https://files.pythonhosted.org/packages/eb/7a/5aba20312c73f1ce61814e520d1920edf68ca3b9c507bd84d8546a8ecaa8/ruff-0.8.4-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ffb60904651c00a1e0b8df594591770018a0f04587f7deeb3838344fe3adabac", size = 10346113 },
-    { url = "https://files.pythonhosted.org/packages/76/f4/c41de22b3728486f0aa95383a44c42657b2db4062f3234ca36fc8cf52d8b/ruff-0.8.4-py3-none-macosx_11_0_arm64.whl", hash = "sha256:6ddf5d654ac0d44389f6bf05cee4caeefc3132a64b58ea46738111d687352296", size = 9943564 },
-    { url = "https://files.pythonhosted.org/packages/0e/f0/afa0d2191af495ac82d4cbbfd7a94e3df6f62a04ca412033e073b871fc6d/ruff-0.8.4-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e248b1f0fa2749edd3350a2a342b67b43a2627434c059a063418e3d375cfe643", size = 10805522 },
-    { url = "https://files.pythonhosted.org/packages/12/57/5d1e9a0fd0c228e663894e8e3a8e7063e5ee90f8e8e60cf2085f362bfa1a/ruff-0.8.4-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bf197b98ed86e417412ee3b6c893f44c8864f816451441483253d5ff22c0e81e", size = 10306763 },
-    { url = "https://files.pythonhosted.org/packages/04/df/f069fdb02e408be8aac6853583572a2873f87f866fe8515de65873caf6b8/ruff-0.8.4-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c41319b85faa3aadd4d30cb1cffdd9ac6b89704ff79f7664b853785b48eccdf3", size = 11359574 },
-    { url = "https://files.pythonhosted.org/packages/d3/04/37c27494cd02e4a8315680debfc6dfabcb97e597c07cce0044db1f9dfbe2/ruff-0.8.4-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:9f8402b7c4f96463f135e936d9ab77b65711fcd5d72e5d67597b543bbb43cf3f", size = 12094851 },
-    { url = "https://files.pythonhosted.org/packages/81/b1/c5d7fb68506cab9832d208d03ea4668da9a9887a4a392f4f328b1bf734ad/ruff-0.8.4-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e4e56b3baa9c23d324ead112a4fdf20db9a3f8f29eeabff1355114dd96014604", size = 11655539 },
-    { url = "https://files.pythonhosted.org/packages/ef/38/8f8f2c8898dc8a7a49bc340cf6f00226917f0f5cb489e37075bcb2ce3671/ruff-0.8.4-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:736272574e97157f7edbbb43b1d046125fce9e7d8d583d5d65d0c9bf2c15addf", size = 12912805 },
-    { url = "https://files.pythonhosted.org/packages/06/dd/fa6660c279f4eb320788876d0cff4ea18d9af7d9ed7216d7bd66877468d0/ruff-0.8.4-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5fe710ab6061592521f902fca7ebcb9fabd27bc7c57c764298b1c1f15fff720", size = 11205976 },
-    { url = "https://files.pythonhosted.org/packages/a8/d7/de94cc89833b5de455750686c17c9e10f4e1ab7ccdc5521b8fe911d1477e/ruff-0.8.4-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:13e9ec6d6b55f6da412d59953d65d66e760d583dd3c1c72bf1f26435b5bfdbae", size = 10792039 },
-    { url = "https://files.pythonhosted.org/packages/6d/15/3e4906559248bdbb74854af684314608297a05b996062c9d72e0ef7c7097/ruff-0.8.4-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:97d9aefef725348ad77d6db98b726cfdb075a40b936c7984088804dfd38268a7", size = 10400088 },
-    { url = "https://files.pythonhosted.org/packages/a2/21/9ed4c0e8133cb4a87a18d470f534ad1a8a66d7bec493bcb8bda2d1a5d5be/ruff-0.8.4-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ab78e33325a6f5374e04c2ab924a3367d69a0da36f8c9cb6b894a62017506111", size = 10900814 },
-    { url = "https://files.pythonhosted.org/packages/0d/5d/122a65a18955bd9da2616b69bc839351f8baf23b2805b543aa2f0aed72b5/ruff-0.8.4-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:8ef06f66f4a05c3ddbc9121a8b0cecccd92c5bf3dd43b5472ffe40b8ca10f0f8", size = 11268828 },
-    { url = "https://files.pythonhosted.org/packages/43/a9/1676ee9106995381e3d34bccac5bb28df70194167337ed4854c20f27c7ba/ruff-0.8.4-py3-none-win32.whl", hash = "sha256:552fb6d861320958ca5e15f28b20a3d071aa83b93caee33a87b471f99a6c0835", size = 8805621 },
-    { url = "https://files.pythonhosted.org/packages/10/98/ed6b56a30ee76771c193ff7ceeaf1d2acc98d33a1a27b8479cbdb5c17a23/ruff-0.8.4-py3-none-win_amd64.whl", hash = "sha256:f21a1143776f8656d7f364bd264a9d60f01b7f52243fbe90e7670c0dfe0cf65d", size = 9660086 },
-    { url = "https://files.pythonhosted.org/packages/13/9f/026e18ca7d7766783d779dae5e9c656746c6ede36ef73c6d934aaf4a6dec/ruff-0.8.4-py3-none-win_arm64.whl", hash = "sha256:9183dd615d8df50defa8b1d9a074053891ba39025cf5ae88e8bcb52edcc4bf08", size = 9074500 },
-]
-
-[[package]]
-name = "setuptools"
-version = "80.9.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/18/5d/3bf57dcd21979b887f014ea83c24ae194cfcd12b9e0fda66b957c69d1fca/setuptools-80.9.0.tar.gz", hash = "sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c", size = 1319958 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any.whl", hash = "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922", size = 1201486 },
-]
-
-[[package]]
-name = "six"
-version = "1.17.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050 },
-]
-
-[[package]]
-name = "smmap"
-version = "5.0.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/88/04/b5bf6d21dc4041000ccba7eb17dd3055feb237e7ffc2c20d3fae3af62baa/smmap-5.0.1.tar.gz", hash = "sha256:dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62", size = 22291 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a7/a5/10f97f73544edcdef54409f1d839f6049a0d79df68adbc1ceb24d1aaca42/smmap-5.0.1-py3-none-any.whl", hash = "sha256:e6d8668fa5f93e706934a62d7b4db19c8d9eb8cf2adbb75ef1b675aa332b69da", size = 24282 },
-]
-
-[[package]]
-name = "sniffio"
-version = "1.3.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235 },
-]
-
-[[package]]
-name = "sqlalchemy"
-version = "2.0.36"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "typing-extensions" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/50/65/9cbc9c4c3287bed2499e05033e207473504dc4df999ce49385fb1f8b058a/sqlalchemy-2.0.36.tar.gz", hash = "sha256:7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5", size = 9574485 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/78/5c/236398ae3678b3237726819b484f15f5c038a9549da01703a771f05a00d6/SQLAlchemy-2.0.36-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b5cc79df7f4bc3d11e4b542596c03826063092611e481fcf1c9dfee3c94355ef", size = 2087651 },
-    { url = "https://files.pythonhosted.org/packages/a8/14/55c47420c0d23fb67a35af8be4719199b81c59f3084c28d131a7767b0b0b/SQLAlchemy-2.0.36-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3c01117dd36800f2ecaa238c65365b7b16497adc1522bf84906e5710ee9ba0e8", size = 2078132 },
-    { url = "https://files.pythonhosted.org/packages/3d/97/1e843b36abff8c4a7aa2e37f9bea364f90d021754c2de94d792c2d91405b/SQLAlchemy-2.0.36-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9bc633f4ee4b4c46e7adcb3a9b5ec083bf1d9a97c1d3854b92749d935de40b9b", size = 3164559 },
-    { url = "https://files.pythonhosted.org/packages/7b/c5/07f18a897b997f6d6b234fab2bf31dccf66d5d16a79fe329aefc95cd7461/SQLAlchemy-2.0.36-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e46ed38affdfc95d2c958de328d037d87801cfcbea6d421000859e9789e61c2", size = 3177897 },
-    { url = "https://files.pythonhosted.org/packages/b3/cd/e16f3cbefd82b5c40b33732da634ec67a5f33b587744c7ab41699789d492/SQLAlchemy-2.0.36-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b2985c0b06e989c043f1dc09d4fe89e1616aadd35392aea2844f0458a989eacf", size = 3111289 },
-    { url = "https://files.pythonhosted.org/packages/15/85/5b8a3b0bc29c9928aa62b5c91fcc8335f57c1de0a6343873b5f372e3672b/SQLAlchemy-2.0.36-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4a121d62ebe7d26fec9155f83f8be5189ef1405f5973ea4874a26fab9f1e262c", size = 3139491 },
-    { url = "https://files.pythonhosted.org/packages/a1/95/81babb6089938680dfe2cd3f88cd3fd39cccd1543b7cb603b21ad881bff1/SQLAlchemy-2.0.36-cp313-cp313-win32.whl", hash = "sha256:0572f4bd6f94752167adfd7c1bed84f4b240ee6203a95e05d1e208d488d0d436", size = 2060439 },
-    { url = "https://files.pythonhosted.org/packages/c1/ce/5f7428df55660d6879d0522adc73a3364970b5ef33ec17fa125c5dbcac1d/SQLAlchemy-2.0.36-cp313-cp313-win_amd64.whl", hash = "sha256:8c78ac40bde930c60e0f78b3cd184c580f89456dd87fc08f9e3ee3ce8765ce88", size = 2084574 },
-    { url = "https://files.pythonhosted.org/packages/b8/49/21633706dd6feb14cd3f7935fc00b60870ea057686035e1a99ae6d9d9d53/SQLAlchemy-2.0.36-py3-none-any.whl", hash = "sha256:fddbe92b4760c6f5d48162aef14824add991aeda8ddadb3c31d56eb15ca69f8e", size = 1883787 },
-]
-
-[[package]]
-name = "sqlmodel"
-version = "0.0.24"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "pydantic" },
-    { name = "sqlalchemy" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/86/4b/c2ad0496f5bdc6073d9b4cef52be9c04f2b37a5773441cc6600b1857648b/sqlmodel-0.0.24.tar.gz", hash = "sha256:cc5c7613c1a5533c9c7867e1aab2fd489a76c9e8a061984da11b4e613c182423", size = 116780 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/16/91/484cd2d05569892b7fef7f5ceab3bc89fb0f8a8c0cde1030d383dbc5449c/sqlmodel-0.0.24-py3-none-any.whl", hash = "sha256:6778852f09370908985b667d6a3ab92910d0d5ec88adcaf23dbc242715ff7193", size = 28622 },
-]
-
-[[package]]
-name = "starlette"
-version = "0.41.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "anyio" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/1a/4c/9b5764bd22eec91c4039ef4c55334e9187085da2d8a2df7bd570869aae18/starlette-0.41.3.tar.gz", hash = "sha256:0e4ab3d16522a255be6b28260b938eae2482f98ce5cc934cb08dce8dc3ba5835", size = 2574159 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/96/00/2b325970b3060c7cecebab6d295afe763365822b1306a12eeab198f74323/starlette-0.41.3-py3-none-any.whl", hash = "sha256:44cedb2b7c77a9de33a8b74b2b90e9f50d11fcf25d8270ea525ad71a25374ff7", size = 73225 },
-]
-
-[[package]]
-name = "typing-extensions"
-version = "4.12.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", size = 85321 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438 },
-]
-
-[[package]]
-name = "tzdata"
-version = "2024.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e1/34/943888654477a574a86a98e9896bae89c7aa15078ec29f490fef2f1e5384/tzdata-2024.2.tar.gz", hash = "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc", size = 193282 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/a6/ab/7e5f53c3b9d14972843a647d8d7a853969a58aecc7559cb3267302c94774/tzdata-2024.2-py2.py3-none-any.whl", hash = "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd", size = 346586 },
-]
-
-[[package]]
-name = "uvicorn"
-version = "0.34.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "click" },
-    { name = "h11" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/4b/4d/938bd85e5bf2edeec766267a5015ad969730bb91e31b44021dfe8b22df6c/uvicorn-0.34.0.tar.gz", hash = "sha256:404051050cd7e905de2c9a7e61790943440b3416f49cb409f965d9dcd0fa73e9", size = 76568 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/61/14/33a3a1352cfa71812a3a21e8c9bfb83f60b0011f5e36f2b1399d51928209/uvicorn-0.34.0-py3-none-any.whl", hash = "sha256:023dc038422502fa28a09c7a30bf2b6991512da7dcdb8fd35fe57cfc154126f4", size = 62315 },
-]
-
-[[package]]
-name = "yarl"
-version = "1.18.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "idna" },
-    { name = "multidict" },
-    { name = "propcache" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/b7/9d/4b94a8e6d2b51b599516a5cb88e5bc99b4d8d4583e468057eaa29d5f0918/yarl-1.18.3.tar.gz", hash = "sha256:ac1801c45cbf77b6c99242eeff4fffb5e4e73a800b5c4ad4fc0be5def634d2e1", size = 181062 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/30/c7/c790513d5328a8390be8f47be5d52e141f78b66c6c48f48d241ca6bd5265/yarl-1.18.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:90adb47ad432332d4f0bc28f83a5963f426ce9a1a8809f5e584e704b82685dcb", size = 140789 },
-    { url = "https://files.pythonhosted.org/packages/30/aa/a2f84e93554a578463e2edaaf2300faa61c8701f0898725842c704ba5444/yarl-1.18.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:913829534200eb0f789d45349e55203a091f45c37a2674678744ae52fae23efa", size = 94144 },
-    { url = "https://files.pythonhosted.org/packages/c6/fc/d68d8f83714b221a85ce7866832cba36d7c04a68fa6a960b908c2c84f325/yarl-1.18.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ef9f7768395923c3039055c14334ba4d926f3baf7b776c923c93d80195624782", size = 91974 },
-    { url = "https://files.pythonhosted.org/packages/56/4e/d2563d8323a7e9a414b5b25341b3942af5902a2263d36d20fb17c40411e2/yarl-1.18.3-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88a19f62ff30117e706ebc9090b8ecc79aeb77d0b1f5ec10d2d27a12bc9f66d0", size = 333587 },
-    { url = "https://files.pythonhosted.org/packages/25/c9/cfec0bc0cac8d054be223e9f2c7909d3e8442a856af9dbce7e3442a8ec8d/yarl-1.18.3-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e17c9361d46a4d5addf777c6dd5eab0715a7684c2f11b88c67ac37edfba6c482", size = 344386 },
-    { url = "https://files.pythonhosted.org/packages/ab/5d/4c532190113b25f1364d25f4c319322e86232d69175b91f27e3ebc2caf9a/yarl-1.18.3-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1a74a13a4c857a84a845505fd2d68e54826a2cd01935a96efb1e9d86c728e186", size = 345421 },
-    { url = "https://files.pythonhosted.org/packages/23/d1/6cdd1632da013aa6ba18cee4d750d953104a5e7aac44e249d9410a972bf5/yarl-1.18.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41f7ce59d6ee7741af71d82020346af364949314ed3d87553763a2df1829cc58", size = 339384 },
-    { url = "https://files.pythonhosted.org/packages/9a/c4/6b3c39bec352e441bd30f432cda6ba51681ab19bb8abe023f0d19777aad1/yarl-1.18.3-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f52a265001d830bc425f82ca9eabda94a64a4d753b07d623a9f2863fde532b53", size = 326689 },
-    { url = "https://files.pythonhosted.org/packages/23/30/07fb088f2eefdc0aa4fc1af4e3ca4eb1a3aadd1ce7d866d74c0f124e6a85/yarl-1.18.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:82123d0c954dc58db301f5021a01854a85bf1f3bb7d12ae0c01afc414a882ca2", size = 345453 },
-    { url = "https://files.pythonhosted.org/packages/63/09/d54befb48f9cd8eec43797f624ec37783a0266855f4930a91e3d5c7717f8/yarl-1.18.3-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:2ec9bbba33b2d00999af4631a3397d1fd78290c48e2a3e52d8dd72db3a067ac8", size = 341872 },
-    { url = "https://files.pythonhosted.org/packages/91/26/fd0ef9bf29dd906a84b59f0cd1281e65b0c3e08c6aa94b57f7d11f593518/yarl-1.18.3-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:fbd6748e8ab9b41171bb95c6142faf068f5ef1511935a0aa07025438dd9a9bc1", size = 347497 },
-    { url = "https://files.pythonhosted.org/packages/d9/b5/14ac7a256d0511b2ac168d50d4b7d744aea1c1aa20c79f620d1059aab8b2/yarl-1.18.3-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:877d209b6aebeb5b16c42cbb377f5f94d9e556626b1bfff66d7b0d115be88d0a", size = 359981 },
-    { url = "https://files.pythonhosted.org/packages/ca/b3/d493221ad5cbd18bc07e642894030437e405e1413c4236dd5db6e46bcec9/yarl-1.18.3-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:b464c4ab4bfcb41e3bfd3f1c26600d038376c2de3297760dfe064d2cb7ea8e10", size = 366229 },
-    { url = "https://files.pythonhosted.org/packages/04/56/6a3e2a5d9152c56c346df9b8fb8edd2c8888b1e03f96324d457e5cf06d34/yarl-1.18.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8d39d351e7faf01483cc7ff7c0213c412e38e5a340238826be7e0e4da450fdc8", size = 360383 },
-    { url = "https://files.pythonhosted.org/packages/fd/b7/4b3c7c7913a278d445cc6284e59b2e62fa25e72758f888b7a7a39eb8423f/yarl-1.18.3-cp313-cp313-win32.whl", hash = "sha256:61ee62ead9b68b9123ec24bc866cbef297dd266175d53296e2db5e7f797f902d", size = 310152 },
-    { url = "https://files.pythonhosted.org/packages/f5/d5/688db678e987c3e0fb17867970700b92603cadf36c56e5fb08f23e822a0c/yarl-1.18.3-cp313-cp313-win_amd64.whl", hash = "sha256:578e281c393af575879990861823ef19d66e2b1d0098414855dd367e234f5b3c", size = 315723 },
-    { url = "https://files.pythonhosted.org/packages/f5/4b/a06e0ec3d155924f77835ed2d167ebd3b211a7b0853da1cf8d8414d784ef/yarl-1.18.3-py3-none-any.whl", hash = "sha256:b57f4f58099328dfb26c6a771d09fb20dbbae81d20cfb66141251ea063bd101b", size = 45109 },
-]