From afb2ff6a13c7a9ce598ac617b10ff533556e702d Mon Sep 17 00:00:00 2001
From: wookie184 <wookie1840@gmail.com>
Date: Sat, 22 Oct 2022 13:35:38 +0100
Subject: Store time of last vote in redis to prevent vote triggering early

Previously if a vote was sent and ended within a day a new one could be sent immediately
---
 bot/exts/recruitment/talentpool/_review.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/bot/exts/recruitment/talentpool/_review.py b/bot/exts/recruitment/talentpool/_review.py
index e3ac1086d..0455f13c4 100644
--- a/bot/exts/recruitment/talentpool/_review.py
+++ b/bot/exts/recruitment/talentpool/_review.py
@@ -8,6 +8,7 @@ from collections import Counter
 from datetime import datetime, timedelta, timezone
 from typing import List, Optional, Union
 
+from async_rediscache import RedisCache
 from botcore.site_api import ResponseCodeError
 from dateutil.parser import isoparse
 from discord import Embed, Emoji, Member, Message, NotFound, PartialMessage, TextChannel
@@ -52,6 +53,11 @@ NOMINATION_MESSAGE_REGEX = re.compile(
 class Reviewer:
     """Manages, formats, and publishes reviews of helper nominees."""
 
+    # RedisCache[
+    #    "last_vote_date": float   | POSIX UTC timestamp.
+    # ]
+    status_cache = RedisCache()
+
     def __init__(self, bot: Bot, pool: 'TalentPool'):
         self.bot = bot
         self._pool = pool
@@ -82,8 +88,18 @@ class Reviewer:
         """
         voting_channel = self.bot.get_channel(Channels.nomination_voting)
 
+        last_vote_timestamp = await self.status_cache.get("last_vote_date")
+        if last_vote_timestamp:
+            last_vote_date = datetime.fromtimestamp(last_vote_timestamp, tz=timezone.utc)
+            time_since_last_vote = datetime.now(timezone.utc) - last_vote_date
+
+            if time_since_last_vote < MIN_REVIEW_INTERVAL:
+                log.debug("Most recent review was less than %s ago, cancelling check", MIN_REVIEW_INTERVAL)
+                return False
+        else:
+            log.info("Date of last vote not found in cache, a vote may be sent early")
+
         review_count = 0
-        is_first_message = True
         async for msg in voting_channel.history():
             # Try and filter out any non-review messages. We also only want to count
             # one message from reviews split over multiple messages. We use fixed text
@@ -91,14 +107,6 @@ class Reviewer:
             if not msg.author.bot or "for Helper!" not in msg.content:
                 continue
 
-            if is_first_message:
-                time_since_message_created = datetime.now(timezone.utc) - msg.created_at
-                if time_since_message_created < MIN_REVIEW_INTERVAL:
-                    log.debug("Most recent review was less than %s ago, cancelling check", MIN_REVIEW_INTERVAL)
-                    return False
-
-                is_first_message = False
-
             review_count += 1
 
             if review_count >= MAX_ONGOING_REVIEWS:
@@ -181,6 +189,9 @@ class Reviewer:
         )
         message = await thread.send(f"<@&{Roles.mod_team}> <@&{Roles.admins}>")
 
+        now = datetime.now(tz=timezone.utc)
+        await self.status_cache.set("last_vote_date", now.timestamp())
+
         if update_database:
             nomination = self._pool.cache.get(user_id)
             await self.bot.api_client.patch(f"bot/nominations/{nomination['id']}", json={"reviewed": True})
-- 
cgit v1.2.3


From b065b2493b6adeb066aec1976eccde4a3bdbec2e Mon Sep 17 00:00:00 2001
From: wookie184 <wookie1840@gmail.com>
Date: Sat, 22 Oct 2022 13:56:25 +0100
Subject: Fix tests

---
 tests/bot/exts/recruitment/talentpool/test_review.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/bot/exts/recruitment/talentpool/test_review.py b/tests/bot/exts/recruitment/talentpool/test_review.py
index ed9b66e12..295b0e221 100644
--- a/tests/bot/exts/recruitment/talentpool/test_review.py
+++ b/tests/bot/exts/recruitment/talentpool/test_review.py
@@ -1,6 +1,6 @@
 import unittest
 from datetime import datetime, timedelta, timezone
-from unittest.mock import Mock, patch
+from unittest.mock import AsyncMock, Mock, patch
 
 from bot.exts.recruitment.talentpool import _review
 from tests.helpers import MockBot, MockMember, MockMessage, MockTextChannel
@@ -65,6 +65,7 @@ class ReviewerTests(unittest.IsolatedAsyncioTestCase):
                     MockMessage(author=self.bot_user, content="Not a review", created_at=not_too_recent),
                     MockMessage(author=self.bot_user, content="Not a review", created_at=not_too_recent),
                 ],
+                not_too_recent.timestamp(),
                 True,
             ),
 
@@ -75,6 +76,7 @@ class ReviewerTests(unittest.IsolatedAsyncioTestCase):
                     MockMessage(author=self.bot_user, content="Zig for Helper!", created_at=not_too_recent),
                     MockMessage(author=self.bot_user, content="Scaleios for Helper!", created_at=not_too_recent),
                 ],
+                not_too_recent.timestamp(),
                 False,
             ),
 
@@ -83,6 +85,7 @@ class ReviewerTests(unittest.IsolatedAsyncioTestCase):
                 [
                     MockMessage(author=self.bot_user, content="Chrisjl for Helper!", created_at=too_recent),
                 ],
+                too_recent.timestamp(),
                 False,
             ),
 
@@ -94,18 +97,25 @@ class ReviewerTests(unittest.IsolatedAsyncioTestCase):
                     MockMessage(author=self.bot_user, content="wookie for Helper!", created_at=not_too_recent),
                     MockMessage(author=self.bot_user, content="Not a review", created_at=not_too_recent),
                 ],
+                not_too_recent.timestamp(),
                 True,
             ),
 
             # No messages, so ready.
-            ([], True),
+            ([], None, True),
         )
 
-        for messages, expected in cases:
+        for messages, last_review_timestamp, expected in cases:
             with self.subTest(messages=messages, expected=expected):
                 self.voting_channel.history = AsyncIterator(messages)
+
+                cache_get_mock = AsyncMock(return_value=last_review_timestamp)
+                self.reviewer.status_cache.get = cache_get_mock
+
                 res = await self.reviewer.is_ready_for_review()
+
                 self.assertIs(res, expected)
+                cache_get_mock.assert_called_with("last_vote_date")
 
     @patch("bot.exts.recruitment.talentpool._review.MIN_NOMINATION_TIME", timedelta(days=7))
     async def test_get_user_for_review(self):
-- 
cgit v1.2.3


From 09a5d57dbaf1f784a98f54e5839bfae328c29d71 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 16 Nov 2022 17:28:45 -0500
Subject: Add support for displaying files from snekbox

---
 bot/exts/utils/snekbox.py | 55 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 5e217a288..1223b89ca 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -1,7 +1,13 @@
+from __future__ import annotations
+
 import asyncio
 import contextlib
 import re
+import zlib
+from base64 import b64decode
+from dataclasses import dataclass
 from functools import partial
+from io import BytesIO
 from operator import attrgetter
 from signal import Signals
 from textwrap import dedent
@@ -9,7 +15,7 @@ from typing import Literal, Optional, Tuple
 
 from botcore.utils import interactions
 from botcore.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
-from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
+from discord import AllowedMentions, File, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
 from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
 
 from bot.bot import Bot
@@ -79,6 +85,28 @@ REDO_EMOJI = '\U0001f501'  # :repeat:
 REDO_TIMEOUT = 30
 
 
+@dataclass
+class FileAttachment:
+    """File Attachment from Snekbox eval."""
+
+    name: str
+    mime: str
+    content: bytes
+
+    @classmethod
+    def from_dict(cls, data: dict) -> FileAttachment:
+        """Create a FileAttachment from a dict response."""
+        return cls(
+            data["name"],
+            data["mime"],
+            zlib.decompress(b64decode(data["content"])),
+        )
+
+    def to_file(self) -> File:
+        """Convert to a discord.File."""
+        return File(BytesIO(self.content), filename=self.name)
+
+
 class CodeblockConverter(Converter):
     """Attempts to extract code from a codeblock, if provided."""
 
@@ -171,7 +199,7 @@ class Snekbox(Cog):
         ctx: Context,
         code: str,
         args: Optional[list[str]] = None
-    ) -> None:
+    ) -> interactions.ViewWithUserAndRoleCheck:
         """Return a view that allows the user to change what version of Python their code is run on."""
         if current_python_version == "3.10":
             alt_python_version = "3.11"
@@ -238,9 +266,12 @@ class Snekbox(Cog):
         return code, args
 
     @staticmethod
-    def get_results_message(results: dict, job_name: str, python_version: Literal["3.10", "3.11"]) -> Tuple[str, str]:
+    def get_results_message(
+            results: dict, job_name: str, python_version: Literal["3.10", "3.11"]
+    ) -> Tuple[str, str, list[FileAttachment]]:
         """Return a user-friendly message and error corresponding to the process's return code."""
         stdout, returncode = results["stdout"], results["returncode"]
+        attachments = [FileAttachment.from_dict(d) for d in results["attachments"]]
         msg = f"Your {python_version} {job_name} job has completed with return code {returncode}"
         error = ""
 
@@ -260,12 +291,12 @@ class Snekbox(Cog):
             except ValueError:
                 pass
 
-        return msg, error
+        return msg, error, attachments
 
     @staticmethod
     def get_status_emoji(results: dict) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
-        if not results["stdout"].strip():  # No output
+        if not results["stdout"].strip() and not results["attachments"]:  # No output
             return ":warning:"
         elif results["returncode"] == 0:  # No error
             return ":white_check_mark:"
@@ -335,7 +366,7 @@ class Snekbox(Cog):
         """
         async with ctx.typing():
             results = await self.post_job(code, python_version, args=args)
-            msg, error = self.get_results_message(results, job_name, python_version)
+            msg, error, attachments = self.get_results_message(results, job_name, python_version)
 
             if error:
                 output, paste_link = error, None
@@ -344,7 +375,12 @@ class Snekbox(Cog):
                 output, paste_link = await self.format_output(results["stdout"])
 
             icon = self.get_status_emoji(results)
-            msg = f"{ctx.author.mention} {icon} {msg}.\n\n```\n{output}\n```"
+
+            if attachments and output in ("[No output]", ""):
+                msg = f"{ctx.author.mention} {icon} {msg}.\n"
+            else:
+                msg = f"{ctx.author.mention} {icon} {msg}.\n\n```\n{output}\n```"
+
             if paste_link:
                 msg = f"{msg}\nFull output: {paste_link}"
 
@@ -363,7 +399,10 @@ class Snekbox(Cog):
             else:
                 allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
                 view = self.build_python_version_switcher_view(job_name, python_version, ctx, code, args)
-                response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view)
+
+                # Attach file if provided
+                files = [atc.to_file() for atc in attachments]
+                response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
                 view.message = response
 
             log.info(f"{ctx.author}'s {job_name} job had a return code of {results['returncode']}")
-- 
cgit v1.2.3


From 499336bd818cc4b9c1c4f5bb3c04a75f1730ada4 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 20 Nov 2022 21:43:30 -0500
Subject: Implement full FileAttachment parsing

---
 bot/exts/utils/snekbox.py | 194 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 135 insertions(+), 59 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 1223b89ca..93941ed4c 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -4,14 +4,15 @@ import asyncio
 import contextlib
 import re
 import zlib
-from base64 import b64decode
-from dataclasses import dataclass
+from base64 import b64decode, b64encode
+from collections.abc import Iterable
+from dataclasses import dataclass, field
 from functools import partial
 from io import BytesIO
 from operator import attrgetter
 from signal import Signals
 from textwrap import dedent
-from typing import Literal, Optional, Tuple
+from typing import Generic, Literal, Optional, TYPE_CHECKING, Tuple, TypeVar
 
 from botcore.utils import interactions
 from botcore.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
@@ -26,6 +27,9 @@ from bot.utils import send_to_paste_service
 from bot.utils.lock import LockedResourceError, lock_arg
 from bot.utils.services import PasteTooLongError, PasteUploadError
 
+if TYPE_CHECKING:
+    from bot.exts.filters.filtering import Filtering
+
 log = get_logger(__name__)
 
 ESCAPE_REGEX = re.compile("[`\u202E\u200B]{3,}")
@@ -84,29 +88,100 @@ SIGKILL = 9
 REDO_EMOJI = '\U0001f501'  # :repeat:
 REDO_TIMEOUT = 30
 
+# Note discord upload limit is 8 MB, or 50 MB for lvl 2 boosted servers
+FILE_SIZE_LIMIT = 8 * 1024 * 1024  # 8 MiB
+
+T = TypeVar("T")
+
+
+def sizeof_fmt(num: int, suffix: str = "B") -> str:
+    """Return a human-readable file size."""
+    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
+        if abs(num) < 1024:
+            return f"{num:3.1f}{unit}{suffix}"
+        num /= 1024
+    return f"{num:.1f}Yi{suffix}"
+
 
 @dataclass
-class FileAttachment:
+class FileAttachment(Generic[T]):
     """File Attachment from Snekbox eval."""
 
     name: str
-    mime: str
-    content: bytes
+    content: T
+
+    def __repr__(self) -> str:
+        """Return the content as a string."""
+        content = self.content if isinstance(self.content, str) else "(...)"
+        return f"FileAttachment(name={self.name}, content={content})"
 
     @classmethod
-    def from_dict(cls, data: dict) -> FileAttachment:
+    def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment[bytes]:
         """Create a FileAttachment from a dict response."""
-        return cls(
-            data["name"],
-            data["mime"],
-            zlib.decompress(b64decode(data["content"])),
-        )
+        size = data.get("size")
+        if (size and size > size_limit) or (len(data["content"]) > size_limit):
+            raise ValueError("File size exceeds limit")
+
+        match data.get("content-encoding"):
+            case "base64+zlib":
+                content = zlib.decompress(b64decode(data["content"]))
+            case "base64":
+                content = b64decode(data["content"])
+            case _:
+                content = data["content"]
+
+        if len(content) > size_limit:
+            raise ValueError("File size exceeds limit")
+
+        return cls(data["name"], content)
+
+    def to_json(self) -> dict[str, str]:
+        """Convert the attachment to a json dict."""
+        if isinstance(self.content, bytes):
+            content = b64encode(self.content).decode("ascii")
+            encoding = "base64"
+        else:
+            content = self.content
+            encoding = ""
+
+        return {
+            "name": self.name,
+            "content-encoding": encoding,
+            "content": content,
+        }
 
     def to_file(self) -> File:
         """Convert to a discord.File."""
         return File(BytesIO(self.content), filename=self.name)
 
 
+@dataclass
+class EvalJob:
+    """Represents a job to be evaluated by Snekbox."""
+
+    args: list[str]
+    files: list[FileAttachment] = field(default_factory=list)
+
+    def __str__(self) -> str:
+        """Return the job as a string."""
+        return f"EvalJob(args={self.args}, files={self.files})"
+
+    @classmethod
+    def from_code(cls, code: str, files: Iterable[FileAttachment] = (), name: str = "main.py") -> EvalJob:
+        """Create an EvalJob from a code string."""
+        return cls(
+            args=[name],
+            files=[FileAttachment(name, code), *files],
+        )
+
+    def to_json(self) -> dict[str, list[str | dict[str, str]]]:
+        """Convert the job to a dict."""
+        return {
+            "args": self.args,
+            "files": [file.to_json() for file in self.files],
+        }
+
+
 class CodeblockConverter(Converter):
     """Attempts to extract code from a codeblock, if provided."""
 
@@ -151,10 +226,9 @@ class PythonVersionSwitcherButton(ui.Button):
         self,
         job_name: str,
         version_to_switch_to: Literal["3.10", "3.11"],
-        snekbox_cog: "Snekbox",
+        snekbox_cog: Snekbox,
         ctx: Context,
-        code: str,
-        args: Optional[list[str]] = None
+        job: EvalJob,
     ) -> None:
         self.version_to_switch_to = version_to_switch_to
         super().__init__(label=f"Run in {self.version_to_switch_to}", style=enums.ButtonStyle.primary)
@@ -162,8 +236,7 @@ class PythonVersionSwitcherButton(ui.Button):
         self.snekbox_cog = snekbox_cog
         self.ctx = ctx
         self.job_name = job_name
-        self.code = code
-        self.args = args
+        self.job = job
 
     async def callback(self, interaction: Interaction) -> None:
         """
@@ -176,13 +249,11 @@ class PythonVersionSwitcherButton(ui.Button):
         await interaction.response.defer()
 
         with contextlib.suppress(NotFound):
-            # Suppress this delete to cover the case where a user re-runs code and very quickly clicks the button.
+            # Suppress delete to cover the case where a user re-runs code and very quickly clicks the button.
             # The log arg on send_job will stop the actual job from running.
             await interaction.message.delete()
 
-        await self.snekbox_cog.run_job(
-            self.job_name, self.ctx, self.version_to_switch_to, self.code, args=self.args
-        )
+        await self.snekbox_cog.run_job(self.job_name, self.ctx, self.version_to_switch_to, self.job)
 
 
 class Snekbox(Cog):
@@ -197,8 +268,7 @@ class Snekbox(Cog):
         job_name: str,
         current_python_version: Literal["3.10", "3.11"],
         ctx: Context,
-        code: str,
-        args: Optional[list[str]] = None
+        job: EvalJob,
     ) -> interactions.ViewWithUserAndRoleCheck:
         """Return a view that allows the user to change what version of Python their code is run on."""
         if current_python_version == "3.10":
@@ -210,17 +280,15 @@ class Snekbox(Cog):
             allowed_users=(ctx.author.id,),
             allowed_roles=MODERATION_ROLES,
         )
-        view.add_item(PythonVersionSwitcherButton(job_name, alt_python_version, self, ctx, code, args))
+        view.add_item(PythonVersionSwitcherButton(job_name, alt_python_version, self, ctx, job))
         view.add_item(interactions.DeleteMessageButton())
 
         return view
 
     async def post_job(
         self,
-        code: str,
+        job: EvalJob,
         python_version: Literal["3.10", "3.11"],
-        *,
-        args: Optional[list[str]] = None
     ) -> dict:
         """Send a POST request to the Snekbox API to evaluate code and return the results."""
         if python_version == "3.10":
@@ -228,10 +296,7 @@ class Snekbox(Cog):
         else:
             url = URLs.snekbox_311_eval_api
 
-        data = {"input": code}
-
-        if args is not None:
-            data["args"] = args
+        data = {"args": job.args, "files": [f.to_json() for f in job.files]}
 
         async with self.bot.http_session.post(url, json=data, raise_for_status=True) as resp:
             return await resp.json()
@@ -248,30 +313,34 @@ class Snekbox(Cog):
             return "unable to upload"
 
     @staticmethod
-    def prepare_timeit_input(codeblocks: list[str]) -> tuple[str, list[str]]:
+    def prepare_timeit_input(codeblocks: list[str]) -> list[str]:
         """
         Join the codeblocks into a single string, then return the code and the arguments in a tuple.
 
         If there are multiple codeblocks, insert the first one into the wrapped setup code.
         """
         args = ["-m", "timeit"]
-        setup = ""
-        if len(codeblocks) > 1:
-            setup = codeblocks.pop(0)
-
+        setup_code = codeblocks.pop(0) if len(codeblocks) > 1 else ""
         code = "\n".join(codeblocks)
 
-        args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup)])
-
-        return code, args
+        args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup_code), code])
+        return args
 
     @staticmethod
     def get_results_message(
-            results: dict, job_name: str, python_version: Literal["3.10", "3.11"]
+        results: dict, job_name: str, python_version: Literal["3.10", "3.11"]
     ) -> Tuple[str, str, list[FileAttachment]]:
         """Return a user-friendly message and error corresponding to the process's return code."""
         stdout, returncode = results["stdout"], results["returncode"]
-        attachments = [FileAttachment.from_dict(d) for d in results["attachments"]]
+
+        attachments: list[FileAttachment] = []
+        failed_attachments: list[str] = []
+        for attachment in results["attachments"]:
+            try:
+                attachments.append(FileAttachment.from_dict(attachment))
+            except ValueError:
+                failed_attachments.append(attachment["name"])
+
         msg = f"Your {python_version} {job_name} job has completed with return code {returncode}"
         error = ""
 
@@ -291,6 +360,14 @@ class Snekbox(Cog):
             except ValueError:
                 pass
 
+        # Add error message for failed attachments
+        if failed_attachments:
+            failed_files = f"({', '.join(failed_attachments)})"
+            msg += (
+                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
+                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
+            )
+
         return msg, error, attachments
 
     @staticmethod
@@ -352,12 +429,10 @@ class Snekbox(Cog):
     @lock_arg("snekbox.send_job", "ctx", attrgetter("author.id"), raise_error=True)
     async def send_job(
         self,
+        job_name: str,
         ctx: Context,
         python_version: Literal["3.10", "3.11"],
-        code: str,
-        *,
-        args: Optional[list[str]] = None,
-        job_name: str
+        job: EvalJob,
     ) -> Message:
         """
         Evaluate code, format it, and send the output to the corresponding channel.
@@ -365,7 +440,7 @@ class Snekbox(Cog):
         Return the bot response.
         """
         async with ctx.typing():
-            results = await self.post_job(code, python_version, args=args)
+            results = await self.post_job(job, python_version)
             msg, error, attachments = self.get_results_message(results, job_name, python_version)
 
             if error:
@@ -390,7 +465,7 @@ class Snekbox(Cog):
             else:
                 self.bot.stats.incr("snekbox.python.success")
 
-            filter_cog = self.bot.get_cog("Filtering")
+            filter_cog: Filtering | None = self.bot.get_cog("Filtering")
             filter_triggered = False
             if filter_cog:
                 filter_triggered = await filter_cog.filter_snekbox_output(msg, ctx.message)
@@ -398,7 +473,7 @@ class Snekbox(Cog):
                 response = await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
             else:
                 allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-                view = self.build_python_version_switcher_view(job_name, python_version, ctx, code, args)
+                view = self.build_python_version_switcher_view(job_name, python_version, ctx, job)
 
                 # Attach file if provided
                 files = [atc.to_file() for atc in attachments]
@@ -485,9 +560,7 @@ class Snekbox(Cog):
         job_name: str,
         ctx: Context,
         python_version: Literal["3.10", "3.11"],
-        code: str,
-        *,
-        args: Optional[list[str]] = None,
+        job: EvalJob,
     ) -> None:
         """Handles checks, stats and re-evaluation of a snekbox job."""
         if Roles.helpers in (role.id for role in ctx.author.roles):
@@ -502,11 +575,11 @@ class Snekbox(Cog):
         else:
             self.bot.stats.incr("snekbox_usages.channels.topical")
 
-        log.info(f"Received code from {ctx.author} for evaluation:\n{code}")
+        log.info(f"Received code from {ctx.author} for evaluation:\n{job}")
 
         while True:
             try:
-                response = await self.send_job(ctx, python_version, code, args=args, job_name=job_name)
+                response = await self.send_job(job_name, ctx, python_version, job)
             except LockedResourceError:
                 await ctx.send(
                     f"{ctx.author.mention} You've already got a job running - "
@@ -514,7 +587,7 @@ class Snekbox(Cog):
                 )
                 return
 
-            # Store the bot's response message id per invocation, to ensure the `wait_for`s in `continue_job`
+            # Store the bots response message id per invocation, to ensure the `wait_for`s in `continue_job`
             # don't trigger if the response has already been replaced by a new response.
             # This can happen when a button is pressed and then original code is edited and re-run.
             self.jobs[ctx.message.id] = response.id
@@ -548,17 +621,19 @@ class Snekbox(Cog):
         clicking the reaction that subsequently appears.
 
         If multiple codeblocks are in a message, all of them will be joined and evaluated,
-        ignoring the text outside of them.
+        ignoring the text outside them.
 
-        By default your code is run on Python's 3.11 beta release, to assist with testing. If you
+        By default, your code is run on Python's 3.11 beta release, to assist with testing. If you
         run into issues related to this Python version, you can request the bot to use Python
         3.10 by specifying the `python_version` arg and setting it to `3.10`.
 
         We've done our best to make this sandboxed, but do let us know if you manage to find an
         issue with it!
         """
+        code: list[str]
         python_version = python_version or "3.11"
-        await self.run_job("eval", ctx, python_version, "\n".join(code))
+        job = EvalJob.from_code("\n".join(code))
+        await self.run_job("eval", ctx, python_version, job)
 
     @command(name="timeit", aliases=("ti",), usage="[python_version] [setup_code] <code, ...>")
     @guild_only()
@@ -593,10 +668,11 @@ class Snekbox(Cog):
         We've done our best to make this sandboxed, but do let us know if you manage to find an
         issue with it!
         """
+        code: list[str]
         python_version = python_version or "3.11"
-        code, args = self.prepare_timeit_input(code)
+        args = self.prepare_timeit_input(code)
 
-        await self.run_job("timeit", ctx, python_version, code=code, args=args)
+        await self.run_job("timeit", ctx, python_version, EvalJob(args))
 
 
 def predicate_message_edit(ctx: Context, old_msg: Message, new_msg: Message) -> bool:
-- 
cgit v1.2.3


From 34f40e58c934b3e19b5a5b77552665ea6a987679 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 20 Nov 2022 21:47:22 -0500
Subject: Change EvalJob str to repr

---
 bot/exts/utils/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 93941ed4c..60b9970b8 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -162,7 +162,7 @@ class EvalJob:
     args: list[str]
     files: list[FileAttachment] = field(default_factory=list)
 
-    def __str__(self) -> str:
+    def __repr__(self) -> str:
         """Return the job as a string."""
         return f"EvalJob(args={self.args}, files={self.files})"
 
-- 
cgit v1.2.3


From 6459d43b79bccf73ab41d5db7d174c6955602883 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 20 Nov 2022 22:37:43 -0500
Subject: Refactor encoding parsing

---
 bot/exts/utils/snekbox.py | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 60b9970b8..1ab63ca38 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -140,9 +140,11 @@ class FileAttachment(Generic[T]):
         if isinstance(self.content, bytes):
             content = b64encode(self.content).decode("ascii")
             encoding = "base64"
-        else:
+        elif isinstance(self.content, str):
             content = self.content
-            encoding = ""
+            encoding = "utf-8"
+        else:
+            raise TypeError(f"Unexpected type for content: {type(self.content)}")
 
         return {
             "name": self.name,
@@ -335,7 +337,7 @@ class Snekbox(Cog):
 
         attachments: list[FileAttachment] = []
         failed_attachments: list[str] = []
-        for attachment in results["attachments"]:
+        for attachment in results.get("attachments", []):
             try:
                 attachments.append(FileAttachment.from_dict(attachment))
             except ValueError:
@@ -373,7 +375,8 @@ class Snekbox(Cog):
     @staticmethod
     def get_status_emoji(results: dict) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
-        if not results["stdout"].strip() and not results["attachments"]:  # No output
+        # If there are attachments, skip empty output warning
+        if not results["stdout"].strip() and not results.get("attachments"):  # No output
             return ":warning:"
         elif results["returncode"] == 0:  # No error
             return ":white_check_mark:"
@@ -485,12 +488,12 @@ class Snekbox(Cog):
 
     async def continue_job(
         self, ctx: Context, response: Message, job_name: str
-    ) -> tuple[Optional[str], Optional[list[str]]]:
+    ) -> EvalJob | None:
         """
         Check if the job's session should continue.
 
-        If the code is to be re-evaluated, return the new code, and the args if the command is the timeit command.
-        Otherwise return (None, None) if the job's session should be terminated.
+        If the code is to be re-evaluated, return the new EvalJob.
+        Otherwise, return None if the job's session should be terminated.
         """
         _predicate_message_edit = partial(predicate_message_edit, ctx)
         _predicate_emoji_reaction = partial(predicate_emoji_reaction, ctx)
@@ -512,7 +515,7 @@ class Snekbox(Cog):
                 # Ensure the response that's about to be edited is still the most recent.
                 # This could have already been updated via a button press to switch to an alt Python version.
                 if self.jobs[ctx.message.id] != response.id:
-                    return None, None
+                    return None
 
                 code = await self.get_code(new_message, ctx.command)
                 await ctx.message.clear_reaction(REDO_EMOJI)
@@ -520,20 +523,20 @@ class Snekbox(Cog):
                     await response.delete()
 
                 if code is None:
-                    return None, None
+                    return None
 
             except asyncio.TimeoutError:
                 await ctx.message.clear_reaction(REDO_EMOJI)
-                return None, None
+                return None
 
             codeblocks = await CodeblockConverter.convert(ctx, code)
 
             if job_name == "timeit":
-                return self.prepare_timeit_input(codeblocks)
+                return EvalJob(self.prepare_timeit_input(codeblocks))
             else:
-                return "\n".join(codeblocks), None
+                return EvalJob.from_code("\n".join(codeblocks))
 
-        return None, None
+        return None
 
     async def get_code(self, message: Message, command: Command) -> Optional[str]:
         """
@@ -592,10 +595,10 @@ class Snekbox(Cog):
             # This can happen when a button is pressed and then original code is edited and re-run.
             self.jobs[ctx.message.id] = response.id
 
-            code, args = await self.continue_job(ctx, response, job_name)
-            if not code:
+            job = await self.continue_job(ctx, response, job_name)
+            if not job:
                 break
-            log.info(f"Re-evaluating code from message {ctx.message.id}:\n{code}")
+            log.info(f"Re-evaluating code from message {ctx.message.id}:\n{job}")
 
     @command(name="eval", aliases=("e",), usage="[python_version] <code, ...>")
     @guild_only()
-- 
cgit v1.2.3


From f6139c68ecfc39cc24a3c8075082b47a509d8bc5 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 20 Nov 2022 22:37:58 -0500
Subject: Update unit tests

---
 tests/bot/exts/utils/test_snekbox.py | 73 ++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index b1f32c210..9e3143776 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -8,7 +8,7 @@ from discord.ext import commands
 from bot import constants
 from bot.errors import LockedResourceError
 from bot.exts.utils import snekbox
-from bot.exts.utils.snekbox import Snekbox
+from bot.exts.utils.snekbox import EvalJob, Snekbox
 from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
 
 
@@ -18,6 +18,11 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.bot = MockBot()
         self.cog = Snekbox(bot=self.bot)
 
+    @staticmethod
+    def code_args(code: str) -> tuple[EvalJob]:
+        """Converts code to a tuple of arguments expected."""
+        return EvalJob.from_code(code),
+
     async def test_post_job(self):
         """Post the eval code to the URLs.snekbox_eval_api endpoint."""
         resp = MagicMock()
@@ -27,10 +32,22 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         context_manager.__aenter__.return_value = resp
         self.bot.http_session.post.return_value = context_manager
 
-        self.assertEqual(await self.cog.post_job("import random", "3.10"), "return")
+        job = EvalJob.from_code("import random")
+        self.assertEqual(await self.cog.post_job(job, "3.10"), "return")
+
+        expected = {
+            "args": ["main.py"],
+            "files": [
+                {
+                    "name": "main.py",
+                    "content-encoding": "utf-8",
+                    "content": "import random"
+                }
+            ]
+        }
         self.bot.http_session.post.assert_called_with(
             constants.URLs.snekbox_eval_api,
-            json={"input": "import random"},
+            json=expected,
             raise_for_status=True
         )
         resp.json.assert_awaited_once()
@@ -76,18 +93,18 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             (['x = 1', 'print(x)', 'print("Some other code.")'], 'x = 1', 'three blocks of code')
         )
 
-        for case, setup_code, testname in cases:
+        for case, setup_code, test_name in cases:
             setup = snekbox.TIMEIT_SETUP_WRAPPER.format(setup=setup_code)
-            expected = ('\n'.join(case[1:] if setup_code else case), [*base_args, setup])
-            with self.subTest(msg=f'Test with {testname} and expected return {expected}'):
+            expected = [*base_args, setup, '\n'.join(case[1:] if setup_code else case)]
+            with self.subTest(msg=f'Test with {test_name} and expected return {expected}'):
                 self.assertEqual(self.cog.prepare_timeit_input(case), expected)
 
     def test_get_results_message(self):
         """Return error and message according to the eval result."""
         cases = (
-            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR')),
-            ('', 128 + snekbox.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '')),
-            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred'))
+            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', [])),
+            ('', 128 + snekbox.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', [])),
+            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred', []))
         )
         for stdout, returncode, expected in cases:
             with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
@@ -98,7 +115,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
     def test_get_results_message_invalid_signal(self, mock_signals: Mock):
         self.assertEqual(
             self.cog.get_results_message({'stdout': '', 'returncode': 127}, 'eval', '3.11'),
-            ('Your 3.11 eval job has completed with return code 127', '')
+            ('Your 3.11 eval job has completed with return code 127', '', [])
         )
 
     @patch('bot.exts.utils.snekbox.Signals')
@@ -106,7 +123,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         mock_signals.return_value.name = 'SIGTEST'
         self.assertEqual(
             self.cog.get_results_message({'stdout': '', 'returncode': 127}, 'eval', '3.11'),
-            ('Your 3.11 eval job has completed with return code 127 (SIGTEST)', '')
+            ('Your 3.11 eval job has completed with return code 127 (SIGTEST)', '', [])
         )
 
     def test_get_status_emoji(self):
@@ -178,10 +195,10 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.command = MagicMock()
 
         self.cog.send_job = AsyncMock(return_value=response)
-        self.cog.continue_job = AsyncMock(return_value=(None, None))
+        self.cog.continue_job = AsyncMock(return_value=None)
 
         await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
-        self.cog.send_job.assert_called_once_with(ctx, '3.11', 'MyAwesomeCode', args=None, job_name='eval')
+        self.cog.send_job.assert_called_once_with('eval', ctx, '3.11', *self.code_args('MyAwesomeCode'))
         self.cog.continue_job.assert_called_once_with(ctx, response, 'eval')
 
     async def test_eval_command_evaluate_twice(self):
@@ -191,11 +208,11 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.command = MagicMock()
         self.cog.send_job = AsyncMock(return_value=response)
         self.cog.continue_job = AsyncMock()
-        self.cog.continue_job.side_effect = (('MyAwesomeFormattedCode', None), (None, None))
+        self.cog.continue_job.side_effect = (EvalJob.from_code('MyAwesomeFormattedCode'), None)
 
         await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
         self.cog.send_job.assert_called_with(
-            ctx, '3.11', 'MyAwesomeFormattedCode', args=None, job_name='eval'
+            'eval', ctx, '3.11', *self.code_args('MyAwesomeFormattedCode')
         )
         self.cog.continue_job.assert_called_with(ctx, response, 'eval')
 
@@ -212,8 +229,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.post_job = AsyncMock(side_effect=delay_with_side_effect)
         with self.assertRaises(LockedResourceError):
             await asyncio.gather(
-                self.cog.send_job(ctx, '3.11', 'MyAwesomeCode', job_name='eval'),
-                self.cog.send_job(ctx, '3.11', 'MyAwesomeCode', job_name='eval'),
+                self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
+                self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
             )
 
     async def test_send_job(self):
@@ -224,7 +241,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.author = MockUser(mention='@LemonLemonishBeard#0042')
 
         self.cog.post_job = AsyncMock(return_value={'stdout': '', 'returncode': 0})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 0', ''))
+        self.cog.get_results_message = MagicMock(return_value=('Return code 0', '', []))
         self.cog.get_status_emoji = MagicMock(return_value=':yay!:')
         self.cog.format_output = AsyncMock(return_value=('[No output]', None))
 
@@ -232,7 +249,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job(ctx, '3.11', 'MyAwesomeCode', job_name='eval')
+        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
 
         ctx.send.assert_called_once()
         self.assertEqual(
@@ -243,7 +260,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         expected_allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
         self.assertEqual(allowed_mentions.to_dict(), expected_allowed_mentions.to_dict())
 
-        self.cog.post_job.assert_called_once_with('MyAwesomeCode', '3.11', args=None)
+        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': '', 'returncode': 0})
         self.cog.get_results_message.assert_called_once_with({'stdout': '', 'returncode': 0}, 'eval', '3.11')
         self.cog.format_output.assert_called_once_with('')
@@ -256,7 +273,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.author.mention = '@LemonLemonishBeard#0042'
 
         self.cog.post_job = AsyncMock(return_value={'stdout': 'Way too long beard', 'returncode': 0})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 0', ''))
+        self.cog.get_results_message = MagicMock(return_value=('Return code 0', '', []))
         self.cog.get_status_emoji = MagicMock(return_value=':yay!:')
         self.cog.format_output = AsyncMock(return_value=('Way too long beard', 'lookatmybeard.com'))
 
@@ -264,7 +281,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job(ctx, '3.11', 'MyAwesomeCode', job_name='eval')
+        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
 
         ctx.send.assert_called_once()
         self.assertEqual(
@@ -273,7 +290,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             '\n\n```\nWay too long beard\n```\nFull output: lookatmybeard.com'
         )
 
-        self.cog.post_job.assert_called_once_with('MyAwesomeCode', '3.11', args=None)
+        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': 'Way too long beard', 'returncode': 0})
         self.cog.get_results_message.assert_called_once_with(
             {'stdout': 'Way too long beard', 'returncode': 0}, 'eval', '3.11'
@@ -287,7 +304,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.send = AsyncMock()
         ctx.author.mention = '@LemonLemonishBeard#0042'
         self.cog.post_job = AsyncMock(return_value={'stdout': 'ERROR', 'returncode': 127})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 127', 'Beard got stuck in the eval'))
+        self.cog.get_results_message = MagicMock(return_value=('Return code 127', 'Beard got stuck in the eval', []))
         self.cog.get_status_emoji = MagicMock(return_value=':nope!:')
         self.cog.format_output = AsyncMock()  # This function isn't called
 
@@ -295,7 +312,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job(ctx, '3.11', 'MyAwesomeCode', job_name='eval')
+        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
 
         ctx.send.assert_called_once()
         self.assertEqual(
@@ -303,7 +320,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             '@LemonLemonishBeard#0042 :nope!: Return code 127.\n\n```\nBeard got stuck in the eval\n```'
         )
 
-        self.cog.post_job.assert_called_once_with('MyAwesomeCode', '3.11', args=None)
+        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
         self.cog.get_status_emoji.assert_called_once_with({'stdout': 'ERROR', 'returncode': 127})
         self.cog.get_results_message.assert_called_once_with({'stdout': 'ERROR', 'returncode': 127}, 'eval', '3.11')
         self.cog.format_output.assert_not_called()
@@ -328,7 +345,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
 
         actual = await self.cog.continue_job(ctx, response, self.cog.eval_command)
         self.cog.get_code.assert_awaited_once_with(new_msg, ctx.command)
-        self.assertEqual(actual, (expected, None))
+        self.assertEqual(actual, EvalJob.from_code(expected))
         self.bot.wait_for.assert_has_awaits(
             (
                 call(
@@ -348,7 +365,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.bot.wait_for.side_effect = asyncio.TimeoutError
 
         actual = await self.cog.continue_job(ctx, MockMessage(), self.cog.eval_command)
-        self.assertEqual(actual, (None, None))
+        self.assertEqual(actual, None)
         ctx.message.clear_reaction.assert_called_once_with(snekbox.REDO_EMOJI)
 
     async def test_get_code(self):
-- 
cgit v1.2.3


From 4932999ddd1fcad2092c083bf57087d393fd9b74 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Thu, 24 Nov 2022 15:35:11 +0800
Subject: Refactor API for snekbox updates

---
 bot/exts/utils/snekbox.py | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 1ab63ca38..75c6f2d3a 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -3,13 +3,13 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import re
-import zlib
 from base64 import b64decode, b64encode
 from collections.abc import Iterable
 from dataclasses import dataclass, field
 from functools import partial
 from io import BytesIO
 from operator import attrgetter
+from pathlib import Path
 from signal import Signals
 from textwrap import dedent
 from typing import Generic, Literal, Optional, TYPE_CHECKING, Tuple, TypeVar
@@ -107,13 +107,13 @@ def sizeof_fmt(num: int, suffix: str = "B") -> str:
 class FileAttachment(Generic[T]):
     """File Attachment from Snekbox eval."""
 
-    name: str
+    path: str
     content: T
 
     def __repr__(self) -> str:
         """Return the content as a string."""
         content = self.content if isinstance(self.content, str) else "(...)"
-        return f"FileAttachment(name={self.name}, content={content})"
+        return f"FileAttachment(path={self.path}, content={content})"
 
     @classmethod
     def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment[bytes]:
@@ -122,39 +122,28 @@ class FileAttachment(Generic[T]):
         if (size and size > size_limit) or (len(data["content"]) > size_limit):
             raise ValueError("File size exceeds limit")
 
-        match data.get("content-encoding"):
-            case "base64+zlib":
-                content = zlib.decompress(b64decode(data["content"]))
-            case "base64":
-                content = b64decode(data["content"])
-            case _:
-                content = data["content"]
+        content = b64decode(data["content"])
 
         if len(content) > size_limit:
             raise ValueError("File size exceeds limit")
 
-        return cls(data["name"], content)
+        return cls(data["path"], content)
 
     def to_json(self) -> dict[str, str]:
         """Convert the attachment to a json dict."""
-        if isinstance(self.content, bytes):
-            content = b64encode(self.content).decode("ascii")
-            encoding = "base64"
-        elif isinstance(self.content, str):
-            content = self.content
-            encoding = "utf-8"
-        else:
-            raise TypeError(f"Unexpected type for content: {type(self.content)}")
+        content = self.content
+        if isinstance(content, str):
+            content = content.encode("utf-8")
 
         return {
-            "name": self.name,
-            "content-encoding": encoding,
-            "content": content,
+            "path": self.path,
+            "content": b64encode(content).decode("ascii"),
         }
 
     def to_file(self) -> File:
         """Convert to a discord.File."""
-        return File(BytesIO(self.content), filename=self.name)
+        name = Path(self.path).name
+        return File(BytesIO(self.content), filename=name)
 
 
 @dataclass
@@ -337,11 +326,11 @@ class Snekbox(Cog):
 
         attachments: list[FileAttachment] = []
         failed_attachments: list[str] = []
-        for attachment in results.get("attachments", []):
+        for attachment in results.get("files", []):
             try:
                 attachments.append(FileAttachment.from_dict(attachment))
             except ValueError:
-                failed_attachments.append(attachment["name"])
+                failed_attachments.append(attachment["path"])
 
         msg = f"Your {python_version} {job_name} job has completed with return code {returncode}"
         error = ""
@@ -376,7 +365,7 @@ class Snekbox(Cog):
     def get_status_emoji(results: dict) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
         # If there are attachments, skip empty output warning
-        if not results["stdout"].strip() and not results.get("attachments"):  # No output
+        if not results["stdout"].strip() and not results.get("files"):  # No output
             return ":warning:"
         elif results["returncode"] == 0:  # No error
             return ":white_check_mark:"
-- 
cgit v1.2.3


From c7d6d05f29bd6f9958198b49f22a4c9623f7425f Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Thu, 24 Nov 2022 15:43:53 +0800
Subject: Update unit test

---
 tests/bot/exts/utils/test_snekbox.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 9e3143776..1f226a6ce 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -1,5 +1,6 @@
 import asyncio
 import unittest
+from base64 import b64encode
 from unittest.mock import AsyncMock, MagicMock, Mock, call, create_autospec, patch
 
 from discord import AllowedMentions
@@ -39,9 +40,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             "args": ["main.py"],
             "files": [
                 {
-                    "name": "main.py",
-                    "content-encoding": "utf-8",
-                    "content": "import random"
+                    "path": "main.py",
+                    "content": b64encode("import random".encode()).decode()
                 }
             ]
         }
-- 
cgit v1.2.3


From 51e7e17e06aedc9f05347a5196faf137dc5a00ae Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 30 Nov 2022 07:48:12 +0800
Subject: Refactors for EvalResult and EvalJob dataclasses

---
 bot/exts/utils/snekbox.py | 296 +++++++++++++++++++---------------------------
 bot/exts/utils/snekio.py  |  64 ++++++++++
 2 files changed, 185 insertions(+), 175 deletions(-)
 create mode 100644 bot/exts/utils/snekio.py

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 75c6f2d3a..d8a3088a6 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -3,25 +3,22 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import re
-from base64 import b64decode, b64encode
-from collections.abc import Iterable
 from dataclasses import dataclass, field
 from functools import partial
-from io import BytesIO
 from operator import attrgetter
-from pathlib import Path
 from signal import Signals
 from textwrap import dedent
-from typing import Generic, Literal, Optional, TYPE_CHECKING, Tuple, TypeVar
+from typing import Literal, Optional, TYPE_CHECKING, Tuple
 
 from botcore.utils import interactions
 from botcore.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
-from discord import AllowedMentions, File, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
+from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
 from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
 
 from bot.bot import Bot
 from bot.constants import Categories, Channels, MODERATION_ROLES, Roles, URLs
 from bot.decorators import redirect_output
+from bot.exts.utils.snekio import FileAttachment, sizeof_fmt, FILE_SIZE_LIMIT
 from bot.log import get_logger
 from bot.utils import send_to_paste_service
 from bot.utils.lock import LockedResourceError, lock_arg
@@ -88,89 +85,108 @@ SIGKILL = 9
 REDO_EMOJI = '\U0001f501'  # :repeat:
 REDO_TIMEOUT = 30
 
-# Note discord upload limit is 8 MB, or 50 MB for lvl 2 boosted servers
-FILE_SIZE_LIMIT = 8 * 1024 * 1024  # 8 MiB
-
-T = TypeVar("T")
-
-
-def sizeof_fmt(num: int, suffix: str = "B") -> str:
-    """Return a human-readable file size."""
-    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
-        if abs(num) < 1024:
-            return f"{num:3.1f}{unit}{suffix}"
-        num /= 1024
-    return f"{num:.1f}Yi{suffix}"
+PythonVersion = Literal["3.10", "3.11"]
 
 
 @dataclass
-class FileAttachment(Generic[T]):
-    """File Attachment from Snekbox eval."""
-
-    path: str
-    content: T
+class EvalJob:
+    """Job to be evaluated by snekbox."""
 
-    def __repr__(self) -> str:
-        """Return the content as a string."""
-        content = self.content if isinstance(self.content, str) else "(...)"
-        return f"FileAttachment(path={self.path}, content={content})"
+    args: list[str]
+    files: list[FileAttachment] = field(default_factory=list)
+    name: str = "eval"
+    version: PythonVersion = "3.11"
 
     @classmethod
-    def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment[bytes]:
-        """Create a FileAttachment from a dict response."""
-        size = data.get("size")
-        if (size and size > size_limit) or (len(data["content"]) > size_limit):
-            raise ValueError("File size exceeds limit")
+    def from_code(cls, code: str, path: str = "main.py") -> EvalJob:
+        """Create an EvalJob from a code string."""
+        return cls(
+            args=[path],
+            files=[FileAttachment(path, code.encode())],
+        )
 
-        content = b64decode(data["content"])
+    def as_version(self, version: PythonVersion) -> EvalJob:
+        """Return a copy of the job with a different Python version."""
+        return EvalJob(
+            args=self.args,
+            files=self.files,
+            name=self.name,
+            version=version,
+        )
 
-        if len(content) > size_limit:
-            raise ValueError("File size exceeds limit")
+    def to_dict(self) -> dict[str, list[str | dict[str, str]]]:
+        """Convert the job to a dict."""
+        return {
+            "args": self.args,
+            "files": [file.to_dict() for file in self.files],
+        }
 
-        return cls(data["path"], content)
 
-    def to_json(self) -> dict[str, str]:
-        """Convert the attachment to a json dict."""
-        content = self.content
-        if isinstance(content, str):
-            content = content.encode("utf-8")
+@dataclass(frozen=True)
+class EvalResult:
+    """The result of an eval job."""
 
-        return {
-            "path": self.path,
-            "content": b64encode(content).decode("ascii"),
-        }
+    stdout: str
+    returncode: int | None
+    files: list[FileAttachment] = field(default_factory=list)
+    err_files: list[str] = field(default_factory=list)
 
-    def to_file(self) -> File:
-        """Convert to a discord.File."""
-        name = Path(self.path).name
-        return File(BytesIO(self.content), filename=name)
+    @property
+    def status_emoji(self):
+        """Return an emoji corresponding to the status code or lack of output in result."""
+        # If there are attachments, skip empty output warning
+        if not self.stdout.strip() and not self.files:  # No output
+            return ":warning:"
+        elif self.returncode == 0:  # No error
+            return ":white_check_mark:"
+        else:  # Exception
+            return ":x:"
 
+    def message(self, job: EvalJob) -> tuple[str, str]:
+        """Return a user-friendly message and error corresponding to the process's return code."""
+        msg = f"Your {job.version} {job.name} job has completed with return code {self.returncode}"
+        error = ""
 
-@dataclass
-class EvalJob:
-    """Represents a job to be evaluated by Snekbox."""
+        if self.returncode is None:
+            msg = f"Your {job.version} {job.name} job has failed"
+            error = self.stdout.strip()
+        elif self.returncode == 128 + SIGKILL:
+            msg = f"Your {job.version} {job.name} job timed out or ran out of memory"
+        elif self.returncode == 255:
+            msg = f"Your {job.version} {job.name} job has failed"
+            error = "A fatal NsJail error occurred"
+        else:
+            # Try to append signal's name if one exists
+            with contextlib.suppress(ValueError):
+                name = Signals(self.returncode - 128).name
+                msg = f"{msg} ({name})"
 
-    args: list[str]
-    files: list[FileAttachment] = field(default_factory=list)
+        # Add error message for failed attachments
+        if self.err_files:
+            failed_files = f"({', '.join(self.err_files)})"
+            msg += (
+                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
+                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
+            )
 
-    def __repr__(self) -> str:
-        """Return the job as a string."""
-        return f"EvalJob(args={self.args}, files={self.files})"
+        return msg, error
 
     @classmethod
-    def from_code(cls, code: str, files: Iterable[FileAttachment] = (), name: str = "main.py") -> EvalJob:
-        """Create an EvalJob from a code string."""
-        return cls(
-            args=[name],
-            files=[FileAttachment(name, code), *files],
+    def from_dict(cls, data: dict[str, str | int | list[dict[str, str]]]) -> EvalResult:
+        """Create an EvalResult from a dict."""
+        res = cls(
+            stdout=data["stdout"],
+            returncode=data["returncode"],
         )
 
-    def to_json(self) -> dict[str, list[str | dict[str, str]]]:
-        """Convert the job to a dict."""
-        return {
-            "args": self.args,
-            "files": [file.to_json() for file in self.files],
-        }
+        for file in data.get("files", []):
+            try:
+                res.files.append(FileAttachment.from_dict(file))
+            except ValueError as e:
+                log.info(f"Failed to parse file from snekbox response: {e}")
+                res.err_files.append(file["path"])
+
+        return res
 
 
 class CodeblockConverter(Converter):
@@ -214,19 +230,17 @@ class PythonVersionSwitcherButton(ui.Button):
     """A button that allows users to re-run their eval command in a different Python version."""
 
     def __init__(
-        self,
-        job_name: str,
-        version_to_switch_to: Literal["3.10", "3.11"],
-        snekbox_cog: Snekbox,
-        ctx: Context,
-        job: EvalJob,
+            self,
+            version_to_switch_to: PythonVersion,
+            snekbox_cog: Snekbox,
+            ctx: Context,
+            job: EvalJob,
     ) -> None:
         self.version_to_switch_to = version_to_switch_to
         super().__init__(label=f"Run in {self.version_to_switch_to}", style=enums.ButtonStyle.primary)
 
         self.snekbox_cog = snekbox_cog
         self.ctx = ctx
-        self.job_name = job_name
         self.job = job
 
     async def callback(self, interaction: Interaction) -> None:
@@ -244,7 +258,7 @@ class PythonVersionSwitcherButton(ui.Button):
             # The log arg on send_job will stop the actual job from running.
             await interaction.message.delete()
 
-        await self.snekbox_cog.run_job(self.job_name, self.ctx, self.version_to_switch_to, self.job)
+        await self.snekbox_cog.run_job(self.ctx, self.job.as_version(self.version_to_switch_to))
 
 
 class Snekbox(Cog):
@@ -255,11 +269,10 @@ class Snekbox(Cog):
         self.jobs = {}
 
     def build_python_version_switcher_view(
-        self,
-        job_name: str,
-        current_python_version: Literal["3.10", "3.11"],
-        ctx: Context,
-        job: EvalJob,
+            self,
+            current_python_version: PythonVersion,
+            ctx: Context,
+            job: EvalJob,
     ) -> interactions.ViewWithUserAndRoleCheck:
         """Return a view that allows the user to change what version of Python their code is run on."""
         if current_python_version == "3.10":
@@ -271,28 +284,25 @@ class Snekbox(Cog):
             allowed_users=(ctx.author.id,),
             allowed_roles=MODERATION_ROLES,
         )
-        view.add_item(PythonVersionSwitcherButton(job_name, alt_python_version, self, ctx, job))
+        view.add_item(PythonVersionSwitcherButton(alt_python_version, self, ctx, job))
         view.add_item(interactions.DeleteMessageButton())
 
         return view
 
-    async def post_job(
-        self,
-        job: EvalJob,
-        python_version: Literal["3.10", "3.11"],
-    ) -> dict:
+    async def post_job(self, job: EvalJob) -> EvalResult:
         """Send a POST request to the Snekbox API to evaluate code and return the results."""
-        if python_version == "3.10":
+        if job.version == "3.10":
             url = URLs.snekbox_eval_api
         else:
             url = URLs.snekbox_311_eval_api
 
-        data = {"args": job.args, "files": [f.to_json() for f in job.files]}
+        data = job.to_dict()
 
         async with self.bot.http_session.post(url, json=data, raise_for_status=True) as resp:
             return await resp.json()
 
-    async def upload_output(self, output: str) -> Optional[str]:
+    @staticmethod
+    async def upload_output(output: str) -> Optional[str]:
         """Upload the job's output to a paste service and return a URL to it if successful."""
         log.trace("Uploading full output to paste service...")
 
@@ -317,61 +327,6 @@ class Snekbox(Cog):
         args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup_code), code])
         return args
 
-    @staticmethod
-    def get_results_message(
-        results: dict, job_name: str, python_version: Literal["3.10", "3.11"]
-    ) -> Tuple[str, str, list[FileAttachment]]:
-        """Return a user-friendly message and error corresponding to the process's return code."""
-        stdout, returncode = results["stdout"], results["returncode"]
-
-        attachments: list[FileAttachment] = []
-        failed_attachments: list[str] = []
-        for attachment in results.get("files", []):
-            try:
-                attachments.append(FileAttachment.from_dict(attachment))
-            except ValueError:
-                failed_attachments.append(attachment["path"])
-
-        msg = f"Your {python_version} {job_name} job has completed with return code {returncode}"
-        error = ""
-
-        if returncode is None:
-            msg = f"Your {python_version} {job_name} job has failed"
-            error = stdout.strip()
-        elif returncode == 128 + SIGKILL:
-            msg = f"Your {python_version} {job_name} job timed out or ran out of memory"
-        elif returncode == 255:
-            msg = f"Your {python_version} {job_name} job has failed"
-            error = "A fatal NsJail error occurred"
-        else:
-            # Try to append signal's name if one exists
-            try:
-                name = Signals(returncode - 128).name
-                msg = f"{msg} ({name})"
-            except ValueError:
-                pass
-
-        # Add error message for failed attachments
-        if failed_attachments:
-            failed_files = f"({', '.join(failed_attachments)})"
-            msg += (
-                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
-                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
-            )
-
-        return msg, error, attachments
-
-    @staticmethod
-    def get_status_emoji(results: dict) -> str:
-        """Return an emoji corresponding to the status code or lack of output in result."""
-        # If there are attachments, skip empty output warning
-        if not results["stdout"].strip() and not results.get("files"):  # No output
-            return ":warning:"
-        elif results["returncode"] == 0:  # No error
-            return ":white_check_mark:"
-        else:  # Exception
-            return ":x:"
-
     async def format_output(self, output: str) -> Tuple[str, Optional[str]]:
         """
         Format the output and return a tuple of the formatted output and a URL to the full output.
@@ -419,40 +374,32 @@ class Snekbox(Cog):
         return output, paste_link
 
     @lock_arg("snekbox.send_job", "ctx", attrgetter("author.id"), raise_error=True)
-    async def send_job(
-        self,
-        job_name: str,
-        ctx: Context,
-        python_version: Literal["3.10", "3.11"],
-        job: EvalJob,
-    ) -> Message:
+    async def send_job(self, ctx: Context, job: EvalJob) -> Message:
         """
         Evaluate code, format it, and send the output to the corresponding channel.
 
         Return the bot response.
         """
         async with ctx.typing():
-            results = await self.post_job(job, python_version)
-            msg, error, attachments = self.get_results_message(results, job_name, python_version)
+            result = await self.post_job(job)
+            msg, error = result.message(job)
 
             if error:
                 output, paste_link = error, None
             else:
                 log.trace("Formatting output...")
-                output, paste_link = await self.format_output(results["stdout"])
-
-            icon = self.get_status_emoji(results)
+                output, paste_link = await self.format_output(result.stdout)
 
-            if attachments and output in ("[No output]", ""):
-                msg = f"{ctx.author.mention} {icon} {msg}.\n"
+            if result.files and output in ("[No output]", ""):
+                msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
             else:
-                msg = f"{ctx.author.mention} {icon} {msg}.\n\n```\n{output}\n```"
+                msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n\n```\n{output}\n```"
 
             if paste_link:
                 msg = f"{msg}\nFull output: {paste_link}"
 
             # Collect stats of job fails + successes
-            if icon == ":x:":
+            if result.returncode != 0:
                 self.bot.stats.incr("snekbox.python.fail")
             else:
                 self.bot.stats.incr("snekbox.python.success")
@@ -465,14 +412,14 @@ class Snekbox(Cog):
                 response = await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
             else:
                 allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-                view = self.build_python_version_switcher_view(job_name, python_version, ctx, job)
+                view = self.build_python_version_switcher_view(job.version, ctx, job)
 
-                # Attach file if provided
-                files = [atc.to_file() for atc in attachments]
+                # Attach files if provided
+                files = [f.to_file() for f in result.files]
                 response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
                 view.message = response
 
-            log.info(f"{ctx.author}'s {job_name} job had a return code of {results['returncode']}")
+            log.info(f"{ctx.author}'s {job.name} job had a return code of {result.returncode}")
         return response
 
     async def continue_job(
@@ -549,9 +496,7 @@ class Snekbox(Cog):
 
     async def run_job(
         self,
-        job_name: str,
         ctx: Context,
-        python_version: Literal["3.10", "3.11"],
         job: EvalJob,
     ) -> None:
         """Handles checks, stats and re-evaluation of a snekbox job."""
@@ -571,7 +516,7 @@ class Snekbox(Cog):
 
         while True:
             try:
-                response = await self.send_job(job_name, ctx, python_version, job)
+                response = await self.send_job(ctx, job)
             except LockedResourceError:
                 await ctx.send(
                     f"{ctx.author.mention} You've already got a job running - "
@@ -584,7 +529,7 @@ class Snekbox(Cog):
             # This can happen when a button is pressed and then original code is edited and re-run.
             self.jobs[ctx.message.id] = response.id
 
-            job = await self.continue_job(ctx, response, job_name)
+            job = await self.continue_job(ctx, response, job.name)
             if not job:
                 break
             log.info(f"Re-evaluating code from message {ctx.message.id}:\n{job}")
@@ -601,7 +546,7 @@ class Snekbox(Cog):
     async def eval_command(
         self,
         ctx: Context,
-        python_version: Optional[Literal["3.10", "3.11"]],
+        python_version: PythonVersion | None,
         *,
         code: CodeblockConverter
     ) -> None:
@@ -624,8 +569,8 @@ class Snekbox(Cog):
         """
         code: list[str]
         python_version = python_version or "3.11"
-        job = EvalJob.from_code("\n".join(code))
-        await self.run_job("eval", ctx, python_version, job)
+        job = EvalJob.from_code("\n".join(code)).as_version(python_version)
+        await self.run_job(ctx, job)
 
     @command(name="timeit", aliases=("ti",), usage="[python_version] [setup_code] <code, ...>")
     @guild_only()
@@ -639,7 +584,7 @@ class Snekbox(Cog):
     async def timeit_command(
         self,
         ctx: Context,
-        python_version: Optional[Literal["3.10", "3.11"]],
+        python_version: PythonVersion | None,
         *,
         code: CodeblockConverter
     ) -> None:
@@ -663,8 +608,9 @@ class Snekbox(Cog):
         code: list[str]
         python_version = python_version or "3.11"
         args = self.prepare_timeit_input(code)
+        job = EvalJob(args, version=python_version, name="timeit")
 
-        await self.run_job("timeit", ctx, python_version, EvalJob(args))
+        await self.run_job(ctx, job)
 
 
 def predicate_message_edit(ctx: Context, old_msg: Message, new_msg: Message) -> bool:
diff --git a/bot/exts/utils/snekio.py b/bot/exts/utils/snekio.py
new file mode 100644
index 000000000..7c5fba648
--- /dev/null
+++ b/bot/exts/utils/snekio.py
@@ -0,0 +1,64 @@
+"""I/O File protocols for snekbox."""
+from __future__ import annotations
+
+from base64 import b64decode, b64encode
+from dataclasses import dataclass
+from io import BytesIO
+from pathlib import Path
+
+from discord import File
+
+# Note discord upload limit is 8 MB, or 50 MB for lvl 2 boosted servers
+FILE_SIZE_LIMIT = 8 * 1024 * 1024  # 8 MiB
+
+
+def sizeof_fmt(num: int, suffix: str = "B") -> str:
+    """Return a human-readable file size."""
+    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
+        if abs(num) < 1024:
+            return f"{num:3.1f}{unit}{suffix}"
+        num /= 1024
+    return f"{num:.1f}Yi{suffix}"
+
+
+@dataclass
+class FileAttachment:
+    """File Attachment from Snekbox eval."""
+
+    path: str
+    content: bytes
+
+    def __repr__(self) -> str:
+        """Return the content as a string."""
+        content = f"{self.content[:10]}..." if len(self.content) > 10 else self.content
+        return f"FileAttachment(path={self.path!r}, content={content})"
+
+    @classmethod
+    def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
+        """Create a FileAttachment from a dict response."""
+        size = data.get("size")
+        if (size and size > size_limit) or (len(data["content"]) > size_limit):
+            raise ValueError("File size exceeds limit")
+
+        content = b64decode(data["content"])
+
+        if len(content) > size_limit:
+            raise ValueError("File size exceeds limit")
+
+        return cls(data["path"], content)
+
+    def to_dict(self) -> dict[str, str]:
+        """Convert the attachment to a json dict."""
+        content = self.content
+        if isinstance(content, str):
+            content = content.encode("utf-8")
+
+        return {
+            "path": self.path,
+            "content": b64encode(content).decode("ascii"),
+        }
+
+    def to_file(self) -> File:
+        """Convert to a discord.File."""
+        name = Path(self.path).name
+        return File(BytesIO(self.content), filename=name)
-- 
cgit v1.2.3


From 7711e2d5b53a3da5481bc74105f7a1c0dbf99d6c Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 30 Nov 2022 07:48:28 +0800
Subject: Update unit tests for snekbox

---
 tests/bot/exts/utils/test_snekbox.py | 111 ++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 1f226a6ce..b52159101 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -9,7 +9,7 @@ from discord.ext import commands
 from bot import constants
 from bot.errors import LockedResourceError
 from bot.exts.utils import snekbox
-from bot.exts.utils.snekbox import EvalJob, Snekbox
+from bot.exts.utils.snekbox import EvalJob, Snekbox, EvalResult
 from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
 
 
@@ -18,6 +18,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         """Add mocked bot and cog to the instance."""
         self.bot = MockBot()
         self.cog = Snekbox(bot=self.bot)
+        self.job = EvalJob.from_code("import random")
 
     @staticmethod
     def code_args(code: str) -> tuple[EvalJob]:
@@ -34,7 +35,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.bot.http_session.post.return_value = context_manager
 
         job = EvalJob.from_code("import random")
-        self.assertEqual(await self.cog.post_job(job, "3.10"), "return")
+        self.assertEqual(await self.cog.post_job(job), "return")
 
         expected = {
             "args": ["main.py"],
@@ -99,34 +100,37 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             with self.subTest(msg=f'Test with {test_name} and expected return {expected}'):
                 self.assertEqual(self.cog.prepare_timeit_input(case), expected)
 
-    def test_get_results_message(self):
-        """Return error and message according to the eval result."""
+    def test_eval_result_message(self):
+        """EvalResult.message, should return error and message."""
         cases = (
-            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', [])),
-            ('', 128 + snekbox.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', [])),
-            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred', []))
+            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR')),
+            ('', 128 + snekbox.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '')),
+            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred'))
         )
         for stdout, returncode, expected in cases:
             with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
-                actual = self.cog.get_results_message({'stdout': stdout, 'returncode': returncode}, 'eval', '3.11')
-                self.assertEqual(actual, expected)
+                result = EvalResult(stdout=stdout, returncode=returncode)
+                job = EvalJob([])
+                self.assertEqual(result.message(job), expected)
 
     @patch('bot.exts.utils.snekbox.Signals', side_effect=ValueError)
-    def test_get_results_message_invalid_signal(self, mock_signals: Mock):
+    def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
+        result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
-            self.cog.get_results_message({'stdout': '', 'returncode': 127}, 'eval', '3.11'),
-            ('Your 3.11 eval job has completed with return code 127', '', [])
+            result.message(EvalJob([], version="3.10")),
+            ("Your 3.10 eval job has completed with return code 127", "")
         )
 
     @patch('bot.exts.utils.snekbox.Signals')
-    def test_get_results_message_valid_signal(self, mock_signals: Mock):
-        mock_signals.return_value.name = 'SIGTEST'
+    def test_eval_result_message_valid_signal(self, mock_signals: Mock):
+        mock_signals.return_value.name = "SIGTEST"
+        result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
-            self.cog.get_results_message({'stdout': '', 'returncode': 127}, 'eval', '3.11'),
-            ('Your 3.11 eval job has completed with return code 127 (SIGTEST)', '', [])
+            result.message(EvalJob([], version="3.11")),
+            ("Your 3.11 eval job has completed with return code 127 (SIGTEST)", "")
         )
 
-    def test_get_status_emoji(self):
+    def test_eval_result_status_emoji(self):
         """Return emoji according to the eval result."""
         cases = (
             (' ', -1, ':warning:'),
@@ -135,8 +139,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         )
         for stdout, returncode, expected in cases:
             with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
-                actual = self.cog.get_status_emoji({'stdout': stdout, 'returncode': returncode})
-                self.assertEqual(actual, expected)
+                result = EvalResult(stdout=stdout, returncode=returncode)
+                self.assertEqual(result.status_emoji, expected)
 
     async def test_format_output(self):
         """Test output formatting."""
@@ -198,7 +202,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.continue_job = AsyncMock(return_value=None)
 
         await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
-        self.cog.send_job.assert_called_once_with('eval', ctx, '3.11', *self.code_args('MyAwesomeCode'))
+        job = EvalJob.from_code("MyAwesomeCode")
+        self.cog.send_job.assert_called_once_with(ctx, job)
         self.cog.continue_job.assert_called_once_with(ctx, response, 'eval')
 
     async def test_eval_command_evaluate_twice(self):
@@ -211,10 +216,10 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.continue_job.side_effect = (EvalJob.from_code('MyAwesomeFormattedCode'), None)
 
         await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
-        self.cog.send_job.assert_called_with(
-            'eval', ctx, '3.11', *self.code_args('MyAwesomeFormattedCode')
-        )
-        self.cog.continue_job.assert_called_with(ctx, response, 'eval')
+
+        expected_job = EvalJob.from_code("MyAwesomeFormattedCode")
+        self.cog.send_job.assert_called_with(ctx, expected_job)
+        self.cog.continue_job.assert_called_with(ctx, response, "eval")
 
     async def test_eval_command_reject_two_eval_at_the_same_time(self):
         """Test if the eval command rejects an eval if the author already have a running eval."""
@@ -229,8 +234,8 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.post_job = AsyncMock(side_effect=delay_with_side_effect)
         with self.assertRaises(LockedResourceError):
             await asyncio.gather(
-                self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
-                self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
+                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
+                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
             )
 
     async def test_send_job(self):
@@ -240,30 +245,31 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.send = AsyncMock()
         ctx.author = MockUser(mention='@LemonLemonishBeard#0042')
 
-        self.cog.post_job = AsyncMock(return_value={'stdout': '', 'returncode': 0})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 0', '', []))
-        self.cog.get_status_emoji = MagicMock(return_value=':yay!:')
+        eval_result = EvalResult("", 0)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
         self.cog.format_output = AsyncMock(return_value=('[No output]', None))
+        self.cog.upload_output = AsyncMock()  # Should not be called
 
         mocked_filter_cog = MagicMock()
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
+        job = EvalJob.from_code('MyAwesomeCode')
+        await self.cog.send_job(ctx, job),
 
         ctx.send.assert_called_once()
         self.assertEqual(
             ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :yay!: Return code 0.\n\n```\n[No output]\n```'
+            '@LemonLemonishBeard#0042 :warning: Your 3.11 eval job has completed '
+            'with return code 0.\n\n```\n[No output]\n```'
         )
         allowed_mentions = ctx.send.call_args.kwargs['allowed_mentions']
         expected_allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
         self.assertEqual(allowed_mentions.to_dict(), expected_allowed_mentions.to_dict())
 
-        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
-        self.cog.get_status_emoji.assert_called_once_with({'stdout': '', 'returncode': 0})
-        self.cog.get_results_message.assert_called_once_with({'stdout': '', 'returncode': 0}, 'eval', '3.11')
+        self.cog.post_job.assert_called_once_with(job)
         self.cog.format_output.assert_called_once_with('')
+        self.cog.upload_output.assert_not_called()
 
     async def test_send_job_with_paste_link(self):
         """Test the send_job function with a too long output that generate a paste link."""
@@ -272,29 +278,26 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.send = AsyncMock()
         ctx.author.mention = '@LemonLemonishBeard#0042'
 
-        self.cog.post_job = AsyncMock(return_value={'stdout': 'Way too long beard', 'returncode': 0})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 0', '', []))
-        self.cog.get_status_emoji = MagicMock(return_value=':yay!:')
+        eval_result = EvalResult("Way too long beard", 0)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
         self.cog.format_output = AsyncMock(return_value=('Way too long beard', 'lookatmybeard.com'))
 
         mocked_filter_cog = MagicMock()
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
+        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
+        await self.cog.send_job(ctx, job),
 
         ctx.send.assert_called_once()
         self.assertEqual(
             ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :yay!: Return code 0.'
+            '@LemonLemonishBeard#0042 :white_check_mark: Your 3.11 eval job '
+            'has completed with return code 0.'
             '\n\n```\nWay too long beard\n```\nFull output: lookatmybeard.com'
         )
 
-        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
-        self.cog.get_status_emoji.assert_called_once_with({'stdout': 'Way too long beard', 'returncode': 0})
-        self.cog.get_results_message.assert_called_once_with(
-            {'stdout': 'Way too long beard', 'returncode': 0}, 'eval', '3.11'
-        )
+        self.cog.post_job.assert_called_once_with(job)
         self.cog.format_output.assert_called_once_with('Way too long beard')
 
     async def test_send_job_with_non_zero_eval(self):
@@ -303,27 +306,27 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ctx.message = MockMessage()
         ctx.send = AsyncMock()
         ctx.author.mention = '@LemonLemonishBeard#0042'
-        self.cog.post_job = AsyncMock(return_value={'stdout': 'ERROR', 'returncode': 127})
-        self.cog.get_results_message = MagicMock(return_value=('Return code 127', 'Beard got stuck in the eval', []))
-        self.cog.get_status_emoji = MagicMock(return_value=':nope!:')
-        self.cog.format_output = AsyncMock()  # This function isn't called
+
+        eval_result = EvalResult("ERROR", 127)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
+        self.cog.upload_output = AsyncMock()  # This function isn't called
 
         mocked_filter_cog = MagicMock()
         mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
         self.bot.get_cog.return_value = mocked_filter_cog
 
-        await self.cog.send_job('eval', ctx, '3.11', *self.code_args('MyAwesomeCode')),
+        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
+        await self.cog.send_job(ctx, job),
 
         ctx.send.assert_called_once()
         self.assertEqual(
             ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :nope!: Return code 127.\n\n```\nBeard got stuck in the eval\n```'
+            '@LemonLemonishBeard#0042 :x: Your 3.11 eval job has completed with return code 127.'
+            '\n\n```\nERROR\n```'
         )
 
-        self.cog.post_job.assert_called_once_with(*self.code_args('MyAwesomeCode'), '3.11')
-        self.cog.get_status_emoji.assert_called_once_with({'stdout': 'ERROR', 'returncode': 127})
-        self.cog.get_results_message.assert_called_once_with({'stdout': 'ERROR', 'returncode': 127}, 'eval', '3.11')
-        self.cog.format_output.assert_not_called()
+        self.cog.post_job.assert_called_once_with(job)
+        self.cog.upload_output.assert_not_called()
 
     @patch("bot.exts.utils.snekbox.partial")
     async def test_continue_job_does_continue(self, partial_mock):
-- 
cgit v1.2.3


From 5eba5306a21e373b55a43828b4455395bbc671fc Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 30 Nov 2022 08:40:41 +0800
Subject: Reorder imports

---
 bot/exts/utils/snekbox.py            | 4 ++--
 tests/bot/exts/utils/test_snekbox.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index cd090ed79..1d003fb9a 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -18,8 +18,8 @@ from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
 from bot.bot import Bot
 from bot.constants import Channels, MODERATION_ROLES, Roles, URLs
 from bot.decorators import redirect_output
-from bot.exts.utils.snekio import FileAttachment, sizeof_fmt, FILE_SIZE_LIMIT
 from bot.exts.help_channels._channel import is_help_forum_post
+from bot.exts.utils.snekio import FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
 from bot.log import get_logger
 from bot.utils import send_to_paste_service
 from bot.utils.lock import LockedResourceError, lock_arg
@@ -133,7 +133,7 @@ class EvalResult:
     err_files: list[str] = field(default_factory=list)
 
     @property
-    def status_emoji(self):
+    def status_emoji(self) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
         # If there are attachments, skip empty output warning
         if not self.stdout.strip() and not self.files:  # No output
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index b52159101..3f9789031 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -9,7 +9,7 @@ from discord.ext import commands
 from bot import constants
 from bot.errors import LockedResourceError
 from bot.exts.utils import snekbox
-from bot.exts.utils.snekbox import EvalJob, Snekbox, EvalResult
+from bot.exts.utils.snekbox import EvalJob, EvalResult, Snekbox
 from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
 
 
-- 
cgit v1.2.3


From 41d2628706a09893e7ee44faf84ae8d9275bab6c Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Thu, 1 Dec 2022 19:54:24 +0800
Subject: Fix send_job return type

---
 bot/exts/utils/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 1d003fb9a..b8e6476f8 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -300,7 +300,7 @@ class Snekbox(Cog):
         data = job.to_dict()
 
         async with self.bot.http_session.post(url, json=data, raise_for_status=True) as resp:
-            return await resp.json()
+            return EvalResult.from_dict(await resp.json())
 
     @staticmethod
     async def upload_output(output: str) -> Optional[str]:
-- 
cgit v1.2.3


From bf5327305717ea87568d72f8ed6d8e79bd8969c6 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 11:45:44 +0800
Subject: Fix test_post_job unit test

---
 tests/bot/exts/utils/test_snekbox.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 3f9789031..f8222761a 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -28,14 +28,14 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
     async def test_post_job(self):
         """Post the eval code to the URLs.snekbox_eval_api endpoint."""
         resp = MagicMock()
-        resp.json = AsyncMock(return_value="return")
+        resp.json = AsyncMock(return_value={"stdout": "Hi", "returncode": 137})
 
         context_manager = MagicMock()
         context_manager.__aenter__.return_value = resp
         self.bot.http_session.post.return_value = context_manager
 
         job = EvalJob.from_code("import random")
-        self.assertEqual(await self.cog.post_job(job), "return")
+        self.assertEqual(await self.cog.post_job(job), EvalResult("Hi", 137))
 
         expected = {
             "args": ["main.py"],
-- 
cgit v1.2.3


From def2dd6407763232fd8b1f13fc352441b9494573 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 11:47:26 +0800
Subject: Revert typo

---
 bot/exts/utils/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index b8e6476f8..2f88133e3 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -525,7 +525,7 @@ class Snekbox(Cog):
                 )
                 return
 
-            # Store the bots response message id per invocation, to ensure the `wait_for`s in `continue_job`
+            # Store the bot's response message id per invocation, to ensure the `wait_for`s in `continue_job`
             # don't trigger if the response has already been replaced by a new response.
             # This can happen when a button is pressed and then original code is edited and re-run.
             self.jobs[ctx.message.id] = response.id
-- 
cgit v1.2.3


From 62722898ef4d5a0fdd21e52bf2e6dbc33f483ac7 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 14 Dec 2022 11:54:48 +0800
Subject: Update bot/exts/utils/snekbox.py

Co-authored-by: Mark <1515135+MarkKoz@users.noreply.github.com>
---
 bot/exts/utils/snekbox.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 2f88133e3..99d4124b0 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -391,10 +391,9 @@ class Snekbox(Cog):
                 log.trace("Formatting output...")
                 output, paste_link = await self.format_output(result.stdout)
 
-            if result.files and output in ("[No output]", ""):
-                msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
-            else:
-                msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n\n```\n{output}\n```"
+            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
+            if not result.files or output not in ("[No output]", ""):
+                msg += f"\n```\n{output}\n```"
 
             if paste_link:
                 msg = f"{msg}\nFull output: {paste_link}"
-- 
cgit v1.2.3


From 7deda3486b0a8bf324c77f48a10b010899b7e75d Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 16:32:46 +0800
Subject: Suppress HTTPException for redo emoji

---
 bot/exts/utils/snekbox.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 2f88133e3..e43f5a5b1 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -463,7 +463,8 @@ class Snekbox(Cog):
                     return None
 
             except asyncio.TimeoutError:
-                await ctx.message.clear_reaction(REDO_EMOJI)
+                with contextlib.suppress(HTTPException):
+                    await ctx.message.clear_reaction(REDO_EMOJI)
                 return None
 
             codeblocks = await CodeblockConverter.convert(ctx, code)
-- 
cgit v1.2.3


From daf92c63d23ed3d4664c9003ae59d0aa4965e00a Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 16:49:31 +0800
Subject: Update file size limit comment

---
 bot/exts/utils/snekio.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekio.py b/bot/exts/utils/snekio.py
index 7c5fba648..a7f84a241 100644
--- a/bot/exts/utils/snekio.py
+++ b/bot/exts/utils/snekio.py
@@ -8,8 +8,9 @@ from pathlib import Path
 
 from discord import File
 
-# Note discord upload limit is 8 MB, or 50 MB for lvl 2 boosted servers
-FILE_SIZE_LIMIT = 8 * 1024 * 1024  # 8 MiB
+# Note discord bot upload limit is 8 MiB per file,
+# or 50 MiB for lvl 2 boosted servers
+FILE_SIZE_LIMIT = 8 * 1024 * 1024
 
 
 def sizeof_fmt(num: int, suffix: str = "B") -> str:
-- 
cgit v1.2.3


From e248e9e1e0fd48b4c76a3806d89d995f2df1a512 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 16:50:55 +0800
Subject: Update function name `get_message`

---
 bot/exts/utils/snekbox.py            | 4 ++--
 tests/bot/exts/utils/test_snekbox.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 018417005..b5ba7335b 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -143,7 +143,7 @@ class EvalResult:
         else:  # Exception
             return ":x:"
 
-    def message(self, job: EvalJob) -> tuple[str, str]:
+    def get_message(self, job: EvalJob) -> tuple[str, str]:
         """Return a user-friendly message and error corresponding to the process's return code."""
         msg = f"Your {job.version} {job.name} job has completed with return code {self.returncode}"
         error = ""
@@ -383,7 +383,7 @@ class Snekbox(Cog):
         """
         async with ctx.typing():
             result = await self.post_job(job)
-            msg, error = result.message(job)
+            msg, error = result.get_message(job)
 
             if error:
                 output, paste_link = error, None
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index f8222761a..e54e80732 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -111,13 +111,13 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
                 result = EvalResult(stdout=stdout, returncode=returncode)
                 job = EvalJob([])
-                self.assertEqual(result.message(job), expected)
+                self.assertEqual(result.get_message(job), expected)
 
     @patch('bot.exts.utils.snekbox.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
         result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
-            result.message(EvalJob([], version="3.10")),
+            result.get_message(EvalJob([], version="3.10")),
             ("Your 3.10 eval job has completed with return code 127", "")
         )
 
@@ -126,7 +126,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         mock_signals.return_value.name = "SIGTEST"
         result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
-            result.message(EvalJob([], version="3.11")),
+            result.get_message(EvalJob([], version="3.11")),
             ("Your 3.11 eval job has completed with return code 127 (SIGTEST)", "")
         )
 
-- 
cgit v1.2.3


From a1d1926de98393324894e8392c7d55d49a0273a1 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 16:56:03 +0800
Subject: Update test_post_job to use 3.10 snekbox

---
 tests/bot/exts/utils/test_snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index e54e80732..722c5c569 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -34,7 +34,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         context_manager.__aenter__.return_value = resp
         self.bot.http_session.post.return_value = context_manager
 
-        job = EvalJob.from_code("import random")
+        job = EvalJob.from_code("import random").as_version("3.10")
         self.assertEqual(await self.cog.post_job(job), EvalResult("Hi", 137))
 
         expected = {
-- 
cgit v1.2.3


From a7d48753e6ab7c2d44cfe66c8647c046ba47b8aa Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 16:57:45 +0800
Subject: Update `prepare_timeit_input` docstring

---
 bot/exts/utils/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index b5ba7335b..b89882a65 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -317,7 +317,7 @@ class Snekbox(Cog):
     @staticmethod
     def prepare_timeit_input(codeblocks: list[str]) -> list[str]:
         """
-        Join the codeblocks into a single string, then return the code and the arguments in a tuple.
+        Join the codeblocks into a single string, then return the arguments in a list.
 
         If there are multiple codeblocks, insert the first one into the wrapped setup code.
         """
-- 
cgit v1.2.3


From 727a146f2de0f37c43d6939dc4368ef780373cd4 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 17:30:33 +0800
Subject: Refactor to move snekbox to module

---
 bot/exts/utils/snekbox.py            | 629 -----------------------------------
 bot/exts/utils/snekbox/__init__.py   |  12 +
 bot/exts/utils/snekbox/_cog.py       | 519 +++++++++++++++++++++++++++++
 bot/exts/utils/snekbox/_eval.py      | 117 +++++++
 bot/exts/utils/snekbox/_io.py        |  65 ++++
 bot/exts/utils/snekio.py             |  65 ----
 tests/bot/exts/utils/test_snekbox.py |  40 ++-
 7 files changed, 735 insertions(+), 712 deletions(-)
 delete mode 100644 bot/exts/utils/snekbox.py
 create mode 100644 bot/exts/utils/snekbox/__init__.py
 create mode 100644 bot/exts/utils/snekbox/_cog.py
 create mode 100644 bot/exts/utils/snekbox/_eval.py
 create mode 100644 bot/exts/utils/snekbox/_io.py
 delete mode 100644 bot/exts/utils/snekio.py

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
deleted file mode 100644
index b89882a65..000000000
--- a/bot/exts/utils/snekbox.py
+++ /dev/null
@@ -1,629 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import re
-from dataclasses import dataclass, field
-from functools import partial
-from operator import attrgetter
-from signal import Signals
-from textwrap import dedent
-from typing import Literal, Optional, TYPE_CHECKING, Tuple
-
-from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
-from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
-from pydis_core.utils import interactions
-from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
-
-from bot.bot import Bot
-from bot.constants import Channels, MODERATION_ROLES, Roles, URLs
-from bot.decorators import redirect_output
-from bot.exts.help_channels._channel import is_help_forum_post
-from bot.exts.utils.snekio import FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
-from bot.log import get_logger
-from bot.utils import send_to_paste_service
-from bot.utils.lock import LockedResourceError, lock_arg
-from bot.utils.services import PasteTooLongError, PasteUploadError
-
-if TYPE_CHECKING:
-    from bot.exts.filters.filtering import Filtering
-
-log = get_logger(__name__)
-
-ESCAPE_REGEX = re.compile("[`\u202E\u200B]{3,}")
-
-# The timeit command should only output the very last line, so all other output should be suppressed.
-# This will be used as the setup code along with any setup code provided.
-TIMEIT_SETUP_WRAPPER = """
-import atexit
-import sys
-from collections import deque
-
-if not hasattr(sys, "_setup_finished"):
-    class Writer(deque):
-        '''A single-item deque wrapper for sys.stdout that will return the last line when read() is called.'''
-
-        def __init__(self):
-            super().__init__(maxlen=1)
-
-        def write(self, string):
-            '''Append the line to the queue if it is not empty.'''
-            if string.strip():
-                self.append(string)
-
-        def read(self):
-            '''This method will be called when print() is called.
-
-            The queue is emptied as we don't need the output later.
-            '''
-            return self.pop()
-
-        def flush(self):
-            '''This method will be called eventually, but we don't need to do anything here.'''
-            pass
-
-    sys.stdout = Writer()
-
-    def print_last_line():
-        if sys.stdout: # If the deque is empty (i.e. an error happened), calling read() will raise an error
-            # Use sys.__stdout__ here because sys.stdout is set to a Writer() instance
-            print(sys.stdout.read(), file=sys.__stdout__)
-
-    atexit.register(print_last_line) # When exiting, print the last line (hopefully it will be the timeit output)
-    sys._setup_finished = None
-{setup}
-"""
-
-MAX_PASTE_LENGTH = 10_000
-
-# The Snekbox commands' whitelists and blacklists.
-NO_SNEKBOX_CHANNELS = (Channels.python_general,)
-NO_SNEKBOX_CATEGORIES = ()
-SNEKBOX_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community, Roles.partners)
-
-SIGKILL = 9
-
-REDO_EMOJI = '\U0001f501'  # :repeat:
-REDO_TIMEOUT = 30
-
-PythonVersion = Literal["3.10", "3.11"]
-
-
-@dataclass
-class EvalJob:
-    """Job to be evaluated by snekbox."""
-
-    args: list[str]
-    files: list[FileAttachment] = field(default_factory=list)
-    name: str = "eval"
-    version: PythonVersion = "3.11"
-
-    @classmethod
-    def from_code(cls, code: str, path: str = "main.py") -> EvalJob:
-        """Create an EvalJob from a code string."""
-        return cls(
-            args=[path],
-            files=[FileAttachment(path, code.encode())],
-        )
-
-    def as_version(self, version: PythonVersion) -> EvalJob:
-        """Return a copy of the job with a different Python version."""
-        return EvalJob(
-            args=self.args,
-            files=self.files,
-            name=self.name,
-            version=version,
-        )
-
-    def to_dict(self) -> dict[str, list[str | dict[str, str]]]:
-        """Convert the job to a dict."""
-        return {
-            "args": self.args,
-            "files": [file.to_dict() for file in self.files],
-        }
-
-
-@dataclass(frozen=True)
-class EvalResult:
-    """The result of an eval job."""
-
-    stdout: str
-    returncode: int | None
-    files: list[FileAttachment] = field(default_factory=list)
-    err_files: list[str] = field(default_factory=list)
-
-    @property
-    def status_emoji(self) -> str:
-        """Return an emoji corresponding to the status code or lack of output in result."""
-        # If there are attachments, skip empty output warning
-        if not self.stdout.strip() and not self.files:  # No output
-            return ":warning:"
-        elif self.returncode == 0:  # No error
-            return ":white_check_mark:"
-        else:  # Exception
-            return ":x:"
-
-    def get_message(self, job: EvalJob) -> tuple[str, str]:
-        """Return a user-friendly message and error corresponding to the process's return code."""
-        msg = f"Your {job.version} {job.name} job has completed with return code {self.returncode}"
-        error = ""
-
-        if self.returncode is None:
-            msg = f"Your {job.version} {job.name} job has failed"
-            error = self.stdout.strip()
-        elif self.returncode == 128 + SIGKILL:
-            msg = f"Your {job.version} {job.name} job timed out or ran out of memory"
-        elif self.returncode == 255:
-            msg = f"Your {job.version} {job.name} job has failed"
-            error = "A fatal NsJail error occurred"
-        else:
-            # Try to append signal's name if one exists
-            with contextlib.suppress(ValueError):
-                name = Signals(self.returncode - 128).name
-                msg = f"{msg} ({name})"
-
-        # Add error message for failed attachments
-        if self.err_files:
-            failed_files = f"({', '.join(self.err_files)})"
-            msg += (
-                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
-                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
-            )
-
-        return msg, error
-
-    @classmethod
-    def from_dict(cls, data: dict[str, str | int | list[dict[str, str]]]) -> EvalResult:
-        """Create an EvalResult from a dict."""
-        res = cls(
-            stdout=data["stdout"],
-            returncode=data["returncode"],
-        )
-
-        for file in data.get("files", []):
-            try:
-                res.files.append(FileAttachment.from_dict(file))
-            except ValueError as e:
-                log.info(f"Failed to parse file from snekbox response: {e}")
-                res.err_files.append(file["path"])
-
-        return res
-
-
-class CodeblockConverter(Converter):
-    """Attempts to extract code from a codeblock, if provided."""
-
-    @classmethod
-    async def convert(cls, ctx: Context, code: str) -> list[str]:
-        """
-        Extract code from the Markdown, format it, and insert it into the code template.
-
-        If there is any code block, ignore text outside the code block.
-        Use the first code block, but prefer a fenced code block.
-        If there are several fenced code blocks, concatenate only the fenced code blocks.
-
-        Return a list of code blocks if any, otherwise return a list with a single string of code.
-        """
-        if match := list(FORMATTED_CODE_REGEX.finditer(code)):
-            blocks = [block for block in match if block.group("block")]
-
-            if len(blocks) > 1:
-                codeblocks = [block.group("code") for block in blocks]
-                info = "several code blocks"
-            else:
-                match = match[0] if len(blocks) == 0 else blocks[0]
-                code, block, lang, delim = match.group("code", "block", "lang", "delim")
-                codeblocks = [dedent(code)]
-                if block:
-                    info = (f"'{lang}' highlighted" if lang else "plain") + " code block"
-                else:
-                    info = f"{delim}-enclosed inline code"
-        else:
-            codeblocks = [dedent(RAW_CODE_REGEX.fullmatch(code).group("code"))]
-            info = "unformatted or badly formatted code"
-
-        code = "\n".join(codeblocks)
-        log.trace(f"Extracted {info} for evaluation:\n{code}")
-        return codeblocks
-
-
-class PythonVersionSwitcherButton(ui.Button):
-    """A button that allows users to re-run their eval command in a different Python version."""
-
-    def __init__(
-            self,
-            version_to_switch_to: PythonVersion,
-            snekbox_cog: Snekbox,
-            ctx: Context,
-            job: EvalJob,
-    ) -> None:
-        self.version_to_switch_to = version_to_switch_to
-        super().__init__(label=f"Run in {self.version_to_switch_to}", style=enums.ButtonStyle.primary)
-
-        self.snekbox_cog = snekbox_cog
-        self.ctx = ctx
-        self.job = job
-
-    async def callback(self, interaction: Interaction) -> None:
-        """
-        Tell snekbox to re-run the user's code in the alternative Python version.
-
-        Use a task calling snekbox, as run_job is blocking while it waits for edit/reaction on the message.
-        """
-        # Defer response here so that the Discord UI doesn't mark this interaction as failed if the job
-        # takes too long to run.
-        await interaction.response.defer()
-
-        with contextlib.suppress(NotFound):
-            # Suppress delete to cover the case where a user re-runs code and very quickly clicks the button.
-            # The log arg on send_job will stop the actual job from running.
-            await interaction.message.delete()
-
-        await self.snekbox_cog.run_job(self.ctx, self.job.as_version(self.version_to_switch_to))
-
-
-class Snekbox(Cog):
-    """Safe evaluation of Python code using Snekbox."""
-
-    def __init__(self, bot: Bot):
-        self.bot = bot
-        self.jobs = {}
-
-    def build_python_version_switcher_view(
-            self,
-            current_python_version: PythonVersion,
-            ctx: Context,
-            job: EvalJob,
-    ) -> interactions.ViewWithUserAndRoleCheck:
-        """Return a view that allows the user to change what version of Python their code is run on."""
-        if current_python_version == "3.10":
-            alt_python_version = "3.11"
-        else:
-            alt_python_version = "3.10"
-
-        view = interactions.ViewWithUserAndRoleCheck(
-            allowed_users=(ctx.author.id,),
-            allowed_roles=MODERATION_ROLES,
-        )
-        view.add_item(PythonVersionSwitcherButton(alt_python_version, self, ctx, job))
-        view.add_item(interactions.DeleteMessageButton())
-
-        return view
-
-    async def post_job(self, job: EvalJob) -> EvalResult:
-        """Send a POST request to the Snekbox API to evaluate code and return the results."""
-        if job.version == "3.10":
-            url = URLs.snekbox_eval_api
-        else:
-            url = URLs.snekbox_311_eval_api
-
-        data = job.to_dict()
-
-        async with self.bot.http_session.post(url, json=data, raise_for_status=True) as resp:
-            return EvalResult.from_dict(await resp.json())
-
-    @staticmethod
-    async def upload_output(output: str) -> Optional[str]:
-        """Upload the job's output to a paste service and return a URL to it if successful."""
-        log.trace("Uploading full output to paste service...")
-
-        try:
-            return await send_to_paste_service(output, extension="txt", max_length=MAX_PASTE_LENGTH)
-        except PasteTooLongError:
-            return "too long to upload"
-        except PasteUploadError:
-            return "unable to upload"
-
-    @staticmethod
-    def prepare_timeit_input(codeblocks: list[str]) -> list[str]:
-        """
-        Join the codeblocks into a single string, then return the arguments in a list.
-
-        If there are multiple codeblocks, insert the first one into the wrapped setup code.
-        """
-        args = ["-m", "timeit"]
-        setup_code = codeblocks.pop(0) if len(codeblocks) > 1 else ""
-        code = "\n".join(codeblocks)
-
-        args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup_code), code])
-        return args
-
-    async def format_output(self, output: str) -> Tuple[str, Optional[str]]:
-        """
-        Format the output and return a tuple of the formatted output and a URL to the full output.
-
-        Prepend each line with a line number. Truncate if there are over 10 lines or 1000 characters
-        and upload the full output to a paste service.
-        """
-        output = output.rstrip("\n")
-        original_output = output  # To be uploaded to a pasting service if needed
-        paste_link = None
-
-        if "<@" in output:
-            output = output.replace("<@", "<@\u200B")  # Zero-width space
-
-        if "<!@" in output:
-            output = output.replace("<!@", "<!@\u200B")  # Zero-width space
-
-        if ESCAPE_REGEX.findall(output):
-            paste_link = await self.upload_output(original_output)
-            return "Code block escape attempt detected; will not output result", paste_link
-
-        truncated = False
-        lines = output.count("\n")
-
-        if lines > 0:
-            output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
-            output = output[:11]  # Limiting to only 11 lines
-            output = "\n".join(output)
-
-        if lines > 10:
-            truncated = True
-            if len(output) >= 1000:
-                output = f"{output[:1000]}\n... (truncated - too long, too many lines)"
-            else:
-                output = f"{output}\n... (truncated - too many lines)"
-        elif len(output) >= 1000:
-            truncated = True
-            output = f"{output[:1000]}\n... (truncated - too long)"
-
-        if truncated:
-            paste_link = await self.upload_output(original_output)
-
-        output = output or "[No output]"
-
-        return output, paste_link
-
-    @lock_arg("snekbox.send_job", "ctx", attrgetter("author.id"), raise_error=True)
-    async def send_job(self, ctx: Context, job: EvalJob) -> Message:
-        """
-        Evaluate code, format it, and send the output to the corresponding channel.
-
-        Return the bot response.
-        """
-        async with ctx.typing():
-            result = await self.post_job(job)
-            msg, error = result.get_message(job)
-
-            if error:
-                output, paste_link = error, None
-            else:
-                log.trace("Formatting output...")
-                output, paste_link = await self.format_output(result.stdout)
-
-            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
-            if not result.files or output not in ("[No output]", ""):
-                msg += f"\n```\n{output}\n```"
-
-            if paste_link:
-                msg = f"{msg}\nFull output: {paste_link}"
-
-            # Collect stats of job fails + successes
-            if result.returncode != 0:
-                self.bot.stats.incr("snekbox.python.fail")
-            else:
-                self.bot.stats.incr("snekbox.python.success")
-
-            filter_cog: Filtering | None = self.bot.get_cog("Filtering")
-            filter_triggered = False
-            if filter_cog:
-                filter_triggered = await filter_cog.filter_snekbox_output(msg, ctx.message)
-            if filter_triggered:
-                response = await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
-            else:
-                allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-                view = self.build_python_version_switcher_view(job.version, ctx, job)
-
-                # Attach files if provided
-                files = [f.to_file() for f in result.files]
-                response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
-                view.message = response
-
-            log.info(f"{ctx.author}'s {job.name} job had a return code of {result.returncode}")
-        return response
-
-    async def continue_job(
-        self, ctx: Context, response: Message, job_name: str
-    ) -> EvalJob | None:
-        """
-        Check if the job's session should continue.
-
-        If the code is to be re-evaluated, return the new EvalJob.
-        Otherwise, return None if the job's session should be terminated.
-        """
-        _predicate_message_edit = partial(predicate_message_edit, ctx)
-        _predicate_emoji_reaction = partial(predicate_emoji_reaction, ctx)
-
-        with contextlib.suppress(NotFound):
-            try:
-                _, new_message = await self.bot.wait_for(
-                    'message_edit',
-                    check=_predicate_message_edit,
-                    timeout=REDO_TIMEOUT
-                )
-                await ctx.message.add_reaction(REDO_EMOJI)
-                await self.bot.wait_for(
-                    'reaction_add',
-                    check=_predicate_emoji_reaction,
-                    timeout=10
-                )
-
-                # Ensure the response that's about to be edited is still the most recent.
-                # This could have already been updated via a button press to switch to an alt Python version.
-                if self.jobs[ctx.message.id] != response.id:
-                    return None
-
-                code = await self.get_code(new_message, ctx.command)
-                with contextlib.suppress(HTTPException):
-                    await ctx.message.clear_reaction(REDO_EMOJI)
-                    await response.delete()
-
-                if code is None:
-                    return None
-
-            except asyncio.TimeoutError:
-                with contextlib.suppress(HTTPException):
-                    await ctx.message.clear_reaction(REDO_EMOJI)
-                return None
-
-            codeblocks = await CodeblockConverter.convert(ctx, code)
-
-            if job_name == "timeit":
-                return EvalJob(self.prepare_timeit_input(codeblocks))
-            else:
-                return EvalJob.from_code("\n".join(codeblocks))
-
-        return None
-
-    async def get_code(self, message: Message, command: Command) -> Optional[str]:
-        """
-        Return the code from `message` to be evaluated.
-
-        If the message is an invocation of the command, return the first argument or None if it
-        doesn't exist. Otherwise, return the full content of the message.
-        """
-        log.trace(f"Getting context for message {message.id}.")
-        new_ctx = await self.bot.get_context(message)
-
-        if new_ctx.command is command:
-            log.trace(f"Message {message.id} invokes {command} command.")
-            split = message.content.split(maxsplit=1)
-            code = split[1] if len(split) > 1 else None
-        else:
-            log.trace(f"Message {message.id} does not invoke {command} command.")
-            code = message.content
-
-        return code
-
-    async def run_job(
-        self,
-        ctx: Context,
-        job: EvalJob,
-    ) -> None:
-        """Handles checks, stats and re-evaluation of a snekbox job."""
-        if Roles.helpers in (role.id for role in ctx.author.roles):
-            self.bot.stats.incr("snekbox_usages.roles.helpers")
-        else:
-            self.bot.stats.incr("snekbox_usages.roles.developers")
-
-        if is_help_forum_post(ctx.channel):
-            self.bot.stats.incr("snekbox_usages.channels.help")
-        elif ctx.channel.id == Channels.bot_commands:
-            self.bot.stats.incr("snekbox_usages.channels.bot_commands")
-        else:
-            self.bot.stats.incr("snekbox_usages.channels.topical")
-
-        log.info(f"Received code from {ctx.author} for evaluation:\n{job}")
-
-        while True:
-            try:
-                response = await self.send_job(ctx, job)
-            except LockedResourceError:
-                await ctx.send(
-                    f"{ctx.author.mention} You've already got a job running - "
-                    "please wait for it to finish!"
-                )
-                return
-
-            # Store the bot's response message id per invocation, to ensure the `wait_for`s in `continue_job`
-            # don't trigger if the response has already been replaced by a new response.
-            # This can happen when a button is pressed and then original code is edited and re-run.
-            self.jobs[ctx.message.id] = response.id
-
-            job = await self.continue_job(ctx, response, job.name)
-            if not job:
-                break
-            log.info(f"Re-evaluating code from message {ctx.message.id}:\n{job}")
-
-    @command(name="eval", aliases=("e",), usage="[python_version] <code, ...>")
-    @guild_only()
-    @redirect_output(
-        destination_channel=Channels.bot_commands,
-        bypass_roles=SNEKBOX_ROLES,
-        categories=NO_SNEKBOX_CATEGORIES,
-        channels=NO_SNEKBOX_CHANNELS,
-        ping_user=False
-    )
-    async def eval_command(
-        self,
-        ctx: Context,
-        python_version: PythonVersion | None,
-        *,
-        code: CodeblockConverter
-    ) -> None:
-        """
-        Run Python code and get the results.
-
-        This command supports multiple lines of code, including code wrapped inside a formatted code
-        block. Code can be re-evaluated by editing the original message within 10 seconds and
-        clicking the reaction that subsequently appears.
-
-        If multiple codeblocks are in a message, all of them will be joined and evaluated,
-        ignoring the text outside them.
-
-        By default, your code is run on Python's 3.11 beta release, to assist with testing. If you
-        run into issues related to this Python version, you can request the bot to use Python
-        3.10 by specifying the `python_version` arg and setting it to `3.10`.
-
-        We've done our best to make this sandboxed, but do let us know if you manage to find an
-        issue with it!
-        """
-        code: list[str]
-        python_version = python_version or "3.11"
-        job = EvalJob.from_code("\n".join(code)).as_version(python_version)
-        await self.run_job(ctx, job)
-
-    @command(name="timeit", aliases=("ti",), usage="[python_version] [setup_code] <code, ...>")
-    @guild_only()
-    @redirect_output(
-        destination_channel=Channels.bot_commands,
-        bypass_roles=SNEKBOX_ROLES,
-        categories=NO_SNEKBOX_CATEGORIES,
-        channels=NO_SNEKBOX_CHANNELS,
-        ping_user=False
-    )
-    async def timeit_command(
-        self,
-        ctx: Context,
-        python_version: PythonVersion | None,
-        *,
-        code: CodeblockConverter
-    ) -> None:
-        """
-        Profile Python Code to find execution time.
-
-        This command supports multiple lines of code, including code wrapped inside a formatted code
-        block. Code can be re-evaluated by editing the original message within 10 seconds and
-        clicking the reaction that subsequently appears.
-
-        If multiple formatted codeblocks are provided, the first one will be the setup code, which will
-        not be timed. The remaining codeblocks will be joined together and timed.
-
-        By default your code is run on Python's 3.11 beta release, to assist with testing. If you
-        run into issues related to this Python version, you can request the bot to use Python
-        3.10 by specifying the `python_version` arg and setting it to `3.10`.
-
-        We've done our best to make this sandboxed, but do let us know if you manage to find an
-        issue with it!
-        """
-        code: list[str]
-        python_version = python_version or "3.11"
-        args = self.prepare_timeit_input(code)
-        job = EvalJob(args, version=python_version, name="timeit")
-
-        await self.run_job(ctx, job)
-
-
-def predicate_message_edit(ctx: Context, old_msg: Message, new_msg: Message) -> bool:
-    """Return True if the edited message is the context message and the content was indeed modified."""
-    return new_msg.id == ctx.message.id and old_msg.content != new_msg.content
-
-
-def predicate_emoji_reaction(ctx: Context, reaction: Reaction, user: User) -> bool:
-    """Return True if the reaction REDO_EMOJI was added by the context message author on this message."""
-    return reaction.message.id == ctx.message.id and user.id == ctx.author.id and str(reaction) == REDO_EMOJI
-
-
-async def setup(bot: Bot) -> None:
-    """Load the Snekbox cog."""
-    await bot.add_cog(Snekbox(bot))
diff --git a/bot/exts/utils/snekbox/__init__.py b/bot/exts/utils/snekbox/__init__.py
new file mode 100644
index 000000000..cd1d3b059
--- /dev/null
+++ b/bot/exts/utils/snekbox/__init__.py
@@ -0,0 +1,12 @@
+from bot.bot import Bot
+from bot.exts.utils.snekbox._cog import CodeblockConverter, Snekbox
+from bot.exts.utils.snekbox._eval import EvalJob, EvalResult
+
+__all__ = ("CodeblockConverter", "Snekbox", "EvalJob", "EvalResult")
+
+
+async def setup(bot: Bot) -> None:
+    """Load the Snekbox cog."""
+    # Defer import to reduce side effects from importing the codeblock package.
+    from bot.exts.utils.snekbox._cog import Snekbox
+    await bot.add_cog(Snekbox(bot))
diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
new file mode 100644
index 000000000..9abbbcfc4
--- /dev/null
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -0,0 +1,519 @@
+from __future__ import annotations
+
+import asyncio
+import contextlib
+import re
+from functools import partial
+from operator import attrgetter
+from textwrap import dedent
+from typing import Literal, Optional, TYPE_CHECKING, Tuple
+
+from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
+from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
+from pydis_core.utils import interactions
+from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
+
+from bot.bot import Bot
+from bot.constants import Channels, MODERATION_ROLES, Roles, URLs
+from bot.decorators import redirect_output
+from bot.exts.help_channels._channel import is_help_forum_post
+from bot.exts.utils.snekbox._eval import EvalJob, EvalResult
+from bot.log import get_logger
+from bot.utils import send_to_paste_service
+from bot.utils.lock import LockedResourceError, lock_arg
+from bot.utils.services import PasteTooLongError, PasteUploadError
+
+if TYPE_CHECKING:
+    from bot.exts.filters.filtering import Filtering
+
+log = get_logger(__name__)
+
+ESCAPE_REGEX = re.compile("[`\u202E\u200B]{3,}")
+
+# The timeit command should only output the very last line, so all other output should be suppressed.
+# This will be used as the setup code along with any setup code provided.
+TIMEIT_SETUP_WRAPPER = """
+import atexit
+import sys
+from collections import deque
+
+if not hasattr(sys, "_setup_finished"):
+    class Writer(deque):
+        '''A single-item deque wrapper for sys.stdout that will return the last line when read() is called.'''
+
+        def __init__(self):
+            super().__init__(maxlen=1)
+
+        def write(self, string):
+            '''Append the line to the queue if it is not empty.'''
+            if string.strip():
+                self.append(string)
+
+        def read(self):
+            '''This method will be called when print() is called.
+
+            The queue is emptied as we don't need the output later.
+            '''
+            return self.pop()
+
+        def flush(self):
+            '''This method will be called eventually, but we don't need to do anything here.'''
+            pass
+
+    sys.stdout = Writer()
+
+    def print_last_line():
+        if sys.stdout: # If the deque is empty (i.e. an error happened), calling read() will raise an error
+            # Use sys.__stdout__ here because sys.stdout is set to a Writer() instance
+            print(sys.stdout.read(), file=sys.__stdout__)
+
+    atexit.register(print_last_line) # When exiting, print the last line (hopefully it will be the timeit output)
+    sys._setup_finished = None
+{setup}
+"""
+
+MAX_PASTE_LENGTH = 10_000
+
+# The Snekbox commands' whitelists and blacklists.
+NO_SNEKBOX_CHANNELS = (Channels.python_general,)
+NO_SNEKBOX_CATEGORIES = ()
+SNEKBOX_ROLES = (Roles.helpers, Roles.moderators, Roles.admins, Roles.owners, Roles.python_community, Roles.partners)
+
+REDO_EMOJI = '\U0001f501'  # :repeat:
+REDO_TIMEOUT = 30
+
+PythonVersion = Literal["3.10", "3.11"]
+
+
+class CodeblockConverter(Converter):
+    """Attempts to extract code from a codeblock, if provided."""
+
+    @classmethod
+    async def convert(cls, ctx: Context, code: str) -> list[str]:
+        """
+        Extract code from the Markdown, format it, and insert it into the code template.
+
+        If there is any code block, ignore text outside the code block.
+        Use the first code block, but prefer a fenced code block.
+        If there are several fenced code blocks, concatenate only the fenced code blocks.
+
+        Return a list of code blocks if any, otherwise return a list with a single string of code.
+        """
+        if match := list(FORMATTED_CODE_REGEX.finditer(code)):
+            blocks = [block for block in match if block.group("block")]
+
+            if len(blocks) > 1:
+                codeblocks = [block.group("code") for block in blocks]
+                info = "several code blocks"
+            else:
+                match = match[0] if len(blocks) == 0 else blocks[0]
+                code, block, lang, delim = match.group("code", "block", "lang", "delim")
+                codeblocks = [dedent(code)]
+                if block:
+                    info = (f"'{lang}' highlighted" if lang else "plain") + " code block"
+                else:
+                    info = f"{delim}-enclosed inline code"
+        else:
+            codeblocks = [dedent(RAW_CODE_REGEX.fullmatch(code).group("code"))]
+            info = "unformatted or badly formatted code"
+
+        code = "\n".join(codeblocks)
+        log.trace(f"Extracted {info} for evaluation:\n{code}")
+        return codeblocks
+
+
+class PythonVersionSwitcherButton(ui.Button):
+    """A button that allows users to re-run their eval command in a different Python version."""
+
+    def __init__(
+            self,
+            version_to_switch_to: PythonVersion,
+            snekbox_cog: Snekbox,
+            ctx: Context,
+            job: EvalJob,
+    ) -> None:
+        self.version_to_switch_to = version_to_switch_to
+        super().__init__(label=f"Run in {self.version_to_switch_to}", style=enums.ButtonStyle.primary)
+
+        self.snekbox_cog = snekbox_cog
+        self.ctx = ctx
+        self.job = job
+
+    async def callback(self, interaction: Interaction) -> None:
+        """
+        Tell snekbox to re-run the user's code in the alternative Python version.
+
+        Use a task calling snekbox, as run_job is blocking while it waits for edit/reaction on the message.
+        """
+        # Defer response here so that the Discord UI doesn't mark this interaction as failed if the job
+        # takes too long to run.
+        await interaction.response.defer()
+
+        with contextlib.suppress(NotFound):
+            # Suppress delete to cover the case where a user re-runs code and very quickly clicks the button.
+            # The log arg on send_job will stop the actual job from running.
+            await interaction.message.delete()
+
+        await self.snekbox_cog.run_job(self.ctx, self.job.as_version(self.version_to_switch_to))
+
+
+class Snekbox(Cog):
+    """Safe evaluation of Python code using Snekbox."""
+
+    def __init__(self, bot: Bot):
+        self.bot = bot
+        self.jobs = {}
+
+    def build_python_version_switcher_view(
+            self,
+            current_python_version: PythonVersion,
+            ctx: Context,
+            job: EvalJob,
+    ) -> interactions.ViewWithUserAndRoleCheck:
+        """Return a view that allows the user to change what version of Python their code is run on."""
+        if current_python_version == "3.10":
+            alt_python_version = "3.11"
+        else:
+            alt_python_version = "3.10"
+
+        view = interactions.ViewWithUserAndRoleCheck(
+            allowed_users=(ctx.author.id,),
+            allowed_roles=MODERATION_ROLES,
+        )
+        view.add_item(PythonVersionSwitcherButton(alt_python_version, self, ctx, job))
+        view.add_item(interactions.DeleteMessageButton())
+
+        return view
+
+    async def post_job(self, job: EvalJob) -> EvalResult:
+        """Send a POST request to the Snekbox API to evaluate code and return the results."""
+        if job.version == "3.10":
+            url = URLs.snekbox_eval_api
+        else:
+            url = URLs.snekbox_311_eval_api
+
+        data = job.to_dict()
+
+        async with self.bot.http_session.post(url, json=data, raise_for_status=True) as resp:
+            return EvalResult.from_dict(await resp.json())
+
+    @staticmethod
+    async def upload_output(output: str) -> Optional[str]:
+        """Upload the job's output to a paste service and return a URL to it if successful."""
+        log.trace("Uploading full output to paste service...")
+
+        try:
+            return await send_to_paste_service(output, extension="txt", max_length=MAX_PASTE_LENGTH)
+        except PasteTooLongError:
+            return "too long to upload"
+        except PasteUploadError:
+            return "unable to upload"
+
+    @staticmethod
+    def prepare_timeit_input(codeblocks: list[str]) -> list[str]:
+        """
+        Join the codeblocks into a single string, then return the arguments in a list.
+
+        If there are multiple codeblocks, insert the first one into the wrapped setup code.
+        """
+        args = ["-m", "timeit"]
+        setup_code = codeblocks.pop(0) if len(codeblocks) > 1 else ""
+        code = "\n".join(codeblocks)
+
+        args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup_code), code])
+        return args
+
+    async def format_output(self, output: str) -> Tuple[str, Optional[str]]:
+        """
+        Format the output and return a tuple of the formatted output and a URL to the full output.
+
+        Prepend each line with a line number. Truncate if there are over 10 lines or 1000 characters
+        and upload the full output to a paste service.
+        """
+        output = output.rstrip("\n")
+        original_output = output  # To be uploaded to a pasting service if needed
+        paste_link = None
+
+        if "<@" in output:
+            output = output.replace("<@", "<@\u200B")  # Zero-width space
+
+        if "<!@" in output:
+            output = output.replace("<!@", "<!@\u200B")  # Zero-width space
+
+        if ESCAPE_REGEX.findall(output):
+            paste_link = await self.upload_output(original_output)
+            return "Code block escape attempt detected; will not output result", paste_link
+
+        truncated = False
+        lines = output.count("\n")
+
+        if lines > 0:
+            output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
+            output = output[:11]  # Limiting to only 11 lines
+            output = "\n".join(output)
+
+        if lines > 10:
+            truncated = True
+            if len(output) >= 1000:
+                output = f"{output[:1000]}\n... (truncated - too long, too many lines)"
+            else:
+                output = f"{output}\n... (truncated - too many lines)"
+        elif len(output) >= 1000:
+            truncated = True
+            output = f"{output[:1000]}\n... (truncated - too long)"
+
+        if truncated:
+            paste_link = await self.upload_output(original_output)
+
+        output = output or "[No output]"
+
+        return output, paste_link
+
+    @lock_arg("snekbox.send_job", "ctx", attrgetter("author.id"), raise_error=True)
+    async def send_job(self, ctx: Context, job: EvalJob) -> Message:
+        """
+        Evaluate code, format it, and send the output to the corresponding channel.
+
+        Return the bot response.
+        """
+        async with ctx.typing():
+            result = await self.post_job(job)
+            msg, error = result.get_message(job)
+
+            if error:
+                output, paste_link = error, None
+            else:
+                log.trace("Formatting output...")
+                output, paste_link = await self.format_output(result.stdout)
+
+            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
+            if not result.files or output not in ("[No output]", ""):
+                msg += f"\n```\n{output}\n```"
+
+            if paste_link:
+                msg = f"{msg}\nFull output: {paste_link}"
+
+            # Collect stats of job fails + successes
+            if result.returncode != 0:
+                self.bot.stats.incr("snekbox.python.fail")
+            else:
+                self.bot.stats.incr("snekbox.python.success")
+
+            filter_cog: Filtering | None = self.bot.get_cog("Filtering")
+            filter_triggered = False
+            if filter_cog:
+                filter_triggered = await filter_cog.filter_snekbox_output(msg, ctx.message)
+            if filter_triggered:
+                response = await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
+            else:
+                allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
+                view = self.build_python_version_switcher_view(job.version, ctx, job)
+
+                # Attach files if provided
+                files = [f.to_file() for f in result.files]
+                response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
+                view.message = response
+
+            log.info(f"{ctx.author}'s {job.name} job had a return code of {result.returncode}")
+        return response
+
+    async def continue_job(
+        self, ctx: Context, response: Message, job_name: str
+    ) -> EvalJob | None:
+        """
+        Check if the job's session should continue.
+
+        If the code is to be re-evaluated, return the new EvalJob.
+        Otherwise, return None if the job's session should be terminated.
+        """
+        _predicate_message_edit = partial(predicate_message_edit, ctx)
+        _predicate_emoji_reaction = partial(predicate_emoji_reaction, ctx)
+
+        with contextlib.suppress(NotFound):
+            try:
+                _, new_message = await self.bot.wait_for(
+                    'message_edit',
+                    check=_predicate_message_edit,
+                    timeout=REDO_TIMEOUT
+                )
+                await ctx.message.add_reaction(REDO_EMOJI)
+                await self.bot.wait_for(
+                    'reaction_add',
+                    check=_predicate_emoji_reaction,
+                    timeout=10
+                )
+
+                # Ensure the response that's about to be edited is still the most recent.
+                # This could have already been updated via a button press to switch to an alt Python version.
+                if self.jobs[ctx.message.id] != response.id:
+                    return None
+
+                code = await self.get_code(new_message, ctx.command)
+                with contextlib.suppress(HTTPException):
+                    await ctx.message.clear_reaction(REDO_EMOJI)
+                    await response.delete()
+
+                if code is None:
+                    return None
+
+            except asyncio.TimeoutError:
+                with contextlib.suppress(HTTPException):
+                    await ctx.message.clear_reaction(REDO_EMOJI)
+                return None
+
+            codeblocks = await CodeblockConverter.convert(ctx, code)
+
+            if job_name == "timeit":
+                return EvalJob(self.prepare_timeit_input(codeblocks))
+            else:
+                return EvalJob.from_code("\n".join(codeblocks))
+
+        return None
+
+    async def get_code(self, message: Message, command: Command) -> Optional[str]:
+        """
+        Return the code from `message` to be evaluated.
+
+        If the message is an invocation of the command, return the first argument or None if it
+        doesn't exist. Otherwise, return the full content of the message.
+        """
+        log.trace(f"Getting context for message {message.id}.")
+        new_ctx = await self.bot.get_context(message)
+
+        if new_ctx.command is command:
+            log.trace(f"Message {message.id} invokes {command} command.")
+            split = message.content.split(maxsplit=1)
+            code = split[1] if len(split) > 1 else None
+        else:
+            log.trace(f"Message {message.id} does not invoke {command} command.")
+            code = message.content
+
+        return code
+
+    async def run_job(
+        self,
+        ctx: Context,
+        job: EvalJob,
+    ) -> None:
+        """Handles checks, stats and re-evaluation of a snekbox job."""
+        if Roles.helpers in (role.id for role in ctx.author.roles):
+            self.bot.stats.incr("snekbox_usages.roles.helpers")
+        else:
+            self.bot.stats.incr("snekbox_usages.roles.developers")
+
+        if is_help_forum_post(ctx.channel):
+            self.bot.stats.incr("snekbox_usages.channels.help")
+        elif ctx.channel.id == Channels.bot_commands:
+            self.bot.stats.incr("snekbox_usages.channels.bot_commands")
+        else:
+            self.bot.stats.incr("snekbox_usages.channels.topical")
+
+        log.info(f"Received code from {ctx.author} for evaluation:\n{job}")
+
+        while True:
+            try:
+                response = await self.send_job(ctx, job)
+            except LockedResourceError:
+                await ctx.send(
+                    f"{ctx.author.mention} You've already got a job running - "
+                    "please wait for it to finish!"
+                )
+                return
+
+            # Store the bot's response message id per invocation, to ensure the `wait_for`s in `continue_job`
+            # don't trigger if the response has already been replaced by a new response.
+            # This can happen when a button is pressed and then original code is edited and re-run.
+            self.jobs[ctx.message.id] = response.id
+
+            job = await self.continue_job(ctx, response, job.name)
+            if not job:
+                break
+            log.info(f"Re-evaluating code from message {ctx.message.id}:\n{job}")
+
+    @command(name="eval", aliases=("e",), usage="[python_version] <code, ...>")
+    @guild_only()
+    @redirect_output(
+        destination_channel=Channels.bot_commands,
+        bypass_roles=SNEKBOX_ROLES,
+        categories=NO_SNEKBOX_CATEGORIES,
+        channels=NO_SNEKBOX_CHANNELS,
+        ping_user=False
+    )
+    async def eval_command(
+        self,
+        ctx: Context,
+        python_version: PythonVersion | None,
+        *,
+        code: CodeblockConverter
+    ) -> None:
+        """
+        Run Python code and get the results.
+
+        This command supports multiple lines of code, including code wrapped inside a formatted code
+        block. Code can be re-evaluated by editing the original message within 10 seconds and
+        clicking the reaction that subsequently appears.
+
+        If multiple codeblocks are in a message, all of them will be joined and evaluated,
+        ignoring the text outside them.
+
+        By default, your code is run on Python's 3.11 beta release, to assist with testing. If you
+        run into issues related to this Python version, you can request the bot to use Python
+        3.10 by specifying the `python_version` arg and setting it to `3.10`.
+
+        We've done our best to make this sandboxed, but do let us know if you manage to find an
+        issue with it!
+        """
+        code: list[str]
+        python_version = python_version or "3.11"
+        job = EvalJob.from_code("\n".join(code)).as_version(python_version)
+        await self.run_job(ctx, job)
+
+    @command(name="timeit", aliases=("ti",), usage="[python_version] [setup_code] <code, ...>")
+    @guild_only()
+    @redirect_output(
+        destination_channel=Channels.bot_commands,
+        bypass_roles=SNEKBOX_ROLES,
+        categories=NO_SNEKBOX_CATEGORIES,
+        channels=NO_SNEKBOX_CHANNELS,
+        ping_user=False
+    )
+    async def timeit_command(
+        self,
+        ctx: Context,
+        python_version: PythonVersion | None,
+        *,
+        code: CodeblockConverter
+    ) -> None:
+        """
+        Profile Python Code to find execution time.
+
+        This command supports multiple lines of code, including code wrapped inside a formatted code
+        block. Code can be re-evaluated by editing the original message within 10 seconds and
+        clicking the reaction that subsequently appears.
+
+        If multiple formatted codeblocks are provided, the first one will be the setup code, which will
+        not be timed. The remaining codeblocks will be joined together and timed.
+
+        By default your code is run on Python's 3.11 beta release, to assist with testing. If you
+        run into issues related to this Python version, you can request the bot to use Python
+        3.10 by specifying the `python_version` arg and setting it to `3.10`.
+
+        We've done our best to make this sandboxed, but do let us know if you manage to find an
+        issue with it!
+        """
+        code: list[str]
+        python_version = python_version or "3.11"
+        args = self.prepare_timeit_input(code)
+        job = EvalJob(args, version=python_version, name="timeit")
+
+        await self.run_job(ctx, job)
+
+
+def predicate_message_edit(ctx: Context, old_msg: Message, new_msg: Message) -> bool:
+    """Return True if the edited message is the context message and the content was indeed modified."""
+    return new_msg.id == ctx.message.id and old_msg.content != new_msg.content
+
+
+def predicate_emoji_reaction(ctx: Context, reaction: Reaction, user: User) -> bool:
+    """Return True if the reaction REDO_EMOJI was added by the context message author on this message."""
+    return reaction.message.id == ctx.message.id and user.id == ctx.author.id and str(reaction) == REDO_EMOJI
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
new file mode 100644
index 000000000..784de5a10
--- /dev/null
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -0,0 +1,117 @@
+from __future__ import annotations
+
+import contextlib
+from dataclasses import dataclass, field
+from signal import Signals
+from typing import TYPE_CHECKING
+
+from bot.exts.utils.snekbox._io import FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
+from bot.log import get_logger
+
+if TYPE_CHECKING:
+    from bot.exts.utils.snekbox._cog import PythonVersion
+
+log = get_logger(__name__)
+
+SIGKILL = 9
+
+
+@dataclass
+class EvalJob:
+    """Job to be evaluated by snekbox."""
+
+    args: list[str]
+    files: list[FileAttachment] = field(default_factory=list)
+    name: str = "eval"
+    version: PythonVersion = "3.11"
+
+    @classmethod
+    def from_code(cls, code: str, path: str = "main.py") -> EvalJob:
+        """Create an EvalJob from a code string."""
+        return cls(
+            args=[path],
+            files=[FileAttachment(path, code.encode())],
+        )
+
+    def as_version(self, version: PythonVersion) -> EvalJob:
+        """Return a copy of the job with a different Python version."""
+        return EvalJob(
+            args=self.args,
+            files=self.files,
+            name=self.name,
+            version=version,
+        )
+
+    def to_dict(self) -> dict[str, list[str | dict[str, str]]]:
+        """Convert the job to a dict."""
+        return {
+            "args": self.args,
+            "files": [file.to_dict() for file in self.files],
+        }
+
+
+@dataclass(frozen=True)
+class EvalResult:
+    """The result of an eval job."""
+
+    stdout: str
+    returncode: int | None
+    files: list[FileAttachment] = field(default_factory=list)
+    err_files: list[str] = field(default_factory=list)
+
+    @property
+    def status_emoji(self) -> str:
+        """Return an emoji corresponding to the status code or lack of output in result."""
+        # If there are attachments, skip empty output warning
+        if not self.stdout.strip() and not self.files:  # No output
+            return ":warning:"
+        elif self.returncode == 0:  # No error
+            return ":white_check_mark:"
+        else:  # Exception
+            return ":x:"
+
+    def get_message(self, job: EvalJob) -> tuple[str, str]:
+        """Return a user-friendly message and error corresponding to the process's return code."""
+        msg = f"Your {job.version} {job.name} job has completed with return code {self.returncode}"
+        error = ""
+
+        if self.returncode is None:
+            msg = f"Your {job.version} {job.name} job has failed"
+            error = self.stdout.strip()
+        elif self.returncode == 128 + SIGKILL:
+            msg = f"Your {job.version} {job.name} job timed out or ran out of memory"
+        elif self.returncode == 255:
+            msg = f"Your {job.version} {job.name} job has failed"
+            error = "A fatal NsJail error occurred"
+        else:
+            # Try to append signal's name if one exists
+            with contextlib.suppress(ValueError):
+                name = Signals(self.returncode - 128).name
+                msg = f"{msg} ({name})"
+
+        # Add error message for failed attachments
+        if self.err_files:
+            failed_files = f"({', '.join(self.err_files)})"
+            msg += (
+                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
+                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
+            )
+
+        return msg, error
+
+    @classmethod
+    def from_dict(cls, data: dict[str, str | int | list[dict[str, str]]]) -> EvalResult:
+        """Create an EvalResult from a dict."""
+        res = cls(
+            stdout=data["stdout"],
+            returncode=data["returncode"],
+        )
+
+        for file in data.get("files", []):
+            try:
+                res.files.append(FileAttachment.from_dict(file))
+            except ValueError as e:
+                log.info(f"Failed to parse file from snekbox response: {e}")
+                res.err_files.append(file["path"])
+
+        return res
diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
new file mode 100644
index 000000000..a7f84a241
--- /dev/null
+++ b/bot/exts/utils/snekbox/_io.py
@@ -0,0 +1,65 @@
+"""I/O File protocols for snekbox."""
+from __future__ import annotations
+
+from base64 import b64decode, b64encode
+from dataclasses import dataclass
+from io import BytesIO
+from pathlib import Path
+
+from discord import File
+
+# Note discord bot upload limit is 8 MiB per file,
+# or 50 MiB for lvl 2 boosted servers
+FILE_SIZE_LIMIT = 8 * 1024 * 1024
+
+
+def sizeof_fmt(num: int, suffix: str = "B") -> str:
+    """Return a human-readable file size."""
+    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
+        if abs(num) < 1024:
+            return f"{num:3.1f}{unit}{suffix}"
+        num /= 1024
+    return f"{num:.1f}Yi{suffix}"
+
+
+@dataclass
+class FileAttachment:
+    """File Attachment from Snekbox eval."""
+
+    path: str
+    content: bytes
+
+    def __repr__(self) -> str:
+        """Return the content as a string."""
+        content = f"{self.content[:10]}..." if len(self.content) > 10 else self.content
+        return f"FileAttachment(path={self.path!r}, content={content})"
+
+    @classmethod
+    def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
+        """Create a FileAttachment from a dict response."""
+        size = data.get("size")
+        if (size and size > size_limit) or (len(data["content"]) > size_limit):
+            raise ValueError("File size exceeds limit")
+
+        content = b64decode(data["content"])
+
+        if len(content) > size_limit:
+            raise ValueError("File size exceeds limit")
+
+        return cls(data["path"], content)
+
+    def to_dict(self) -> dict[str, str]:
+        """Convert the attachment to a json dict."""
+        content = self.content
+        if isinstance(content, str):
+            content = content.encode("utf-8")
+
+        return {
+            "path": self.path,
+            "content": b64encode(content).decode("ascii"),
+        }
+
+    def to_file(self) -> File:
+        """Convert to a discord.File."""
+        name = Path(self.path).name
+        return File(BytesIO(self.content), filename=name)
diff --git a/bot/exts/utils/snekio.py b/bot/exts/utils/snekio.py
deleted file mode 100644
index a7f84a241..000000000
--- a/bot/exts/utils/snekio.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""I/O File protocols for snekbox."""
-from __future__ import annotations
-
-from base64 import b64decode, b64encode
-from dataclasses import dataclass
-from io import BytesIO
-from pathlib import Path
-
-from discord import File
-
-# Note discord bot upload limit is 8 MiB per file,
-# or 50 MiB for lvl 2 boosted servers
-FILE_SIZE_LIMIT = 8 * 1024 * 1024
-
-
-def sizeof_fmt(num: int, suffix: str = "B") -> str:
-    """Return a human-readable file size."""
-    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
-        if abs(num) < 1024:
-            return f"{num:3.1f}{unit}{suffix}"
-        num /= 1024
-    return f"{num:.1f}Yi{suffix}"
-
-
-@dataclass
-class FileAttachment:
-    """File Attachment from Snekbox eval."""
-
-    path: str
-    content: bytes
-
-    def __repr__(self) -> str:
-        """Return the content as a string."""
-        content = f"{self.content[:10]}..." if len(self.content) > 10 else self.content
-        return f"FileAttachment(path={self.path!r}, content={content})"
-
-    @classmethod
-    def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
-        """Create a FileAttachment from a dict response."""
-        size = data.get("size")
-        if (size and size > size_limit) or (len(data["content"]) > size_limit):
-            raise ValueError("File size exceeds limit")
-
-        content = b64decode(data["content"])
-
-        if len(content) > size_limit:
-            raise ValueError("File size exceeds limit")
-
-        return cls(data["path"], content)
-
-    def to_dict(self) -> dict[str, str]:
-        """Convert the attachment to a json dict."""
-        content = self.content
-        if isinstance(content, str):
-            content = content.encode("utf-8")
-
-        return {
-            "path": self.path,
-            "content": b64encode(content).decode("ascii"),
-        }
-
-    def to_file(self) -> File:
-        """Convert to a discord.File."""
-        name = Path(self.path).name
-        return File(BytesIO(self.content), filename=name)
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 722c5c569..31b1ca260 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -55,14 +55,18 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
 
     async def test_upload_output_reject_too_long(self):
         """Reject output longer than MAX_PASTE_LENGTH."""
-        result = await self.cog.upload_output("-" * (snekbox.MAX_PASTE_LENGTH + 1))
+        result = await self.cog.upload_output("-" * (snekbox._cog.MAX_PASTE_LENGTH + 1))
         self.assertEqual(result, "too long to upload")
 
-    @patch("bot.exts.utils.snekbox.send_to_paste_service")
+    @patch("bot.exts.utils.snekbox._cog.send_to_paste_service")
     async def test_upload_output(self, mock_paste_util):
         """Upload the eval output to the URLs.paste_service.format(key="documents") endpoint."""
         await self.cog.upload_output("Test output.")
-        mock_paste_util.assert_called_once_with("Test output.", extension="txt", max_length=snekbox.MAX_PASTE_LENGTH)
+        mock_paste_util.assert_called_once_with(
+            "Test output.",
+            extension="txt",
+            max_length=snekbox._cog.MAX_PASTE_LENGTH
+        )
 
     async def test_codeblock_converter(self):
         ctx = MockContext()
@@ -95,7 +99,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         )
 
         for case, setup_code, test_name in cases:
-            setup = snekbox.TIMEIT_SETUP_WRAPPER.format(setup=setup_code)
+            setup = snekbox._cog.TIMEIT_SETUP_WRAPPER.format(setup=setup_code)
             expected = [*base_args, setup, '\n'.join(case[1:] if setup_code else case)]
             with self.subTest(msg=f'Test with {test_name} and expected return {expected}'):
                 self.assertEqual(self.cog.prepare_timeit_input(case), expected)
@@ -104,7 +108,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         """EvalResult.message, should return error and message."""
         cases = (
             ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR')),
-            ('', 128 + snekbox.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '')),
+            ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '')),
             ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred'))
         )
         for stdout, returncode, expected in cases:
@@ -113,7 +117,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
                 job = EvalJob([])
                 self.assertEqual(result.get_message(job), expected)
 
-    @patch('bot.exts.utils.snekbox.Signals', side_effect=ValueError)
+    @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
         result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
@@ -121,7 +125,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             ("Your 3.10 eval job has completed with return code 127", "")
         )
 
-    @patch('bot.exts.utils.snekbox.Signals')
+    @patch('bot.exts.utils.snekbox._eval.Signals')
     def test_eval_result_message_valid_signal(self, mock_signals: Mock):
         mock_signals.return_value.name = "SIGTEST"
         result = EvalResult(stdout="", returncode=127)
@@ -328,7 +332,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.post_job.assert_called_once_with(job)
         self.cog.upload_output.assert_not_called()
 
-    @patch("bot.exts.utils.snekbox.partial")
+    @patch("bot.exts.utils.snekbox._cog.partial")
     async def test_continue_job_does_continue(self, partial_mock):
         """Test that the continue_job function does continue if required conditions are met."""
         ctx = MockContext(
@@ -353,14 +357,14 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             (
                 call(
                     'message_edit',
-                    check=partial_mock(snekbox.predicate_message_edit, ctx),
-                    timeout=snekbox.REDO_TIMEOUT,
+                    check=partial_mock(snekbox._cog.predicate_message_edit, ctx),
+                    timeout=snekbox._cog.REDO_TIMEOUT,
                 ),
-                call('reaction_add', check=partial_mock(snekbox.predicate_emoji_reaction, ctx), timeout=10)
+                call('reaction_add', check=partial_mock(snekbox._cog.predicate_emoji_reaction, ctx), timeout=10)
             )
         )
-        ctx.message.add_reaction.assert_called_once_with(snekbox.REDO_EMOJI)
-        ctx.message.clear_reaction.assert_called_once_with(snekbox.REDO_EMOJI)
+        ctx.message.add_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
+        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
         response.delete.assert_called_once()
 
     async def test_continue_job_does_not_continue(self):
@@ -369,7 +373,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
 
         actual = await self.cog.continue_job(ctx, MockMessage(), self.cog.eval_command)
         self.assertEqual(actual, None)
-        ctx.message.clear_reaction.assert_called_once_with(snekbox.REDO_EMOJI)
+        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
 
     async def test_get_code(self):
         """Should return 1st arg (or None) if eval cmd in message, otherwise return full content."""
@@ -411,18 +415,18 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         for ctx_msg, new_msg, expected, testname in cases:
             with self.subTest(msg=f'Messages with {testname} return {expected}'):
                 ctx = MockContext(message=ctx_msg)
-                actual = snekbox.predicate_message_edit(ctx, ctx_msg, new_msg)
+                actual = snekbox._cog.predicate_message_edit(ctx, ctx_msg, new_msg)
                 self.assertEqual(actual, expected)
 
     def test_predicate_emoji_reaction(self):
         """Test the predicate_emoji_reaction function."""
         valid_reaction = MockReaction(message=MockMessage(id=1))
-        valid_reaction.__str__.return_value = snekbox.REDO_EMOJI
+        valid_reaction.__str__.return_value = snekbox._cog.REDO_EMOJI
         valid_ctx = MockContext(message=MockMessage(id=1), author=MockUser(id=2))
         valid_user = MockUser(id=2)
 
         invalid_reaction_id = MockReaction(message=MockMessage(id=42))
-        invalid_reaction_id.__str__.return_value = snekbox.REDO_EMOJI
+        invalid_reaction_id.__str__.return_value = snekbox._cog.REDO_EMOJI
         invalid_user_id = MockUser(id=42)
         invalid_reaction_str = MockReaction(message=MockMessage(id=1))
         invalid_reaction_str.__str__.return_value = ':longbeard:'
@@ -435,7 +439,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         )
         for reaction, user, expected, testname in cases:
             with self.subTest(msg=f'Test with {testname} and expected return {expected}'):
-                actual = snekbox.predicate_emoji_reaction(valid_ctx, reaction, user)
+                actual = snekbox._cog.predicate_emoji_reaction(valid_ctx, reaction, user)
                 self.assertEqual(actual, expected)
 
 
-- 
cgit v1.2.3


From 56664828c300b0380e16cde66f6106b0fdcf56bd Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 17:31:41 +0800
Subject: Rename attribute `failed_files`

---
 bot/exts/utils/snekbox/_eval.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 784de5a10..1764b6871 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -57,7 +57,7 @@ class EvalResult:
     stdout: str
     returncode: int | None
     files: list[FileAttachment] = field(default_factory=list)
-    err_files: list[str] = field(default_factory=list)
+    failed_files: list[str] = field(default_factory=list)
 
     @property
     def status_emoji(self) -> str:
@@ -90,8 +90,8 @@ class EvalResult:
                 msg = f"{msg} ({name})"
 
         # Add error message for failed attachments
-        if self.err_files:
-            failed_files = f"({', '.join(self.err_files)})"
+        if self.failed_files:
+            failed_files = f"({', '.join(self.failed_files)})"
             msg += (
                 f".\n\n> Some attached files were not able to be uploaded {failed_files}."
                 f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
@@ -112,6 +112,6 @@ class EvalResult:
                 res.files.append(FileAttachment.from_dict(file))
             except ValueError as e:
                 log.info(f"Failed to parse file from snekbox response: {e}")
-                res.err_files.append(file["path"])
+                res.failed_files.append(file["path"])
 
         return res
-- 
cgit v1.2.3


From d00584408a20e231df1e3d6ce3c4837e6bb829e4 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Wed, 14 Dec 2022 18:29:53 +0800
Subject: Add FILE_COUNT_LIMIT and error messages

---
 bot/exts/utils/snekbox/_cog.py  |  6 +++---
 bot/exts/utils/snekbox/_eval.py | 24 ++++++++++++++++++------
 bot/exts/utils/snekbox/_io.py   |  3 +++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 9abbbcfc4..f8ddbbf0e 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -286,12 +286,12 @@ class Snekbox(Cog):
                 log.trace("Formatting output...")
                 output, paste_link = await self.format_output(result.stdout)
 
-            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
+            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n\n"
             if not result.files or output not in ("[No output]", ""):
-                msg += f"\n```\n{output}\n```"
+                msg += f"```\n{output}\n```"
 
             if paste_link:
-                msg = f"{msg}\nFull output: {paste_link}"
+                msg += f"Full output: {paste_link}"
 
             # Collect stats of job fails + successes
             if result.returncode != 0:
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 1764b6871..d955d26d0 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
 from signal import Signals
 from typing import TYPE_CHECKING
 
-from bot.exts.utils.snekbox._io import FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
+from bot.exts.utils.snekbox._io import FILE_COUNT_LIMIT, FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
 from bot.log import get_logger
 
 if TYPE_CHECKING:
@@ -92,10 +92,17 @@ class EvalResult:
         # Add error message for failed attachments
         if self.failed_files:
             failed_files = f"({', '.join(self.failed_files)})"
-            msg += (
-                f".\n\n> Some attached files were not able to be uploaded {failed_files}."
-                f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
-            )
+            # Case for over 10
+            if len(self.failed_files) + len(self.files) > FILE_COUNT_LIMIT:
+                msg += (
+                    f".\n\n> Some files were not able to be uploaded, as they exceeded"
+                    f" the {FILE_COUNT_LIMIT} file upload limit {failed_files}"
+                )
+            else:
+                msg += (
+                    f".\n\n> Some files were not able to be uploaded {failed_files}."
+                    f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
+                )
 
         return msg, error
 
@@ -107,7 +114,12 @@ class EvalResult:
             returncode=data["returncode"],
         )
 
-        for file in data.get("files", []):
+        files = iter(data["files"])
+        for i, file in enumerate(files):
+            # Limit to FILE_COUNT_LIMIT files
+            if i >= FILE_COUNT_LIMIT:
+                res.failed_files.extend(file["path"] for file in files)
+                break
             try:
                 res.files.append(FileAttachment.from_dict(file))
             except ValueError as e:
diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index a7f84a241..fcf5451aa 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -12,6 +12,9 @@ from discord import File
 # or 50 MiB for lvl 2 boosted servers
 FILE_SIZE_LIMIT = 8 * 1024 * 1024
 
+# Discord currently has a 10-file limit per message
+FILE_COUNT_LIMIT = 10
+
 
 def sizeof_fmt(num: int, suffix: str = "B") -> str:
     """Return a human-readable file size."""
-- 
cgit v1.2.3


From a577e4810df719d67bfd2eae48c49854a700edd6 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 19:07:21 +0800
Subject: sizeof_fmt uses 0 d.p. for integrals

---
 bot/exts/utils/snekbox/_io.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index fcf5451aa..3ec5ff00a 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -16,13 +16,16 @@ FILE_SIZE_LIMIT = 8 * 1024 * 1024
 FILE_COUNT_LIMIT = 10
 
 
-def sizeof_fmt(num: int, suffix: str = "B") -> str:
+def sizeof_fmt(num: int | float, suffix: str = "B") -> str:
     """Return a human-readable file size."""
+    num = float(num)
     for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
         if abs(num) < 1024:
-            return f"{num:3.1f}{unit}{suffix}"
+            num_str = f"{int(num)}" if num.is_integer() else f"{num:3.1f}"
+            return f"{num_str} {unit}{suffix}"
         num /= 1024
-    return f"{num:.1f}Yi{suffix}"
+    num_str = f"{int(num)}" if num.is_integer() else f"{num:3.1f}"
+    return f"{num_str} Yi{suffix}"
 
 
 @dataclass
-- 
cgit v1.2.3


From fc785d1c9cf00e7775c3faf9a39cca575f367dd1 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 19:07:54 +0800
Subject: Split get_message errors to other properties

---
 bot/exts/utils/snekbox/_cog.py  |  8 ++++-
 bot/exts/utils/snekbox/_eval.py | 77 +++++++++++++++++++++++++++--------------
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f8ddbbf0e..6aa7c6324 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -278,7 +278,9 @@ class Snekbox(Cog):
         """
         async with ctx.typing():
             result = await self.post_job(job)
-            msg, error = result.get_message(job)
+            msg = result.get_message(job)
+            error = result.error_message
+            files_error = result.files_error_message
 
             if error:
                 output, paste_link = error, None
@@ -293,6 +295,10 @@ class Snekbox(Cog):
             if paste_link:
                 msg += f"Full output: {paste_link}"
 
+            # Additional files error message after output
+            if files_error:
+                msg += f"\n{files_error}"
+
             # Collect stats of job fails + successes
             if result.returncode != 0:
                 self.bot.stats.incr("snekbox.python.fail")
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index d955d26d0..748b58a3b 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -70,41 +70,66 @@ class EvalResult:
         else:  # Exception
             return ":x:"
 
-    def get_message(self, job: EvalJob) -> tuple[str, str]:
-        """Return a user-friendly message and error corresponding to the process's return code."""
-        msg = f"Your {job.version} {job.name} job has completed with return code {self.returncode}"
+    @property
+    def error_message(self) -> str:
+        """Return an error message corresponding to the process's return code."""
         error = ""
-
         if self.returncode is None:
-            msg = f"Your {job.version} {job.name} job has failed"
             error = self.stdout.strip()
-        elif self.returncode == 128 + SIGKILL:
-            msg = f"Your {job.version} {job.name} job timed out or ran out of memory"
         elif self.returncode == 255:
-            msg = f"Your {job.version} {job.name} job has failed"
             error = "A fatal NsJail error occurred"
+        return error
+
+    @property
+    def files_error_message(self) -> str:
+        """Return an error message corresponding to the failed files."""
+        if not self.failed_files:
+            return ""
+
+        failed_files = f"({self.failed_files_str()})"
+
+        n_failed = len(self.failed_files)
+        files = f"file{'s' if n_failed > 1 else ''}"
+        msg = f"Failed to upload {n_failed} {files} {failed_files}"
+
+        if (n_failed + len(self.files)) > FILE_COUNT_LIMIT:
+            it_they = "they" if n_failed > 1 else "it"
+            msg += f" as {it_they} exceeded the {FILE_COUNT_LIMIT} file limit."
+        else:
+            msg += f". File sizes should each not exceed {sizeof_fmt(FILE_SIZE_LIMIT)}."
+
+        return msg
+
+    def failed_files_str(self, char_max: int = 85, file_max: int = 5) -> str:
+        """Return a string containing the names of failed files, truncated to lower of char_max and file_max."""
+        names = []
+        for file in self.failed_files:
+            char_max -= len(file)
+            if char_max <= 0 or len(names) >= file_max:
+                names.append("...")
+                break
+            names.append(file)
+        text = ", ".join(names)
+        return text
+
+    def get_message(self, job: EvalJob) -> str:
+        """Return a user-friendly message corresponding to the process's return code."""
+        msg = f"Your {job.version} {job.name} job"
+
+        if self.returncode is None:
+            msg += " has failed"
+        elif self.returncode == 128 + SIGKILL:
+            msg += " timed out or ran out of memory"
+        elif self.returncode == 255:
+            msg += " has failed"
         else:
+            msg += f" has completed with return code {self.returncode}"
             # Try to append signal's name if one exists
             with contextlib.suppress(ValueError):
                 name = Signals(self.returncode - 128).name
-                msg = f"{msg} ({name})"
-
-        # Add error message for failed attachments
-        if self.failed_files:
-            failed_files = f"({', '.join(self.failed_files)})"
-            # Case for over 10
-            if len(self.failed_files) + len(self.files) > FILE_COUNT_LIMIT:
-                msg += (
-                    f".\n\n> Some files were not able to be uploaded, as they exceeded"
-                    f" the {FILE_COUNT_LIMIT} file upload limit {failed_files}"
-                )
-            else:
-                msg += (
-                    f".\n\n> Some files were not able to be uploaded {failed_files}."
-                    f" Check that the file size is less than {sizeof_fmt(FILE_SIZE_LIMIT)}"
-                )
-
-        return msg, error
+                msg += f" ({name})"
+
+        return msg
 
     @classmethod
     def from_dict(cls, data: dict[str, str | int | list[dict[str, str]]]) -> EvalResult:
-- 
cgit v1.2.3


From 75d1fde1ed516b5698be2b652297765f1ba5ccfe Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 19:17:49 +0800
Subject: Update unit tests for EvalResult message change

---
 tests/bot/exts/utils/test_snekbox.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 31b1ca260..3ce832771 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -28,7 +28,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
     async def test_post_job(self):
         """Post the eval code to the URLs.snekbox_eval_api endpoint."""
         resp = MagicMock()
-        resp.json = AsyncMock(return_value={"stdout": "Hi", "returncode": 137})
+        resp.json = AsyncMock(return_value={"stdout": "Hi", "returncode": 137, "files": []})
 
         context_manager = MagicMock()
         context_manager.__aenter__.return_value = resp
@@ -107,23 +107,32 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
     def test_eval_result_message(self):
         """EvalResult.message, should return error and message."""
         cases = (
-            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR')),
-            ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '')),
-            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred'))
+            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', '')),
+            ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', '')),
+            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred', ''))
         )
         for stdout, returncode, expected in cases:
+            exp_msg, exp_err, exp_files_err = expected
             with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
                 result = EvalResult(stdout=stdout, returncode=returncode)
                 job = EvalJob([])
-                self.assertEqual(result.get_message(job), expected)
+                # Check all 3 message types
+                msg = result.get_message(job)
+                self.assertEqual(msg, exp_msg)
+                error = result.error_message
+                self.assertEqual(error, exp_err)
+                files_error = result.files_error_message
+                self.assertEqual(files_error, exp_files_err)
 
     @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
         result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
             result.get_message(EvalJob([], version="3.10")),
-            ("Your 3.10 eval job has completed with return code 127", "")
+            "Your 3.10 eval job has completed with return code 127"
         )
+        self.assertEqual(result.error_message, "")
+        self.assertEqual(result.files_error_message, "")
 
     @patch('bot.exts.utils.snekbox._eval.Signals')
     def test_eval_result_message_valid_signal(self, mock_signals: Mock):
@@ -131,7 +140,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         result = EvalResult(stdout="", returncode=127)
         self.assertEqual(
             result.get_message(EvalJob([], version="3.11")),
-            ("Your 3.11 eval job has completed with return code 127 (SIGTEST)", "")
+            "Your 3.11 eval job has completed with return code 127 (SIGTEST)"
         )
 
     def test_eval_result_status_emoji(self):
-- 
cgit v1.2.3


From 9ab03ada0ff5dcbb78a5f6c7ed4f81552e0d6138 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 19:17:59 +0800
Subject: Revert newline format for msg

---
 bot/exts/utils/snekbox/_cog.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 6aa7c6324..5fe20d339 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -288,12 +288,12 @@ class Snekbox(Cog):
                 log.trace("Formatting output...")
                 output, paste_link = await self.format_output(result.stdout)
 
-            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n\n"
+            msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
             if not result.files or output not in ("[No output]", ""):
-                msg += f"```\n{output}\n```"
+                msg += f"\n```\n{output}\n```"
 
             if paste_link:
-                msg += f"Full output: {paste_link}"
+                msg += f"\nFull output: {paste_link}"
 
             # Additional files error message after output
             if files_error:
-- 
cgit v1.2.3


From a82c15dcb3643856ca1276679b4ba5e0a3854a3a Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 20:07:45 +0800
Subject: Add unit test for files_error_message

---
 tests/bot/exts/utils/test_snekbox.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 3ce832771..afe48dceb 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -105,7 +105,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
                 self.assertEqual(self.cog.prepare_timeit_input(case), expected)
 
     def test_eval_result_message(self):
-        """EvalResult.message, should return error and message."""
+        """EvalResult.get_message(), should return message."""
         cases = (
             ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', '')),
             ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', '')),
@@ -124,6 +124,33 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
                 files_error = result.files_error_message
                 self.assertEqual(files_error, exp_files_err)
 
+    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
+    def test_eval_result_files_error_message(self):
+        """EvalResult.files_error_message, should return files error message."""
+        cases = [
+            ([], ["abc"], (
+                "Failed to upload 1 file (abc)."
+                " File sizes should each not exceed 8 MiB."
+            )),
+            ([], ["file1.bin", "f2.bin"], (
+                "Failed to upload 2 files (file1.bin, f2.bin)."
+                " File sizes should each not exceed 8 MiB."
+            )),
+            (["a", "b"], ["c"], (
+                "Failed to upload 1 file (c)"
+                " as it exceeded the 2 file limit."
+            )),
+            (["a"], ["b", "c"], (
+                "Failed to upload 2 files (b, c)"
+                " as they exceeded the 2 file limit."
+            )),
+        ]
+        for files, failed_files, expected_msg in cases:
+            with self.subTest(files=files, failed_files=failed_files, expected_msg=expected_msg):
+                result = EvalResult("", 0, files, failed_files)
+                msg = result.files_error_message
+                self.assertEqual(msg, expected_msg)
+
     @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
         result = EvalResult(stdout="", returncode=127)
-- 
cgit v1.2.3


From d2de465e8fb3659eb1fe40aa2d1c9e9cb80e0d11 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Sat, 17 Dec 2022 20:16:57 +0800
Subject: Add unit tests for EvalResult.files_error_str

---
 bot/exts/utils/snekbox/_eval.py      |  2 +-
 tests/bot/exts/utils/test_snekbox.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 748b58a3b..56a02d981 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -105,7 +105,7 @@ class EvalResult:
         names = []
         for file in self.failed_files:
             char_max -= len(file)
-            if char_max <= 0 or len(names) >= file_max:
+            if char_max < 0 or len(names) >= file_max:
                 names.append("...")
                 break
             names.append(file)
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index afe48dceb..5e13ac4bb 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -151,6 +151,27 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
                 msg = result.files_error_message
                 self.assertEqual(msg, expected_msg)
 
+    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
+    def test_eval_result_files_error_str(self):
+        """EvalResult.files_error_message, should return files error message."""
+        max_file_name = "a" * 32
+        cases = [
+            (["x.ini"], "x.ini"),
+            (["dog.py", "cat.py"], "dog.py, cat.py"),
+            # 3 files limit
+            (["a", "b", "c"], "a, b, c"),
+            (["a", "b", "c", "d"], "a, b, c, ..."),
+            (["x", "y", "z"] + ["a"] * 100, "x, y, z, ..."),
+            # 32 char limit
+            ([max_file_name], max_file_name),
+            ([max_file_name, "b"], f"{max_file_name}, ..."),
+            ([max_file_name + "a"], "...")
+        ]
+        for failed_files, expected in cases:
+            result = EvalResult("", 0, [], failed_files)
+            msg = result.failed_files_str(char_max=32, file_max=3)
+            self.assertEqual(msg, expected)
+
     @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
         result = EvalResult(stdout="", returncode=127)
-- 
cgit v1.2.3


From d7722b3c335af13d43d3b958c34802d2a98d0279 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 12:39:56 +0800
Subject: Rename method get_failed_files_str

---
 bot/exts/utils/snekbox/_eval.py      | 4 ++--
 tests/bot/exts/utils/test_snekbox.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 56a02d981..afbb4a32d 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -86,7 +86,7 @@ class EvalResult:
         if not self.failed_files:
             return ""
 
-        failed_files = f"({self.failed_files_str()})"
+        failed_files = f"({self.get_failed_files_str()})"
 
         n_failed = len(self.failed_files)
         files = f"file{'s' if n_failed > 1 else ''}"
@@ -100,7 +100,7 @@ class EvalResult:
 
         return msg
 
-    def failed_files_str(self, char_max: int = 85, file_max: int = 5) -> str:
+    def get_failed_files_str(self, char_max: int = 85, file_max: int = 5) -> str:
         """Return a string containing the names of failed files, truncated to lower of char_max and file_max."""
         names = []
         for file in self.failed_files:
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
index 5e13ac4bb..b129bfcdb 100644
--- a/tests/bot/exts/utils/test_snekbox.py
+++ b/tests/bot/exts/utils/test_snekbox.py
@@ -169,7 +169,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         ]
         for failed_files, expected in cases:
             result = EvalResult("", 0, [], failed_files)
-            msg = result.failed_files_str(char_max=32, file_max=3)
+            msg = result.get_failed_files_str(char_max=32, file_max=3)
             self.assertEqual(msg, expected)
 
     @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
-- 
cgit v1.2.3


From 48cf627b37e48bdce15312c0981347e6e2b10622 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 17:22:41 +0800
Subject: Add markdown mention escape for file error str

---
 bot/exts/utils/snekbox/_eval.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index afbb4a32d..95039f0bd 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -5,6 +5,8 @@ from dataclasses import dataclass, field
 from signal import Signals
 from typing import TYPE_CHECKING
 
+from discord.utils import escape_markdown, escape_mentions
+
 from bot.exts.utils.snekbox._io import FILE_COUNT_LIMIT, FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
 from bot.log import get_logger
 
@@ -110,6 +112,9 @@ class EvalResult:
                 break
             names.append(file)
         text = ", ".join(names)
+        # Since the file names are provided by user
+        text = escape_markdown(text)
+        text = escape_mentions(text)
         return text
 
     def get_message(self, job: EvalJob) -> str:
-- 
cgit v1.2.3


From 2aaf161b8d8e4d89a57fca43df2fc50788a5f109 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 17:22:57 +0800
Subject: Add discord file name normalization

---
 bot/exts/utils/snekbox/_io.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index 3ec5ff00a..88f10e4a2 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -6,6 +6,7 @@ from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path
 
+import regex
 from discord import File
 
 # Note discord bot upload limit is 8 MiB per file,
@@ -16,6 +17,14 @@ FILE_SIZE_LIMIT = 8 * 1024 * 1024
 FILE_COUNT_LIMIT = 10
 
 
+# ANSI escape sequences
+RE_ANSI = regex.compile(r"\x1b[^m]*m")
+# Characters with a leading backslash
+RE_BACKSLASH = regex.compile(r"\\.")
+# Discord disallowed file name characters
+RE_DISCORD_FILE_NAME_DISALLOWED = regex.compile(r"[^a-zA-Z0-9._-]+")
+
+
 def sizeof_fmt(num: int | float, suffix: str = "B") -> str:
     """Return a human-readable file size."""
     num = float(num)
@@ -28,6 +37,18 @@ def sizeof_fmt(num: int | float, suffix: str = "B") -> str:
     return f"{num_str} Yi{suffix}"
 
 
+def normalize_discord_file_name(name: str) -> str:
+    """Return a normalized valid discord file name."""
+    # Discord file names only allow A-Z, a-z, 0-9, underscores, dashes, and dots
+    # https://discord.com/developers/docs/reference#uploading-files
+    # Server will remove any other characters, but we'll get a 400 error for \ escaped chars
+    name = RE_ANSI.sub("_", name)
+    name = RE_BACKSLASH.sub("_", name)
+    # Replace any disallowed character with an underscore
+    name = RE_DISCORD_FILE_NAME_DISALLOWED.sub("_", name)
+    return name
+
+
 @dataclass
 class FileAttachment:
     """File Attachment from Snekbox eval."""
@@ -68,4 +89,5 @@ class FileAttachment:
     def to_file(self) -> File:
         """Convert to a discord.File."""
         name = Path(self.path).name
+        name = normalize_discord_file_name(name)
         return File(BytesIO(self.content), filename=name)
-- 
cgit v1.2.3


From d75d465f0a1df473e90239cbd352bcd1e8c687f0 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 17:53:03 +0800
Subject: Improve RE_ANSI match cases

---
 bot/exts/utils/snekbox/_io.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index 88f10e4a2..faa7d3bb3 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -18,7 +18,7 @@ FILE_COUNT_LIMIT = 10
 
 
 # ANSI escape sequences
-RE_ANSI = regex.compile(r"\x1b[^m]*m")
+RE_ANSI = regex.compile(r"\\u.*\[(.*?)m")
 # Characters with a leading backslash
 RE_BACKSLASH = regex.compile(r"\\.")
 # Discord disallowed file name characters
-- 
cgit v1.2.3


From 7affd4816d7bbe1cfc92221c3a47553fed9d0cd8 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 17:53:21 +0800
Subject: Refactor snekbox tests to module

---
 tests/bot/exts/utils/snekbox/__init__.py     |   0
 tests/bot/exts/utils/snekbox/test_snekbox.py | 510 +++++++++++++++++++++++++++
 tests/bot/exts/utils/test_snekbox.py         | 510 ---------------------------
 3 files changed, 510 insertions(+), 510 deletions(-)
 create mode 100644 tests/bot/exts/utils/snekbox/__init__.py
 create mode 100644 tests/bot/exts/utils/snekbox/test_snekbox.py
 delete mode 100644 tests/bot/exts/utils/test_snekbox.py

diff --git a/tests/bot/exts/utils/snekbox/__init__.py b/tests/bot/exts/utils/snekbox/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py
new file mode 100644
index 000000000..b129bfcdb
--- /dev/null
+++ b/tests/bot/exts/utils/snekbox/test_snekbox.py
@@ -0,0 +1,510 @@
+import asyncio
+import unittest
+from base64 import b64encode
+from unittest.mock import AsyncMock, MagicMock, Mock, call, create_autospec, patch
+
+from discord import AllowedMentions
+from discord.ext import commands
+
+from bot import constants
+from bot.errors import LockedResourceError
+from bot.exts.utils import snekbox
+from bot.exts.utils.snekbox import EvalJob, EvalResult, Snekbox
+from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
+
+
+class SnekboxTests(unittest.IsolatedAsyncioTestCase):
+    def setUp(self):
+        """Add mocked bot and cog to the instance."""
+        self.bot = MockBot()
+        self.cog = Snekbox(bot=self.bot)
+        self.job = EvalJob.from_code("import random")
+
+    @staticmethod
+    def code_args(code: str) -> tuple[EvalJob]:
+        """Converts code to a tuple of arguments expected."""
+        return EvalJob.from_code(code),
+
+    async def test_post_job(self):
+        """Post the eval code to the URLs.snekbox_eval_api endpoint."""
+        resp = MagicMock()
+        resp.json = AsyncMock(return_value={"stdout": "Hi", "returncode": 137, "files": []})
+
+        context_manager = MagicMock()
+        context_manager.__aenter__.return_value = resp
+        self.bot.http_session.post.return_value = context_manager
+
+        job = EvalJob.from_code("import random").as_version("3.10")
+        self.assertEqual(await self.cog.post_job(job), EvalResult("Hi", 137))
+
+        expected = {
+            "args": ["main.py"],
+            "files": [
+                {
+                    "path": "main.py",
+                    "content": b64encode("import random".encode()).decode()
+                }
+            ]
+        }
+        self.bot.http_session.post.assert_called_with(
+            constants.URLs.snekbox_eval_api,
+            json=expected,
+            raise_for_status=True
+        )
+        resp.json.assert_awaited_once()
+
+    async def test_upload_output_reject_too_long(self):
+        """Reject output longer than MAX_PASTE_LENGTH."""
+        result = await self.cog.upload_output("-" * (snekbox._cog.MAX_PASTE_LENGTH + 1))
+        self.assertEqual(result, "too long to upload")
+
+    @patch("bot.exts.utils.snekbox._cog.send_to_paste_service")
+    async def test_upload_output(self, mock_paste_util):
+        """Upload the eval output to the URLs.paste_service.format(key="documents") endpoint."""
+        await self.cog.upload_output("Test output.")
+        mock_paste_util.assert_called_once_with(
+            "Test output.",
+            extension="txt",
+            max_length=snekbox._cog.MAX_PASTE_LENGTH
+        )
+
+    async def test_codeblock_converter(self):
+        ctx = MockContext()
+        cases = (
+            ('print("Hello world!")', 'print("Hello world!")', 'non-formatted'),
+            ('`print("Hello world!")`', 'print("Hello world!")', 'one line code block'),
+            ('```\nprint("Hello world!")```', 'print("Hello world!")', 'multiline code block'),
+            ('```py\nprint("Hello world!")```', 'print("Hello world!")', 'multiline python code block'),
+            ('text```print("Hello world!")```text', 'print("Hello world!")', 'code block surrounded by text'),
+            ('```print("Hello world!")```\ntext\n```py\nprint("Hello world!")```',
+             'print("Hello world!")\nprint("Hello world!")', 'two code blocks with text in-between'),
+            ('`print("Hello world!")`\ntext\n```print("How\'s it going?")```',
+             'print("How\'s it going?")', 'code block preceded by inline code'),
+            ('`print("Hello world!")`\ntext\n`print("Hello world!")`',
+             'print("Hello world!")', 'one inline code block of two')
+        )
+        for case, expected, testname in cases:
+            with self.subTest(msg=f'Extract code from {testname}.'):
+                self.assertEqual(
+                    '\n'.join(await snekbox.CodeblockConverter.convert(ctx, case)), expected
+                )
+
+    def test_prepare_timeit_input(self):
+        """Test the prepare_timeit_input codeblock detection."""
+        base_args = ('-m', 'timeit', '-s')
+        cases = (
+            (['print("Hello World")'], '', 'single block of code'),
+            (['x = 1', 'print(x)'], 'x = 1', 'two blocks of code'),
+            (['x = 1', 'print(x)', 'print("Some other code.")'], 'x = 1', 'three blocks of code')
+        )
+
+        for case, setup_code, test_name in cases:
+            setup = snekbox._cog.TIMEIT_SETUP_WRAPPER.format(setup=setup_code)
+            expected = [*base_args, setup, '\n'.join(case[1:] if setup_code else case)]
+            with self.subTest(msg=f'Test with {test_name} and expected return {expected}'):
+                self.assertEqual(self.cog.prepare_timeit_input(case), expected)
+
+    def test_eval_result_message(self):
+        """EvalResult.get_message(), should return message."""
+        cases = (
+            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', '')),
+            ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', '')),
+            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred', ''))
+        )
+        for stdout, returncode, expected in cases:
+            exp_msg, exp_err, exp_files_err = expected
+            with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
+                result = EvalResult(stdout=stdout, returncode=returncode)
+                job = EvalJob([])
+                # Check all 3 message types
+                msg = result.get_message(job)
+                self.assertEqual(msg, exp_msg)
+                error = result.error_message
+                self.assertEqual(error, exp_err)
+                files_error = result.files_error_message
+                self.assertEqual(files_error, exp_files_err)
+
+    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
+    def test_eval_result_files_error_message(self):
+        """EvalResult.files_error_message, should return files error message."""
+        cases = [
+            ([], ["abc"], (
+                "Failed to upload 1 file (abc)."
+                " File sizes should each not exceed 8 MiB."
+            )),
+            ([], ["file1.bin", "f2.bin"], (
+                "Failed to upload 2 files (file1.bin, f2.bin)."
+                " File sizes should each not exceed 8 MiB."
+            )),
+            (["a", "b"], ["c"], (
+                "Failed to upload 1 file (c)"
+                " as it exceeded the 2 file limit."
+            )),
+            (["a"], ["b", "c"], (
+                "Failed to upload 2 files (b, c)"
+                " as they exceeded the 2 file limit."
+            )),
+        ]
+        for files, failed_files, expected_msg in cases:
+            with self.subTest(files=files, failed_files=failed_files, expected_msg=expected_msg):
+                result = EvalResult("", 0, files, failed_files)
+                msg = result.files_error_message
+                self.assertEqual(msg, expected_msg)
+
+    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
+    def test_eval_result_files_error_str(self):
+        """EvalResult.files_error_message, should return files error message."""
+        max_file_name = "a" * 32
+        cases = [
+            (["x.ini"], "x.ini"),
+            (["dog.py", "cat.py"], "dog.py, cat.py"),
+            # 3 files limit
+            (["a", "b", "c"], "a, b, c"),
+            (["a", "b", "c", "d"], "a, b, c, ..."),
+            (["x", "y", "z"] + ["a"] * 100, "x, y, z, ..."),
+            # 32 char limit
+            ([max_file_name], max_file_name),
+            ([max_file_name, "b"], f"{max_file_name}, ..."),
+            ([max_file_name + "a"], "...")
+        ]
+        for failed_files, expected in cases:
+            result = EvalResult("", 0, [], failed_files)
+            msg = result.get_failed_files_str(char_max=32, file_max=3)
+            self.assertEqual(msg, expected)
+
+    @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
+    def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
+        result = EvalResult(stdout="", returncode=127)
+        self.assertEqual(
+            result.get_message(EvalJob([], version="3.10")),
+            "Your 3.10 eval job has completed with return code 127"
+        )
+        self.assertEqual(result.error_message, "")
+        self.assertEqual(result.files_error_message, "")
+
+    @patch('bot.exts.utils.snekbox._eval.Signals')
+    def test_eval_result_message_valid_signal(self, mock_signals: Mock):
+        mock_signals.return_value.name = "SIGTEST"
+        result = EvalResult(stdout="", returncode=127)
+        self.assertEqual(
+            result.get_message(EvalJob([], version="3.11")),
+            "Your 3.11 eval job has completed with return code 127 (SIGTEST)"
+        )
+
+    def test_eval_result_status_emoji(self):
+        """Return emoji according to the eval result."""
+        cases = (
+            (' ', -1, ':warning:'),
+            ('Hello world!', 0, ':white_check_mark:'),
+            ('Invalid beard size', -1, ':x:')
+        )
+        for stdout, returncode, expected in cases:
+            with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
+                result = EvalResult(stdout=stdout, returncode=returncode)
+                self.assertEqual(result.status_emoji, expected)
+
+    async def test_format_output(self):
+        """Test output formatting."""
+        self.cog.upload_output = AsyncMock(return_value='https://testificate.com/')
+
+        too_many_lines = (
+            '001 | v\n002 | e\n003 | r\n004 | y\n005 | l\n006 | o\n'
+            '007 | n\n008 | g\n009 | b\n010 | e\n011 | a\n... (truncated - too many lines)'
+        )
+        too_long_too_many_lines = (
+            "\n".join(
+                f"{i:03d} | {line}" for i, line in enumerate(['verylongbeard' * 10] * 15, 1)
+            )[:1000] + "\n... (truncated - too long, too many lines)"
+        )
+
+        cases = (
+            ('', ('[No output]', None), 'No output'),
+            ('My awesome output', ('My awesome output', None), 'One line output'),
+            ('<@', ("<@\u200B", None), r'Convert <@ to <@\u200B'),
+            ('<!@', ("<!@\u200B", None), r'Convert <!@ to <!@\u200B'),
+            (
+                '\u202E\u202E\u202E',
+                ('Code block escape attempt detected; will not output result', 'https://testificate.com/'),
+                'Detect RIGHT-TO-LEFT OVERRIDE'
+            ),
+            (
+                '\u200B\u200B\u200B',
+                ('Code block escape attempt detected; will not output result', 'https://testificate.com/'),
+                'Detect ZERO WIDTH SPACE'
+            ),
+            ('long\nbeard', ('001 | long\n002 | beard', None), 'Two line output'),
+            (
+                'v\ne\nr\ny\nl\no\nn\ng\nb\ne\na\nr\nd',
+                (too_many_lines, 'https://testificate.com/'),
+                '12 lines output'
+            ),
+            (
+                'verylongbeard' * 100,
+                ('verylongbeard' * 76 + 'verylongbear\n... (truncated - too long)', 'https://testificate.com/'),
+                '1300 characters output'
+            ),
+            (
+                ('verylongbeard' * 10 + '\n') * 15,
+                (too_long_too_many_lines, 'https://testificate.com/'),
+                '15 lines, 1965 characters output'
+            ),
+        )
+        for case, expected, testname in cases:
+            with self.subTest(msg=testname, case=case, expected=expected):
+                self.assertEqual(await self.cog.format_output(case), expected)
+
+    async def test_eval_command_evaluate_once(self):
+        """Test the eval command procedure."""
+        ctx = MockContext()
+        response = MockMessage()
+        ctx.command = MagicMock()
+
+        self.cog.send_job = AsyncMock(return_value=response)
+        self.cog.continue_job = AsyncMock(return_value=None)
+
+        await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
+        job = EvalJob.from_code("MyAwesomeCode")
+        self.cog.send_job.assert_called_once_with(ctx, job)
+        self.cog.continue_job.assert_called_once_with(ctx, response, 'eval')
+
+    async def test_eval_command_evaluate_twice(self):
+        """Test the eval and re-eval command procedure."""
+        ctx = MockContext()
+        response = MockMessage()
+        ctx.command = MagicMock()
+        self.cog.send_job = AsyncMock(return_value=response)
+        self.cog.continue_job = AsyncMock()
+        self.cog.continue_job.side_effect = (EvalJob.from_code('MyAwesomeFormattedCode'), None)
+
+        await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
+
+        expected_job = EvalJob.from_code("MyAwesomeFormattedCode")
+        self.cog.send_job.assert_called_with(ctx, expected_job)
+        self.cog.continue_job.assert_called_with(ctx, response, "eval")
+
+    async def test_eval_command_reject_two_eval_at_the_same_time(self):
+        """Test if the eval command rejects an eval if the author already have a running eval."""
+        ctx = MockContext()
+        ctx.author.id = 42
+
+        async def delay_with_side_effect(*args, **kwargs) -> dict:
+            """Delay the post_job call to ensure the job runs long enough to conflict."""
+            await asyncio.sleep(1)
+            return {'stdout': '', 'returncode': 0}
+
+        self.cog.post_job = AsyncMock(side_effect=delay_with_side_effect)
+        with self.assertRaises(LockedResourceError):
+            await asyncio.gather(
+                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
+                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
+            )
+
+    async def test_send_job(self):
+        """Test the send_job function."""
+        ctx = MockContext()
+        ctx.message = MockMessage()
+        ctx.send = AsyncMock()
+        ctx.author = MockUser(mention='@LemonLemonishBeard#0042')
+
+        eval_result = EvalResult("", 0)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
+        self.cog.format_output = AsyncMock(return_value=('[No output]', None))
+        self.cog.upload_output = AsyncMock()  # Should not be called
+
+        mocked_filter_cog = MagicMock()
+        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
+        self.bot.get_cog.return_value = mocked_filter_cog
+
+        job = EvalJob.from_code('MyAwesomeCode')
+        await self.cog.send_job(ctx, job),
+
+        ctx.send.assert_called_once()
+        self.assertEqual(
+            ctx.send.call_args.args[0],
+            '@LemonLemonishBeard#0042 :warning: Your 3.11 eval job has completed '
+            'with return code 0.\n\n```\n[No output]\n```'
+        )
+        allowed_mentions = ctx.send.call_args.kwargs['allowed_mentions']
+        expected_allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
+        self.assertEqual(allowed_mentions.to_dict(), expected_allowed_mentions.to_dict())
+
+        self.cog.post_job.assert_called_once_with(job)
+        self.cog.format_output.assert_called_once_with('')
+        self.cog.upload_output.assert_not_called()
+
+    async def test_send_job_with_paste_link(self):
+        """Test the send_job function with a too long output that generate a paste link."""
+        ctx = MockContext()
+        ctx.message = MockMessage()
+        ctx.send = AsyncMock()
+        ctx.author.mention = '@LemonLemonishBeard#0042'
+
+        eval_result = EvalResult("Way too long beard", 0)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
+        self.cog.format_output = AsyncMock(return_value=('Way too long beard', 'lookatmybeard.com'))
+
+        mocked_filter_cog = MagicMock()
+        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
+        self.bot.get_cog.return_value = mocked_filter_cog
+
+        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
+        await self.cog.send_job(ctx, job),
+
+        ctx.send.assert_called_once()
+        self.assertEqual(
+            ctx.send.call_args.args[0],
+            '@LemonLemonishBeard#0042 :white_check_mark: Your 3.11 eval job '
+            'has completed with return code 0.'
+            '\n\n```\nWay too long beard\n```\nFull output: lookatmybeard.com'
+        )
+
+        self.cog.post_job.assert_called_once_with(job)
+        self.cog.format_output.assert_called_once_with('Way too long beard')
+
+    async def test_send_job_with_non_zero_eval(self):
+        """Test the send_job function with a code returning a non-zero code."""
+        ctx = MockContext()
+        ctx.message = MockMessage()
+        ctx.send = AsyncMock()
+        ctx.author.mention = '@LemonLemonishBeard#0042'
+
+        eval_result = EvalResult("ERROR", 127)
+        self.cog.post_job = AsyncMock(return_value=eval_result)
+        self.cog.upload_output = AsyncMock()  # This function isn't called
+
+        mocked_filter_cog = MagicMock()
+        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
+        self.bot.get_cog.return_value = mocked_filter_cog
+
+        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
+        await self.cog.send_job(ctx, job),
+
+        ctx.send.assert_called_once()
+        self.assertEqual(
+            ctx.send.call_args.args[0],
+            '@LemonLemonishBeard#0042 :x: Your 3.11 eval job has completed with return code 127.'
+            '\n\n```\nERROR\n```'
+        )
+
+        self.cog.post_job.assert_called_once_with(job)
+        self.cog.upload_output.assert_not_called()
+
+    @patch("bot.exts.utils.snekbox._cog.partial")
+    async def test_continue_job_does_continue(self, partial_mock):
+        """Test that the continue_job function does continue if required conditions are met."""
+        ctx = MockContext(
+            message=MockMessage(
+                id=4,
+                add_reaction=AsyncMock(),
+                clear_reactions=AsyncMock()
+            ),
+            author=MockMember(id=14)
+        )
+        response = MockMessage(id=42, delete=AsyncMock())
+        new_msg = MockMessage()
+        self.cog.jobs = {4: 42}
+        self.bot.wait_for.side_effect = ((None, new_msg), None)
+        expected = "NewCode"
+        self.cog.get_code = create_autospec(self.cog.get_code, spec_set=True, return_value=expected)
+
+        actual = await self.cog.continue_job(ctx, response, self.cog.eval_command)
+        self.cog.get_code.assert_awaited_once_with(new_msg, ctx.command)
+        self.assertEqual(actual, EvalJob.from_code(expected))
+        self.bot.wait_for.assert_has_awaits(
+            (
+                call(
+                    'message_edit',
+                    check=partial_mock(snekbox._cog.predicate_message_edit, ctx),
+                    timeout=snekbox._cog.REDO_TIMEOUT,
+                ),
+                call('reaction_add', check=partial_mock(snekbox._cog.predicate_emoji_reaction, ctx), timeout=10)
+            )
+        )
+        ctx.message.add_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
+        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
+        response.delete.assert_called_once()
+
+    async def test_continue_job_does_not_continue(self):
+        ctx = MockContext(message=MockMessage(clear_reactions=AsyncMock()))
+        self.bot.wait_for.side_effect = asyncio.TimeoutError
+
+        actual = await self.cog.continue_job(ctx, MockMessage(), self.cog.eval_command)
+        self.assertEqual(actual, None)
+        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
+
+    async def test_get_code(self):
+        """Should return 1st arg (or None) if eval cmd in message, otherwise return full content."""
+        prefix = constants.Bot.prefix
+        subtests = (
+            (self.cog.eval_command, f"{prefix}{self.cog.eval_command.name} print(1)", "print(1)"),
+            (self.cog.eval_command, f"{prefix}{self.cog.eval_command.name}", None),
+            (MagicMock(spec=commands.Command), f"{prefix}tags get foo"),
+            (None, "print(123)")
+        )
+
+        for command, content, *expected_code in subtests:
+            if not expected_code:
+                expected_code = content
+            else:
+                [expected_code] = expected_code
+
+            with self.subTest(content=content, expected_code=expected_code):
+                self.bot.get_context.reset_mock()
+                self.bot.get_context.return_value = MockContext(command=command)
+                message = MockMessage(content=content)
+
+                actual_code = await self.cog.get_code(message, self.cog.eval_command)
+
+                self.bot.get_context.assert_awaited_once_with(message)
+                self.assertEqual(actual_code, expected_code)
+
+    def test_predicate_message_edit(self):
+        """Test the predicate_message_edit function."""
+        msg0 = MockMessage(id=1, content='abc')
+        msg1 = MockMessage(id=2, content='abcdef')
+        msg2 = MockMessage(id=1, content='abcdef')
+
+        cases = (
+            (msg0, msg0, False, 'same ID, same content'),
+            (msg0, msg1, False, 'different ID, different content'),
+            (msg0, msg2, True, 'same ID, different content')
+        )
+        for ctx_msg, new_msg, expected, testname in cases:
+            with self.subTest(msg=f'Messages with {testname} return {expected}'):
+                ctx = MockContext(message=ctx_msg)
+                actual = snekbox._cog.predicate_message_edit(ctx, ctx_msg, new_msg)
+                self.assertEqual(actual, expected)
+
+    def test_predicate_emoji_reaction(self):
+        """Test the predicate_emoji_reaction function."""
+        valid_reaction = MockReaction(message=MockMessage(id=1))
+        valid_reaction.__str__.return_value = snekbox._cog.REDO_EMOJI
+        valid_ctx = MockContext(message=MockMessage(id=1), author=MockUser(id=2))
+        valid_user = MockUser(id=2)
+
+        invalid_reaction_id = MockReaction(message=MockMessage(id=42))
+        invalid_reaction_id.__str__.return_value = snekbox._cog.REDO_EMOJI
+        invalid_user_id = MockUser(id=42)
+        invalid_reaction_str = MockReaction(message=MockMessage(id=1))
+        invalid_reaction_str.__str__.return_value = ':longbeard:'
+
+        cases = (
+            (invalid_reaction_id, valid_user, False, 'invalid reaction ID'),
+            (valid_reaction, invalid_user_id, False, 'invalid user ID'),
+            (invalid_reaction_str, valid_user, False, 'invalid reaction __str__'),
+            (valid_reaction, valid_user, True, 'matching attributes')
+        )
+        for reaction, user, expected, testname in cases:
+            with self.subTest(msg=f'Test with {testname} and expected return {expected}'):
+                actual = snekbox._cog.predicate_emoji_reaction(valid_ctx, reaction, user)
+                self.assertEqual(actual, expected)
+
+
+class SnekboxSetupTests(unittest.IsolatedAsyncioTestCase):
+    """Tests setup of the `Snekbox` cog."""
+
+    async def test_setup(self):
+        """Setup of the extension should call add_cog."""
+        bot = MockBot()
+        await snekbox.setup(bot)
+        bot.add_cog.assert_awaited_once()
diff --git a/tests/bot/exts/utils/test_snekbox.py b/tests/bot/exts/utils/test_snekbox.py
deleted file mode 100644
index b129bfcdb..000000000
--- a/tests/bot/exts/utils/test_snekbox.py
+++ /dev/null
@@ -1,510 +0,0 @@
-import asyncio
-import unittest
-from base64 import b64encode
-from unittest.mock import AsyncMock, MagicMock, Mock, call, create_autospec, patch
-
-from discord import AllowedMentions
-from discord.ext import commands
-
-from bot import constants
-from bot.errors import LockedResourceError
-from bot.exts.utils import snekbox
-from bot.exts.utils.snekbox import EvalJob, EvalResult, Snekbox
-from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
-
-
-class SnekboxTests(unittest.IsolatedAsyncioTestCase):
-    def setUp(self):
-        """Add mocked bot and cog to the instance."""
-        self.bot = MockBot()
-        self.cog = Snekbox(bot=self.bot)
-        self.job = EvalJob.from_code("import random")
-
-    @staticmethod
-    def code_args(code: str) -> tuple[EvalJob]:
-        """Converts code to a tuple of arguments expected."""
-        return EvalJob.from_code(code),
-
-    async def test_post_job(self):
-        """Post the eval code to the URLs.snekbox_eval_api endpoint."""
-        resp = MagicMock()
-        resp.json = AsyncMock(return_value={"stdout": "Hi", "returncode": 137, "files": []})
-
-        context_manager = MagicMock()
-        context_manager.__aenter__.return_value = resp
-        self.bot.http_session.post.return_value = context_manager
-
-        job = EvalJob.from_code("import random").as_version("3.10")
-        self.assertEqual(await self.cog.post_job(job), EvalResult("Hi", 137))
-
-        expected = {
-            "args": ["main.py"],
-            "files": [
-                {
-                    "path": "main.py",
-                    "content": b64encode("import random".encode()).decode()
-                }
-            ]
-        }
-        self.bot.http_session.post.assert_called_with(
-            constants.URLs.snekbox_eval_api,
-            json=expected,
-            raise_for_status=True
-        )
-        resp.json.assert_awaited_once()
-
-    async def test_upload_output_reject_too_long(self):
-        """Reject output longer than MAX_PASTE_LENGTH."""
-        result = await self.cog.upload_output("-" * (snekbox._cog.MAX_PASTE_LENGTH + 1))
-        self.assertEqual(result, "too long to upload")
-
-    @patch("bot.exts.utils.snekbox._cog.send_to_paste_service")
-    async def test_upload_output(self, mock_paste_util):
-        """Upload the eval output to the URLs.paste_service.format(key="documents") endpoint."""
-        await self.cog.upload_output("Test output.")
-        mock_paste_util.assert_called_once_with(
-            "Test output.",
-            extension="txt",
-            max_length=snekbox._cog.MAX_PASTE_LENGTH
-        )
-
-    async def test_codeblock_converter(self):
-        ctx = MockContext()
-        cases = (
-            ('print("Hello world!")', 'print("Hello world!")', 'non-formatted'),
-            ('`print("Hello world!")`', 'print("Hello world!")', 'one line code block'),
-            ('```\nprint("Hello world!")```', 'print("Hello world!")', 'multiline code block'),
-            ('```py\nprint("Hello world!")```', 'print("Hello world!")', 'multiline python code block'),
-            ('text```print("Hello world!")```text', 'print("Hello world!")', 'code block surrounded by text'),
-            ('```print("Hello world!")```\ntext\n```py\nprint("Hello world!")```',
-             'print("Hello world!")\nprint("Hello world!")', 'two code blocks with text in-between'),
-            ('`print("Hello world!")`\ntext\n```print("How\'s it going?")```',
-             'print("How\'s it going?")', 'code block preceded by inline code'),
-            ('`print("Hello world!")`\ntext\n`print("Hello world!")`',
-             'print("Hello world!")', 'one inline code block of two')
-        )
-        for case, expected, testname in cases:
-            with self.subTest(msg=f'Extract code from {testname}.'):
-                self.assertEqual(
-                    '\n'.join(await snekbox.CodeblockConverter.convert(ctx, case)), expected
-                )
-
-    def test_prepare_timeit_input(self):
-        """Test the prepare_timeit_input codeblock detection."""
-        base_args = ('-m', 'timeit', '-s')
-        cases = (
-            (['print("Hello World")'], '', 'single block of code'),
-            (['x = 1', 'print(x)'], 'x = 1', 'two blocks of code'),
-            (['x = 1', 'print(x)', 'print("Some other code.")'], 'x = 1', 'three blocks of code')
-        )
-
-        for case, setup_code, test_name in cases:
-            setup = snekbox._cog.TIMEIT_SETUP_WRAPPER.format(setup=setup_code)
-            expected = [*base_args, setup, '\n'.join(case[1:] if setup_code else case)]
-            with self.subTest(msg=f'Test with {test_name} and expected return {expected}'):
-                self.assertEqual(self.cog.prepare_timeit_input(case), expected)
-
-    def test_eval_result_message(self):
-        """EvalResult.get_message(), should return message."""
-        cases = (
-            ('ERROR', None, ('Your 3.11 eval job has failed', 'ERROR', '')),
-            ('', 128 + snekbox._eval.SIGKILL, ('Your 3.11 eval job timed out or ran out of memory', '', '')),
-            ('', 255, ('Your 3.11 eval job has failed', 'A fatal NsJail error occurred', ''))
-        )
-        for stdout, returncode, expected in cases:
-            exp_msg, exp_err, exp_files_err = expected
-            with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
-                result = EvalResult(stdout=stdout, returncode=returncode)
-                job = EvalJob([])
-                # Check all 3 message types
-                msg = result.get_message(job)
-                self.assertEqual(msg, exp_msg)
-                error = result.error_message
-                self.assertEqual(error, exp_err)
-                files_error = result.files_error_message
-                self.assertEqual(files_error, exp_files_err)
-
-    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
-    def test_eval_result_files_error_message(self):
-        """EvalResult.files_error_message, should return files error message."""
-        cases = [
-            ([], ["abc"], (
-                "Failed to upload 1 file (abc)."
-                " File sizes should each not exceed 8 MiB."
-            )),
-            ([], ["file1.bin", "f2.bin"], (
-                "Failed to upload 2 files (file1.bin, f2.bin)."
-                " File sizes should each not exceed 8 MiB."
-            )),
-            (["a", "b"], ["c"], (
-                "Failed to upload 1 file (c)"
-                " as it exceeded the 2 file limit."
-            )),
-            (["a"], ["b", "c"], (
-                "Failed to upload 2 files (b, c)"
-                " as they exceeded the 2 file limit."
-            )),
-        ]
-        for files, failed_files, expected_msg in cases:
-            with self.subTest(files=files, failed_files=failed_files, expected_msg=expected_msg):
-                result = EvalResult("", 0, files, failed_files)
-                msg = result.files_error_message
-                self.assertEqual(msg, expected_msg)
-
-    @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
-    def test_eval_result_files_error_str(self):
-        """EvalResult.files_error_message, should return files error message."""
-        max_file_name = "a" * 32
-        cases = [
-            (["x.ini"], "x.ini"),
-            (["dog.py", "cat.py"], "dog.py, cat.py"),
-            # 3 files limit
-            (["a", "b", "c"], "a, b, c"),
-            (["a", "b", "c", "d"], "a, b, c, ..."),
-            (["x", "y", "z"] + ["a"] * 100, "x, y, z, ..."),
-            # 32 char limit
-            ([max_file_name], max_file_name),
-            ([max_file_name, "b"], f"{max_file_name}, ..."),
-            ([max_file_name + "a"], "...")
-        ]
-        for failed_files, expected in cases:
-            result = EvalResult("", 0, [], failed_files)
-            msg = result.get_failed_files_str(char_max=32, file_max=3)
-            self.assertEqual(msg, expected)
-
-    @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
-    def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
-        result = EvalResult(stdout="", returncode=127)
-        self.assertEqual(
-            result.get_message(EvalJob([], version="3.10")),
-            "Your 3.10 eval job has completed with return code 127"
-        )
-        self.assertEqual(result.error_message, "")
-        self.assertEqual(result.files_error_message, "")
-
-    @patch('bot.exts.utils.snekbox._eval.Signals')
-    def test_eval_result_message_valid_signal(self, mock_signals: Mock):
-        mock_signals.return_value.name = "SIGTEST"
-        result = EvalResult(stdout="", returncode=127)
-        self.assertEqual(
-            result.get_message(EvalJob([], version="3.11")),
-            "Your 3.11 eval job has completed with return code 127 (SIGTEST)"
-        )
-
-    def test_eval_result_status_emoji(self):
-        """Return emoji according to the eval result."""
-        cases = (
-            (' ', -1, ':warning:'),
-            ('Hello world!', 0, ':white_check_mark:'),
-            ('Invalid beard size', -1, ':x:')
-        )
-        for stdout, returncode, expected in cases:
-            with self.subTest(stdout=stdout, returncode=returncode, expected=expected):
-                result = EvalResult(stdout=stdout, returncode=returncode)
-                self.assertEqual(result.status_emoji, expected)
-
-    async def test_format_output(self):
-        """Test output formatting."""
-        self.cog.upload_output = AsyncMock(return_value='https://testificate.com/')
-
-        too_many_lines = (
-            '001 | v\n002 | e\n003 | r\n004 | y\n005 | l\n006 | o\n'
-            '007 | n\n008 | g\n009 | b\n010 | e\n011 | a\n... (truncated - too many lines)'
-        )
-        too_long_too_many_lines = (
-            "\n".join(
-                f"{i:03d} | {line}" for i, line in enumerate(['verylongbeard' * 10] * 15, 1)
-            )[:1000] + "\n... (truncated - too long, too many lines)"
-        )
-
-        cases = (
-            ('', ('[No output]', None), 'No output'),
-            ('My awesome output', ('My awesome output', None), 'One line output'),
-            ('<@', ("<@\u200B", None), r'Convert <@ to <@\u200B'),
-            ('<!@', ("<!@\u200B", None), r'Convert <!@ to <!@\u200B'),
-            (
-                '\u202E\u202E\u202E',
-                ('Code block escape attempt detected; will not output result', 'https://testificate.com/'),
-                'Detect RIGHT-TO-LEFT OVERRIDE'
-            ),
-            (
-                '\u200B\u200B\u200B',
-                ('Code block escape attempt detected; will not output result', 'https://testificate.com/'),
-                'Detect ZERO WIDTH SPACE'
-            ),
-            ('long\nbeard', ('001 | long\n002 | beard', None), 'Two line output'),
-            (
-                'v\ne\nr\ny\nl\no\nn\ng\nb\ne\na\nr\nd',
-                (too_many_lines, 'https://testificate.com/'),
-                '12 lines output'
-            ),
-            (
-                'verylongbeard' * 100,
-                ('verylongbeard' * 76 + 'verylongbear\n... (truncated - too long)', 'https://testificate.com/'),
-                '1300 characters output'
-            ),
-            (
-                ('verylongbeard' * 10 + '\n') * 15,
-                (too_long_too_many_lines, 'https://testificate.com/'),
-                '15 lines, 1965 characters output'
-            ),
-        )
-        for case, expected, testname in cases:
-            with self.subTest(msg=testname, case=case, expected=expected):
-                self.assertEqual(await self.cog.format_output(case), expected)
-
-    async def test_eval_command_evaluate_once(self):
-        """Test the eval command procedure."""
-        ctx = MockContext()
-        response = MockMessage()
-        ctx.command = MagicMock()
-
-        self.cog.send_job = AsyncMock(return_value=response)
-        self.cog.continue_job = AsyncMock(return_value=None)
-
-        await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
-        job = EvalJob.from_code("MyAwesomeCode")
-        self.cog.send_job.assert_called_once_with(ctx, job)
-        self.cog.continue_job.assert_called_once_with(ctx, response, 'eval')
-
-    async def test_eval_command_evaluate_twice(self):
-        """Test the eval and re-eval command procedure."""
-        ctx = MockContext()
-        response = MockMessage()
-        ctx.command = MagicMock()
-        self.cog.send_job = AsyncMock(return_value=response)
-        self.cog.continue_job = AsyncMock()
-        self.cog.continue_job.side_effect = (EvalJob.from_code('MyAwesomeFormattedCode'), None)
-
-        await self.cog.eval_command(self.cog, ctx=ctx, python_version='3.11', code=['MyAwesomeCode'])
-
-        expected_job = EvalJob.from_code("MyAwesomeFormattedCode")
-        self.cog.send_job.assert_called_with(ctx, expected_job)
-        self.cog.continue_job.assert_called_with(ctx, response, "eval")
-
-    async def test_eval_command_reject_two_eval_at_the_same_time(self):
-        """Test if the eval command rejects an eval if the author already have a running eval."""
-        ctx = MockContext()
-        ctx.author.id = 42
-
-        async def delay_with_side_effect(*args, **kwargs) -> dict:
-            """Delay the post_job call to ensure the job runs long enough to conflict."""
-            await asyncio.sleep(1)
-            return {'stdout': '', 'returncode': 0}
-
-        self.cog.post_job = AsyncMock(side_effect=delay_with_side_effect)
-        with self.assertRaises(LockedResourceError):
-            await asyncio.gather(
-                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
-                self.cog.send_job(ctx, EvalJob.from_code("MyAwesomeCode")),
-            )
-
-    async def test_send_job(self):
-        """Test the send_job function."""
-        ctx = MockContext()
-        ctx.message = MockMessage()
-        ctx.send = AsyncMock()
-        ctx.author = MockUser(mention='@LemonLemonishBeard#0042')
-
-        eval_result = EvalResult("", 0)
-        self.cog.post_job = AsyncMock(return_value=eval_result)
-        self.cog.format_output = AsyncMock(return_value=('[No output]', None))
-        self.cog.upload_output = AsyncMock()  # Should not be called
-
-        mocked_filter_cog = MagicMock()
-        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
-        self.bot.get_cog.return_value = mocked_filter_cog
-
-        job = EvalJob.from_code('MyAwesomeCode')
-        await self.cog.send_job(ctx, job),
-
-        ctx.send.assert_called_once()
-        self.assertEqual(
-            ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :warning: Your 3.11 eval job has completed '
-            'with return code 0.\n\n```\n[No output]\n```'
-        )
-        allowed_mentions = ctx.send.call_args.kwargs['allowed_mentions']
-        expected_allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-        self.assertEqual(allowed_mentions.to_dict(), expected_allowed_mentions.to_dict())
-
-        self.cog.post_job.assert_called_once_with(job)
-        self.cog.format_output.assert_called_once_with('')
-        self.cog.upload_output.assert_not_called()
-
-    async def test_send_job_with_paste_link(self):
-        """Test the send_job function with a too long output that generate a paste link."""
-        ctx = MockContext()
-        ctx.message = MockMessage()
-        ctx.send = AsyncMock()
-        ctx.author.mention = '@LemonLemonishBeard#0042'
-
-        eval_result = EvalResult("Way too long beard", 0)
-        self.cog.post_job = AsyncMock(return_value=eval_result)
-        self.cog.format_output = AsyncMock(return_value=('Way too long beard', 'lookatmybeard.com'))
-
-        mocked_filter_cog = MagicMock()
-        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
-        self.bot.get_cog.return_value = mocked_filter_cog
-
-        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
-        await self.cog.send_job(ctx, job),
-
-        ctx.send.assert_called_once()
-        self.assertEqual(
-            ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :white_check_mark: Your 3.11 eval job '
-            'has completed with return code 0.'
-            '\n\n```\nWay too long beard\n```\nFull output: lookatmybeard.com'
-        )
-
-        self.cog.post_job.assert_called_once_with(job)
-        self.cog.format_output.assert_called_once_with('Way too long beard')
-
-    async def test_send_job_with_non_zero_eval(self):
-        """Test the send_job function with a code returning a non-zero code."""
-        ctx = MockContext()
-        ctx.message = MockMessage()
-        ctx.send = AsyncMock()
-        ctx.author.mention = '@LemonLemonishBeard#0042'
-
-        eval_result = EvalResult("ERROR", 127)
-        self.cog.post_job = AsyncMock(return_value=eval_result)
-        self.cog.upload_output = AsyncMock()  # This function isn't called
-
-        mocked_filter_cog = MagicMock()
-        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
-        self.bot.get_cog.return_value = mocked_filter_cog
-
-        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
-        await self.cog.send_job(ctx, job),
-
-        ctx.send.assert_called_once()
-        self.assertEqual(
-            ctx.send.call_args.args[0],
-            '@LemonLemonishBeard#0042 :x: Your 3.11 eval job has completed with return code 127.'
-            '\n\n```\nERROR\n```'
-        )
-
-        self.cog.post_job.assert_called_once_with(job)
-        self.cog.upload_output.assert_not_called()
-
-    @patch("bot.exts.utils.snekbox._cog.partial")
-    async def test_continue_job_does_continue(self, partial_mock):
-        """Test that the continue_job function does continue if required conditions are met."""
-        ctx = MockContext(
-            message=MockMessage(
-                id=4,
-                add_reaction=AsyncMock(),
-                clear_reactions=AsyncMock()
-            ),
-            author=MockMember(id=14)
-        )
-        response = MockMessage(id=42, delete=AsyncMock())
-        new_msg = MockMessage()
-        self.cog.jobs = {4: 42}
-        self.bot.wait_for.side_effect = ((None, new_msg), None)
-        expected = "NewCode"
-        self.cog.get_code = create_autospec(self.cog.get_code, spec_set=True, return_value=expected)
-
-        actual = await self.cog.continue_job(ctx, response, self.cog.eval_command)
-        self.cog.get_code.assert_awaited_once_with(new_msg, ctx.command)
-        self.assertEqual(actual, EvalJob.from_code(expected))
-        self.bot.wait_for.assert_has_awaits(
-            (
-                call(
-                    'message_edit',
-                    check=partial_mock(snekbox._cog.predicate_message_edit, ctx),
-                    timeout=snekbox._cog.REDO_TIMEOUT,
-                ),
-                call('reaction_add', check=partial_mock(snekbox._cog.predicate_emoji_reaction, ctx), timeout=10)
-            )
-        )
-        ctx.message.add_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
-        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
-        response.delete.assert_called_once()
-
-    async def test_continue_job_does_not_continue(self):
-        ctx = MockContext(message=MockMessage(clear_reactions=AsyncMock()))
-        self.bot.wait_for.side_effect = asyncio.TimeoutError
-
-        actual = await self.cog.continue_job(ctx, MockMessage(), self.cog.eval_command)
-        self.assertEqual(actual, None)
-        ctx.message.clear_reaction.assert_called_once_with(snekbox._cog.REDO_EMOJI)
-
-    async def test_get_code(self):
-        """Should return 1st arg (or None) if eval cmd in message, otherwise return full content."""
-        prefix = constants.Bot.prefix
-        subtests = (
-            (self.cog.eval_command, f"{prefix}{self.cog.eval_command.name} print(1)", "print(1)"),
-            (self.cog.eval_command, f"{prefix}{self.cog.eval_command.name}", None),
-            (MagicMock(spec=commands.Command), f"{prefix}tags get foo"),
-            (None, "print(123)")
-        )
-
-        for command, content, *expected_code in subtests:
-            if not expected_code:
-                expected_code = content
-            else:
-                [expected_code] = expected_code
-
-            with self.subTest(content=content, expected_code=expected_code):
-                self.bot.get_context.reset_mock()
-                self.bot.get_context.return_value = MockContext(command=command)
-                message = MockMessage(content=content)
-
-                actual_code = await self.cog.get_code(message, self.cog.eval_command)
-
-                self.bot.get_context.assert_awaited_once_with(message)
-                self.assertEqual(actual_code, expected_code)
-
-    def test_predicate_message_edit(self):
-        """Test the predicate_message_edit function."""
-        msg0 = MockMessage(id=1, content='abc')
-        msg1 = MockMessage(id=2, content='abcdef')
-        msg2 = MockMessage(id=1, content='abcdef')
-
-        cases = (
-            (msg0, msg0, False, 'same ID, same content'),
-            (msg0, msg1, False, 'different ID, different content'),
-            (msg0, msg2, True, 'same ID, different content')
-        )
-        for ctx_msg, new_msg, expected, testname in cases:
-            with self.subTest(msg=f'Messages with {testname} return {expected}'):
-                ctx = MockContext(message=ctx_msg)
-                actual = snekbox._cog.predicate_message_edit(ctx, ctx_msg, new_msg)
-                self.assertEqual(actual, expected)
-
-    def test_predicate_emoji_reaction(self):
-        """Test the predicate_emoji_reaction function."""
-        valid_reaction = MockReaction(message=MockMessage(id=1))
-        valid_reaction.__str__.return_value = snekbox._cog.REDO_EMOJI
-        valid_ctx = MockContext(message=MockMessage(id=1), author=MockUser(id=2))
-        valid_user = MockUser(id=2)
-
-        invalid_reaction_id = MockReaction(message=MockMessage(id=42))
-        invalid_reaction_id.__str__.return_value = snekbox._cog.REDO_EMOJI
-        invalid_user_id = MockUser(id=42)
-        invalid_reaction_str = MockReaction(message=MockMessage(id=1))
-        invalid_reaction_str.__str__.return_value = ':longbeard:'
-
-        cases = (
-            (invalid_reaction_id, valid_user, False, 'invalid reaction ID'),
-            (valid_reaction, invalid_user_id, False, 'invalid user ID'),
-            (invalid_reaction_str, valid_user, False, 'invalid reaction __str__'),
-            (valid_reaction, valid_user, True, 'matching attributes')
-        )
-        for reaction, user, expected, testname in cases:
-            with self.subTest(msg=f'Test with {testname} and expected return {expected}'):
-                actual = snekbox._cog.predicate_emoji_reaction(valid_ctx, reaction, user)
-                self.assertEqual(actual, expected)
-
-
-class SnekboxSetupTests(unittest.IsolatedAsyncioTestCase):
-    """Tests setup of the `Snekbox` cog."""
-
-    async def test_setup(self):
-        """Setup of the extension should call add_cog."""
-        bot = MockBot()
-        await snekbox.setup(bot)
-        bot.add_cog.assert_awaited_once()
-- 
cgit v1.2.3


From b04143ca971e2f272ab78da808a63b5fd700ab68 Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 17:54:48 +0800
Subject: Add normalize file name tests

---
 tests/bot/exts/utils/snekbox/test_io.py | 34 +++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 tests/bot/exts/utils/snekbox/test_io.py

diff --git a/tests/bot/exts/utils/snekbox/test_io.py b/tests/bot/exts/utils/snekbox/test_io.py
new file mode 100644
index 000000000..36ac720ba
--- /dev/null
+++ b/tests/bot/exts/utils/snekbox/test_io.py
@@ -0,0 +1,34 @@
+import unittest
+
+# noinspection PyProtectedMember
+from bot.exts.utils.snekbox import _io
+
+
+class SnekboxIOTests(unittest.TestCase):
+    # noinspection SpellCheckingInspection
+    def test_normalize_file_name(self):
+        """Invalid file names should be normalized."""
+        cases = [
+            # ANSI escape sequences -> underscore
+            (r"\u001b[31mText", "_Text"),
+            # (Multiple consecutive should be collapsed to one underscore)
+            (r"a\u001b[35m\u001b[37mb", "a_b"),
+            # Backslash escaped chars -> underscore
+            (r"\n", "_"),
+            (r"\r", "_"),
+            (r"A\0\tB", "A__B"),
+            # Any other disallowed chars -> underscore
+            (r"\\.txt", "_.txt"),
+            (r"A!@#$%^&*B, C()[]{}+=D.txt", "A_B_C_D.txt"),  # noqa: P103
+            (" ", "_"),
+            # Normal file names should be unchanged
+            ("legal_file-name.txt", "legal_file-name.txt"),
+            ("_-.", "_-."),
+        ]
+        for name, expected in cases:
+            with self.subTest(name=name, expected=expected):
+                # Test function directly
+                self.assertEqual(_io.normalize_discord_file_name(name), expected)
+                # Test FileAttachment.to_file()
+                obj = _io.FileAttachment(name, b"")
+                self.assertEqual(obj.to_file().filename, expected)
-- 
cgit v1.2.3


From 2b4c85e947a73295c72161190302d960597420be Mon Sep 17 00:00:00 2001
From: ionite34 <dev@ionite.io>
Date: Tue, 20 Dec 2022 18:26:34 +0800
Subject: Change failed files str to truncate on chars only

---
 bot/exts/utils/snekbox/_eval.py              | 23 +++++++++++++++++++----
 tests/bot/exts/utils/snekbox/test_snekbox.py | 24 +++++++++++-------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 95039f0bd..6bc7d7bb3 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -102,15 +102,30 @@ class EvalResult:
 
         return msg
 
-    def get_failed_files_str(self, char_max: int = 85, file_max: int = 5) -> str:
-        """Return a string containing the names of failed files, truncated to lower of char_max and file_max."""
+    def get_failed_files_str(self, char_max: int = 85) -> str:
+        """
+        Return a string containing the names of failed files, truncated char_max.
+
+        Will truncate on whole file names if less than 3 characters remaining.
+        """
         names = []
         for file in self.failed_files:
-            char_max -= len(file)
-            if char_max < 0 or len(names) >= file_max:
+            # Only attempt to truncate name if more than 3 chars remaining
+            if char_max < 3:
                 names.append("...")
                 break
+
+            to_display = min(char_max, len(file))
+            name_short = file[:to_display]
+            # Add ellipsis if name was truncated
+            if to_display < len(file):
+                name_short += "..."
+                names.append(name_short)
+                break
+
+            char_max -= len(file)
             names.append(file)
+
         text = ", ".join(names)
         # Since the file names are provided by user
         text = escape_markdown(text)
diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py
index b129bfcdb..faa849178 100644
--- a/tests/bot/exts/utils/snekbox/test_snekbox.py
+++ b/tests/bot/exts/utils/snekbox/test_snekbox.py
@@ -154,23 +154,21 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
     @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
     def test_eval_result_files_error_str(self):
         """EvalResult.files_error_message, should return files error message."""
-        max_file_name = "a" * 32
         cases = [
+            # Normal
             (["x.ini"], "x.ini"),
-            (["dog.py", "cat.py"], "dog.py, cat.py"),
-            # 3 files limit
-            (["a", "b", "c"], "a, b, c"),
-            (["a", "b", "c", "d"], "a, b, c, ..."),
-            (["x", "y", "z"] + ["a"] * 100, "x, y, z, ..."),
-            # 32 char limit
-            ([max_file_name], max_file_name),
-            ([max_file_name, "b"], f"{max_file_name}, ..."),
-            ([max_file_name + "a"], "...")
+            (["123456", "879"], "123456, 879"),
+            # Break on whole name if less than 3 characters remaining
+            (["12345678", "9"], "12345678, ..."),
+            # Otherwise break on max chars
+            (["123", "345", "67890000"], "123, 345, 6789..."),
+            (["abcdefg1234567"], "abcdefg123..."),
         ]
         for failed_files, expected in cases:
-            result = EvalResult("", 0, [], failed_files)
-            msg = result.get_failed_files_str(char_max=32, file_max=3)
-            self.assertEqual(msg, expected)
+            with self.subTest(failed_files=failed_files, expected=expected):
+                result = EvalResult("", 0, [], failed_files)
+                msg = result.get_failed_files_str(char_max=10)
+                self.assertEqual(msg, expected)
 
     @patch('bot.exts.utils.snekbox._eval.Signals', side_effect=ValueError)
     def test_eval_result_message_invalid_signal(self, _mock_signals: Mock):
-- 
cgit v1.2.3


From 7500eee5c16db9c580f2aa026f255645f7915e59 Mon Sep 17 00:00:00 2001
From: wookie184 <wookie1840@gmail.com>
Date: Sat, 14 Jan 2023 19:01:47 +0000
Subject: Trim query in command not found error to avoid embed limits

---
 bot/exts/info/help.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bot/exts/info/help.py b/bot/exts/info/help.py
index 48f840e51..8950f4936 100644
--- a/bot/exts/info/help.py
+++ b/bot/exts/info/help.py
@@ -244,15 +244,20 @@ class CustomHelpCommand(HelpCommand):
         choices.update(cog.category for cog in self.context.bot.cogs.values() if hasattr(cog, "category"))
         return choices
 
-    async def command_not_found(self, string: str) -> "HelpQueryNotFound":
+    async def command_not_found(self, query: str) -> "HelpQueryNotFound":
         """
         Handles when a query does not match a valid command, group, cog or category.
 
         Will return an instance of the `HelpQueryNotFound` exception with the error message and possible matches.
         """
         choices = list(await self.get_all_help_choices())
-        result = process.extract(default_process(string), choices, scorer=fuzz.ratio, score_cutoff=60, processor=None)
-        return HelpQueryNotFound(f'Query "{string}" not found.', {choice[0]: choice[1] for choice in result})
+        result = process.extract(default_process(query), choices, scorer=fuzz.ratio, score_cutoff=60, processor=None)
+
+        # Trim query to avoid embed limits when sending the error.
+        if len(query) >= 100:
+            query = query[:100] + "..."
+
+        return HelpQueryNotFound(f'Query "{query}" not found.', {choice[0]: choice[1] for choice in result})
 
     async def subcommand_not_found(self, command: Command, string: str) -> "HelpQueryNotFound":
         """
-- 
cgit v1.2.3


From bebd241756cc4ec35839a3abdc20ffdf18b1b463 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 6 Feb 2023 21:27:20 -0500
Subject: Add file extension filtering

---
 bot/exts/utils/snekbox/_cog.py | 76 ++++++++++++++++++++++++++++++++++--------
 bot/exts/utils/snekbox/_io.py  |  5 +++
 2 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 5fe20d339..ffa7d4f57 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -6,7 +6,7 @@ import re
 from functools import partial
 from operator import attrgetter
 from textwrap import dedent
-from typing import Literal, Optional, TYPE_CHECKING, Tuple
+from typing import Literal, NamedTuple, Optional, TYPE_CHECKING, Tuple
 
 from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
 from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
@@ -14,10 +14,13 @@ from pydis_core.utils import interactions
 from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
 
 from bot.bot import Bot
-from bot.constants import Channels, MODERATION_ROLES, Roles, URLs
+from bot.constants import Channels, Filter, MODERATION_ROLES, Roles, URLs
 from bot.decorators import redirect_output
+from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME
+from bot.exts.filters.antimalware import TXT_LIKE_FILES
 from bot.exts.help_channels._channel import is_help_forum_post
 from bot.exts.utils.snekbox._eval import EvalJob, EvalResult
+from bot.exts.utils.snekbox._io import FileAttachment
 from bot.log import get_logger
 from bot.utils import send_to_paste_service
 from bot.utils.lock import LockedResourceError, lock_arg
@@ -84,6 +87,8 @@ REDO_TIMEOUT = 30
 
 PythonVersion = Literal["3.10", "3.11"]
 
+FilteredFiles = NamedTuple("FilteredFiles", [("allowed", list[FileAttachment]), ("blocked", list[FileAttachment])])
+
 
 class CodeblockConverter(Converter):
     """Attempts to extract code from a codeblock, if provided."""
@@ -269,6 +274,41 @@ class Snekbox(Cog):
 
         return output, paste_link
 
+    def get_extensions_whitelist(self) -> set[str]:
+        """Return a set of whitelisted file extensions."""
+        return set(self.bot.filter_list_cache['FILE_FORMAT.True'].keys()) | TXT_LIKE_FILES
+
+    def _filter_files(self, ctx: Context, files: list[FileAttachment]) -> FilteredFiles:
+        """Filter to restrict files to allowed extensions. Return a named tuple of allowed and blocked files lists."""
+        # Check if user is staff, if is, return
+        # Since we only care that roles exist to iterate over, check for the attr rather than a User/Member instance
+        if hasattr(ctx.author, "roles") and any(role.id in Filter.role_whitelist for role in ctx.author.roles):
+            return FilteredFiles(files, [])
+        # Ignore code jam channels
+        if getattr(ctx.channel, "category", None) and ctx.channel.category.name == JAM_CATEGORY_NAME:
+            return FilteredFiles(files, [])
+
+        # Get whitelisted extensions
+        whitelist = self.get_extensions_whitelist()
+
+        # Filter files into allowed and blocked
+        blocked = []
+        allowed = []
+        for file in files:
+            if file.suffix in whitelist:
+                allowed.append(file)
+            else:
+                blocked.append(file)
+
+        if blocked:
+            blocked_str = ", ".join(f.suffix for f in blocked)
+            log.info(
+                f"User '{ctx.author}' ({ctx.author.id}) uploaded blacklisted file(s) in eval: {blocked_str}",
+                extra={"attachment_list": [f.path for f in files]}
+            )
+
+        return FilteredFiles(allowed, blocked)
+
     @lock_arg("snekbox.send_job", "ctx", attrgetter("author.id"), raise_error=True)
     async def send_job(self, ctx: Context, job: EvalJob) -> Message:
         """
@@ -305,20 +345,28 @@ class Snekbox(Cog):
             else:
                 self.bot.stats.incr("snekbox.python.success")
 
+            allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
+            view = self.build_python_version_switcher_view(job.version, ctx, job)
+
+            # Filter file extensions
+            allowed, blocked = self._filter_files(ctx, result.files)
+            # Add notice if any files were blocked
+            if blocked:
+                file_s = "file was" if len(blocked) == 1 else "files were"
+                ext_s = "extension" if len(blocked) == 1 else "extensions"
+                msg += (
+                    f"\n{len(blocked)} {file_s} not uploaded due to disallowed {ext_s}: "
+                    f"**{', '.join(f.suffix for f in blocked)}**"
+                )
+
             filter_cog: Filtering | None = self.bot.get_cog("Filtering")
-            filter_triggered = False
-            if filter_cog:
-                filter_triggered = await filter_cog.filter_snekbox_output(msg, ctx.message)
-            if filter_triggered:
-                response = await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
-            else:
-                allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-                view = self.build_python_version_switcher_view(job.version, ctx, job)
+            if filter_cog and (await filter_cog.filter_snekbox_output(msg, ctx.message)):
+                return await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
 
-                # Attach files if provided
-                files = [f.to_file() for f in result.files]
-                response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
-                view.message = response
+            # Attach files if provided
+            files = [f.to_file() for f in allowed]
+            response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
+            view.message = response
 
             log.info(f"{ctx.author}'s {job.name} job had a return code of {result.returncode}")
         return response
diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index faa7d3bb3..ce645dbca 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -61,6 +61,11 @@ class FileAttachment:
         content = f"{self.content[:10]}..." if len(self.content) > 10 else self.content
         return f"FileAttachment(path={self.path!r}, content={content})"
 
+    @property
+    def suffix(self) -> str:
+        """Return the file suffix."""
+        return Path(self.path).suffix
+
     @classmethod
     def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
         """Create a FileAttachment from a dict response."""
-- 
cgit v1.2.3


From 5d6b042a2acc104178b1a4e68229a5b9714e9920 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 6 Feb 2023 21:28:11 -0500
Subject: Add disallowed file extensions tests

---
 tests/bot/exts/utils/snekbox/test_snekbox.py | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py
index faa849178..686dc0291 100644
--- a/tests/bot/exts/utils/snekbox/test_snekbox.py
+++ b/tests/bot/exts/utils/snekbox/test_snekbox.py
@@ -10,6 +10,7 @@ from bot import constants
 from bot.errors import LockedResourceError
 from bot.exts.utils import snekbox
 from bot.exts.utils.snekbox import EvalJob, EvalResult, Snekbox
+from bot.exts.utils.snekbox._io import FileAttachment
 from tests.helpers import MockBot, MockContext, MockMember, MockMessage, MockReaction, MockUser
 
 
@@ -387,6 +388,34 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.cog.post_job.assert_called_once_with(job)
         self.cog.upload_output.assert_not_called()
 
+    async def test_send_job_with_disallowed_file_ext(self):
+        """Test send_job with disallowed file extensions."""
+        ctx = MockContext()
+        ctx.message = MockMessage()
+        ctx.send = AsyncMock()
+        ctx.author.mention = "@user#7700"
+
+        eval_result = EvalResult("", 0, files=[FileAttachment("test.disallowed", b"test")])
+        self.cog.post_job = AsyncMock(return_value=eval_result)
+        self.cog.upload_output = AsyncMock()  # This function isn't called
+
+        mocked_filter_cog = MagicMock()
+        mocked_filter_cog.filter_snekbox_output = AsyncMock(return_value=False)
+        self.bot.get_cog.return_value = mocked_filter_cog
+
+        job = EvalJob.from_code("MyAwesomeCode").as_version("3.11")
+        await self.cog.send_job(ctx, job),
+
+        ctx.send.assert_called_once()
+        self.assertEqual(
+            ctx.send.call_args.args[0],
+            '@user#7700 :white_check_mark: Your 3.11 eval job has completed with return code 0.'
+            '\n\n1 file was not uploaded due to disallowed extension: **.disallowed**'
+        )
+
+        self.cog.post_job.assert_called_once_with(job)
+        self.cog.upload_output.assert_not_called()
+
     @patch("bot.exts.utils.snekbox._cog.partial")
     async def test_continue_job_does_continue(self, partial_mock):
         """Test that the continue_job function does continue if required conditions are met."""
-- 
cgit v1.2.3


From 3d5fa6c3f38c2bd7fd5f79030643ab4fb438879d Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Tue, 7 Feb 2023 02:43:36 -0500
Subject: Change wording for failed attachments, use `:failmail:` emoji

---
 bot/exts/utils/snekbox/_cog.py  | 6 ++----
 bot/exts/utils/snekbox/_eval.py | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index ffa7d4f57..605f0fa15 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -14,7 +14,7 @@ from pydis_core.utils import interactions
 from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
 
 from bot.bot import Bot
-from bot.constants import Channels, Filter, MODERATION_ROLES, Roles, URLs
+from bot.constants import Channels, Emojis, Filter, MODERATION_ROLES, Roles, URLs
 from bot.decorators import redirect_output
 from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME
 from bot.exts.filters.antimalware import TXT_LIKE_FILES
@@ -352,10 +352,8 @@ class Snekbox(Cog):
             allowed, blocked = self._filter_files(ctx, result.files)
             # Add notice if any files were blocked
             if blocked:
-                file_s = "file was" if len(blocked) == 1 else "files were"
-                ext_s = "extension" if len(blocked) == 1 else "extensions"
                 msg += (
-                    f"\n{len(blocked)} {file_s} not uploaded due to disallowed {ext_s}: "
+                    f"\n{Emojis.failmail} Some files with disallowed extensions can't be uploaded: "
                     f"**{', '.join(f.suffix for f in blocked)}**"
                 )
 
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 6bc7d7bb3..b88225adc 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
 
 from discord.utils import escape_markdown, escape_mentions
 
+from bot.constants import Emojis
 from bot.exts.utils.snekbox._io import FILE_COUNT_LIMIT, FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
 from bot.log import get_logger
 
@@ -92,7 +93,7 @@ class EvalResult:
 
         n_failed = len(self.failed_files)
         files = f"file{'s' if n_failed > 1 else ''}"
-        msg = f"Failed to upload {n_failed} {files} {failed_files}"
+        msg = f"{Emojis.failmail} Failed to upload {n_failed} {files} {failed_files}"
 
         if (n_failed + len(self.files)) > FILE_COUNT_LIMIT:
             it_they = "they" if n_failed > 1 else "it"
-- 
cgit v1.2.3


From 810165935dce10bc76bcbeb4c510d5510fdfb42c Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Tue, 7 Feb 2023 02:53:21 -0500
Subject: Fix unit tests for new failmail emoji

---
 tests/bot/exts/utils/snekbox/test_snekbox.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py
index 686dc0291..8f4b2e85c 100644
--- a/tests/bot/exts/utils/snekbox/test_snekbox.py
+++ b/tests/bot/exts/utils/snekbox/test_snekbox.py
@@ -150,7 +150,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
             with self.subTest(files=files, failed_files=failed_files, expected_msg=expected_msg):
                 result = EvalResult("", 0, files, failed_files)
                 msg = result.files_error_message
-                self.assertEqual(msg, expected_msg)
+                self.assertIn(expected_msg, msg)
 
     @patch("bot.exts.utils.snekbox._eval.FILE_COUNT_LIMIT", 2)
     def test_eval_result_files_error_str(self):
@@ -407,11 +407,11 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         await self.cog.send_job(ctx, job),
 
         ctx.send.assert_called_once()
-        self.assertEqual(
-            ctx.send.call_args.args[0],
-            '@user#7700 :white_check_mark: Your 3.11 eval job has completed with return code 0.'
-            '\n\n1 file was not uploaded due to disallowed extension: **.disallowed**'
+        res = ctx.send.call_args.args[0]
+        self.assertTrue(
+            res.startswith("@user#7700 :white_check_mark: Your 3.11 eval job has completed with return code 0.")
         )
+        self.assertIn("Some files with disallowed extensions can't be uploaded: **.disallowed**", res)
 
         self.cog.post_job.assert_called_once_with(job)
         self.cog.upload_output.assert_not_called()
-- 
cgit v1.2.3


From 8f2b323b083de318351cc856c7eeee5f44537253 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Tue, 7 Feb 2023 02:53:36 -0500
Subject: Add skip condition for windows not able to test path escapes

---
 tests/bot/exts/utils/snekbox/test_io.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/bot/exts/utils/snekbox/test_io.py b/tests/bot/exts/utils/snekbox/test_io.py
index 36ac720ba..a544a2056 100644
--- a/tests/bot/exts/utils/snekbox/test_io.py
+++ b/tests/bot/exts/utils/snekbox/test_io.py
@@ -1,11 +1,15 @@
-import unittest
+import platform
+from unittest import TestCase, skipIf
 
 # noinspection PyProtectedMember
 from bot.exts.utils.snekbox import _io
 
 
-class SnekboxIOTests(unittest.TestCase):
+class SnekboxIOTests(TestCase):
     # noinspection SpellCheckingInspection
+    # Skip Windows since both pathlib and os strips the escape sequences
+    # and many of these aren't valid Windows file paths
+    @skipIf(platform.system() == "Windows", "File names normalizer tests requires Unix-like OS.")
     def test_normalize_file_name(self):
         """Invalid file names should be normalized."""
         cases = [
-- 
cgit v1.2.3


From 3a4a6a5c53d4ec1514a7626a2ab6c019482a1f10 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 8 Feb 2023 12:00:04 -0500
Subject: Update file error messages

---
 bot/exts/utils/snekbox/_cog.py  | 22 ++++++++++++++++++----
 bot/exts/utils/snekbox/_eval.py | 16 ++++++++++------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 605f0fa15..a46fb8f44 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -350,12 +350,26 @@ class Snekbox(Cog):
 
             # Filter file extensions
             allowed, blocked = self._filter_files(ctx, result.files)
+            # Also scan failed files for blocked extensions
+            failed_files = [FileAttachment(name, b"") for name in result.failed_files]
+            blocked.extend(self._filter_files(ctx, failed_files).blocked)
             # Add notice if any files were blocked
             if blocked:
-                msg += (
-                    f"\n{Emojis.failmail} Some files with disallowed extensions can't be uploaded: "
-                    f"**{', '.join(f.suffix for f in blocked)}**"
-                )
+                blocked_sorted = sorted(set(f.suffix for f in blocked))
+                # Only no extension
+                if len(blocked_sorted) == 1 and blocked_sorted[0] == "":
+                    blocked_msg = "Files with no extension can't be uploaded."
+                # Both
+                elif "" in blocked_sorted:
+                    blocked_str = ", ".join(ext for ext in blocked_sorted if ext)
+                    blocked_msg = (
+                        f"Files with no extension or disallowed extensions can't be uploaded: **{blocked_str}**"
+                    )
+                else:
+                    blocked_str = ", ".join(blocked_sorted)
+                    blocked_msg = f"Files with disallowed extensions can't be uploaded: **{blocked_str}**"
+
+                msg += f"\n{Emojis.failmail} {blocked_msg}"
 
             filter_cog: Filtering | None = self.bot.get_cog("Filtering")
             if filter_cog and (await filter_cog.filter_snekbox_output(msg, ctx.message)):
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index b88225adc..93262959a 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -66,7 +66,7 @@ class EvalResult:
     def status_emoji(self) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
         # If there are attachments, skip empty output warning
-        if not self.stdout.strip() and not self.files:  # No output
+        if not self.stdout.strip() and not (self.files or self.failed_files):
             return ":warning:"
         elif self.returncode == 0:  # No error
             return ":white_check_mark:"
@@ -92,14 +92,18 @@ class EvalResult:
         failed_files = f"({self.get_failed_files_str()})"
 
         n_failed = len(self.failed_files)
-        files = f"file{'s' if n_failed > 1 else ''}"
-        msg = f"{Emojis.failmail} Failed to upload {n_failed} {files} {failed_files}"
+        s_upload = "uploads" if n_failed > 1 else "upload"
 
+        msg = f"{Emojis.failmail} {n_failed} file {s_upload} {failed_files} failed"
+
+        # Exceeded file count limit
         if (n_failed + len(self.files)) > FILE_COUNT_LIMIT:
-            it_they = "they" if n_failed > 1 else "it"
-            msg += f" as {it_they} exceeded the {FILE_COUNT_LIMIT} file limit."
+            s_it = "they" if n_failed > 1 else "it"
+            msg += f" as {s_it} exceeded the {FILE_COUNT_LIMIT} file limit."
+        # Exceeded file size limit
         else:
-            msg += f". File sizes should each not exceed {sizeof_fmt(FILE_SIZE_LIMIT)}."
+            s_each_file = "each file's" if n_failed > 1 else "its file"
+            msg += f" because {s_each_file} size exceeds {sizeof_fmt(FILE_SIZE_LIMIT)}."
 
         return msg
 
-- 
cgit v1.2.3


From a59eaf405eb91ce8c2961b820a0a9ae44d2215e1 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 8 Feb 2023 12:04:30 -0500
Subject: Update unit tests for file error message changes

---
 tests/bot/exts/utils/snekbox/test_snekbox.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/bot/exts/utils/snekbox/test_snekbox.py b/tests/bot/exts/utils/snekbox/test_snekbox.py
index 8f4b2e85c..9dcf7fd8c 100644
--- a/tests/bot/exts/utils/snekbox/test_snekbox.py
+++ b/tests/bot/exts/utils/snekbox/test_snekbox.py
@@ -130,20 +130,16 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         """EvalResult.files_error_message, should return files error message."""
         cases = [
             ([], ["abc"], (
-                "Failed to upload 1 file (abc)."
-                " File sizes should each not exceed 8 MiB."
+                "1 file upload (abc) failed because its file size exceeds 8 MiB."
             )),
             ([], ["file1.bin", "f2.bin"], (
-                "Failed to upload 2 files (file1.bin, f2.bin)."
-                " File sizes should each not exceed 8 MiB."
+                "2 file uploads (file1.bin, f2.bin) failed because each file's size exceeds 8 MiB."
             )),
             (["a", "b"], ["c"], (
-                "Failed to upload 1 file (c)"
-                " as it exceeded the 2 file limit."
+                "1 file upload (c) failed as it exceeded the 2 file limit."
             )),
             (["a"], ["b", "c"], (
-                "Failed to upload 2 files (b, c)"
-                " as they exceeded the 2 file limit."
+                "2 file uploads (b, c) failed as they exceeded the 2 file limit."
             )),
         ]
         for files, failed_files, expected_msg in cases:
@@ -411,7 +407,7 @@ class SnekboxTests(unittest.IsolatedAsyncioTestCase):
         self.assertTrue(
             res.startswith("@user#7700 :white_check_mark: Your 3.11 eval job has completed with return code 0.")
         )
-        self.assertIn("Some files with disallowed extensions can't be uploaded: **.disallowed**", res)
+        self.assertIn("Files with disallowed extensions can't be uploaded: **.disallowed**", res)
 
         self.cog.post_job.assert_called_once_with(job)
         self.cog.upload_output.assert_not_called()
-- 
cgit v1.2.3


From 455c6b8128d8ad9fe24b9b87002a096f8eff0319 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Thu, 9 Feb 2023 13:16:25 -0500
Subject: Hide no output on any file upload

---
 bot/exts/utils/snekbox/_cog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index a46fb8f44..c0e8e432e 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -329,7 +329,7 @@ class Snekbox(Cog):
                 output, paste_link = await self.format_output(result.stdout)
 
             msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
-            if not result.files or output not in ("[No output]", ""):
+            if output not in ("[No output]", "") or not (result.files or result.failed_files):
                 msg += f"\n```\n{output}\n```"
 
             if paste_link:
-- 
cgit v1.2.3


From a8c333048a9d9c73d0eecb983b64dbbc377664eb Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Thu, 9 Feb 2023 13:16:49 -0500
Subject: Add and update eval to use new `failed_file` emoji

---
 bot/constants.py                | 1 +
 bot/exts/utils/snekbox/_cog.py  | 2 +-
 bot/exts/utils/snekbox/_eval.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index 9851aea97..f17f2dc0c 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -289,6 +289,7 @@ class Emojis(metaclass=YAMLGetter):
     defcon_update: str  # noqa: E704
 
     failmail: str
+    failed_file: str
 
     incident_actioned: str
     incident_investigating: str
diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index c0e8e432e..cdb709a5d 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -369,7 +369,7 @@ class Snekbox(Cog):
                     blocked_str = ", ".join(blocked_sorted)
                     blocked_msg = f"Files with disallowed extensions can't be uploaded: **{blocked_str}**"
 
-                msg += f"\n{Emojis.failmail} {blocked_msg}"
+                msg += f"\n{Emojis.failed_file} {blocked_msg}"
 
             filter_cog: Filtering | None = self.bot.get_cog("Filtering")
             if filter_cog and (await filter_cog.filter_snekbox_output(msg, ctx.message)):
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 93262959a..5c2fc8757 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -94,7 +94,7 @@ class EvalResult:
         n_failed = len(self.failed_files)
         s_upload = "uploads" if n_failed > 1 else "upload"
 
-        msg = f"{Emojis.failmail} {n_failed} file {s_upload} {failed_files} failed"
+        msg = f"{Emojis.failed_file} {n_failed} file {s_upload} {failed_files} failed"
 
         # Exceeded file count limit
         if (n_failed + len(self.files)) > FILE_COUNT_LIMIT:
-- 
cgit v1.2.3


From adbb011d28eb0536ea7761e43e4907e4cd8beabc Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Thu, 9 Feb 2023 13:17:03 -0500
Subject: Add `failed_file` emoji to config

---
 config-default.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config-default.yml b/config-default.yml
index 1d7a2ff78..d843dce3b 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -59,6 +59,7 @@ style:
         defcon_update:      "<:defconsettingsupdated:470326274082996224>"
 
         failmail: "<:failmail:633660039931887616>"
+        failed_file: "<:failed_file:1073298441968562226>"
 
         incident_actioned: "<:incident_actioned:714221559279255583>"
         incident_investigating: "<:incident_investigating:714224190928191551>"
-- 
cgit v1.2.3


From 13eb7c4dff9ceb845bb3cfd2d8e378dbdd4f980b Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:33:22 -0500
Subject: Made EvalJob and FileAttachment dataclasses frozen

---
 bot/exts/utils/snekbox/_eval.py | 2 +-
 bot/exts/utils/snekbox/_io.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 5c2fc8757..51455fb58 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -19,7 +19,7 @@ log = get_logger(__name__)
 SIGKILL = 9
 
 
-@dataclass
+@dataclass(frozen=True)
 class EvalJob:
     """Job to be evaluated by snekbox."""
 
diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index ce645dbca..8f704705f 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -49,7 +49,7 @@ def normalize_discord_file_name(name: str) -> str:
     return name
 
 
-@dataclass
+@dataclass(frozen=True)
 class FileAttachment:
     """File Attachment from Snekbox eval."""
 
-- 
cgit v1.2.3


From 48b0f7d90243a1248cb5d12a0e3d0f42611f3896 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:39:44 -0500
Subject: Simplify file name truncation

Co-authored-by: Boris Muratov <8bee278@gmail.com>
---
 bot/exts/utils/snekbox/_eval.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 5c2fc8757..6de88baed 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -120,14 +120,9 @@ class EvalResult:
                 names.append("...")
                 break
 
-            to_display = min(char_max, len(file))
-            name_short = file[:to_display]
-            # Add ellipsis if name was truncated
-            if to_display < len(file):
-                name_short += "..."
-                names.append(name_short)
+            if len(file) > char_max:
+                names.append(file[:char_max] + "...")
                 break
-
             char_max -= len(file)
             names.append(file)
 
-- 
cgit v1.2.3


From 5bbb49c6d3f5bf94a3e057e8aef7d6e05b3fe8ea Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:40:30 -0500
Subject: Fix indentation

---
 bot/exts/utils/snekbox/_cog.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index cdb709a5d..f049c0d68 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -170,10 +170,10 @@ class Snekbox(Cog):
         self.jobs = {}
 
     def build_python_version_switcher_view(
-            self,
-            current_python_version: PythonVersion,
-            ctx: Context,
-            job: EvalJob,
+        self,
+        current_python_version: PythonVersion,
+        ctx: Context,
+        job: EvalJob,
     ) -> interactions.ViewWithUserAndRoleCheck:
         """Return a view that allows the user to change what version of Python their code is run on."""
         if current_python_version == "3.10":
-- 
cgit v1.2.3


From d481e35104fd955259b6f1f459eb645ef6ceb289 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:41:12 -0500
Subject: Fix identation

---
 bot/exts/utils/snekbox/_cog.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f049c0d68..eb9eb3b8f 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -131,11 +131,11 @@ class PythonVersionSwitcherButton(ui.Button):
     """A button that allows users to re-run their eval command in a different Python version."""
 
     def __init__(
-            self,
-            version_to_switch_to: PythonVersion,
-            snekbox_cog: Snekbox,
-            ctx: Context,
-            job: EvalJob,
+        self,
+        version_to_switch_to: PythonVersion,
+        snekbox_cog: Snekbox,
+        ctx: Context,
+        job: EvalJob,
     ) -> None:
         self.version_to_switch_to = version_to_switch_to
         super().__init__(label=f"Run in {self.version_to_switch_to}", style=enums.ButtonStyle.primary)
-- 
cgit v1.2.3


From 70d3d3c4f80e7ff866a29f7f68fafd123d56cbf1 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:46:00 -0500
Subject: Move files error message call

---
 bot/exts/utils/snekbox/_cog.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index eb9eb3b8f..de546a671 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -320,7 +320,6 @@ class Snekbox(Cog):
             result = await self.post_job(job)
             msg = result.get_message(job)
             error = result.error_message
-            files_error = result.files_error_message
 
             if error:
                 output, paste_link = error, None
@@ -336,7 +335,7 @@ class Snekbox(Cog):
                 msg += f"\nFull output: {paste_link}"
 
             # Additional files error message after output
-            if files_error:
+            if files_error := result.files_error_message:
                 msg += f"\n{files_error}"
 
             # Collect stats of job fails + successes
-- 
cgit v1.2.3


From bc7a3fb76f01d92603ac2906c6cdd20f09d86712 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sun, 12 Feb 2023 03:51:04 -0500
Subject: Move allowed_mentions and view definitions

---
 bot/exts/utils/snekbox/_cog.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index de546a671..e2a155176 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -344,9 +344,6 @@ class Snekbox(Cog):
             else:
                 self.bot.stats.incr("snekbox.python.success")
 
-            allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
-            view = self.build_python_version_switcher_view(job.version, ctx, job)
-
             # Filter file extensions
             allowed, blocked = self._filter_files(ctx, result.files)
             # Also scan failed files for blocked extensions
@@ -374,8 +371,9 @@ class Snekbox(Cog):
             if filter_cog and (await filter_cog.filter_snekbox_output(msg, ctx.message)):
                 return await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
 
-            # Attach files if provided
             files = [f.to_file() for f in allowed]
+            allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
+            view = self.build_python_version_switcher_view(job.version, ctx, job)
             response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
             view.message = response
 
-- 
cgit v1.2.3


From 46a7b9785902729da8e7de01935f0af3d53384ca Mon Sep 17 00:00:00 2001
From: vivekashok1221 <vivekashok1221@gmail.com>
Date: Fri, 30 Dec 2022 19:29:00 +0400
Subject: Display message link in infraction log

---
 bot/exts/moderation/infraction/_utils.py     | 9 ++++++++-
 bot/exts/moderation/infraction/management.py | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index 2cf7f8efb..0343709fa 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -6,11 +6,12 @@ from discord.ext.commands import Context
 from pydis_core.site_api import ResponseCodeError
 
 import bot
-from bot.constants import Colours, Icons
+from bot.constants import Categories, Colours, Icons
 from bot.converters import DurationOrExpiry, MemberOrUser
 from bot.errors import InvalidInfractedUserError
 from bot.log import get_logger
 from bot.utils import time
+from bot.utils.channel import is_in_category
 from bot.utils.time import unpack_duration
 
 log = get_logger(__name__)
@@ -94,6 +95,11 @@ async def post_infraction(
 
     current_time = arrow.utcnow()
 
+    if is_in_category(ctx.channel, Categories.modmail):
+        jump_url_text = "Infraction issued in a ModMail channel."
+    else:
+        jump_url_text = f"[Click here]({ctx.message.jump_url})"
+
     payload = {
         "actor": ctx.author.id,  # Don't use ctx.message.author; antispam only patches ctx.author.
         "hidden": hidden,
@@ -102,6 +108,7 @@ async def post_infraction(
         "user": user.id,
         "active": active,
         "dm_sent": dm_sent,
+        "jump_url_text": jump_url_text,
         "inserted_at": current_time.isoformat(),
         "last_applied": current_time.isoformat(),
     }
diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py
index 6ef382119..bcbacf085 100644
--- a/bot/exts/moderation/infraction/management.py
+++ b/bot/exts/moderation/infraction/management.py
@@ -390,6 +390,7 @@ class ModManagement(commands.Cog):
         applied = time.discord_timestamp(last_applied)
         duration_edited = arrow.get(last_applied) > arrow.get(inserted_at)
         dm_sent = infraction["dm_sent"]
+        jump_url_text = infraction["jump_url_text"]
 
         # Format the user string.
         if user_obj := self.bot.get_user(user["id"]):
@@ -420,6 +421,10 @@ class ModManagement(commands.Cog):
         else:
             dm_sent_text = "Yes" if dm_sent else "No"
 
+        if jump_url_text == "":
+            # Infraction was issued prior to jump urls being stored in the database.
+            jump_url_text = "N/A"
+
         lines = textwrap.dedent(f"""
             {"**===============**" if active else "==============="}
             Status: {"__**Active**__" if active else "Inactive"}
@@ -432,6 +437,7 @@ class ModManagement(commands.Cog):
             Duration: {duration}
             Actor: <@{infraction["actor"]["id"]}>
             ID: `{infraction["id"]}`
+            Jump Url: {jump_url_text}
             Reason: {infraction["reason"] or "*None*"}
             {"**===============**" if active else "==============="}
         """)
-- 
cgit v1.2.3


From c6af8bfdb5d57ed304636b4eb89343e40e928dad Mon Sep 17 00:00:00 2001
From: vivekashok1221 <vivekashok1221@gmail.com>
Date: Sat, 31 Dec 2022 11:14:48 +0400
Subject: Include message link in mod-log embeds

---
 bot/exts/moderation/infraction/_scheduler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py
index 9b8e67ec5..4b8ab18a4 100644
--- a/bot/exts/moderation/infraction/_scheduler.py
+++ b/bot/exts/moderation/infraction/_scheduler.py
@@ -147,6 +147,7 @@ class InfractionScheduler:
         icon = _utils.INFRACTION_ICONS[infr_type][0]
         reason = infraction["reason"]
         id_ = infraction['id']
+        jump_url_text = infraction['jump_url_text']
         expiry = time.format_with_duration(
             infraction["expires_at"],
             infraction["last_applied"]
@@ -273,6 +274,7 @@ class InfractionScheduler:
                 Member: {messages.format_user(user)}
                 Actor: {ctx.author.mention}{dm_log_text}{expiry_log_text}
                 Reason: {reason}
+                Jump url: {jump_url_text}
                 {additional_info}
             """),
             content=log_content,
-- 
cgit v1.2.3


From fa2cd5cdaebaa9f4b1abe79f3127cd1a0778f13c Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 13 Feb 2023 22:01:06 -0500
Subject: Add `has_output` and `has_files` for EvalResult

---
 bot/exts/utils/snekbox/_cog.py  |  3 ++-
 bot/exts/utils/snekbox/_eval.py | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index e2a155176..00150a837 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -328,7 +328,8 @@ class Snekbox(Cog):
                 output, paste_link = await self.format_output(result.stdout)
 
             msg = f"{ctx.author.mention} {result.status_emoji} {msg}.\n"
-            if output not in ("[No output]", "") or not (result.files or result.failed_files):
+            # Skip output if it's empty and there are file uploads
+            if result.stdout or not result.has_files:
                 msg += f"\n```\n{output}\n```"
 
             if paste_link:
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index f82b6aa89..2f61b5924 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -62,11 +62,20 @@ class EvalResult:
     files: list[FileAttachment] = field(default_factory=list)
     failed_files: list[str] = field(default_factory=list)
 
+    @property
+    def has_output(self) -> bool:
+        """True if the result has any output (stdout, files, or failed files)."""
+        return bool(self.stdout.strip() or self.files or self.failed_files)
+
+    @property
+    def has_files(self) -> bool:
+        """True if the result has any files or failed files."""
+        return bool(self.files or self.failed_files)
+
     @property
     def status_emoji(self) -> str:
         """Return an emoji corresponding to the status code or lack of output in result."""
-        # If there are attachments, skip empty output warning
-        if not self.stdout.strip() and not (self.files or self.failed_files):
+        if not self.has_output:
             return ":warning:"
         elif self.returncode == 0:  # No error
             return ":white_check_mark:"
-- 
cgit v1.2.3


From ed59a9fd38f8bcfcb81efaf66f86e7ebc6661665 Mon Sep 17 00:00:00 2001
From: vivekashok1221 <vivekashok1221@gmail.com>
Date: Fri, 17 Feb 2023 11:35:00 +0530
Subject: Format jump url bot-side

---
 bot/exts/moderation/infraction/_scheduler.py |  8 ++++++--
 bot/exts/moderation/infraction/_utils.py     | 27 +++++++++++++++------------
 bot/exts/moderation/infraction/management.py | 11 +++++++----
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py
index 4b8ab18a4..de1ec398e 100644
--- a/bot/exts/moderation/infraction/_scheduler.py
+++ b/bot/exts/moderation/infraction/_scheduler.py
@@ -147,7 +147,7 @@ class InfractionScheduler:
         icon = _utils.INFRACTION_ICONS[infr_type][0]
         reason = infraction["reason"]
         id_ = infraction['id']
-        jump_url_text = infraction['jump_url_text']
+        jump_url = infraction['jump_url']
         expiry = time.format_with_duration(
             infraction["expires_at"],
             infraction["last_applied"]
@@ -262,6 +262,10 @@ class InfractionScheduler:
         mentions = discord.AllowedMentions(users=[user], roles=False)
         await ctx.send(f"{dm_result}{confirm_msg}{infr_message}.", allowed_mentions=mentions)
 
+        if "discord.com" in jump_url:
+            jump_url = f"[Click here.]({jump_url})"
+            # Else, infraction was issued in ModMail category.
+
         # Send a log message to the mod log.
         # Don't use ctx.message.author for the actor; antispam only patches ctx.author.
         log.trace(f"Sending apply mod log for infraction #{id_}.")
@@ -274,7 +278,7 @@ class InfractionScheduler:
                 Member: {messages.format_user(user)}
                 Actor: {ctx.author.mention}{dm_log_text}{expiry_log_text}
                 Reason: {reason}
-                Jump url: {jump_url_text}
+                Jump URL: {jump_url}
                 {additional_info}
             """),
             content=log_content,
diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index 0343709fa..12c8f0614 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -77,14 +77,14 @@ async def post_user(ctx: Context, user: MemberOrUser) -> t.Optional[dict]:
 
 
 async def post_infraction(
-        ctx: Context,
-        user: MemberOrUser,
-        infr_type: str,
-        reason: str,
-        duration_or_expiry: t.Optional[DurationOrExpiry] = None,
-        hidden: bool = False,
-        active: bool = True,
-        dm_sent: bool = False,
+    ctx: Context,
+    user: MemberOrUser,
+    infr_type: str,
+    reason: str,
+    duration_or_expiry: t.Optional[DurationOrExpiry] = None,
+    hidden: bool = False,
+    active: bool = True,
+    dm_sent: bool = False,
 ) -> t.Optional[dict]:
     """Posts an infraction to the API."""
     if isinstance(user, (discord.Member, discord.User)) and user.bot:
@@ -95,10 +95,13 @@ async def post_infraction(
 
     current_time = arrow.utcnow()
 
-    if is_in_category(ctx.channel, Categories.modmail):
-        jump_url_text = "Infraction issued in a ModMail channel."
+    if any(
+        is_in_category(ctx.channel, category)
+        for category in (Categories.modmail, Categories.appeals, Categories.appeals2)
+    ):
+        jump_url = "Infraction issued in a ModMail channel."
     else:
-        jump_url_text = f"[Click here]({ctx.message.jump_url})"
+        jump_url = ctx.message.jump_url
 
     payload = {
         "actor": ctx.author.id,  # Don't use ctx.message.author; antispam only patches ctx.author.
@@ -108,7 +111,7 @@ async def post_infraction(
         "user": user.id,
         "active": active,
         "dm_sent": dm_sent,
-        "jump_url_text": jump_url_text,
+        "jump_url": jump_url,
         "inserted_at": current_time.isoformat(),
         "last_applied": current_time.isoformat(),
     }
diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py
index bcbacf085..78778048e 100644
--- a/bot/exts/moderation/infraction/management.py
+++ b/bot/exts/moderation/infraction/management.py
@@ -390,7 +390,7 @@ class ModManagement(commands.Cog):
         applied = time.discord_timestamp(last_applied)
         duration_edited = arrow.get(last_applied) > arrow.get(inserted_at)
         dm_sent = infraction["dm_sent"]
-        jump_url_text = infraction["jump_url_text"]
+        jump_url = infraction["jump_url"]
 
         # Format the user string.
         if user_obj := self.bot.get_user(user["id"]):
@@ -421,9 +421,12 @@ class ModManagement(commands.Cog):
         else:
             dm_sent_text = "Yes" if dm_sent else "No"
 
-        if jump_url_text == "":
+        if jump_url == "":
             # Infraction was issued prior to jump urls being stored in the database.
-            jump_url_text = "N/A"
+            jump_url = "N/A"
+        elif "discord.com" in jump_url:
+            jump_url = f"[Click here.]({jump_url})"
+            # Else, infraction was issued in ModMail category.
 
         lines = textwrap.dedent(f"""
             {"**===============**" if active else "==============="}
@@ -437,7 +440,7 @@ class ModManagement(commands.Cog):
             Duration: {duration}
             Actor: <@{infraction["actor"]["id"]}>
             ID: `{infraction["id"]}`
-            Jump Url: {jump_url_text}
+            Jump URL: {jump_url}
             Reason: {infraction["reason"] or "*None*"}
             {"**===============**" if active else "==============="}
         """)
-- 
cgit v1.2.3


From 540ed9cf63785e5e922f74434f011fb2689da988 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sat, 18 Feb 2023 15:38:54 -0500
Subject: Fix typing

---
 bot/exts/utils/snekbox/_cog.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 00150a837..ab8815697 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -176,6 +176,7 @@ class Snekbox(Cog):
         job: EvalJob,
     ) -> interactions.ViewWithUserAndRoleCheck:
         """Return a view that allows the user to change what version of Python their code is run on."""
+        alt_python_version: PythonVersion
         if current_python_version == "3.10":
             alt_python_version = "3.11"
         else:
-- 
cgit v1.2.3


From 84ac06de827d0b1eb31320641fb3e6adf58929ca Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sat, 18 Feb 2023 15:39:14 -0500
Subject: Introduce variable for max output lines and chars

---
 bot/exts/utils/snekbox/_cog.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index ab8815697..7a2d05d37 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -76,6 +76,10 @@ if not hasattr(sys, "_setup_finished"):
 """
 
 MAX_PASTE_LENGTH = 10_000
+# Max to display in a codeblock before sending to a paste service
+# This also applies to text files
+MAX_OUTPUT_BLOCK_LINES = 10
+MAX_OUTPUT_BLOCK_CHARS = 1000
 
 # The Snekbox commands' whitelists and blacklists.
 NO_SNEKBOX_CHANNELS = (Channels.python_general,)
@@ -255,18 +259,18 @@ class Snekbox(Cog):
 
         if lines > 0:
             output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
-            output = output[:11]  # Limiting to only 11 lines
+            output = output[:MAX_OUTPUT_BLOCK_LINES+1]  # Limiting to max+1 lines
             output = "\n".join(output)
 
-        if lines > 10:
+        if lines > MAX_OUTPUT_BLOCK_LINES:
             truncated = True
-            if len(output) >= 1000:
-                output = f"{output[:1000]}\n... (truncated - too long, too many lines)"
+            if len(output) >= MAX_OUTPUT_BLOCK_CHARS:
+                output = f"{output[:MAX_OUTPUT_BLOCK_CHARS]}\n... (truncated - too long, too many lines)"
             else:
                 output = f"{output}\n... (truncated - too many lines)"
-        elif len(output) >= 1000:
+        elif len(output) >= MAX_OUTPUT_BLOCK_CHARS:
             truncated = True
-            output = f"{output[:1000]}\n... (truncated - too long)"
+            output = f"{output[:MAX_OUTPUT_BLOCK_CHARS]}\n... (truncated - too long)"
 
         if truncated:
             paste_link = await self.upload_output(original_output)
-- 
cgit v1.2.3


From 07ba33781352892a4e91ce0cea713e45fa5bc541 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sat, 18 Feb 2023 18:25:07 -0500
Subject: Add name property for FileAttachment

---
 bot/exts/utils/snekbox/_io.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index 8f704705f..404681936 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -66,6 +66,11 @@ class FileAttachment:
         """Return the file suffix."""
         return Path(self.path).suffix
 
+    @property
+    def name(self) -> str:
+        """Return the file name."""
+        return Path(self.path).name
+
     @classmethod
     def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
         """Create a FileAttachment from a dict response."""
-- 
cgit v1.2.3


From 81832941b971266e33ed149b7ec0b6a48c9e2faf Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sat, 18 Feb 2023 18:27:03 -0500
Subject: Text file upload to paste service / in-line display

---
 bot/exts/utils/snekbox/_cog.py | 59 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 11 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 7a2d05d37..21699e8e5 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -6,7 +6,7 @@ import re
 from functools import partial
 from operator import attrgetter
 from textwrap import dedent
-from typing import Literal, NamedTuple, Optional, TYPE_CHECKING, Tuple
+from typing import Literal, NamedTuple, Optional, TYPE_CHECKING
 
 from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui
 from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only
@@ -233,7 +233,14 @@ class Snekbox(Cog):
         args.extend(["-s", TIMEIT_SETUP_WRAPPER.format(setup=setup_code), code])
         return args
 
-    async def format_output(self, output: str) -> Tuple[str, Optional[str]]:
+    async def format_output(
+        self,
+        output: str,
+        max_lines: int = MAX_OUTPUT_BLOCK_LINES,
+        max_chars: int = MAX_OUTPUT_BLOCK_CHARS,
+        line_nums: bool = True,
+        mark_no_output: bool = True
+    ) -> tuple[str, str | None]:
         """
         Format the output and return a tuple of the formatted output and a URL to the full output.
 
@@ -258,24 +265,26 @@ class Snekbox(Cog):
         lines = output.count("\n")
 
         if lines > 0:
-            output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
-            output = output[:MAX_OUTPUT_BLOCK_LINES+1]  # Limiting to max+1 lines
+            if line_nums:
+                output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
+            output = output[:max_lines+1]  # Limiting to max+1 lines
             output = "\n".join(output)
 
-        if lines > MAX_OUTPUT_BLOCK_LINES:
+        if lines > max_lines:
             truncated = True
-            if len(output) >= MAX_OUTPUT_BLOCK_CHARS:
-                output = f"{output[:MAX_OUTPUT_BLOCK_CHARS]}\n... (truncated - too long, too many lines)"
+            if len(output) >= max_chars:
+                output = f"{output[:max_chars]}\n... (truncated - too long, too many lines)"
             else:
                 output = f"{output}\n... (truncated - too many lines)"
-        elif len(output) >= MAX_OUTPUT_BLOCK_CHARS:
+        elif len(output) >= max_chars:
             truncated = True
-            output = f"{output[:MAX_OUTPUT_BLOCK_CHARS]}\n... (truncated - too long)"
+            output = f"{output[:max_chars]}\n... (truncated - too long)"
 
         if truncated:
             paste_link = await self.upload_output(original_output)
 
-        output = output or "[No output]"
+        if mark_no_output and not output:
+            output = "[No output]"
 
         return output, paste_link
 
@@ -373,11 +382,39 @@ class Snekbox(Cog):
 
                 msg += f"\n{Emojis.failed_file} {blocked_msg}"
 
+            # Split text files
+            text_files = [f for f in allowed if f.suffix in TXT_LIKE_FILES]
+            # Inline until budget, then upload to paste service
+            budget_lines = MAX_OUTPUT_BLOCK_LINES
+            budget_chars = MAX_OUTPUT_BLOCK_CHARS
+            for file in text_files:
+                file_text = file.content.decode("utf-8", errors="replace") or "[Empty]"
+                # Override to always allow 1 line and < 50 chars, since this is less than a link
+                if len(file_text) < 50 and file_text.count("\n") < 2:
+                    msg += f"\n`{file.name}`\n```\n{file_text}\n```"
+                # otherwise, use budget
+                else:
+                    format_text, link_text = await self.format_output(
+                        file_text,
+                        budget_lines,
+                        budget_chars,
+                        line_nums=False,
+                        mark_no_output=False
+                    )
+                    # With any link, use it (don't use budget)
+                    if link_text:
+                        msg += f"\n`{file.name}`\n{link_text}"
+                    else:
+                        msg += f"\n`{file.name}`\n```\n{format_text}\n```"
+                        budget_lines -= file_text.count("\n")
+                        budget_chars -= len(file_text)
+
             filter_cog: Filtering | None = self.bot.get_cog("Filtering")
             if filter_cog and (await filter_cog.filter_snekbox_output(msg, ctx.message)):
                 return await ctx.send("Attempt to circumvent filter detected. Moderator team has been alerted.")
 
-            files = [f.to_file() for f in allowed]
+            # Upload remaining non-text files
+            files = [f.to_file() for f in allowed if f not in text_files]
             allowed_mentions = AllowedMentions(everyone=False, roles=False, users=[ctx.author])
             view = self.build_python_version_switcher_view(job.version, ctx, job)
             response = await ctx.send(msg, allowed_mentions=allowed_mentions, view=view, files=files)
-- 
cgit v1.2.3


From 3438ac3eaadc6a114e9201fe00d5b76ed7448bc3 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Sat, 18 Feb 2023 18:45:28 -0500
Subject: Fix empty files format when only new lines

---
 bot/exts/utils/snekbox/_cog.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 21699e8e5..f20a6e822 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -401,6 +401,7 @@ class Snekbox(Cog):
                         line_nums=False,
                         mark_no_output=False
                     )
+                    format_text = format_text or "[Empty]"
                     # With any link, use it (don't use budget)
                     if link_text:
                         msg += f"\n`{file.name}`\n{link_text}"
-- 
cgit v1.2.3


From dc7653b63deee4abcf850b28fc4d30edf04b5e27 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 22 Feb 2023 15:38:41 -0500
Subject: Refactor format_output to have `output_default` as str

---
 bot/exts/utils/snekbox/_cog.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f20a6e822..f09725b20 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -239,7 +239,7 @@ class Snekbox(Cog):
         max_lines: int = MAX_OUTPUT_BLOCK_LINES,
         max_chars: int = MAX_OUTPUT_BLOCK_CHARS,
         line_nums: bool = True,
-        mark_no_output: bool = True
+        output_default: str = "[No output]",
     ) -> tuple[str, str | None]:
         """
         Format the output and return a tuple of the formatted output and a URL to the full output.
@@ -283,8 +283,8 @@ class Snekbox(Cog):
         if truncated:
             paste_link = await self.upload_output(original_output)
 
-        if mark_no_output and not output:
-            output = "[No output]"
+        if output_default and not output:
+            output = output_default
 
         return output, paste_link
 
@@ -399,9 +399,8 @@ class Snekbox(Cog):
                         budget_lines,
                         budget_chars,
                         line_nums=False,
-                        mark_no_output=False
+                        output_default="[Empty]"
                     )
-                    format_text = format_text or "[Empty]"
                     # With any link, use it (don't use budget)
                     if link_text:
                         msg += f"\n`{file.name}`\n{link_text}"
-- 
cgit v1.2.3


From a6726c5ba3e890cc7ccb06dfb25fb61968353e90 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 22 Feb 2023 15:42:37 -0500
Subject: Fix file text count comparison

---
 bot/exts/utils/snekbox/_cog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f09725b20..f1f0fddd7 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -389,8 +389,8 @@ class Snekbox(Cog):
             budget_chars = MAX_OUTPUT_BLOCK_CHARS
             for file in text_files:
                 file_text = file.content.decode("utf-8", errors="replace") or "[Empty]"
-                # Override to always allow 1 line and < 50 chars, since this is less than a link
-                if len(file_text) < 50 and file_text.count("\n") < 2:
+                # Override to always allow 1 line and <= 50 chars, since this is less than a link
+                if len(file_text) <= 50 and not file_text.count("\n"):
                     msg += f"\n`{file.name}`\n```\n{file_text}\n```"
                 # otherwise, use budget
                 else:
-- 
cgit v1.2.3


From 7e7f7c3ca1a0edeb51d741edbeffed50421a773a Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 22 Feb 2023 15:46:12 -0500
Subject: Fix budget lines comparison

---
 bot/exts/utils/snekbox/_cog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f1f0fddd7..a569541c8 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -406,7 +406,7 @@ class Snekbox(Cog):
                         msg += f"\n`{file.name}`\n{link_text}"
                     else:
                         msg += f"\n`{file.name}`\n```\n{format_text}\n```"
-                        budget_lines -= file_text.count("\n")
+                        budget_lines -= format_text.count("\n") + 1
                         budget_chars -= len(file_text)
 
             filter_cog: Filtering | None = self.bot.get_cog("Filtering")
-- 
cgit v1.2.3


From 4fed4410ea9f0087f5c60c66c1291adffa7cd896 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 22 Feb 2023 15:59:18 -0500
Subject: Update budget lines and chars for text to be shared with stdout

---
 bot/exts/utils/snekbox/_cog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index a569541c8..f4032e4a1 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -385,8 +385,9 @@ class Snekbox(Cog):
             # Split text files
             text_files = [f for f in allowed if f.suffix in TXT_LIKE_FILES]
             # Inline until budget, then upload to paste service
-            budget_lines = MAX_OUTPUT_BLOCK_LINES
-            budget_chars = MAX_OUTPUT_BLOCK_CHARS
+            # Budget is shared with stdout, so subtract what we've already used
+            budget_lines = MAX_OUTPUT_BLOCK_LINES - (output.count("\n") + 1)
+            budget_chars = MAX_OUTPUT_BLOCK_CHARS - len(output)
             for file in text_files:
                 file_text = file.content.decode("utf-8", errors="replace") or "[Empty]"
                 # Override to always allow 1 line and <= 50 chars, since this is less than a link
-- 
cgit v1.2.3


From d29e8c6c4240a5e9cb5293788529621ee919c0b7 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Wed, 22 Feb 2023 16:24:56 -0500
Subject: Use PurePosixPath so tests work on windows

---
 bot/exts/utils/snekbox/_io.py           | 9 ++++-----
 tests/bot/exts/utils/snekbox/test_io.py | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/bot/exts/utils/snekbox/_io.py b/bot/exts/utils/snekbox/_io.py
index 404681936..9be396335 100644
--- a/bot/exts/utils/snekbox/_io.py
+++ b/bot/exts/utils/snekbox/_io.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 from base64 import b64decode, b64encode
 from dataclasses import dataclass
 from io import BytesIO
-from pathlib import Path
+from pathlib import PurePosixPath
 
 import regex
 from discord import File
@@ -64,12 +64,12 @@ class FileAttachment:
     @property
     def suffix(self) -> str:
         """Return the file suffix."""
-        return Path(self.path).suffix
+        return PurePosixPath(self.path).suffix
 
     @property
     def name(self) -> str:
         """Return the file name."""
-        return Path(self.path).name
+        return PurePosixPath(self.path).name
 
     @classmethod
     def from_dict(cls, data: dict, size_limit: int = FILE_SIZE_LIMIT) -> FileAttachment:
@@ -98,6 +98,5 @@ class FileAttachment:
 
     def to_file(self) -> File:
         """Convert to a discord.File."""
-        name = Path(self.path).name
-        name = normalize_discord_file_name(name)
+        name = normalize_discord_file_name(self.name)
         return File(BytesIO(self.content), filename=name)
diff --git a/tests/bot/exts/utils/snekbox/test_io.py b/tests/bot/exts/utils/snekbox/test_io.py
index a544a2056..bcf1162b8 100644
--- a/tests/bot/exts/utils/snekbox/test_io.py
+++ b/tests/bot/exts/utils/snekbox/test_io.py
@@ -1,5 +1,4 @@
-import platform
-from unittest import TestCase, skipIf
+from unittest import TestCase
 
 # noinspection PyProtectedMember
 from bot.exts.utils.snekbox import _io
@@ -7,9 +6,6 @@ from bot.exts.utils.snekbox import _io
 
 class SnekboxIOTests(TestCase):
     # noinspection SpellCheckingInspection
-    # Skip Windows since both pathlib and os strips the escape sequences
-    # and many of these aren't valid Windows file paths
-    @skipIf(platform.system() == "Windows", "File names normalizer tests requires Unix-like OS.")
     def test_normalize_file_name(self):
         """Invalid file names should be normalized."""
         cases = [
-- 
cgit v1.2.3


From 3d19133d70334eb9a46b4788f95e3c5ac44cc41d Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Fri, 24 Feb 2023 15:04:58 -0500
Subject: Fix and simplify logic for optional line numbering

---
 bot/exts/utils/snekbox/_cog.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index f4032e4a1..a549ec70a 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -262,15 +262,15 @@ class Snekbox(Cog):
             return "Code block escape attempt detected; will not output result", paste_link
 
         truncated = False
-        lines = output.count("\n")
+        lines = output.splitlines()
 
-        if lines > 0:
+        if lines:
             if line_nums:
-                output = [f"{i:03d} | {line}" for i, line in enumerate(output.split('\n'), 1)]
-            output = output[:max_lines+1]  # Limiting to max+1 lines
-            output = "\n".join(output)
+                lines = [f"{i:03d} | {line}" for i, line in enumerate(lines, 1)]
+            lines = lines[:max_lines+1]  # Limiting to max+1 lines
+            output = "\n".join(lines)
 
-        if lines > max_lines:
+        if len(lines) > max_lines:
             truncated = True
             if len(output) >= max_chars:
                 output = f"{output[:max_chars]}\n... (truncated - too long, too many lines)"
-- 
cgit v1.2.3


From 0743f89d48dde18381c7ca7e3d29cc31699bf986 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Fri, 24 Feb 2023 15:11:14 -0500
Subject: Restore implicit no line nums when 0 lines behavior

---
 bot/exts/utils/snekbox/_cog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index a549ec70a..94b06f941 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -264,7 +264,7 @@ class Snekbox(Cog):
         truncated = False
         lines = output.splitlines()
 
-        if lines:
+        if len(lines) > 1:
             if line_nums:
                 lines = [f"{i:03d} | {line}" for i, line in enumerate(lines, 1)]
             lines = lines[:max_lines+1]  # Limiting to max+1 lines
-- 
cgit v1.2.3


From 618471ce3ce840286486891a3a10067de7321360 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Fri, 24 Feb 2023 18:23:20 -0500
Subject: Add docstring info on file system support for eval

---
 bot/exts/utils/snekbox/_cog.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index 94b06f941..924977edb 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -556,16 +556,17 @@ class Snekbox(Cog):
         """
         Run Python code and get the results.
 
-        This command supports multiple lines of code, including code wrapped inside a formatted code
-        block. Code can be re-evaluated by editing the original message within 10 seconds and
+        This command supports multiple lines of code, including formatted code blocks.
+        Code can be re-evaluated by editing the original message within 10 seconds and
         clicking the reaction that subsequently appears.
 
+        The starting working directory `/home`, is a writeable temporary file system.
+        Files created, excluding names with leading underscores, will be uploaded in the response.
+
         If multiple codeblocks are in a message, all of them will be joined and evaluated,
         ignoring the text outside them.
 
-        By default, your code is run on Python's 3.11 beta release, to assist with testing. If you
-        run into issues related to this Python version, you can request the bot to use Python
-        3.10 by specifying the `python_version` arg and setting it to `3.10`.
+        By default, your code is run on Python 3.11. A `python_version` arg of `3.10` can also be specified.
 
         We've done our best to make this sandboxed, but do let us know if you manage to find an
         issue with it!
@@ -601,9 +602,7 @@ class Snekbox(Cog):
         If multiple formatted codeblocks are provided, the first one will be the setup code, which will
         not be timed. The remaining codeblocks will be joined together and timed.
 
-        By default your code is run on Python's 3.11 beta release, to assist with testing. If you
-        run into issues related to this Python version, you can request the bot to use Python
-        3.10 by specifying the `python_version` arg and setting it to `3.10`.
+        By default, your code is run on Python 3.11. A `python_version` arg of `3.10` can also be specified.
 
         We've done our best to make this sandboxed, but do let us know if you manage to find an
         issue with it!
-- 
cgit v1.2.3


From e5fbddbe56921d46bf7f8451aef6c859214b2709 Mon Sep 17 00:00:00 2001
From: Ibrahim <cshore.2750mi@gmail.com>
Date: Wed, 1 Mar 2023 16:45:24 +0530
Subject: Add warning message when using `input`

---
 bot/exts/utils/snekbox.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 8a2e68b28..7ee5c5d21 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -344,8 +344,14 @@ class Snekbox(Cog):
                 log.trace("Formatting output...")
                 output, paste_link = await self.format_output(results["stdout"])
 
+            warning_message = ""
+            # 33 is the length of the error message. It is done to make sure the last line of output contains
+            # the error and the error is not manually printed by the author with a syntax error.
+            if "EOFError: EOF when reading a line" in output[-33:] and results['returncode'] == 1:
+                warning_message += ":warning: Note: `input` is not supported by the bot :warning:\n\n"
+
             icon = self.get_status_emoji(results)
-            msg = f"{ctx.author.mention} {icon} {msg}.\n\n```\n{output}\n```"
+            msg = f"{ctx.author.mention} {icon} {msg}.\n\n{warning_message}```\n{output}\n```"
             if paste_link:
                 msg = f"{msg}\nFull output: {paste_link}"
 
-- 
cgit v1.2.3


From f0119faacfd9db6f972a56d74e327a00a2e29a48 Mon Sep 17 00:00:00 2001
From: Mohammad Ibrahim <74553450+Ibrahim2750mi@users.noreply.github.com>
Date: Fri, 3 Mar 2023 01:53:55 +0530
Subject: Wookie's review

+ Double quotes for consistency
+ Using results["stdout"] instead of output so the warning is still displayed if the error doesn't fit in the message.
+ Using endswith so we don't need to hardcode the constant.

Co-authored-by: wookie184 <wookie1840@gmail.com>
---
 bot/exts/utils/snekbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 7ee5c5d21..1c0896804 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -347,7 +347,7 @@ class Snekbox(Cog):
             warning_message = ""
             # 33 is the length of the error message. It is done to make sure the last line of output contains
             # the error and the error is not manually printed by the author with a syntax error.
-            if "EOFError: EOF when reading a line" in output[-33:] and results['returncode'] == 1:
+            if results["stdout"].rstrip().endswith("EOFError: EOF when reading a line") and results["returncode"] == 1:
                 warning_message += ":warning: Note: `input` is not supported by the bot :warning:\n\n"
 
             icon = self.get_status_emoji(results)
-- 
cgit v1.2.3


From f3c103856190f360bf1bcd4378e05ea7a5b22a74 Mon Sep 17 00:00:00 2001
From: Ibrahim <cshore.2750mi@gmail.com>
Date: Fri, 3 Mar 2023 01:57:14 +0530
Subject: Edit comment to match wookie's review

---
 bot/exts/utils/snekbox.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py
index 1c0896804..ddcbe01fa 100644
--- a/bot/exts/utils/snekbox.py
+++ b/bot/exts/utils/snekbox.py
@@ -345,8 +345,9 @@ class Snekbox(Cog):
                 output, paste_link = await self.format_output(results["stdout"])
 
             warning_message = ""
-            # 33 is the length of the error message. It is done to make sure the last line of output contains
-            # the error and the error is not manually printed by the author with a syntax error.
+
+            # This is done to make sure the last line of output contains the error
+            # and the error is not manually printed by the author with a syntax error.
             if results["stdout"].rstrip().endswith("EOFError: EOF when reading a line") and results["returncode"] == 1:
                 warning_message += ":warning: Note: `input` is not supported by the bot :warning:\n\n"
 
-- 
cgit v1.2.3


From e2cfba8312830d2ab933d0b19007d2fe51fed1f0 Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Fri, 3 Mar 2023 14:06:15 +0100
Subject: Add CI to the list of trigger workflow runs (#2426)

Co-authored-by: ChrisJL <ChrisLovering@users.noreply.github.com>
---
 .github/workflows/status_embed.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/status_embed.yaml b/.github/workflows/status_embed.yaml
index 4178c366d..0fa240b2c 100644
--- a/.github/workflows/status_embed.yaml
+++ b/.github/workflows/status_embed.yaml
@@ -3,6 +3,7 @@ name: Status Embed
 on:
   workflow_run:
     workflows:
+      - CI
       - Lint & Test
       - Build
       - Deploy
-- 
cgit v1.2.3


From 8d449296bbb60fb3ce13647d373c16b44c1401ec Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Fri, 3 Mar 2023 14:59:15 +0100
Subject: Bundle workflows into a "main" CI flow (#2425)

* bundle build & deploy into a single workflow

* delete separate build & deploy wokrflows

* trigger status embed on the new bundled "Build & Deploy" workflow

* Call linting & build-deployment workflows from main

* keep one empty line in workflow files

* use v4 of k8s deploy

* yeet kubectl version

* use v3 of  k8s-set-context

* setup kubectl config using the setup-kubectl v3 action

* use v2 of the checkout action

* add dependabot config

* add new line for dependabot.yml

* update path of the sentry_release workflow

* update path of the lint-test workflow

* specify push branch

* update the sentry_release workflow path, again

* update sentry_release's trigger to workflow_call

* update lint-test's trigger to workflow_call

* remove extra line at the end

* unify usage of quotes

* update concurrency groups of reusable local workflows

* appease our dear linter with a blank line

* always run status embed

* Revert "always run status embed"

This reverts commit 2f69fd77b212337ff45bf7815783030bc6099452.

* remove colons after workflow_call

* remove empty line at the end

* Revert "remove empty line at the end"

This reverts commit 223bef4159c76f1968878fe312b5fbc16544549b.

* echo event name in status embed

* try running status embed on bot ci/cd wf

* run ci/cd on push to main

* reinstate the Lint & Test trigger for status embed

* rename main wf name to "CI"

This also triggers status embed on that name

* add group-workflows to the list of branches

* remove test step

* trigger status embed on ci only

* trigger main on main branch only

* remove concurrency groups in lint-test & sentry-release workflows
---
 .github/dependabot.yml               | 12 ++++++
 .github/workflows/build-deploy.yml   | 80 ++++++++++++++++++++++++++++++++++++
 .github/workflows/build.yml          | 63 ----------------------------
 .github/workflows/deploy.yml         | 46 ---------------------
 .github/workflows/lint-test.yml      |  9 +---
 .github/workflows/main.yml           | 47 +++++++++++++++++++++
 .github/workflows/sentry_release.yml |  7 +---
 .github/workflows/status_embed.yaml  |  3 --
 8 files changed, 141 insertions(+), 126 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/build-deploy.yml
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/deploy.yml
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..f60e94af8
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    reviewers:
+      - "python-discord/devops"
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
new file mode 100644
index 000000000..b099dd22c
--- /dev/null
+++ b/.github/workflows/build-deploy.yml
@@ -0,0 +1,80 @@
+name: Build & Deploy
+
+on:
+  workflow_call:
+    inputs:
+      sha-tag:
+        description: "A short-form SHA tag for the commit that triggered this workflow"
+        required: true
+        type: string
+
+
+jobs:
+  build:
+    name: Build & Push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # The current version (v2) of Docker's build-push action uses
+      # buildx, which comes with BuildKit features that help us speed
+      # up our builds using additional cache features. Buildx also
+      # has a lot of other features that are not as relevant to us.
+      #
+      # See https://github.com/docker/build-push-action
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build and push the container to the GitHub Container
+      # Repository. The container will be tagged as "latest"
+      # and with the short SHA of the commit.
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          cache-from: type=registry,ref=ghcr.io/python-discord/bot:latest
+          cache-to: type=inline
+          tags: |
+            ghcr.io/python-discord/bot:latest
+            ghcr.io/python-discord/bot:${{ inputs.sha-tag }}
+          build-args: |
+            git_sha=${{ github.sha }}
+
+  deploy:
+    name: Deploy
+    needs: build
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Checkout Kubernetes repository
+        uses: actions/checkout@v3
+        with:
+          repository: python-discord/kubernetes
+
+      - uses: azure/setup-kubectl@v3
+
+      - name: Authenticate with Kubernetes
+        uses: azure/k8s-set-context@v3
+        with:
+          method: kubeconfig
+          kubeconfig: ${{ secrets.KUBECONFIG }}
+
+      - name: Deploy to Kubernetes
+        uses: Aure/k8s-deploy@v4
+        with:
+          manifests: |
+            namespaces/default/bot/deployment.yaml
+          images: 'ghcr.io/python-discord/bot:${{ inputs.sha-tag }}'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index f8f2c8888..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: Build
-
-on:
-  workflow_run:
-    workflows: ["Lint & Test"]
-    branches:
-      - main
-    types:
-      - completed
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push'
-    name: Build & Push
-    runs-on: ubuntu-latest
-
-    steps:
-      # Create a commit SHA-based tag for the container repositories
-      - name: Create SHA Container Tag
-        id: sha_tag
-        run: |
-          tag=$(cut -c 1-7 <<< $GITHUB_SHA)
-          echo "::set-output name=tag::$tag"
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      # The current version (v2) of Docker's build-push action uses
-      # buildx, which comes with BuildKit features that help us speed
-      # up our builds using additional cache features. Buildx also
-      # has a lot of other features that are not as relevant to us.
-      #
-      # See https://github.com/docker/build-push-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to Github Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-
-      # Build and push the container to the GitHub Container
-      # Repository. The container will be tagged as "latest"
-      # and with the short SHA of the commit.
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          cache-from: type=registry,ref=ghcr.io/python-discord/bot:latest
-          cache-to: type=inline
-          tags: |
-            ghcr.io/python-discord/bot:latest
-            ghcr.io/python-discord/bot:${{ steps.sha_tag.outputs.tag }}
-          build-args: |
-            git_sha=${{ github.sha }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 79eef8821..000000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Deploy
-
-on:
-  workflow_run:
-    workflows: ["Build"]
-    branches:
-      - main
-    types:
-      - completed
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    environment: production
-    if: github.event.workflow_run.conclusion == 'success'
-    name: Build & Push
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Create SHA Container Tag
-        id: sha_tag
-        run: |
-          tag=$(cut -c 1-7 <<< $GITHUB_SHA)
-          echo "::set-output name=tag::$tag"
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          repository: python-discord/kubernetes
-
-      - name: Authenticate with Kubernetes
-        uses: azure/k8s-set-context@v1
-        with:
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBECONFIG }}
-
-      - name: Deploy to Kubernetes
-        uses: Azure/k8s-deploy@v1
-        with:
-          manifests: |
-              namespaces/default/bot/deployment.yaml
-          images: 'ghcr.io/python-discord/bot:${{ steps.sha_tag.outputs.tag }}'
-          kubectl-version: 'latest'
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index a331659e6..bea7b8760 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -1,14 +1,7 @@
 name: Lint & Test
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  workflow_call
 
 jobs:
   lint-test:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..0f972b16f
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,47 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+
+jobs:
+  lint-test:
+    uses: ./.github/workflows/lint-test.yml
+
+
+  generate-sha-tag:
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    outputs:
+      sha-tag: ${{ steps.sha-tag.outputs.sha-tag }}
+    steps:
+      - name: Create SHA Container tag
+        id: sha-tag
+        run: |
+          tag=$(cut -c 1-7 <<< $GITHUB_SHA)
+          echo "sha-tag=$tag" >> $GITHUB_OUTPUT
+
+
+  build-deploy:
+    if: github.ref == 'refs/heads/main'
+    uses: ./.github/workflows/build-deploy.yml
+    needs:
+      - lint-test
+      - generate-sha-tag
+    with:
+      sha-tag: ${{ needs.generate-sha-tag.outputs.sha-tag }}
+    secrets: inherit
+
+  sentry-release:
+    if: github.ref == 'refs/heads/main'
+    uses: ./.github/workflows/sentry_release.yml
+    needs: build-deploy
+    secrets: inherit
diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml
index 48f5e50f4..f215148a8 100644
--- a/.github/workflows/sentry_release.yml
+++ b/.github/workflows/sentry_release.yml
@@ -1,13 +1,8 @@
 name: Create Sentry release
 
 on:
-  push:
-    branches:
-      - main
+  workflow_call
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   create_sentry_release:
diff --git a/.github/workflows/status_embed.yaml b/.github/workflows/status_embed.yaml
index 0fa240b2c..1923965ab 100644
--- a/.github/workflows/status_embed.yaml
+++ b/.github/workflows/status_embed.yaml
@@ -4,9 +4,6 @@ on:
   workflow_run:
     workflows:
       - CI
-      - Lint & Test
-      - Build
-      - Deploy
     types:
       - completed
 
-- 
cgit v1.2.3


From fb9a5d02b9536ce909e74fc2b22d12b8b2f2ac17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 14:01:48 +0000
Subject: Bump pydis-core from 9.5.0 to 9.5.1

Bumps [pydis-core](https://github.com/python-discord/bot-core) from 9.5.0 to 9.5.1.
- [Release notes](https://github.com/python-discord/bot-core/releases)
- [Changelog](https://github.com/python-discord/bot-core/blob/main/docs/changelog.rst)
- [Commits](https://github.com/python-discord/bot-core/compare/v9.5.0...v9.5.1)

---
updated-dependencies:
- dependency-name: pydis-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 16 ++++++++--------
 pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index db694b8f9..924f1645e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -454,14 +454,14 @@ cli = ["clevercsv (==0.7.4)", "click (==8.1.3)", "pyyaml (==6.0)", "toml (==0.10
 
 [[package]]
 name = "discord-py"
-version = "2.2.0"
+version = "2.2.2"
 description = "A Python wrapper for the Discord API"
 category = "main"
 optional = false
 python-versions = ">=3.8.0"
 files = [
-    {file = "discord.py-2.2.0-py3-none-any.whl", hash = "sha256:012e98571af6847467e81f9501bbe4c6ebfe292c842f5ef8e951908839ee1cd0"},
-    {file = "discord.py-2.2.0.tar.gz", hash = "sha256:a92d69ab6f982998693d0c371ea19235fa0f9900b50068fc461086d02c33e6bb"},
+    {file = "discord.py-2.2.2-py3-none-any.whl", hash = "sha256:38fc52a784727b8e5e5749267089400035b187a009028eddfabeb182abcc6d52"},
+    {file = "discord.py-2.2.2.tar.gz", hash = "sha256:b9944056bcb5711b2d04088848fd004466cf117c15c84fa798bf55470f28275f"},
 ]
 
 [package.dependencies]
@@ -1479,20 +1479,20 @@ email = ["email-validator (>=1.0.3)"]
 
 [[package]]
 name = "pydis-core"
-version = "9.5.0"
+version = "9.5.1"
 description = "PyDis core provides core functionality and utility to the bots of the Python Discord community."
 category = "main"
 optional = false
 python-versions = ">=3.10.0,<3.12.0"
 files = [
-    {file = "pydis_core-9.5.0-py3-none-any.whl", hash = "sha256:35834274a80b86a5426f27cb546b3fada8a5711bbf01bbcf1b0a8860a2afee94"},
-    {file = "pydis_core-9.5.0.tar.gz", hash = "sha256:1cf9c223af9b5377e08cc0eb046a12130518e4743afbdd4f052d5556b7dae805"},
+    {file = "pydis_core-9.5.1-py3-none-any.whl", hash = "sha256:50bbf1800fe228dd60ba6624615815f45139c105512ef701c556ee7dedaa91eb"},
+    {file = "pydis_core-9.5.1.tar.gz", hash = "sha256:83b89117def529c8b130f22c9f8cd46211df6329b039eedd5020098e656aa198"},
 ]
 
 [package.dependencies]
 aiodns = "3.0.0"
 async-rediscache = {version = "1.0.0rc2", extras = ["fakeredis"], optional = true, markers = "extra == \"async-rediscache\""}
-"discord.py" = "2.2.0"
+"discord.py" = "2.2.2"
 statsd = "4.0.1"
 
 [package.extras]
@@ -2314,4 +2314,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "95d9251abd0a6125c99cc0c290fd8f97e9003cfe95cde3666ccc1817f751e814"
+content-hash = "9e554d23838cde31200630eda42ce0f1ead91a0f521d10362037f6d4290d3529"
diff --git a/pyproject.toml b/pyproject.toml
index 13efe1f34..8950bcbc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "3.10.*"
 
 # See https://bot-core.pythondiscord.com/ for docs.
-pydis_core = { version = "9.5.0", extras = ["async-rediscache"] }
+pydis_core = { version = "9.5.1", extras = ["async-rediscache"] }
 redis = "4.3.5"
 fakeredis = { version = "2.0.0", extras = ["lua"] }
 
-- 
cgit v1.2.3


From f01127b34789a0d4eabf205fa0c0544e7d894d40 Mon Sep 17 00:00:00 2001
From: ChrisJL <ChrisLovering@users.noreply.github.com>
Date: Fri, 3 Mar 2023 14:11:31 +0000
Subject: Bump action versions in CI (#2433)

---
 .github/workflows/build-deploy.yml   | 8 ++++----
 .github/workflows/lint-test.yml      | 6 ++----
 .github/workflows/sentry_release.yml | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
index b099dd22c..2582a4113 100644
--- a/.github/workflows/build-deploy.yml
+++ b/.github/workflows/build-deploy.yml
@@ -26,10 +26,10 @@ jobs:
       # See https://github.com/docker/build-push-action
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to Github Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -40,7 +40,7 @@ jobs:
       # and with the short SHA of the commit.
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./Dockerfile
@@ -73,7 +73,7 @@ jobs:
           kubeconfig: ${{ secrets.KUBECONFIG }}
 
       - name: Deploy to Kubernetes
-        uses: Aure/k8s-deploy@v4
+        uses: azure/k8s-deploy@v4
         with:
           manifests: |
             namespaces/default/bot/deployment.yaml
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index bea7b8760..051ca2265 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -28,13 +28,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install Python Dependencies
-        uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1
+        uses: HassanAbouelela/actions/setup-python@setup-python_v1.4.0
         with:
-          # Set dev=true to install flake8 extensions, which are dev dependencies
-          dev: true
           python_version: '3.10'
 
       # Check all of our non-dev dependencies are compatible with the MIT license.
diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml
index f215148a8..cdc8f37d5 100644
--- a/.github/workflows/sentry_release.yml
+++ b/.github/workflows/sentry_release.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@main
+        uses: actions/checkout@v3
 
       - name: Create a Sentry.io release
         uses: tclindner/sentry-releases-action@v1.2.0
-- 
cgit v1.2.3


From ebb85bd86191d8fa20b9e179b1a0b225f5f55f88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:52:29 +0000
Subject: Bump sentry-sdk from 1.11.1 to 1.16.0

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.11.1 to 1.16.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.11.1...1.16.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 12 ++++++++----
 pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 924f1645e..f00713778 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1993,14 +1993,14 @@ six = "*"
 
 [[package]]
 name = "sentry-sdk"
-version = "1.11.1"
+version = "1.16.0"
 description = "Python client for Sentry (https://sentry.io)"
 category = "main"
 optional = false
 python-versions = "*"
 files = [
-    {file = "sentry-sdk-1.11.1.tar.gz", hash = "sha256:675f6279b6bb1fea09fd61751061f9a90dca3b5929ef631dd50dc8b3aeb245e9"},
-    {file = "sentry_sdk-1.11.1-py2.py3-none-any.whl", hash = "sha256:8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c"},
+    {file = "sentry-sdk-1.16.0.tar.gz", hash = "sha256:a900845bd78c263d49695d48ce78a4bce1030bbd917e0b6cc021fc000c901113"},
+    {file = "sentry_sdk-1.16.0-py2.py3-none-any.whl", hash = "sha256:633edefead34d976ff22e7edc367cdf57768e24bc714615ccae746d9d91795ae"},
 ]
 
 [package.dependencies]
@@ -2009,6 +2009,7 @@ urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""}
 
 [package.extras]
 aiohttp = ["aiohttp (>=3.5)"]
+arq = ["arq (>=0.23)"]
 beam = ["apache-beam (>=2.12)"]
 bottle = ["bottle (>=0.12.13)"]
 celery = ["celery (>=3)"]
@@ -2018,6 +2019,8 @@ falcon = ["falcon (>=1.4)"]
 fastapi = ["fastapi (>=0.79.0)"]
 flask = ["blinker (>=1.1)", "flask (>=0.11)"]
 httpx = ["httpx (>=0.16.0)"]
+huey = ["huey (>=2)"]
+opentelemetry = ["opentelemetry-distro (>=0.35b0)"]
 pure-eval = ["asttokens", "executing", "pure-eval"]
 pymongo = ["pymongo (>=3.1)"]
 pyspark = ["pyspark (>=2.4.4)"]
@@ -2026,6 +2029,7 @@ rq = ["rq (>=0.6)"]
 sanic = ["sanic (>=0.8)"]
 sqlalchemy = ["sqlalchemy (>=1.2)"]
 starlette = ["starlette (>=0.19.1)"]
+starlite = ["starlite (>=1.48)"]
 tornado = ["tornado (>=5)"]
 
 [[package]]
@@ -2314,4 +2318,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "9e554d23838cde31200630eda42ce0f1ead91a0f521d10362037f6d4290d3529"
+content-hash = "4239eb9deb7fe5792cbac76d5eb1a1a7c585f4a337df2772286733f70172a6b1"
diff --git a/pyproject.toml b/pyproject.toml
index 8950bcbc8..ecfe2b205 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,7 +33,7 @@ python-frontmatter = "1.0.0"
 pyyaml = "6.0"
 rapidfuzz = "2.13.2"
 regex = "2022.10.31"
-sentry-sdk = "1.11.1"
+sentry-sdk = "1.16.0"
 tldextract = "3.4.0"
 pydantic = "1.10.2"
 
-- 
cgit v1.2.3


From 94b27b433b2f4de75e4ac6cf79a09d5d603fecf6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:29:24 +0000
Subject: Bump redis from 4.3.5 to 4.4.2

Bumps [redis](https://github.com/redis/redis-py) from 4.3.5 to 4.4.2.
- [Release notes](https://github.com/redis/redis-py/releases)
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES)
- [Commits](https://github.com/redis/redis-py/compare/v4.3.5...v4.4.2)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 15 +++++++--------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f00713778..8a718ab82 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1194,7 +1194,7 @@ dev = ["black", "mypy", "pytest"]
 name = "packaging"
 version = "21.3"
 description = "Core utilities for Python packages"
-category = "main"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
@@ -1532,7 +1532,7 @@ files = [
 name = "pyparsing"
 version = "3.0.9"
 description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "main"
+category = "dev"
 optional = false
 python-versions = ">=3.6.8"
 files = [
@@ -1837,19 +1837,18 @@ full = ["numpy"]
 
 [[package]]
 name = "redis"
-version = "4.3.5"
+version = "4.4.2"
 description = "Python client for Redis database and key-value store"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "redis-4.3.5-py3-none-any.whl", hash = "sha256:46652271dc7525cd5a9667e5b0ca983c848c75b2b8f7425403395bb8379dcf25"},
-    {file = "redis-4.3.5.tar.gz", hash = "sha256:30c07511627a4c5c4d970e060000772f323174f75e745a26938319817ead7a12"},
+    {file = "redis-4.4.2-py3-none-any.whl", hash = "sha256:e6206448e2f8a432871d07d432c13ed6c2abcf6b74edb436c99752b1371be387"},
+    {file = "redis-4.4.2.tar.gz", hash = "sha256:a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7"},
 ]
 
 [package.dependencies]
 async-timeout = ">=4.0.2"
-packaging = ">=20.4"
 
 [package.extras]
 hiredis = ["hiredis (>=1.0.0)"]
@@ -2318,4 +2317,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "4239eb9deb7fe5792cbac76d5eb1a1a7c585f4a337df2772286733f70172a6b1"
+content-hash = "68bfdf2115a5242df097155a2660a1c0276cf25b4785bdb761580bd35b77383c"
diff --git a/pyproject.toml b/pyproject.toml
index ecfe2b205..71981e8d0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = "3.10.*"
 
 # See https://bot-core.pythondiscord.com/ for docs.
 pydis_core = { version = "9.5.1", extras = ["async-rediscache"] }
-redis = "4.3.5"
+redis = "4.4.2"
 fakeredis = { version = "2.0.0", extras = ["lua"] }
 
 aiohttp = "3.8.3"
-- 
cgit v1.2.3


From fdece3cc21f1317762535907ee50d04da0d9e1ec Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Sat, 4 Mar 2023 21:25:43 +0200
Subject: Migrate from role-based mutes to native timeouts

- Makes use of the native timeout instead of adding the Muted role.
- Renames all references to the "mute" infraction to "timeout", except in command aliases for ease of transition.
- Maintains support for the old functionality (pardoning users with the muted role, applying timeout to users who rejoin and are not yet timed out because they originally had the role). This can be removed (the relevant parts are marked with TODOs) after there are no longer users with the old mute.
---
 bot/constants.py                              |  6 +-
 bot/exts/filters/antispam.py                  | 10 +--
 bot/exts/moderation/infraction/_scheduler.py  | 18 ++---
 bot/exts/moderation/infraction/_utils.py      |  2 +-
 bot/exts/moderation/infraction/infractions.py | 99 +++++++++++++++++----------
 config-default.yml                            |  6 +-
 6 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index f1fb5471f..7e8e7591a 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -356,9 +356,9 @@ class Icons(metaclass=YAMLGetter):
     token_removed: str
 
     user_ban: str
-    user_mute: str
+    user_timeout: str
     user_unban: str
-    user_unmute: str
+    user_untimeout: str
     user_update: str
     user_verified: str
     user_warn: str
@@ -493,7 +493,7 @@ class Roles(metaclass=YAMLGetter):
 
     contributors: int
     help_cooldown: int
-    muted: int
+    muted: int  # TODO remove when no longer relevant.
     partners: int
     python_community: int
     sprinters: int
diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py
index d7783292d..5473889f3 100644
--- a/bot/exts/filters/antispam.py
+++ b/bot/exts/filters/antispam.py
@@ -228,17 +228,17 @@ class AntiSpam(Cog):
     @lock.lock_arg("antispam.punish", "member", attrgetter("id"))
     async def punish(self, msg: Message, member: Member, reason: str) -> None:
         """Punishes the given member for triggering an antispam rule."""
-        if not any(role.id == self.muted_role.id for role in member.roles):
-            remove_role_after = AntiSpamConfig.punishment['remove_after']
+        if not member.is_timed_out():
+            remove_timeout_after = AntiSpamConfig.punishment['remove_after']
 
             # Get context and make sure the bot becomes the actor of infraction by patching the `author` attributes
             context = await self.bot.get_context(msg)
             context.author = self.bot.user
 
-            # Since we're going to invoke the tempmute command directly, we need to manually call the converter.
-            dt_remove_role_after = await self.expiration_date_converter.convert(context, f"{remove_role_after}S")
+            # Since we're going to invoke the timeout command directly, we need to manually call the converter.
+            dt_remove_role_after = await self.expiration_date_converter.convert(context, f"{remove_timeout_after}S")
             await context.invoke(
-                self.bot.get_command('tempmute'),
+                self.bot.get_command('timeout'),
                 member,
                 dt_remove_role_after,
                 reason=reason
diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py
index 9b8e67ec5..c04cf7933 100644
--- a/bot/exts/moderation/infraction/_scheduler.py
+++ b/bot/exts/moderation/infraction/_scheduler.py
@@ -89,7 +89,7 @@ class InfractionScheduler:
         to prevent getting a RuntimeWarning if it is not used (e.g. in mocked tests).
         """
         if infraction["expires_at"] is not None:
-            # Calculate the time remaining, in seconds, for the mute.
+            # Calculate the time remaining, in seconds, for the infraction.
             expiry = dateutil.parser.isoparse(infraction["expires_at"])
             delta = (expiry - arrow.utcnow()).total_seconds()
         else:
@@ -283,14 +283,14 @@ class InfractionScheduler:
         return not failed
 
     async def pardon_infraction(
-            self,
-            ctx: Context,
-            infr_type: str,
-            user: MemberOrUser,
-            pardon_reason: t.Optional[str] = None,
-            *,
-            send_msg: bool = True,
-            notify: bool = True
+        self,
+        ctx: Context,
+        infr_type: str,
+        user: MemberOrUser,
+        pardon_reason: t.Optional[str] = None,
+        *,
+        send_msg: bool = True,
+        notify: bool = True
     ) -> None:
         """
         Prematurely end an infraction for a user and log the action in the mod log.
diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index c2ef80461..662bd4cd4 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -19,7 +19,7 @@ log = get_logger(__name__)
 INFRACTION_ICONS = {
     "ban": (Icons.user_ban, Icons.user_unban),
     "kick": (Icons.sign_out, None),
-    "mute": (Icons.user_mute, Icons.user_unmute),
+    "timeout": (Icons.user_timeout, Icons.user_untimeout),
     "note": (Icons.user_warn, None),
     "superstar": (Icons.superstarify, Icons.unsuperstarify),
     "warning": (Icons.user_warn, None),
diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 60b4428b7..96e4eb642 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -1,8 +1,10 @@
 import textwrap
 import typing as t
+from datetime import timedelta
 
 import arrow
 import discord
+from dateutil.relativedelta import relativedelta
 from discord import Member
 from discord.ext import commands
 from discord.ext.commands import Context, command
@@ -27,6 +29,9 @@ if t.TYPE_CHECKING:
     from bot.exts.moderation.watchchannels.bigbrother import BigBrother
 
 
+MAXIMUM_TIMEOUT_DAYS = timedelta(days=28)
+
+
 class Infractions(InfractionScheduler, commands.Cog):
     """Apply and pardon infractions on users for moderation purposes."""
 
@@ -34,30 +39,35 @@ class Infractions(InfractionScheduler, commands.Cog):
     category_description = "Server moderation tools."
 
     def __init__(self, bot: Bot):
-        super().__init__(bot, supported_infractions={"ban", "kick", "mute", "note", "warning", "voice_mute"})
+        super().__init__(bot, supported_infractions={"ban", "kick", "timeout", "note", "warning", "voice_mute"})
 
         self.category = "Moderation"
-        self._muted_role = discord.Object(constants.Roles.muted)
+        self._muted_role = discord.Object(constants.Roles.muted)  # TODO remove when no longer relevant.
         self._voice_verified_role = discord.Object(constants.Roles.voice_verified)
 
     @commands.Cog.listener()
     async def on_member_join(self, member: Member) -> None:
-        """Reapply active mute infractions for returning members."""
-        active_mutes = await self.bot.api_client.get(
+        """
+        Apply active timeout infractions for returning members.
+
+        This is only needed for users who received the old role-mute, and are returning before it's ended.
+        TODO remove when no longer relevant.
+        """
+        active_timeouts = await self.bot.api_client.get(
             "bot/infractions",
             params={
                 "active": "true",
-                "type": "mute",
+                "type": "timeout",
                 "user__id": member.id
             }
         )
 
-        if active_mutes:
-            reason = f"Re-applying active mute: {active_mutes[0]['id']}"
+        if active_timeouts and not member.is_timed_out():
+            reason = f"Applying active timeout for returning member: {active_timeouts[0]['id']}"
 
             async def action() -> None:
-                await member.add_roles(self._muted_role, reason=reason)
-            await self.reapply_infraction(active_mutes[0], action)
+                await member.edit(timed_out_until=arrow.get(active_timeouts[0]["expires_at"]).datetime, reason=reason)
+            await self.reapply_infraction(active_timeouts[0], action)
 
     # region: Permanent infractions
 
@@ -190,9 +200,9 @@ class Infractions(InfractionScheduler, commands.Cog):
     # endregion
     # region: Temporary infractions
 
-    @command(aliases=["mute"])
+    @command(aliases=["mute", "tempmute"])
     @ensure_future_timestamp(timestamp_arg=3)
-    async def tempmute(
+    async def timeout(
         self, ctx: Context,
         user: UnambiguousMemberOrUser,
         duration: t.Optional[DurationOrExpiry] = None,
@@ -200,7 +210,7 @@ class Infractions(InfractionScheduler, commands.Cog):
         reason: t.Optional[str] = None
     ) -> None:
         """
-        Temporarily mute a user for the given reason and duration.
+        Timeout a user for the given reason and duration.
 
         A unit of time should be appended to the duration.
         Units (∗case-sensitive):
@@ -214,7 +224,7 @@ class Infractions(InfractionScheduler, commands.Cog):
 
         Alternatively, an ISO 8601 timestamp can be provided for the duration.
 
-        If no duration is given, a one hour duration is used by default.
+        If no duration is given, a one-hour duration is used by default.
         """
         if not isinstance(user, Member):
             await ctx.send(":x: The user doesn't appear to be on the server.")
@@ -222,7 +232,18 @@ class Infractions(InfractionScheduler, commands.Cog):
 
         if duration is None:
             duration = await Duration().convert(ctx, "1h")
-        await self.apply_mute(ctx, user, reason, duration_or_expiry=duration)
+        else:
+            now = arrow.utcnow()
+            if isinstance(duration, relativedelta):
+                duration += now
+            if duration > now + MAXIMUM_TIMEOUT_DAYS:
+                await ctx.send(f":x: A timeout cannot be longer than {MAXIMUM_TIMEOUT_DAYS.days} days.")
+                return
+            elif duration > now + MAXIMUM_TIMEOUT_DAYS - timedelta(minutes=1):
+                # Duration cap is exclusive. This is to still allow specifying "28d".
+                duration -= timedelta(minutes=1)
+
+        await self.apply_timeout(ctx, user, reason, duration_or_expiry=duration)
 
     @command(aliases=("tban",))
     @ensure_future_timestamp(timestamp_arg=3)
@@ -337,16 +358,16 @@ class Infractions(InfractionScheduler, commands.Cog):
     # endregion
     # region: Remove infractions (un- commands)
 
-    @command()
-    async def unmute(
+    @command(aliases=("unmute",))
+    async def untimeout(
         self,
         ctx: Context,
         user: UnambiguousMemberOrUser,
         *,
         pardon_reason: t.Optional[str] = None
     ) -> None:
-        """Prematurely end the active mute infraction for the user."""
-        await self.pardon_infraction(ctx, "mute", user, pardon_reason)
+        """Prematurely end the active timeout infraction for the user."""
+        await self.pardon_infraction(ctx, "timeout", user, pardon_reason)
 
     @command()
     async def unban(self, ctx: Context, user: UnambiguousMemberOrUser, *, pardon_reason: str) -> None:
@@ -376,23 +397,23 @@ class Infractions(InfractionScheduler, commands.Cog):
     # endregion
     # region: Base apply functions
 
-    async def apply_mute(self, ctx: Context, user: Member, reason: t.Optional[str], **kwargs) -> None:
-        """Apply a mute infraction with kwargs passed to `post_infraction`."""
-        if active := await _utils.get_active_infraction(ctx, user, "mute", send_msg=False):
+    async def apply_timeout(self, ctx: Context, user: Member, reason: t.Optional[str], **kwargs) -> None:
+        """Apply a timeout infraction with kwargs passed to `post_infraction`."""
+        if active := await _utils.get_active_infraction(ctx, user, "timeout", send_msg=False):
             if active["actor"] != self.bot.user.id:
                 await _utils.send_active_infraction_message(ctx, active)
                 return
 
-            # Allow the current mute attempt to override an automatically triggered mute.
+            # Allow the current timeout attempt to override an automatically triggered timeout.
             log_text = await self.deactivate_infraction(active, notify=False)
             if "Failure" in log_text:
                 await ctx.send(
-                    f":x: can't override infraction **mute** for {user.mention}: "
+                    f":x: can't override infraction **timeout** for {user.mention}: "
                     f"failed to deactivate. {log_text['Failure']}"
                 )
                 return
 
-        infraction = await _utils.post_infraction(ctx, user, "mute", reason, active=True, **kwargs)
+        infraction = await _utils.post_infraction(ctx, user, "timeout", reason, active=True, **kwargs)
         if infraction is None:
             return
 
@@ -402,10 +423,13 @@ class Infractions(InfractionScheduler, commands.Cog):
             # Skip members that left the server
             if not isinstance(user, Member):
                 return
+            duration_or_expiry = kwargs["duration_or_expiry"]
+            if isinstance(duration_or_expiry, relativedelta):
+                duration_or_expiry += arrow.utcnow()
 
-            await user.add_roles(self._muted_role, reason=reason)
+            await user.edit(timed_out_until=duration_or_expiry, reason=reason)
 
-            log.trace(f"Attempting to kick {user} from voice because they've been muted.")
+            log.trace(f"Attempting to kick {user} from voice because they've been timed out.")
             await user.move_to(None, reason=reason)
 
         await self.apply_infraction(ctx, infraction, user, action)
@@ -522,7 +546,7 @@ class Infractions(InfractionScheduler, commands.Cog):
     # endregion
     # region: Base pardon functions
 
-    async def pardon_mute(
+    async def pardon_timeout(
         self,
         user_id: int,
         guild: discord.Guild,
@@ -530,28 +554,33 @@ class Infractions(InfractionScheduler, commands.Cog):
         *,
         notify: bool = True
     ) -> t.Dict[str, str]:
-        """Remove a user's muted role, optionally DM them a notification, and return a log dict."""
+        """Remove a user's timeout, optionally DM them a notification, and return a log dict."""
         user = await get_or_fetch_member(guild, user_id)
         log_text = {}
 
         if user:
-            # Remove the muted role.
+            # Remove the timeout.
             self.mod_log.ignore(Event.member_update, user.id)
-            await user.remove_roles(self._muted_role, reason=reason)
+            if user.get_role(self._muted_role.id):
+                # Compatibility with existing role mutes. TODO remove when no longer relevant.
+                await user.remove_roles(self._muted_role, reason=reason)
+            if user.is_timed_out():  # Handle pardons via the command and any other obscure weirdness.
+                log.trace(f"Manually pardoning timeout for user {user.id}")
+                await user.edit(timed_out_until=None, reason=reason)
 
             if notify:
                 # DM the user about the expiration.
                 notified = await _utils.notify_pardon(
                     user=user,
-                    title="You have been unmuted",
+                    title="Your timeout has ended",
                     content="You may now send messages in the server.",
-                    icon_url=_utils.INFRACTION_ICONS["mute"][1]
+                    icon_url=_utils.INFRACTION_ICONS["timeout"][1]
                 )
                 log_text["DM"] = "Sent" if notified else "**Failed**"
 
             log_text["Member"] = format_user(user)
         else:
-            log.info(f"Failed to unmute user {user_id}: user not found")
+            log.info(f"Failed to remove timeout from user {user_id}: user not found")
             log_text["Failure"] = "User was not found in the guild."
 
         return log_text
@@ -610,8 +639,8 @@ class Infractions(InfractionScheduler, commands.Cog):
         user_id = infraction["user"]
         reason = f"Infraction #{infraction['id']} expired or was pardoned."
 
-        if infraction["type"] == "mute":
-            return await self.pardon_mute(user_id, guild, reason, notify=notify)
+        if infraction["type"] == "timeout":
+            return await self.pardon_timeout(user_id, guild, reason, notify=notify)
         elif infraction["type"] == "ban":
             return await self.pardon_ban(user_id, guild, reason)
         elif infraction["type"] == "voice_mute":
diff --git a/config-default.yml b/config-default.yml
index de0f7e4e8..9088fae34 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -122,9 +122,9 @@ style:
         token_removed: "https://cdn.discordapp.com/emojis/470326273298792469.png"
 
         user_ban:    "https://cdn.discordapp.com/emojis/469952898026045441.png"
-        user_mute:     "https://cdn.discordapp.com/emojis/472472640100106250.png"
+        user_timeout:     "https://cdn.discordapp.com/emojis/472472640100106250.png"
         user_unban:  "https://cdn.discordapp.com/emojis/469952898692808704.png"
-        user_unmute:   "https://cdn.discordapp.com/emojis/472472639206719508.png"
+        user_untimeout:   "https://cdn.discordapp.com/emojis/472472639206719508.png"
         user_update: "https://cdn.discordapp.com/emojis/469952898684551168.png"
         user_verified: "https://cdn.discordapp.com/emojis/470326274519334936.png"
         user_warn: "https://cdn.discordapp.com/emojis/470326274238447633.png"
@@ -275,7 +275,7 @@ guild:
 
         contributors:                           295488872404484098
         help_cooldown:                          699189276025421825
-        muted:              &MUTED_ROLE         277914926603829249
+        muted:              &MUTED_ROLE         277914926603829249  # TODO remove when no longer relevant.
         partners:           &PY_PARTNER_ROLE    323426753857191936
         python_community:   &PY_COMMUNITY_ROLE  458226413825294336
         sprinters:          &SPRINTERS          758422482289426471
-- 
cgit v1.2.3


From 8cdcffb1848c5946c7c7e6869513f58299384d8f Mon Sep 17 00:00:00 2001
From: Boris Muratov <8bee278@gmail.com>
Date: Mon, 6 Mar 2023 00:54:04 +0200
Subject: Group thread stats under parent channel (#2440)

Also makes make the stat name slightly more robust to small name changes.
---
 bot/exts/info/stats.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bot/exts/info/stats.py b/bot/exts/info/stats.py
index d4001a7bb..64bff9632 100644
--- a/bot/exts/info/stats.py
+++ b/bot/exts/info/stats.py
@@ -41,12 +41,11 @@ class Stats(Cog):
                 # of them for interesting statistics to be drawn out of this.
                 return
 
-        reformatted_name = message.channel.name.replace('-', '_')
-
-        if CHANNEL_NAME_OVERRIDES.get(message.channel.id):
-            reformatted_name = CHANNEL_NAME_OVERRIDES.get(message.channel.id)
-
-        reformatted_name = "".join(char for char in reformatted_name if char in ALLOWED_CHARS)
+        channel = message.channel
+        if hasattr(channel, 'parent'):
+            channel = channel.parent
+        reformatted_name = CHANNEL_NAME_OVERRIDES.get(channel.id, channel.name)
+        reformatted_name = "".join(char if char in ALLOWED_CHARS else '_' for char in reformatted_name)
 
         stat_name = f"channels.{reformatted_name}"
         self.bot.stats.incr(stat_name)
-- 
cgit v1.2.3


From 2f813a726fc5e79a043f3d0b94ffb0ce2a1e4497 Mon Sep 17 00:00:00 2001
From: Boris Muratov <8bee278@gmail.com>
Date: Mon, 6 Mar 2023 01:10:53 +0200
Subject: Make sure channel parent isn't None (#2441)

This shouldn't happen, but the type hint says it can so but just in case.
---
 bot/exts/info/stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/info/stats.py b/bot/exts/info/stats.py
index 64bff9632..65a4b5b6c 100644
--- a/bot/exts/info/stats.py
+++ b/bot/exts/info/stats.py
@@ -42,7 +42,7 @@ class Stats(Cog):
                 return
 
         channel = message.channel
-        if hasattr(channel, 'parent'):
+        if hasattr(channel, 'parent') and channel.parent:
             channel = channel.parent
         reformatted_name = CHANNEL_NAME_OVERRIDES.get(channel.id, channel.name)
         reformatted_name = "".join(char if char in ALLOWED_CHARS else '_' for char in reformatted_name)
-- 
cgit v1.2.3


From bc2b4c6d74c4e6f2f1b84ed41b4501a2d6d035cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Mar 2023 13:18:05 +0000
Subject: Bump actions/upload-artifact from 2 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 051ca2265..b3e58316a 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -83,7 +83,7 @@ jobs:
       - name: Upload a Build Artifact
         if: always() && steps.prepare-artifact.outcome == 'success'
         continue-on-error: true
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pull-request-payload
           path: pull_request_payload.json
-- 
cgit v1.2.3


From e77053068c19a0aae4a3c05cea8c1e46fc6a5532 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 14:45:07 +0000
Subject: Bump SebastiaanZ/github-status-embed-for-discord from 0.2.1 to 0.3.0
 (#2448)

Bumps [SebastiaanZ/github-status-embed-for-discord](https://github.com/SebastiaanZ/github-status-embed-for-discord) from 0.2.1 to 0.3.0.
- [Release notes](https://github.com/SebastiaanZ/github-status-embed-for-discord/releases)
- [Commits](https://github.com/SebastiaanZ/github-status-embed-for-discord/compare/v0.2.1...v0.3.0)

---
updated-dependencies:
- dependency-name: SebastiaanZ/github-status-embed-for-discord
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/status_embed.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/status_embed.yaml b/.github/workflows/status_embed.yaml
index 1923965ab..60bdaf770 100644
--- a/.github/workflows/status_embed.yaml
+++ b/.github/workflows/status_embed.yaml
@@ -58,7 +58,7 @@ jobs:
       # more information and we can fine tune when we actually want
       # to send an embed.
       - name: GitHub Actions Status Embed for Discord
-        uses: SebastiaanZ/github-status-embed-for-discord@v0.2.1
+        uses: SebastiaanZ/github-status-embed-for-discord@v0.3.0
         with:
           # Our GitHub Actions webhook
           webhook_id: '784184528997842985'
-- 
cgit v1.2.3


From 8cfd1b26069f1e827aa09386e7bfff3bad9dae89 Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Tue, 7 Mar 2023 23:00:28 +0200
Subject: Reduce long timeout to 28d instead of denying it

---
 bot/exts/moderation/infraction/infractions.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 96e4eb642..1eb67bee4 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -11,13 +11,14 @@ from discord.ext.commands import Context, command
 
 from bot import constants
 from bot.bot import Bot
-from bot.constants import Event
+from bot.constants import Channels, Event
 from bot.converters import Age, Duration, DurationOrExpiry, MemberOrUser, UnambiguousMemberOrUser
 from bot.decorators import ensure_future_timestamp, respect_role_hierarchy
 from bot.exts.filters.filtering import AUTO_BAN_DURATION, AUTO_BAN_REASON
 from bot.exts.moderation.infraction import _utils
 from bot.exts.moderation.infraction._scheduler import InfractionScheduler
 from bot.log import get_logger
+from bot.utils.channel import is_mod_channel
 from bot.utils.members import get_or_fetch_member
 from bot.utils.messages import format_user
 
@@ -30,6 +31,10 @@ if t.TYPE_CHECKING:
 
 
 MAXIMUM_TIMEOUT_DAYS = timedelta(days=28)
+TIMEOUT_CAP_MESSAGE = (
+    f"Timeouts can't be longer than {MAXIMUM_TIMEOUT_DAYS.days} days."
+    " I'll pretend that's what you meant."
+)
 
 
 class Infractions(InfractionScheduler, commands.Cog):
@@ -237,8 +242,13 @@ class Infractions(InfractionScheduler, commands.Cog):
             if isinstance(duration, relativedelta):
                 duration += now
             if duration > now + MAXIMUM_TIMEOUT_DAYS:
-                await ctx.send(f":x: A timeout cannot be longer than {MAXIMUM_TIMEOUT_DAYS.days} days.")
-                return
+                if is_mod_channel(ctx.channel):
+                    await ctx.reply(f":warning: {TIMEOUT_CAP_MESSAGE}")
+                else:
+                    await self.bot.get_channel(Channels.mods).send(
+                        f":warning: {ctx.author.mention} {TIMEOUT_CAP_MESSAGE}"
+                    )
+                duration = now + MAXIMUM_TIMEOUT_DAYS - timedelta(minutes=1)  # Duration cap is exclusive.
             elif duration > now + MAXIMUM_TIMEOUT_DAYS - timedelta(minutes=1):
                 # Duration cap is exclusive. This is to still allow specifying "28d".
                 duration -= timedelta(minutes=1)
-- 
cgit v1.2.3


From bf8f8f4c1f9522a942c88ca69a2d48427d2bbc28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 21:00:53 +0000
Subject: Bump markdownify from 0.6.1 to 0.11.6 (#2429)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: wookie184 <wookie1840@gmail.com>
---
 bot/exts/info/doc/_markdown.py          | 12 ++++++++++--
 poetry.lock                             | 12 ++++++------
 pyproject.toml                          |  6 +-----
 tests/bot/exts/info/doc/test_parsing.py | 23 +++++++++++++++++++++++
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/bot/exts/info/doc/_markdown.py b/bot/exts/info/doc/_markdown.py
index 1b7d8232b..315adda66 100644
--- a/bot/exts/info/doc/_markdown.py
+++ b/bot/exts/info/doc/_markdown.py
@@ -1,10 +1,14 @@
+import re
 from urllib.parse import urljoin
 
+import markdownify
 from bs4.element import PageElement
-from markdownify import MarkdownConverter
 
+# See https://github.com/matthewwithanm/python-markdownify/issues/31
+markdownify.whitespace_re = re.compile(r"[\r\n\s\t ]+")
 
-class DocMarkdownConverter(MarkdownConverter):
+
+class DocMarkdownConverter(markdownify.MarkdownConverter):
     """Subclass markdownify's MarkdownCoverter to provide custom conversion methods."""
 
     def __init__(self, *, page_url: str, **options):
@@ -56,3 +60,7 @@ class DocMarkdownConverter(MarkdownConverter):
         if parent is not None and parent.name == "li":
             return f"{text}\n"
         return super().convert_p(el, text, convert_as_inline)
+
+    def convert_hr(self, el: PageElement, text: str, convert_as_inline: bool) -> str:
+        """Ignore `hr` tag."""
+        return ""
diff --git a/poetry.lock b/poetry.lock
index 8a718ab82..de777c828 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1041,19 +1041,19 @@ source = ["Cython (>=0.29.7)"]
 
 [[package]]
 name = "markdownify"
-version = "0.6.1"
+version = "0.11.6"
 description = "Convert HTML to markdown."
 category = "main"
 optional = false
 python-versions = "*"
 files = [
-    {file = "markdownify-0.6.1-py3-none-any.whl", hash = "sha256:7489fd5c601536996a376c4afbcd1dd034db7690af807120681461e82fbc0acc"},
-    {file = "markdownify-0.6.1.tar.gz", hash = "sha256:31d7c13ac2ada8bfc7535a25fee6622ca720e1b5f2d4a9cbc429d167c21f886d"},
+    {file = "markdownify-0.11.6-py3-none-any.whl", hash = "sha256:ba35fe289d5e9073bcd7d2cad629278fe25f1a93741fcdc0bfb4f009076d8324"},
+    {file = "markdownify-0.11.6.tar.gz", hash = "sha256:009b240e0c9f4c8eaf1d085625dcd4011e12f0f8cec55dedf9ea6f7655e49bfe"},
 ]
 
 [package.dependencies]
-beautifulsoup4 = "*"
-six = "*"
+beautifulsoup4 = ">=4.9,<5"
+six = ">=1.15,<2"
 
 [[package]]
 name = "mccabe"
@@ -2317,4 +2317,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "68bfdf2115a5242df097155a2660a1c0276cf25b4785bdb761580bd35b77383c"
+content-hash = "4b3549e9e47535d1fea6015a0f7ebf056a42e4d27e766583ccd8b59ebe8297d6"
diff --git a/pyproject.toml b/pyproject.toml
index 71981e8d0..11e99ecbe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,11 +22,7 @@ deepdiff = "6.2.1"
 emoji = "2.2.0"
 feedparser = "6.0.10"
 lxml = "4.9.1"
-
-# Must be kept on this version unless doc command output is fixed
-# See https://github.com/python-discord/bot/pull/2156
-markdownify = "0.6.1"
-
+markdownify = "0.11.6"
 more-itertools = "9.0.0"
 python-dateutil = "2.8.2"
 python-frontmatter = "1.0.0"
diff --git a/tests/bot/exts/info/doc/test_parsing.py b/tests/bot/exts/info/doc/test_parsing.py
index 1663d8491..d2105a53c 100644
--- a/tests/bot/exts/info/doc/test_parsing.py
+++ b/tests/bot/exts/info/doc/test_parsing.py
@@ -1,6 +1,7 @@
 from unittest import TestCase
 
 from bot.exts.info.doc import _parsing as parsing
+from bot.exts.info.doc._markdown import DocMarkdownConverter
 
 
 class SignatureSplitter(TestCase):
@@ -64,3 +65,25 @@ class SignatureSplitter(TestCase):
         for input_string, expected_output in test_cases:
             with self.subTest(input_string=input_string):
                 self.assertEqual(list(parsing._split_parameters(input_string)), expected_output)
+
+
+class MarkdownConverterTest(TestCase):
+    def test_hr_removed(self):
+        test_cases = (
+            ('<hr class="docutils"/>', ""),
+            ("<hr>", ""),
+        )
+        self._run_tests(test_cases)
+
+    def test_whitespace_removed(self):
+        test_cases = (
+            ("lines\nof\ntext", "lines of text"),
+            ("lines\n\nof\n\ntext", "lines of text"),
+        )
+        self._run_tests(test_cases)
+
+    def _run_tests(self, test_cases: tuple[tuple[str, str], ...]):
+        for input_string, expected_output in test_cases:
+            with self.subTest(input_string=input_string):
+                d = DocMarkdownConverter(page_url="https://example.com")
+                self.assertEqual(d.convert(input_string), expected_output)
-- 
cgit v1.2.3


From e9850d3e27ae398949c73f861ceb4400305d7211 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Tue, 7 Mar 2023 20:58:10 +0000
Subject: Update all dependencies to latest

---
 poetry.lock    | 1519 ++++++++++++++++++++++++++++++--------------------------
 pyproject.toml |   39 +-
 2 files changed, 846 insertions(+), 712 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index de777c828..3bc0ea024 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -17,106 +17,106 @@ pycares = ">=4.0.0"
 
 [[package]]
 name = "aiohttp"
-version = "3.8.3"
+version = "3.8.4"
 description = "Async http client/server framework (asyncio)"
 category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ba71c9b4dcbb16212f334126cc3d8beb6af377f6703d9dc2d9fb3874fd667ee9"},
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d24b8bb40d5c61ef2d9b6a8f4528c2f17f1c5d2d31fed62ec860f6006142e83e"},
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f88df3a83cf9df566f171adba39d5bd52814ac0b94778d2448652fc77f9eb491"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b97decbb3372d4b69e4d4c8117f44632551c692bb1361b356a02b97b69e18a62"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:309aa21c1d54b8ef0723181d430347d7452daaff93e8e2363db8e75c72c2fb2d"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ad5383a67514e8e76906a06741febd9126fc7c7ff0f599d6fcce3e82b80d026f"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20acae4f268317bb975671e375493dbdbc67cddb5f6c71eebdb85b34444ac46b"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:05a3c31c6d7cd08c149e50dc7aa2568317f5844acd745621983380597f027a18"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d6f76310355e9fae637c3162936e9504b4767d5c52ca268331e2756e54fd4ca5"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:256deb4b29fe5e47893fa32e1de2d73c3afe7407738bd3c63829874661d4822d"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:5c59fcd80b9049b49acd29bd3598cada4afc8d8d69bd4160cd613246912535d7"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:059a91e88f2c00fe40aed9031b3606c3f311414f86a90d696dd982e7aec48142"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2feebbb6074cdbd1ac276dbd737b40e890a1361b3cc30b74ac2f5e24aab41f7b"},
-    {file = "aiohttp-3.8.3-cp310-cp310-win32.whl", hash = "sha256:5bf651afd22d5f0c4be16cf39d0482ea494f5c88f03e75e5fef3a85177fecdeb"},
-    {file = "aiohttp-3.8.3-cp310-cp310-win_amd64.whl", hash = "sha256:653acc3880459f82a65e27bd6526e47ddf19e643457d36a2250b85b41a564715"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:86fc24e58ecb32aee09f864cb11bb91bc4c1086615001647dbfc4dc8c32f4008"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75e14eac916f024305db517e00a9252714fce0abcb10ad327fb6dcdc0d060f1d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d1fde0f44029e02d02d3993ad55ce93ead9bb9b15c6b7ccd580f90bd7e3de476"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ab94426ddb1ecc6a0b601d832d5d9d421820989b8caa929114811369673235c"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89d2e02167fa95172c017732ed7725bc8523c598757f08d13c5acca308e1a061"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:02f9a2c72fc95d59b881cf38a4b2be9381b9527f9d328771e90f72ac76f31ad8"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c7149272fb5834fc186328e2c1fa01dda3e1fa940ce18fded6d412e8f2cf76d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:512bd5ab136b8dc0ffe3fdf2dfb0c4b4f49c8577f6cae55dca862cd37a4564e2"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7018ecc5fe97027214556afbc7c502fbd718d0740e87eb1217b17efd05b3d276"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:88c70ed9da9963d5496d38320160e8eb7e5f1886f9290475a881db12f351ab5d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:da22885266bbfb3f78218dc40205fed2671909fbd0720aedba39b4515c038091"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:e65bc19919c910127c06759a63747ebe14f386cda573d95bcc62b427ca1afc73"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:08c78317e950e0762c2983f4dd58dc5e6c9ff75c8a0efeae299d363d439c8e34"},
-    {file = "aiohttp-3.8.3-cp311-cp311-win32.whl", hash = "sha256:45d88b016c849d74ebc6f2b6e8bc17cabf26e7e40c0661ddd8fae4c00f015697"},
-    {file = "aiohttp-3.8.3-cp311-cp311-win_amd64.whl", hash = "sha256:96372fc29471646b9b106ee918c8eeb4cca423fcbf9a34daa1b93767a88a2290"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c971bf3786b5fad82ce5ad570dc6ee420f5b12527157929e830f51c55dc8af77"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff25f48fc8e623d95eca0670b8cc1469a83783c924a602e0fbd47363bb54aaca"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e381581b37db1db7597b62a2e6b8b57c3deec95d93b6d6407c5b61ddc98aca6d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db19d60d846283ee275d0416e2a23493f4e6b6028825b51290ac05afc87a6f97"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25892c92bee6d9449ffac82c2fe257f3a6f297792cdb18ad784737d61e7a9a85"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:398701865e7a9565d49189f6c90868efaca21be65c725fc87fc305906be915da"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4a4fbc769ea9b6bd97f4ad0b430a6807f92f0e5eb020f1e42ece59f3ecfc4585"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:b29bfd650ed8e148f9c515474a6ef0ba1090b7a8faeee26b74a8ff3b33617502"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:1e56b9cafcd6531bab5d9b2e890bb4937f4165109fe98e2b98ef0dcfcb06ee9d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ec40170327d4a404b0d91855d41bfe1fe4b699222b2b93e3d833a27330a87a6d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2df5f139233060578d8c2c975128fb231a89ca0a462b35d4b5fcf7c501ebdbe1"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-win32.whl", hash = "sha256:f973157ffeab5459eefe7b97a804987876dd0a55570b8fa56b4e1954bf11329b"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-win_amd64.whl", hash = "sha256:437399385f2abcd634865705bdc180c8314124b98299d54fe1d4c8990f2f9494"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:09e28f572b21642128ef31f4e8372adb6888846f32fecb288c8b0457597ba61a"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f3553510abdbec67c043ca85727396ceed1272eef029b050677046d3387be8d"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e168a7560b7c61342ae0412997b069753f27ac4862ec7867eff74f0fe4ea2ad9"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db4c979b0b3e0fa7e9e69ecd11b2b3174c6963cebadeecfb7ad24532ffcdd11a"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e164e0a98e92d06da343d17d4e9c4da4654f4a4588a20d6c73548a29f176abe2"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8a78079d9a39ca9ca99a8b0ac2fdc0c4d25fc80c8a8a82e5c8211509c523363"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:21b30885a63c3f4ff5b77a5d6caf008b037cb521a5f33eab445dc566f6d092cc"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4b0f30372cef3fdc262f33d06e7b411cd59058ce9174ef159ad938c4a34a89da"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:8135fa153a20d82ffb64f70a1b5c2738684afa197839b34cc3e3c72fa88d302c"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ad61a9639792fd790523ba072c0555cd6be5a0baf03a49a5dd8cfcf20d56df48"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:978b046ca728073070e9abc074b6299ebf3501e8dee5e26efacb13cec2b2dea0"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-win32.whl", hash = "sha256:0d2c6d8c6872df4a6ec37d2ede71eff62395b9e337b4e18efd2177de883a5033"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-win_amd64.whl", hash = "sha256:21d69797eb951f155026651f7e9362877334508d39c2fc37bd04ff55b2007091"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ca9af5f8f5812d475c5259393f52d712f6d5f0d7fdad9acdb1107dd9e3cb7eb"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d90043c1882067f1bd26196d5d2db9aa6d268def3293ed5fb317e13c9413ea4"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d737fc67b9a970f3234754974531dc9afeea11c70791dcb7db53b0cf81b79784"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebf909ea0a3fc9596e40d55d8000702a85e27fd578ff41a5500f68f20fd32e6c"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5835f258ca9f7c455493a57ee707b76d2d9634d84d5d7f62e77be984ea80b849"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da37dcfbf4b7f45d80ee386a5f81122501ec75672f475da34784196690762f4b"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87f44875f2804bc0511a69ce44a9595d5944837a62caecc8490bbdb0e18b1342"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:527b3b87b24844ea7865284aabfab08eb0faf599b385b03c2aa91fc6edd6e4b6"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d5ba88df9aa5e2f806650fcbeedbe4f6e8736e92fc0e73b0400538fd25a4dd96"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e7b8813be97cab8cb52b1375f41f8e6804f6507fe4660152e8ca5c48f0436017"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2dea10edfa1a54098703cb7acaa665c07b4e7568472a47f4e64e6319d3821ccf"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:713d22cd9643ba9025d33c4af43943c7a1eb8547729228de18d3e02e278472b6"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d252771fc85e0cf8da0b823157962d70639e63cb9b578b1dec9868dd1f4f937"},
-    {file = "aiohttp-3.8.3-cp38-cp38-win32.whl", hash = "sha256:66bd5f950344fb2b3dbdd421aaa4e84f4411a1a13fca3aeb2bcbe667f80c9f76"},
-    {file = "aiohttp-3.8.3-cp38-cp38-win_amd64.whl", hash = "sha256:84b14f36e85295fe69c6b9789b51a0903b774046d5f7df538176516c3e422446"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16c121ba0b1ec2b44b73e3a8a171c4f999b33929cd2397124a8c7fcfc8cd9e06"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8d6aaa4e7155afaf994d7924eb290abbe81a6905b303d8cb61310a2aba1c68ba"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43046a319664a04b146f81b40e1545d4c8ac7b7dd04c47e40bf09f65f2437346"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:599418aaaf88a6d02a8c515e656f6faf3d10618d3dd95866eb4436520096c84b"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92a2964319d359f494f16011e23434f6f8ef0434acd3cf154a6b7bec511e2fb7"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:73a4131962e6d91109bca6536416aa067cf6c4efb871975df734f8d2fd821b37"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:598adde339d2cf7d67beaccda3f2ce7c57b3b412702f29c946708f69cf8222aa"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75880ed07be39beff1881d81e4a907cafb802f306efd6d2d15f2b3c69935f6fb"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0239da9fbafd9ff82fd67c16704a7d1bccf0d107a300e790587ad05547681c8"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4e3a23ec214e95c9fe85a58470b660efe6534b83e6cbe38b3ed52b053d7cb6ad"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:47841407cc89a4b80b0c52276f3cc8138bbbfba4b179ee3acbd7d77ae33f7ac4"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:54d107c89a3ebcd13228278d68f1436d3f33f2dd2af5415e3feaeb1156e1a62c"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c37c5cce780349d4d51739ae682dec63573847a2a8dcb44381b174c3d9c8d403"},
-    {file = "aiohttp-3.8.3-cp39-cp39-win32.whl", hash = "sha256:f178d2aadf0166be4df834c4953da2d7eef24719e8aec9a65289483eeea9d618"},
-    {file = "aiohttp-3.8.3-cp39-cp39-win_amd64.whl", hash = "sha256:88e5be56c231981428f4f506c68b6a46fa25c4123a2e86d156c58a8369d31ab7"},
-    {file = "aiohttp-3.8.3.tar.gz", hash = "sha256:3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5ce45967538fb747370308d3145aa68a074bdecb4f3a300869590f725ced69c1"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b744c33b6f14ca26b7544e8d8aadff6b765a80ad6164fb1a430bbadd593dfb1a"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a45865451439eb320784918617ba54b7a377e3501fb70402ab84d38c2cd891b"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a86d42d7cba1cec432d47ab13b6637bee393a10f664c425ea7b305d1301ca1a3"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee3c36df21b5714d49fc4580247947aa64bcbe2939d1b77b4c8dcb8f6c9faecc"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:176a64b24c0935869d5bbc4c96e82f89f643bcdf08ec947701b9dbb3c956b7dd"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c844fd628851c0bc309f3c801b3a3d58ce430b2ce5b359cd918a5a76d0b20cb5"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5393fb786a9e23e4799fec788e7e735de18052f83682ce2dfcabaf1c00c2c08e"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e4b09863aae0dc965c3ef36500d891a3ff495a2ea9ae9171e4519963c12ceefd"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:adfbc22e87365a6e564c804c58fc44ff7727deea782d175c33602737b7feadb6"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:147ae376f14b55f4f3c2b118b95be50a369b89b38a971e80a17c3fd623f280c9"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:eafb3e874816ebe2a92f5e155f17260034c8c341dad1df25672fb710627c6949"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c6cc15d58053c76eacac5fa9152d7d84b8d67b3fde92709195cb984cfb3475ea"},
+    {file = "aiohttp-3.8.4-cp310-cp310-win32.whl", hash = "sha256:59f029a5f6e2d679296db7bee982bb3d20c088e52a2977e3175faf31d6fb75d1"},
+    {file = "aiohttp-3.8.4-cp310-cp310-win_amd64.whl", hash = "sha256:fe7ba4a51f33ab275515f66b0a236bcde4fb5561498fe8f898d4e549b2e4509f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3d8ef1a630519a26d6760bc695842579cb09e373c5f227a21b67dc3eb16cfea4"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5b3f2e06a512e94722886c0827bee9807c86a9f698fac6b3aee841fab49bbfb4"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3a80464982d41b1fbfe3154e440ba4904b71c1a53e9cd584098cd41efdb188ef"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b631e26df63e52f7cce0cce6507b7a7f1bc9b0c501fcde69742130b32e8782f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f43255086fe25e36fd5ed8f2ee47477408a73ef00e804cb2b5cba4bf2ac7f5e"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4d347a172f866cd1d93126d9b239fcbe682acb39b48ee0873c73c933dd23bd0f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3fec6a4cb5551721cdd70473eb009d90935b4063acc5f40905d40ecfea23e05"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80a37fe8f7c1e6ce8f2d9c411676e4bc633a8462844e38f46156d07a7d401654"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d1e6a862b76f34395a985b3cd39a0d949ca80a70b6ebdea37d3ab39ceea6698a"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cd468460eefef601ece4428d3cf4562459157c0f6523db89365202c31b6daebb"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:618c901dd3aad4ace71dfa0f5e82e88b46ef57e3239fc7027773cb6d4ed53531"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:652b1bff4f15f6287550b4670546a2947f2a4575b6c6dff7760eafb22eacbf0b"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80575ba9377c5171407a06d0196b2310b679dc752d02a1fcaa2bc20b235dbf24"},
+    {file = "aiohttp-3.8.4-cp311-cp311-win32.whl", hash = "sha256:bbcf1a76cf6f6dacf2c7f4d2ebd411438c275faa1dc0c68e46eb84eebd05dd7d"},
+    {file = "aiohttp-3.8.4-cp311-cp311-win_amd64.whl", hash = "sha256:6e74dd54f7239fcffe07913ff8b964e28b712f09846e20de78676ce2a3dc0bfc"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:880e15bb6dad90549b43f796b391cfffd7af373f4646784795e20d92606b7a51"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb96fa6b56bb536c42d6a4a87dfca570ff8e52de2d63cabebfd6fb67049c34b6"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a6cadebe132e90cefa77e45f2d2f1a4b2ce5c6b1bfc1656c1ddafcfe4ba8131"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f352b62b45dff37b55ddd7b9c0c8672c4dd2eb9c0f9c11d395075a84e2c40f75"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ab43061a0c81198d88f39aaf90dae9a7744620978f7ef3e3708339b8ed2ef01"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9cb1565a7ad52e096a6988e2ee0397f72fe056dadf75d17fa6b5aebaea05622"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:1b3ea7edd2d24538959c1c1abf97c744d879d4e541d38305f9bd7d9b10c9ec41"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:7c7837fe8037e96b6dd5cfcf47263c1620a9d332a87ec06a6ca4564e56bd0f36"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:3b90467ebc3d9fa5b0f9b6489dfb2c304a1db7b9946fa92aa76a831b9d587e99"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:cab9401de3ea52b4b4c6971db5fb5c999bd4260898af972bf23de1c6b5dd9d71"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d1f9282c5f2b5e241034a009779e7b2a1aa045f667ff521e7948ea9b56e0c5ff"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-win32.whl", hash = "sha256:5e14f25765a578a0a634d5f0cd1e2c3f53964553a00347998dfdf96b8137f777"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4c745b109057e7e5f1848c689ee4fb3a016c8d4d92da52b312f8a509f83aa05e"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:aede4df4eeb926c8fa70de46c340a1bc2c6079e1c40ccf7b0eae1313ffd33519"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ddaae3f3d32fc2cb4c53fab020b69a05c8ab1f02e0e59665c6f7a0d3a5be54f"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4eb3b82ca349cf6fadcdc7abcc8b3a50ab74a62e9113ab7a8ebc268aad35bb9"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9bcb89336efa095ea21b30f9e686763f2be4478f1b0a616969551982c4ee4c3b"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c08e8ed6fa3d477e501ec9db169bfac8140e830aa372d77e4a43084d8dd91ab"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c6cd05ea06daca6ad6a4ca3ba7fe7dc5b5de063ff4daec6170ec0f9979f6c332"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7a00a9ed8d6e725b55ef98b1b35c88013245f35f68b1b12c5cd4100dddac333"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:de04b491d0e5007ee1b63a309956eaed959a49f5bb4e84b26c8f5d49de140fa9"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:40653609b3bf50611356e6b6554e3a331f6879fa7116f3959b20e3528783e699"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dbf3a08a06b3f433013c143ebd72c15cac33d2914b8ea4bea7ac2c23578815d6"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:854f422ac44af92bfe172d8e73229c270dc09b96535e8a548f99c84f82dde241"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-win32.whl", hash = "sha256:aeb29c84bb53a84b1a81c6c09d24cf33bb8432cc5c39979021cc0f98c1292a1a"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-win_amd64.whl", hash = "sha256:db3fc6120bce9f446d13b1b834ea5b15341ca9ff3f335e4a951a6ead31105480"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fabb87dd8850ef0f7fe2b366d44b77d7e6fa2ea87861ab3844da99291e81e60f"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91f6d540163f90bbaef9387e65f18f73ffd7c79f5225ac3d3f61df7b0d01ad15"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d265f09a75a79a788237d7f9054f929ced2e69eb0bb79de3798c468d8a90f945"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d89efa095ca7d442a6d0cbc755f9e08190ba40069b235c9886a8763b03785da"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4dac314662f4e2aa5009977b652d9b8db7121b46c38f2073bfeed9f4049732cd"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe11310ae1e4cd560035598c3f29d86cef39a83d244c7466f95c27ae04850f10"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ddb2a2026c3f6a68c3998a6c47ab6795e4127315d2e35a09997da21865757f8"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e75b89ac3bd27d2d043b234aa7b734c38ba1b0e43f07787130a0ecac1e12228a"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6e601588f2b502c93c30cd5a45bfc665faaf37bbe835b7cfd461753068232074"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a5d794d1ae64e7753e405ba58e08fcfa73e3fad93ef9b7e31112ef3c9a0efb52"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:a1f4689c9a1462f3df0a1f7e797791cd6b124ddbee2b570d34e7f38ade0e2c71"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3032dcb1c35bc330134a5b8a5d4f68c1a87252dfc6e1262c65a7e30e62298275"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8189c56eb0ddbb95bfadb8f60ea1b22fcfa659396ea36f6adcc521213cd7b44d"},
+    {file = "aiohttp-3.8.4-cp38-cp38-win32.whl", hash = "sha256:33587f26dcee66efb2fff3c177547bd0449ab7edf1b73a7f5dea1e38609a0c54"},
+    {file = "aiohttp-3.8.4-cp38-cp38-win_amd64.whl", hash = "sha256:e595432ac259af2d4630008bf638873d69346372d38255774c0e286951e8b79f"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5a7bdf9e57126dc345b683c3632e8ba317c31d2a41acd5800c10640387d193ed"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:22f6eab15b6db242499a16de87939a342f5a950ad0abaf1532038e2ce7d31567"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7235604476a76ef249bd64cb8274ed24ccf6995c4a8b51a237005ee7a57e8643"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea9eb976ffdd79d0e893869cfe179a8f60f152d42cb64622fca418cd9b18dc2a"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92c0cea74a2a81c4c76b62ea1cac163ecb20fb3ba3a75c909b9fa71b4ad493cf"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:493f5bc2f8307286b7799c6d899d388bbaa7dfa6c4caf4f97ef7521b9cb13719"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a63f03189a6fa7c900226e3ef5ba4d3bd047e18f445e69adbd65af433add5a2"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10c8cefcff98fd9168cdd86c4da8b84baaa90bf2da2269c6161984e6737bf23e"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bca5f24726e2919de94f047739d0a4fc01372801a3672708260546aa2601bf57"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:03baa76b730e4e15a45f81dfe29a8d910314143414e528737f8589ec60cf7391"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:8c29c77cc57e40f84acef9bfb904373a4e89a4e8b74e71aa8075c021ec9078c2"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:03543dcf98a6619254b409be2d22b51f21ec66272be4ebda7b04e6412e4b2e14"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:17b79c2963db82086229012cff93ea55196ed31f6493bb1ccd2c62f1724324e4"},
+    {file = "aiohttp-3.8.4-cp39-cp39-win32.whl", hash = "sha256:34ce9f93a4a68d1272d26030655dd1b58ff727b3ed2a33d80ec433561b03d67a"},
+    {file = "aiohttp-3.8.4-cp39-cp39-win_amd64.whl", hash = "sha256:41a86a69bb63bb2fc3dc9ad5ea9f10f1c9c8e282b471931be0268ddd09430b04"},
+    {file = "aiohttp-3.8.4.tar.gz", hash = "sha256:bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c"},
 ]
 
 [package.dependencies]
 aiosignal = ">=1.1.2"
 async-timeout = ">=4.0.0a3,<5.0"
 attrs = ">=17.3.0"
-charset-normalizer = ">=2.0,<3.0"
+charset-normalizer = ">=2.0,<4.0"
 frozenlist = ">=1.1.1"
 multidict = ">=4.5,<7.0"
 yarl = ">=1.0,<2.0"
@@ -187,32 +187,33 @@ files = [
 
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "22.2.0"
 description = "Classes Without Boilerplate"
 category = "main"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
 files = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
 ]
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"]
+tests = ["attrs[tests-no-zope]", "zope.interface"]
+tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.11.1"
+version = "4.11.2"
 description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
 files = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+    {file = "beautifulsoup4-4.11.2-py3-none-any.whl", hash = "sha256:0e79446b10b3ecb499c1556f7e228a53e64a2bfcebd455f370d8927cb5b59e39"},
+    {file = "beautifulsoup4-4.11.2.tar.gz", hash = "sha256:bc4bdda6717de5a2987436fb8d72f45dc90dd856bdfd512a1314ce90349a0106"},
 ]
 
 [package.dependencies]
@@ -325,19 +326,89 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "2.1.1"
+version = "3.1.0"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.6.0"
-files = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+python-versions = ">=3.7.0"
+files = [
+    {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"},
+    {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"},
+    {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"},
+    {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"},
+    {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"},
+    {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"},
+    {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"},
 ]
 
-[package.extras]
-unicode-backport = ["unicodedata2"]
-
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -370,62 +441,63 @@ cron = ["capturer (>=2.4)"]
 
 [[package]]
 name = "coverage"
-version = "6.5.0"
+version = "7.2.1"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+    {file = "coverage-7.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:49567ec91fc5e0b15356da07a2feabb421d62f52a9fff4b1ec40e9e19772f5f8"},
+    {file = "coverage-7.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d2ef6cae70168815ed91388948b5f4fcc69681480a0061114db737f957719f03"},
+    {file = "coverage-7.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3004765bca3acd9e015794e5c2f0c9a05587f5e698127ff95e9cfba0d3f29339"},
+    {file = "coverage-7.2.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cca7c0b7f5881dfe0291ef09ba7bb1582cb92ab0aeffd8afb00c700bf692415a"},
+    {file = "coverage-7.2.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2167d116309f564af56f9aa5e75ef710ef871c5f9b313a83050035097b56820"},
+    {file = "coverage-7.2.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:cb5f152fb14857cbe7f3e8c9a5d98979c4c66319a33cad6e617f0067c9accdc4"},
+    {file = "coverage-7.2.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:87dc37f16fb5e3a28429e094145bf7c1753e32bb50f662722e378c5851f7fdc6"},
+    {file = "coverage-7.2.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e191a63a05851f8bce77bc875e75457f9b01d42843f8bd7feed2fc26bbe60833"},
+    {file = "coverage-7.2.1-cp310-cp310-win32.whl", hash = "sha256:e3ea04b23b114572b98a88c85379e9e9ae031272ba1fb9b532aa934c621626d4"},
+    {file = "coverage-7.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:0cf557827be7eca1c38a2480484d706693e7bb1929e129785fe59ec155a59de6"},
+    {file = "coverage-7.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:570c21a29493b350f591a4b04c158ce1601e8d18bdcd21db136fbb135d75efa6"},
+    {file = "coverage-7.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9e872b082b32065ac2834149dc0adc2a2e6d8203080501e1e3c3c77851b466f9"},
+    {file = "coverage-7.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fac6343bae03b176e9b58104a9810df3cdccd5cfed19f99adfa807ffbf43cf9b"},
+    {file = "coverage-7.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abacd0a738e71b20e224861bc87e819ef46fedba2fb01bc1af83dfd122e9c319"},
+    {file = "coverage-7.2.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d9256d4c60c4bbfec92721b51579c50f9e5062c21c12bec56b55292464873508"},
+    {file = "coverage-7.2.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:80559eaf6c15ce3da10edb7977a1548b393db36cbc6cf417633eca05d84dd1ed"},
+    {file = "coverage-7.2.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:0bd7e628f6c3ec4e7d2d24ec0e50aae4e5ae95ea644e849d92ae4805650b4c4e"},
+    {file = "coverage-7.2.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:09643fb0df8e29f7417adc3f40aaf379d071ee8f0350ab290517c7004f05360b"},
+    {file = "coverage-7.2.1-cp311-cp311-win32.whl", hash = "sha256:1b7fb13850ecb29b62a447ac3516c777b0e7a09ecb0f4bb6718a8654c87dfc80"},
+    {file = "coverage-7.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:617a94ada56bbfe547aa8d1b1a2b8299e2ec1ba14aac1d4b26a9f7d6158e1273"},
+    {file = "coverage-7.2.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8649371570551d2fd7dee22cfbf0b61f1747cdfb2b7587bb551e4beaaa44cb97"},
+    {file = "coverage-7.2.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d2b9b5e70a21474c105a133ba227c61bc95f2ac3b66861143ce39a5ea4b3f84"},
+    {file = "coverage-7.2.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae82c988954722fa07ec5045c57b6d55bc1a0890defb57cf4a712ced65b26ddd"},
+    {file = "coverage-7.2.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:861cc85dfbf55a7a768443d90a07e0ac5207704a9f97a8eb753292a7fcbdfcfc"},
+    {file = "coverage-7.2.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0339dc3237c0d31c3b574f19c57985fcbe494280153bbcad33f2cdf469f4ac3e"},
+    {file = "coverage-7.2.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5928b85416a388dd557ddc006425b0c37e8468bd1c3dc118c1a3de42f59e2a54"},
+    {file = "coverage-7.2.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8d3843ca645f62c426c3d272902b9de90558e9886f15ddf5efe757b12dd376f5"},
+    {file = "coverage-7.2.1-cp37-cp37m-win32.whl", hash = "sha256:6a034480e9ebd4e83d1aa0453fd78986414b5d237aea89a8fdc35d330aa13bae"},
+    {file = "coverage-7.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6fce673f79a0e017a4dc35e18dc7bb90bf6d307c67a11ad5e61ca8d42b87cbff"},
+    {file = "coverage-7.2.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7f099da6958ddfa2ed84bddea7515cb248583292e16bb9231d151cd528eab657"},
+    {file = "coverage-7.2.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:97a3189e019d27e914ecf5c5247ea9f13261d22c3bb0cfcfd2a9b179bb36f8b1"},
+    {file = "coverage-7.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a81dbcf6c6c877986083d00b834ac1e84b375220207a059ad45d12f6e518a4e3"},
+    {file = "coverage-7.2.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78d2c3dde4c0b9be4b02067185136b7ee4681978228ad5ec1278fa74f5ca3e99"},
+    {file = "coverage-7.2.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a209d512d157379cc9ab697cbdbb4cfd18daa3e7eebaa84c3d20b6af0037384"},
+    {file = "coverage-7.2.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f3d07edb912a978915576a776756069dede66d012baa503022d3a0adba1b6afa"},
+    {file = "coverage-7.2.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8dca3c1706670297851bca1acff9618455122246bdae623be31eca744ade05ec"},
+    {file = "coverage-7.2.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1991a6d64231a3e5bbe3099fb0dd7c9aeaa4275ad0e0aeff4cb9ef885c62ba2"},
+    {file = "coverage-7.2.1-cp38-cp38-win32.whl", hash = "sha256:22c308bc508372576ffa3d2dbc4824bb70d28eeb4fcd79d4d1aed663a06630d0"},
+    {file = "coverage-7.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:b0c0d46de5dd97f6c2d1b560bf0fcf0215658097b604f1840365296302a9d1fb"},
+    {file = "coverage-7.2.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4dd34a935de268a133e4741827ae951283a28c0125ddcdbcbba41c4b98f2dfef"},
+    {file = "coverage-7.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0f8318ed0f3c376cfad8d3520f496946977abde080439d6689d7799791457454"},
+    {file = "coverage-7.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:834c2172edff5a08d78e2f53cf5e7164aacabeb66b369f76e7bb367ca4e2d993"},
+    {file = "coverage-7.2.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4d70c853f0546855f027890b77854508bdb4d6a81242a9d804482e667fff6e6"},
+    {file = "coverage-7.2.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a6450da4c7afc4534305b2b7d8650131e130610cea448ff240b6ab73d7eab63"},
+    {file = "coverage-7.2.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:99f4dd81b2bb8fc67c3da68b1f5ee1650aca06faa585cbc6818dbf67893c6d58"},
+    {file = "coverage-7.2.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bdd3f2f285ddcf2e75174248b2406189261a79e7fedee2ceeadc76219b6faa0e"},
+    {file = "coverage-7.2.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:f29351393eb05e6326f044a7b45ed8e38cb4dcc38570d12791f271399dc41431"},
+    {file = "coverage-7.2.1-cp39-cp39-win32.whl", hash = "sha256:e2b50ebc2b6121edf352336d503357321b9d8738bb7a72d06fc56153fd3f4cd8"},
+    {file = "coverage-7.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:bd5a12239c0006252244f94863f1c518ac256160cd316ea5c47fb1a11b25889a"},
+    {file = "coverage-7.2.1-pp37.pp38.pp39-none-any.whl", hash = "sha256:436313d129db7cf5b4ac355dd2bd3f7c7e5294af077b090b85de75f8458b8616"},
+    {file = "coverage-7.2.1.tar.gz", hash = "sha256:c77f2a9093ccf329dd523a9b2b3c854c20d2a3d968b6def3b820272ca6732242"},
 ]
 
 [package.dependencies]
@@ -436,21 +508,22 @@ toml = ["tomli"]
 
 [[package]]
 name = "deepdiff"
-version = "6.2.1"
+version = "6.2.3"
 description = "Deep Difference and Search of any Python object/data. Recreate objects by adding adding deltas to each other."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "deepdiff-6.2.1-py3-none-any.whl", hash = "sha256:8ba27c185f9197b78c316ce7bb0c743d25d14f7cdb8ec3b340437dbc93dcbff2"},
-    {file = "deepdiff-6.2.1.tar.gz", hash = "sha256:3fe134dde5b3922ff8c51fc1e95a972e659c853797231b836a5ccf15532fd516"},
+    {file = "deepdiff-6.2.3-py3-none-any.whl", hash = "sha256:d83b06e043447d6770860a635abecb46e849b0494c43ced2ecafda7628c7ce72"},
+    {file = "deepdiff-6.2.3.tar.gz", hash = "sha256:a02aaa8171351eba675cff5f795ec7a90987f86ad5449553308d4e18df57dc3d"},
 ]
 
 [package.dependencies]
 ordered-set = ">=4.0.2,<4.2.0"
+orjson = "*"
 
 [package.extras]
-cli = ["clevercsv (==0.7.4)", "click (==8.1.3)", "pyyaml (==6.0)", "toml (==0.10.2)"]
+cli = ["click (==8.1.3)", "pyyaml (==6.0)"]
 
 [[package]]
 name = "discord-py"
@@ -501,14 +574,14 @@ dev = ["coverage", "coveralls", "pytest"]
 
 [[package]]
 name = "exceptiongroup"
-version = "1.0.4"
+version = "1.1.0"
 description = "Backport of PEP 654 (exception groups)"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
-    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
+    {file = "exceptiongroup-1.1.0-py3-none-any.whl", hash = "sha256:327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e"},
+    {file = "exceptiongroup-1.1.0.tar.gz", hash = "sha256:bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23"},
 ]
 
 [package.extras]
@@ -531,24 +604,24 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "fakeredis"
-version = "2.0.0"
+version = "2.10.0"
 description = "Fake implementation of redis API for testing purposes."
 category = "main"
 optional = false
-python-versions = ">=3.7,<4.0"
+python-versions = ">=3.8,<4.0"
 files = [
-    {file = "fakeredis-2.0.0-py3-none-any.whl", hash = "sha256:fb3186cbbe4c549f922b0f08eb84b09c0e51ecf8efbed3572d20544254f93a97"},
-    {file = "fakeredis-2.0.0.tar.gz", hash = "sha256:6d1dc2417921b7ce56a80877afa390d6335a3154146f201a86e3a14417bdc79e"},
+    {file = "fakeredis-2.10.0-py3-none-any.whl", hash = "sha256:7e66c96793688703a1da41256323ddaa1b3a2cab4ef793866839a937bb273915"},
+    {file = "fakeredis-2.10.0.tar.gz", hash = "sha256:722644759bba4ad61fa38f0bb34939b7657f166ba35892f747e282407a196845"},
 ]
 
 [package.dependencies]
-lupa = {version = ">=1.13,<2.0", optional = true, markers = "extra == \"lua\""}
-redis = "<4.5"
-sortedcontainers = ">=2.4.0,<3.0.0"
+lupa = {version = ">=1.14,<2.0", optional = true, markers = "extra == \"lua\""}
+redis = ">=4,<5"
+sortedcontainers = ">=2.4,<3.0"
 
 [package.extras]
-aioredis = ["aioredis (>=2.0.1,<3.0.0)"]
-lua = ["lupa (>=1.13,<2.0)"]
+json = ["jsonpath-ng (>=1.5,<2.0)"]
+lua = ["lupa (>=1.14,<2.0)"]
 
 [[package]]
 name = "feedparser"
@@ -567,19 +640,19 @@ sgmllib3k = "*"
 
 [[package]]
 name = "filelock"
-version = "3.8.0"
+version = "3.9.0"
 description = "A platform independent file lock."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
-    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
 ]
 
 [package.extras]
-docs = ["furo (>=2022.6.21)", "sphinx (>=5.1.1)", "sphinx-autodoc-typehints (>=1.19.1)"]
-testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pytest-cov (>=3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "flake8"
@@ -600,30 +673,30 @@ pyflakes = ">=3.0.0,<3.1.0"
 
 [[package]]
 name = "flake8-annotations"
-version = "2.9.1"
+version = "3.0.0"
 description = "Flake8 Type Annotation Checks"
 category = "dev"
 optional = false
-python-versions = ">=3.7,<4.0"
+python-versions = ">=3.8.1,<4.0.0"
 files = [
-    {file = "flake8-annotations-2.9.1.tar.gz", hash = "sha256:11f09efb99ae63c8f9d6b492b75fe147fbc323179fddfe00b2e56eefeca42f57"},
-    {file = "flake8_annotations-2.9.1-py3-none-any.whl", hash = "sha256:a4385158a7a9fc8af1d8820a2f4c8d03387997006a83f5f8bfe5bc6085bdf88a"},
+    {file = "flake8_annotations-3.0.0-py3-none-any.whl", hash = "sha256:ea927d31016515e9aa6e256651d74baeeee6fa4ad3f8383715ec5c0460a4c225"},
+    {file = "flake8_annotations-3.0.0.tar.gz", hash = "sha256:88c8b35a0db10b9a92be69ed3f81494509a18db1c3162551e57bc0fc35fab065"},
 ]
 
 [package.dependencies]
 attrs = ">=21.4"
-flake8 = ">=3.7"
+flake8 = ">=5.0"
 
 [[package]]
 name = "flake8-bugbear"
-version = "22.10.27"
+version = "23.2.13"
 description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "flake8-bugbear-22.10.27.tar.gz", hash = "sha256:a6708608965c9e0de5fff13904fed82e0ba21ac929fe4896459226a797e11cd5"},
-    {file = "flake8_bugbear-22.10.27-py3-none-any.whl", hash = "sha256:6ad0ab754507319060695e2f2be80e6d8977cfcea082293089a9226276bd825d"},
+    {file = "flake8-bugbear-23.2.13.tar.gz", hash = "sha256:39259814a83f33c8409417ee12dd4050c9c0bb4c8707c12fc18ae62b2f3ddee1"},
+    {file = "flake8_bugbear-23.2.13-py3-none-any.whl", hash = "sha256:f136bd0ca2684f101168bba2310dec541e11aa6b252260c17dcf58d18069a740"},
 ]
 
 [package.dependencies]
@@ -631,18 +704,18 @@ attrs = ">=19.2.0"
 flake8 = ">=3.0.0"
 
 [package.extras]
-dev = ["coverage", "hypothesis", "hypothesmith (>=0.2)", "pre-commit", "tox"]
+dev = ["coverage", "hypothesis", "hypothesmith (>=0.2)", "pre-commit", "pytest", "tox"]
 
 [[package]]
 name = "flake8-docstrings"
-version = "1.6.0"
+version = "1.7.0"
 description = "Extension for flake8 which uses pydocstyle to check docstrings"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 files = [
-    {file = "flake8-docstrings-1.6.0.tar.gz", hash = "sha256:9fe7c6a306064af8e62a055c2f61e9eb1da55f84bb39caef2b84ce53708ac34b"},
-    {file = "flake8_docstrings-1.6.0-py2.py3-none-any.whl", hash = "sha256:99cac583d6c7e32dd28bbfbef120a7c0d1b6dde4adb5a9fd441c4227a6534bde"},
+    {file = "flake8_docstrings-1.7.0-py2.py3-none-any.whl", hash = "sha256:51f2344026da083fc084166a9353f5082b01f72901df422f74b4d953ae88ac75"},
+    {file = "flake8_docstrings-1.7.0.tar.gz", hash = "sha256:4c8cc748dc16e6869728699e5d0d685da9a10b0ea718e090b1ba088e67a941af"},
 ]
 
 [package.dependencies]
@@ -651,19 +724,19 @@ pydocstyle = ">=2.1"
 
 [[package]]
 name = "flake8-isort"
-version = "5.0.3"
+version = "6.0.0"
 description = "flake8 plugin that integrates isort ."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "flake8-isort-5.0.3.tar.gz", hash = "sha256:0951398c343c67f4933407adbbfb495d4df7c038650c5d05753a006efcfeb390"},
-    {file = "flake8_isort-5.0.3-py3-none-any.whl", hash = "sha256:8c4ab431d87780d0c8336e9614e50ef11201bc848ef64ca017532dec39d4bf49"},
+    {file = "flake8-isort-6.0.0.tar.gz", hash = "sha256:537f453a660d7e903f602ecfa36136b140de279df58d02eb1b6a0c84e83c528c"},
+    {file = "flake8_isort-6.0.0-py3-none-any.whl", hash = "sha256:aa0cac02a62c7739e370ce6b9c31743edac904bae4b157274511fc8a19c75bbc"},
 ]
 
 [package.dependencies]
 flake8 = "*"
-isort = ">=4.3.5,<6"
+isort = ">=5.0.0,<6"
 
 [package.extras]
 test = ["pytest"]
@@ -813,14 +886,14 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve
 
 [[package]]
 name = "identify"
-version = "2.5.9"
+version = "2.5.18"
 description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"},
-    {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"},
+    {file = "identify-2.5.18-py2.py3-none-any.whl", hash = "sha256:93aac7ecf2f6abf879b8f29a8002d3c6de7086b8c28d88e1ad15045a15ab63f9"},
+    {file = "identify-2.5.18.tar.gz", hash = "sha256:89e144fa560cc4cffb6ef2ab5e9fb18ed9f9b3cb054384bab4b95c12f6c309fe"},
 ]
 
 [package.extras]
@@ -840,31 +913,31 @@ files = [
 
 [[package]]
 name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
+version = "2.0.0"
+description = "brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 files = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
 ]
 
 [[package]]
 name = "isort"
-version = "5.10.1"
+version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1,<4.0"
+python-versions = ">=3.8.0"
 files = [
-    {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
-    {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
+    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
+    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
-pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
+colors = ["colorama (>=0.4.3)"]
+pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
 plugins = ["setuptools"]
 requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
@@ -955,82 +1028,89 @@ files = [
 
 [[package]]
 name = "lxml"
-version = "4.9.1"
+version = "4.9.2"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*"
 files = [
-    {file = "lxml-4.9.1-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:98cafc618614d72b02185ac583c6f7796202062c41d2eeecdf07820bad3295ed"},
-    {file = "lxml-4.9.1-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c62e8dd9754b7debda0c5ba59d34509c4688f853588d75b53c3791983faa96fc"},
-    {file = "lxml-4.9.1-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:21fb3d24ab430fc538a96e9fbb9b150029914805d551deeac7d7822f64631dfc"},
-    {file = "lxml-4.9.1-cp27-cp27m-win32.whl", hash = "sha256:86e92728ef3fc842c50a5cb1d5ba2bc66db7da08a7af53fb3da79e202d1b2cd3"},
-    {file = "lxml-4.9.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4cfbe42c686f33944e12f45a27d25a492cc0e43e1dc1da5d6a87cbcaf2e95627"},
-    {file = "lxml-4.9.1-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:dad7b164905d3e534883281c050180afcf1e230c3d4a54e8038aa5cfcf312b84"},
-    {file = "lxml-4.9.1-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a614e4afed58c14254e67862456d212c4dcceebab2eaa44d627c2ca04bf86837"},
-    {file = "lxml-4.9.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f9ced82717c7ec65a67667bb05865ffe38af0e835cdd78728f1209c8fffe0cad"},
-    {file = "lxml-4.9.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:d9fc0bf3ff86c17348dfc5d322f627d78273eba545db865c3cd14b3f19e57fa5"},
-    {file = "lxml-4.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:e5f66bdf0976ec667fc4594d2812a00b07ed14d1b44259d19a41ae3fff99f2b8"},
-    {file = "lxml-4.9.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:fe17d10b97fdf58155f858606bddb4e037b805a60ae023c009f760d8361a4eb8"},
-    {file = "lxml-4.9.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8caf4d16b31961e964c62194ea3e26a0e9561cdf72eecb1781458b67ec83423d"},
-    {file = "lxml-4.9.1-cp310-cp310-win32.whl", hash = "sha256:4780677767dd52b99f0af1f123bc2c22873d30b474aa0e2fc3fe5e02217687c7"},
-    {file = "lxml-4.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:b122a188cd292c4d2fcd78d04f863b789ef43aa129b233d7c9004de08693728b"},
-    {file = "lxml-4.9.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:be9eb06489bc975c38706902cbc6888f39e946b81383abc2838d186f0e8b6a9d"},
-    {file = "lxml-4.9.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:f1be258c4d3dc609e654a1dc59d37b17d7fef05df912c01fc2e15eb43a9735f3"},
-    {file = "lxml-4.9.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:927a9dd016d6033bc12e0bf5dee1dde140235fc8d0d51099353c76081c03dc29"},
-    {file = "lxml-4.9.1-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9232b09f5efee6a495a99ae6824881940d6447debe272ea400c02e3b68aad85d"},
-    {file = "lxml-4.9.1-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:04da965dfebb5dac2619cb90fcf93efdb35b3c6994fea58a157a834f2f94b318"},
-    {file = "lxml-4.9.1-cp35-cp35m-win32.whl", hash = "sha256:4d5bae0a37af799207140652a700f21a85946f107a199bcb06720b13a4f1f0b7"},
-    {file = "lxml-4.9.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4878e667ebabe9b65e785ac8da4d48886fe81193a84bbe49f12acff8f7a383a4"},
-    {file = "lxml-4.9.1-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:1355755b62c28950f9ce123c7a41460ed9743c699905cbe664a5bcc5c9c7c7fb"},
-    {file = "lxml-4.9.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:bcaa1c495ce623966d9fc8a187da80082334236a2a1c7e141763ffaf7a405067"},
-    {file = "lxml-4.9.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6eafc048ea3f1b3c136c71a86db393be36b5b3d9c87b1c25204e7d397cee9536"},
-    {file = "lxml-4.9.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:13c90064b224e10c14dcdf8086688d3f0e612db53766e7478d7754703295c7c8"},
-    {file = "lxml-4.9.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:206a51077773c6c5d2ce1991327cda719063a47adc02bd703c56a662cdb6c58b"},
-    {file = "lxml-4.9.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e8f0c9d65da595cfe91713bc1222af9ecabd37971762cb830dea2fc3b3bb2acf"},
-    {file = "lxml-4.9.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8f0a4d179c9a941eb80c3a63cdb495e539e064f8054230844dcf2fcb812b71d3"},
-    {file = "lxml-4.9.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:830c88747dce8a3e7525defa68afd742b4580df6aa2fdd6f0855481e3994d391"},
-    {file = "lxml-4.9.1-cp36-cp36m-win32.whl", hash = "sha256:1e1cf47774373777936c5aabad489fef7b1c087dcd1f426b621fda9dcc12994e"},
-    {file = "lxml-4.9.1-cp36-cp36m-win_amd64.whl", hash = "sha256:5974895115737a74a00b321e339b9c3f45c20275d226398ae79ac008d908bff7"},
-    {file = "lxml-4.9.1-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:1423631e3d51008871299525b541413c9b6c6423593e89f9c4cfbe8460afc0a2"},
-    {file = "lxml-4.9.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:2aaf6a0a6465d39b5ca69688fce82d20088c1838534982996ec46633dc7ad6cc"},
-    {file = "lxml-4.9.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:9f36de4cd0c262dd9927886cc2305aa3f2210db437aa4fed3fb4940b8bf4592c"},
-    {file = "lxml-4.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ae06c1e4bc60ee076292e582a7512f304abdf6c70db59b56745cca1684f875a4"},
-    {file = "lxml-4.9.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:57e4d637258703d14171b54203fd6822fda218c6c2658a7d30816b10995f29f3"},
-    {file = "lxml-4.9.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6d279033bf614953c3fc4a0aa9ac33a21e8044ca72d4fa8b9273fe75359d5cca"},
-    {file = "lxml-4.9.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a60f90bba4c37962cbf210f0188ecca87daafdf60271f4c6948606e4dabf8785"},
-    {file = "lxml-4.9.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6ca2264f341dd81e41f3fffecec6e446aa2121e0b8d026fb5130e02de1402785"},
-    {file = "lxml-4.9.1-cp37-cp37m-win32.whl", hash = "sha256:27e590352c76156f50f538dbcebd1925317a0f70540f7dc8c97d2931c595783a"},
-    {file = "lxml-4.9.1-cp37-cp37m-win_amd64.whl", hash = "sha256:eea5d6443b093e1545ad0210e6cf27f920482bfcf5c77cdc8596aec73523bb7e"},
-    {file = "lxml-4.9.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:f05251bbc2145349b8d0b77c0d4e5f3b228418807b1ee27cefb11f69ed3d233b"},
-    {file = "lxml-4.9.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:487c8e61d7acc50b8be82bda8c8d21d20e133c3cbf41bd8ad7eb1aaeb3f07c97"},
-    {file = "lxml-4.9.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8d1a92d8e90b286d491e5626af53afef2ba04da33e82e30744795c71880eaa21"},
-    {file = "lxml-4.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:b570da8cd0012f4af9fa76a5635cd31f707473e65a5a335b186069d5c7121ff2"},
-    {file = "lxml-4.9.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ef87fca280fb15342726bd5f980f6faf8b84a5287fcc2d4962ea8af88b35130"},
-    {file = "lxml-4.9.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:93e414e3206779ef41e5ff2448067213febf260ba747fc65389a3ddaa3fb8715"},
-    {file = "lxml-4.9.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6653071f4f9bac46fbc30f3c7838b0e9063ee335908c5d61fb7a4a86c8fd2036"},
-    {file = "lxml-4.9.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:32a73c53783becdb7eaf75a2a1525ea8e49379fb7248c3eeefb9412123536387"},
-    {file = "lxml-4.9.1-cp38-cp38-win32.whl", hash = "sha256:1a7c59c6ffd6ef5db362b798f350e24ab2cfa5700d53ac6681918f314a4d3b94"},
-    {file = "lxml-4.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:1436cf0063bba7888e43f1ba8d58824f085410ea2025befe81150aceb123e345"},
-    {file = "lxml-4.9.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:4beea0f31491bc086991b97517b9683e5cfb369205dac0148ef685ac12a20a67"},
-    {file = "lxml-4.9.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:41fb58868b816c202e8881fd0f179a4644ce6e7cbbb248ef0283a34b73ec73bb"},
-    {file = "lxml-4.9.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:bd34f6d1810d9354dc7e35158aa6cc33456be7706df4420819af6ed966e85448"},
-    {file = "lxml-4.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:edffbe3c510d8f4bf8640e02ca019e48a9b72357318383ca60e3330c23aaffc7"},
-    {file = "lxml-4.9.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6d949f53ad4fc7cf02c44d6678e7ff05ec5f5552b235b9e136bd52e9bf730b91"},
-    {file = "lxml-4.9.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:079b68f197c796e42aa80b1f739f058dcee796dc725cc9a1be0cdb08fc45b000"},
-    {file = "lxml-4.9.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9c3a88d20e4fe4a2a4a84bf439a5ac9c9aba400b85244c63a1ab7088f85d9d25"},
-    {file = "lxml-4.9.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e285b5f2bf321fc0857b491b5028c5f276ec0c873b985d58d7748ece1d770dd"},
-    {file = "lxml-4.9.1-cp39-cp39-win32.whl", hash = "sha256:ef72013e20dd5ba86a8ae1aed7f56f31d3374189aa8b433e7b12ad182c0d2dfb"},
-    {file = "lxml-4.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:10d2017f9150248563bb579cd0d07c61c58da85c922b780060dcc9a3aa9f432d"},
-    {file = "lxml-4.9.1-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:0538747a9d7827ce3e16a8fdd201a99e661c7dee3c96c885d8ecba3c35d1032c"},
-    {file = "lxml-4.9.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0645e934e940107e2fdbe7c5b6fb8ec6232444260752598bc4d09511bd056c0b"},
-    {file = "lxml-4.9.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6daa662aba22ef3258934105be2dd9afa5bb45748f4f702a3b39a5bf53a1f4dc"},
-    {file = "lxml-4.9.1-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:603a464c2e67d8a546ddaa206d98e3246e5db05594b97db844c2f0a1af37cf5b"},
-    {file = "lxml-4.9.1-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c4b2e0559b68455c085fb0f6178e9752c4be3bba104d6e881eb5573b399d1eb2"},
-    {file = "lxml-4.9.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0f3f0059891d3254c7b5fb935330d6db38d6519ecd238ca4fce93c234b4a0f73"},
-    {file = "lxml-4.9.1-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c852b1530083a620cb0de5f3cd6826f19862bafeaf77586f1aef326e49d95f0c"},
-    {file = "lxml-4.9.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:287605bede6bd36e930577c5925fcea17cb30453d96a7b4c63c14a257118dbb9"},
-    {file = "lxml-4.9.1.tar.gz", hash = "sha256:fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f"},
+    {file = "lxml-4.9.2-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:76cf573e5a365e790396a5cc2b909812633409306c6531a6877c59061e42c4f2"},
+    {file = "lxml-4.9.2-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b1f42b6921d0e81b1bcb5e395bc091a70f41c4d4e55ba99c6da2b31626c44892"},
+    {file = "lxml-4.9.2-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:9f102706d0ca011de571de32c3247c6476b55bb6bc65a20f682f000b07a4852a"},
+    {file = "lxml-4.9.2-cp27-cp27m-win32.whl", hash = "sha256:8d0b4612b66ff5d62d03bcaa043bb018f74dfea51184e53f067e6fdcba4bd8de"},
+    {file = "lxml-4.9.2-cp27-cp27m-win_amd64.whl", hash = "sha256:4c8f293f14abc8fd3e8e01c5bd86e6ed0b6ef71936ded5bf10fe7a5efefbaca3"},
+    {file = "lxml-4.9.2-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2899456259589aa38bfb018c364d6ae7b53c5c22d8e27d0ec7609c2a1ff78b50"},
+    {file = "lxml-4.9.2-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6749649eecd6a9871cae297bffa4ee76f90b4504a2a2ab528d9ebe912b101975"},
+    {file = "lxml-4.9.2-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:a08cff61517ee26cb56f1e949cca38caabe9ea9fbb4b1e10a805dc39844b7d5c"},
+    {file = "lxml-4.9.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:85cabf64adec449132e55616e7ca3e1000ab449d1d0f9d7f83146ed5bdcb6d8a"},
+    {file = "lxml-4.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:8340225bd5e7a701c0fa98284c849c9b9fc9238abf53a0ebd90900f25d39a4e4"},
+    {file = "lxml-4.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:1ab8f1f932e8f82355e75dda5413a57612c6ea448069d4fb2e217e9a4bed13d4"},
+    {file = "lxml-4.9.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:699a9af7dffaf67deeae27b2112aa06b41c370d5e7633e0ee0aea2e0b6c211f7"},
+    {file = "lxml-4.9.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9cc34af337a97d470040f99ba4282f6e6bac88407d021688a5d585e44a23184"},
+    {file = "lxml-4.9.2-cp310-cp310-win32.whl", hash = "sha256:d02a5399126a53492415d4906ab0ad0375a5456cc05c3fc0fc4ca11771745cda"},
+    {file = "lxml-4.9.2-cp310-cp310-win_amd64.whl", hash = "sha256:a38486985ca49cfa574a507e7a2215c0c780fd1778bb6290c21193b7211702ab"},
+    {file = "lxml-4.9.2-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:c83203addf554215463b59f6399835201999b5e48019dc17f182ed5ad87205c9"},
+    {file = "lxml-4.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:2a87fa548561d2f4643c99cd13131acb607ddabb70682dcf1dff5f71f781a4bf"},
+    {file = "lxml-4.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:d6b430a9938a5a5d85fc107d852262ddcd48602c120e3dbb02137c83d212b380"},
+    {file = "lxml-4.9.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3efea981d956a6f7173b4659849f55081867cf897e719f57383698af6f618a92"},
+    {file = "lxml-4.9.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:df0623dcf9668ad0445e0558a21211d4e9a149ea8f5666917c8eeec515f0a6d1"},
+    {file = "lxml-4.9.2-cp311-cp311-win32.whl", hash = "sha256:da248f93f0418a9e9d94b0080d7ebc407a9a5e6d0b57bb30db9b5cc28de1ad33"},
+    {file = "lxml-4.9.2-cp311-cp311-win_amd64.whl", hash = "sha256:3818b8e2c4b5148567e1b09ce739006acfaa44ce3156f8cbbc11062994b8e8dd"},
+    {file = "lxml-4.9.2-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ca989b91cf3a3ba28930a9fc1e9aeafc2a395448641df1f387a2d394638943b0"},
+    {file = "lxml-4.9.2-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:822068f85e12a6e292803e112ab876bc03ed1f03dddb80154c395f891ca6b31e"},
+    {file = "lxml-4.9.2-cp35-cp35m-win32.whl", hash = "sha256:be7292c55101e22f2a3d4d8913944cbea71eea90792bf914add27454a13905df"},
+    {file = "lxml-4.9.2-cp35-cp35m-win_amd64.whl", hash = "sha256:998c7c41910666d2976928c38ea96a70d1aa43be6fe502f21a651e17483a43c5"},
+    {file = "lxml-4.9.2-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:b26a29f0b7fc6f0897f043ca366142d2b609dc60756ee6e4e90b5f762c6adc53"},
+    {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:ab323679b8b3030000f2be63e22cdeea5b47ee0abd2d6a1dc0c8103ddaa56cd7"},
+    {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:689bb688a1db722485e4610a503e3e9210dcc20c520b45ac8f7533c837be76fe"},
+    {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:f49e52d174375a7def9915c9f06ec4e569d235ad428f70751765f48d5926678c"},
+    {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:36c3c175d34652a35475a73762b545f4527aec044910a651d2bf50de9c3352b1"},
+    {file = "lxml-4.9.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a35f8b7fa99f90dd2f5dc5a9fa12332642f087a7641289ca6c40d6e1a2637d8e"},
+    {file = "lxml-4.9.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:58bfa3aa19ca4c0f28c5dde0ff56c520fbac6f0daf4fac66ed4c8d2fb7f22e74"},
+    {file = "lxml-4.9.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc718cd47b765e790eecb74d044cc8d37d58562f6c314ee9484df26276d36a38"},
+    {file = "lxml-4.9.2-cp36-cp36m-win32.whl", hash = "sha256:d5bf6545cd27aaa8a13033ce56354ed9e25ab0e4ac3b5392b763d8d04b08e0c5"},
+    {file = "lxml-4.9.2-cp36-cp36m-win_amd64.whl", hash = "sha256:3ab9fa9d6dc2a7f29d7affdf3edebf6ece6fb28a6d80b14c3b2fb9d39b9322c3"},
+    {file = "lxml-4.9.2-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:05ca3f6abf5cf78fe053da9b1166e062ade3fa5d4f92b4ed688127ea7d7b1d03"},
+    {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:a5da296eb617d18e497bcf0a5c528f5d3b18dadb3619fbdadf4ed2356ef8d941"},
+    {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:04876580c050a8c5341d706dd464ff04fd597095cc8c023252566a8826505726"},
+    {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:c9ec3eaf616d67db0764b3bb983962b4f385a1f08304fd30c7283954e6a7869b"},
+    {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2a29ba94d065945944016b6b74e538bdb1751a1db6ffb80c9d3c2e40d6fa9894"},
+    {file = "lxml-4.9.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a82d05da00a58b8e4c0008edbc8a4b6ec5a4bc1e2ee0fb6ed157cf634ed7fa45"},
+    {file = "lxml-4.9.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:223f4232855ade399bd409331e6ca70fb5578efef22cf4069a6090acc0f53c0e"},
+    {file = "lxml-4.9.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d17bc7c2ccf49c478c5bdd447594e82692c74222698cfc9b5daae7ae7e90743b"},
+    {file = "lxml-4.9.2-cp37-cp37m-win32.whl", hash = "sha256:b64d891da92e232c36976c80ed7ebb383e3f148489796d8d31a5b6a677825efe"},
+    {file = "lxml-4.9.2-cp37-cp37m-win_amd64.whl", hash = "sha256:a0a336d6d3e8b234a3aae3c674873d8f0e720b76bc1d9416866c41cd9500ffb9"},
+    {file = "lxml-4.9.2-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:da4dd7c9c50c059aba52b3524f84d7de956f7fef88f0bafcf4ad7dde94a064e8"},
+    {file = "lxml-4.9.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:821b7f59b99551c69c85a6039c65b75f5683bdc63270fec660f75da67469ca24"},
+    {file = "lxml-4.9.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:e5168986b90a8d1f2f9dc1b841467c74221bd752537b99761a93d2d981e04889"},
+    {file = "lxml-4.9.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:8e20cb5a47247e383cf4ff523205060991021233ebd6f924bca927fcf25cf86f"},
+    {file = "lxml-4.9.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:13598ecfbd2e86ea7ae45ec28a2a54fb87ee9b9fdb0f6d343297d8e548392c03"},
+    {file = "lxml-4.9.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:880bbbcbe2fca64e2f4d8e04db47bcdf504936fa2b33933efd945e1b429bea8c"},
+    {file = "lxml-4.9.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:7d2278d59425777cfcb19735018d897ca8303abe67cc735f9f97177ceff8027f"},
+    {file = "lxml-4.9.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5344a43228767f53a9df6e5b253f8cdca7dfc7b7aeae52551958192f56d98457"},
+    {file = "lxml-4.9.2-cp38-cp38-win32.whl", hash = "sha256:925073b2fe14ab9b87e73f9a5fde6ce6392da430f3004d8b72cc86f746f5163b"},
+    {file = "lxml-4.9.2-cp38-cp38-win_amd64.whl", hash = "sha256:9b22c5c66f67ae00c0199f6055705bc3eb3fcb08d03d2ec4059a2b1b25ed48d7"},
+    {file = "lxml-4.9.2-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:5f50a1c177e2fa3ee0667a5ab79fdc6b23086bc8b589d90b93b4bd17eb0e64d1"},
+    {file = "lxml-4.9.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:090c6543d3696cbe15b4ac6e175e576bcc3f1ccfbba970061b7300b0c15a2140"},
+    {file = "lxml-4.9.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:63da2ccc0857c311d764e7d3d90f429c252e83b52d1f8f1d1fe55be26827d1f4"},
+    {file = "lxml-4.9.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:5b4545b8a40478183ac06c073e81a5ce4cf01bf1734962577cf2bb569a5b3bbf"},
+    {file = "lxml-4.9.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2e430cd2824f05f2d4f687701144556646bae8f249fd60aa1e4c768ba7018947"},
+    {file = "lxml-4.9.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6804daeb7ef69e7b36f76caddb85cccd63d0c56dedb47555d2fc969e2af6a1a5"},
+    {file = "lxml-4.9.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a6e441a86553c310258aca15d1c05903aaf4965b23f3bc2d55f200804e005ee5"},
+    {file = "lxml-4.9.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ca34efc80a29351897e18888c71c6aca4a359247c87e0b1c7ada14f0ab0c0fb2"},
+    {file = "lxml-4.9.2-cp39-cp39-win32.whl", hash = "sha256:6b418afe5df18233fc6b6093deb82a32895b6bb0b1155c2cdb05203f583053f1"},
+    {file = "lxml-4.9.2-cp39-cp39-win_amd64.whl", hash = "sha256:f1496ea22ca2c830cbcbd473de8f114a320da308438ae65abad6bab7867fe38f"},
+    {file = "lxml-4.9.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b264171e3143d842ded311b7dccd46ff9ef34247129ff5bf5066123c55c2431c"},
+    {file = "lxml-4.9.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0dc313ef231edf866912e9d8f5a042ddab56c752619e92dfd3a2c277e6a7299a"},
+    {file = "lxml-4.9.2-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:16efd54337136e8cd72fb9485c368d91d77a47ee2d42b057564aae201257d419"},
+    {file = "lxml-4.9.2-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0f2b1e0d79180f344ff9f321327b005ca043a50ece8713de61d1cb383fb8ac05"},
+    {file = "lxml-4.9.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:7b770ed79542ed52c519119473898198761d78beb24b107acf3ad65deae61f1f"},
+    {file = "lxml-4.9.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efa29c2fe6b4fdd32e8ef81c1528506895eca86e1d8c4657fda04c9b3786ddf9"},
+    {file = "lxml-4.9.2-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7e91ee82f4199af8c43d8158024cbdff3d931df350252288f0d4ce656df7f3b5"},
+    {file = "lxml-4.9.2-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b23e19989c355ca854276178a0463951a653309fb8e57ce674497f2d9f208746"},
+    {file = "lxml-4.9.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:01d36c05f4afb8f7c20fd9ed5badca32a2029b93b1750f571ccc0b142531caf7"},
+    {file = "lxml-4.9.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7b515674acfdcadb0eb5d00d8a709868173acece5cb0be3dd165950cbfdf5409"},
+    {file = "lxml-4.9.2.tar.gz", hash = "sha256:2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"},
 ]
 
 [package.extras]
@@ -1069,14 +1149,14 @@ files = [
 
 [[package]]
 name = "more-itertools"
-version = "9.0.0"
+version = "9.1.0"
 description = "More routines for operating on iterables, beyond itertools"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
-    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
+    {file = "more-itertools-9.1.0.tar.gz", hash = "sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d"},
+    {file = "more_itertools-9.1.0-py3-none-any.whl", hash = "sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3"},
 ]
 
 [[package]]
@@ -1093,71 +1173,86 @@ files = [
 
 [[package]]
 name = "multidict"
-version = "6.0.2"
+version = "6.0.4"
 description = "multidict implementation"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2"},
-    {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3"},
-    {file = "multidict-6.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:041b81a5f6b38244b34dc18c7b6aba91f9cdaf854d9a39e5ff0b58e2b5773b9c"},
-    {file = "multidict-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fdda29a3c7e76a064f2477c9aab1ba96fd94e02e386f1e665bca1807fc5386f"},
-    {file = "multidict-6.0.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3368bf2398b0e0fcbf46d85795adc4c259299fec50c1416d0f77c0a843a3eed9"},
-    {file = "multidict-6.0.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4f052ee022928d34fe1f4d2bc743f32609fb79ed9c49a1710a5ad6b2198db20"},
-    {file = "multidict-6.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:225383a6603c086e6cef0f2f05564acb4f4d5f019a4e3e983f572b8530f70c88"},
-    {file = "multidict-6.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50bd442726e288e884f7be9071016c15a8742eb689a593a0cac49ea093eef0a7"},
-    {file = "multidict-6.0.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:47e6a7e923e9cada7c139531feac59448f1f47727a79076c0b1ee80274cd8eee"},
-    {file = "multidict-6.0.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0556a1d4ea2d949efe5fd76a09b4a82e3a4a30700553a6725535098d8d9fb672"},
-    {file = "multidict-6.0.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:626fe10ac87851f4cffecee161fc6f8f9853f0f6f1035b59337a51d29ff3b4f9"},
-    {file = "multidict-6.0.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:8064b7c6f0af936a741ea1efd18690bacfbae4078c0c385d7c3f611d11f0cf87"},
-    {file = "multidict-6.0.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2d36e929d7f6a16d4eb11b250719c39560dd70545356365b494249e2186bc389"},
-    {file = "multidict-6.0.2-cp310-cp310-win32.whl", hash = "sha256:fcb91630817aa8b9bc4a74023e4198480587269c272c58b3279875ed7235c293"},
-    {file = "multidict-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:8cbf0132f3de7cc6c6ce00147cc78e6439ea736cee6bca4f068bcf892b0fd658"},
-    {file = "multidict-6.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:05f6949d6169878a03e607a21e3b862eaf8e356590e8bdae4227eedadacf6e51"},
-    {file = "multidict-6.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2c2e459f7050aeb7c1b1276763364884595d47000c1cddb51764c0d8976e608"},
-    {file = "multidict-6.0.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d0509e469d48940147e1235d994cd849a8f8195e0bca65f8f5439c56e17872a3"},
-    {file = "multidict-6.0.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:514fe2b8d750d6cdb4712346a2c5084a80220821a3e91f3f71eec11cf8d28fd4"},
-    {file = "multidict-6.0.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19adcfc2a7197cdc3987044e3f415168fc5dc1f720c932eb1ef4f71a2067e08b"},
-    {file = "multidict-6.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b9d153e7f1f9ba0b23ad1568b3b9e17301e23b042c23870f9ee0522dc5cc79e8"},
-    {file = "multidict-6.0.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:aef9cc3d9c7d63d924adac329c33835e0243b5052a6dfcbf7732a921c6e918ba"},
-    {file = "multidict-6.0.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4571f1beddff25f3e925eea34268422622963cd8dc395bb8778eb28418248e43"},
-    {file = "multidict-6.0.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:d48b8ee1d4068561ce8033d2c344cf5232cb29ee1a0206a7b828c79cbc5982b8"},
-    {file = "multidict-6.0.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:45183c96ddf61bf96d2684d9fbaf6f3564d86b34cb125761f9a0ef9e36c1d55b"},
-    {file = "multidict-6.0.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:75bdf08716edde767b09e76829db8c1e5ca9d8bb0a8d4bd94ae1eafe3dac5e15"},
-    {file = "multidict-6.0.2-cp37-cp37m-win32.whl", hash = "sha256:a45e1135cb07086833ce969555df39149680e5471c04dfd6a915abd2fc3f6dbc"},
-    {file = "multidict-6.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6f3cdef8a247d1eafa649085812f8a310e728bdf3900ff6c434eafb2d443b23a"},
-    {file = "multidict-6.0.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0327292e745a880459ef71be14e709aaea2f783f3537588fb4ed09b6c01bca60"},
-    {file = "multidict-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e875b6086e325bab7e680e4316d667fc0e5e174bb5611eb16b3ea121c8951b86"},
-    {file = "multidict-6.0.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:feea820722e69451743a3d56ad74948b68bf456984d63c1a92e8347b7b88452d"},
-    {file = "multidict-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cc57c68cb9139c7cd6fc39f211b02198e69fb90ce4bc4a094cf5fe0d20fd8b0"},
-    {file = "multidict-6.0.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:497988d6b6ec6ed6f87030ec03280b696ca47dbf0648045e4e1d28b80346560d"},
-    {file = "multidict-6.0.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:89171b2c769e03a953d5969b2f272efa931426355b6c0cb508022976a17fd376"},
-    {file = "multidict-6.0.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:684133b1e1fe91eda8fa7447f137c9490a064c6b7f392aa857bba83a28cfb693"},
-    {file = "multidict-6.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd9fc9c4849a07f3635ccffa895d57abce554b467d611a5009ba4f39b78a8849"},
-    {file = "multidict-6.0.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e07c8e79d6e6fd37b42f3250dba122053fddb319e84b55dd3a8d6446e1a7ee49"},
-    {file = "multidict-6.0.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:4070613ea2227da2bfb2c35a6041e4371b0af6b0be57f424fe2318b42a748516"},
-    {file = "multidict-6.0.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:47fbeedbf94bed6547d3aa632075d804867a352d86688c04e606971595460227"},
-    {file = "multidict-6.0.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:5774d9218d77befa7b70d836004a768fb9aa4fdb53c97498f4d8d3f67bb9cfa9"},
-    {file = "multidict-6.0.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2957489cba47c2539a8eb7ab32ff49101439ccf78eab724c828c1a54ff3ff98d"},
-    {file = "multidict-6.0.2-cp38-cp38-win32.whl", hash = "sha256:e5b20e9599ba74391ca0cfbd7b328fcc20976823ba19bc573983a25b32e92b57"},
-    {file = "multidict-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:8004dca28e15b86d1b1372515f32eb6f814bdf6f00952699bdeb541691091f96"},
-    {file = "multidict-6.0.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2e4a0785b84fb59e43c18a015ffc575ba93f7d1dbd272b4cdad9f5134b8a006c"},
-    {file = "multidict-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6701bf8a5d03a43375909ac91b6980aea74b0f5402fbe9428fc3f6edf5d9677e"},
-    {file = "multidict-6.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a007b1638e148c3cfb6bf0bdc4f82776cef0ac487191d093cdc316905e504071"},
-    {file = "multidict-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:07a017cfa00c9890011628eab2503bee5872f27144936a52eaab449be5eaf032"},
-    {file = "multidict-6.0.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c207fff63adcdf5a485969131dc70e4b194327666b7e8a87a97fbc4fd80a53b2"},
-    {file = "multidict-6.0.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:373ba9d1d061c76462d74e7de1c0c8e267e9791ee8cfefcf6b0b2495762c370c"},
-    {file = "multidict-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfba7c6d5d7c9099ba21f84662b037a0ffd4a5e6b26ac07d19e423e6fdf965a9"},
-    {file = "multidict-6.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:19d9bad105dfb34eb539c97b132057a4e709919ec4dd883ece5838bcbf262b80"},
-    {file = "multidict-6.0.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:de989b195c3d636ba000ee4281cd03bb1234635b124bf4cd89eeee9ca8fcb09d"},
-    {file = "multidict-6.0.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7c40b7bbece294ae3a87c1bc2abff0ff9beef41d14188cda94ada7bcea99b0fb"},
-    {file = "multidict-6.0.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:d16cce709ebfadc91278a1c005e3c17dd5f71f5098bfae1035149785ea6e9c68"},
-    {file = "multidict-6.0.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:a2c34a93e1d2aa35fbf1485e5010337c72c6791407d03aa5f4eed920343dd360"},
-    {file = "multidict-6.0.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:feba80698173761cddd814fa22e88b0661e98cb810f9f986c54aa34d281e4937"},
-    {file = "multidict-6.0.2-cp39-cp39-win32.whl", hash = "sha256:23b616fdc3c74c9fe01d76ce0d1ce872d2d396d8fa8e4899398ad64fb5aa214a"},
-    {file = "multidict-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:4bae31803d708f6f15fd98be6a6ac0b6958fcf68fda3c77a048a4f9073704aae"},
-    {file = "multidict-6.0.2.tar.gz", hash = "sha256:5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeb6dcc05e911516ae3d1f207d4b0520d07f54484c49dfc294d6e7d63b734171"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d6d635d5209b82a3492508cf5b365f3446afb65ae7ebd755e70e18f287b0adf7"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c048099e4c9e9d615545e2001d3d8a4380bd403e1a0578734e0d31703d1b0c0b"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ea20853c6dbbb53ed34cb4d080382169b6f4554d394015f1bef35e881bf83547"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16d232d4e5396c2efbbf4f6d4df89bfa905eb0d4dc5b3549d872ab898451f569"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36c63aaa167f6c6b04ef2c85704e93af16c11d20de1d133e39de6a0e84582a93"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:64bdf1086b6043bf519869678f5f2757f473dee970d7abf6da91ec00acb9cb98"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:43644e38f42e3af682690876cff722d301ac585c5b9e1eacc013b7a3f7b696a0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7582a1d1030e15422262de9f58711774e02fa80df0d1578995c76214f6954988"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ddff9c4e225a63a5afab9dd15590432c22e8057e1a9a13d28ed128ecf047bbdc"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ee2a1ece51b9b9e7752e742cfb661d2a29e7bcdba2d27e66e28a99f1890e4fa0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a2e4369eb3d47d2034032a26c7a80fcb21a2cb22e1173d761a162f11e562caa5"},
+    {file = "multidict-6.0.4-cp310-cp310-win32.whl", hash = "sha256:574b7eae1ab267e5f8285f0fe881f17efe4b98c39a40858247720935b893bba8"},
+    {file = "multidict-6.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:4dcbb0906e38440fa3e325df2359ac6cb043df8e58c965bb45f4e406ecb162cc"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0dfad7a5a1e39c53ed00d2dd0c2e36aed4650936dc18fd9a1826a5ae1cad6f03"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:64da238a09d6039e3bd39bb3aee9c21a5e34f28bfa5aa22518581f910ff94af3"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ff959bee35038c4624250473988b24f846cbeb2c6639de3602c073f10410ceba"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c5cb09abb18c1ea940fb99360ea0396f34d46566f157122c92dfa069d3e0e982"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666daae833559deb2d609afa4490b85830ab0dfca811a98b70a205621a6109fe"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11bdf3f5e1518b24530b8241529d2050014c884cf18b6fc69c0c2b30ca248710"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d18748f2d30f94f498e852c67d61261c643b349b9d2a581131725595c45ec6c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:458f37be2d9e4c95e2d8866a851663cbc76e865b78395090786f6cd9b3bbf4f4"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b1a2eeedcead3a41694130495593a559a668f382eee0727352b9a41e1c45759a"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7d6ae9d593ef8641544d6263c7fa6408cc90370c8cb2bbb65f8d43e5b0351d9c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:5979b5632c3e3534e42ca6ff856bb24b2e3071b37861c2c727ce220d80eee9ed"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dcfe792765fab89c365123c81046ad4103fcabbc4f56d1c1997e6715e8015461"},
+    {file = "multidict-6.0.4-cp311-cp311-win32.whl", hash = "sha256:3601a3cece3819534b11d4efc1eb76047488fddd0c85a3948099d5da4d504636"},
+    {file = "multidict-6.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:81a4f0b34bd92df3da93315c6a59034df95866014ac08535fc819f043bfd51f0"},
+    {file = "multidict-6.0.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:67040058f37a2a51ed8ea8f6b0e6ee5bd78ca67f169ce6122f3e2ec80dfe9b78"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:853888594621e6604c978ce2a0444a1e6e70c8d253ab65ba11657659dcc9100f"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:39ff62e7d0f26c248b15e364517a72932a611a9b75f35b45be078d81bdb86603"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:af048912e045a2dc732847d33821a9d84ba553f5c5f028adbd364dd4765092ac"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1e8b901e607795ec06c9e42530788c45ac21ef3aaa11dbd0c69de543bfb79a9"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62501642008a8b9871ddfccbf83e4222cf8ac0d5aeedf73da36153ef2ec222d2"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:99b76c052e9f1bc0721f7541e5e8c05db3941eb9ebe7b8553c625ef88d6eefde"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:509eac6cf09c794aa27bcacfd4d62c885cce62bef7b2c3e8b2e49d365b5003fe"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:21a12c4eb6ddc9952c415f24eef97e3e55ba3af61f67c7bc388dcdec1404a067"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:5cad9430ab3e2e4fa4a2ef4450f548768400a2ac635841bc2a56a2052cdbeb87"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ab55edc2e84460694295f401215f4a58597f8f7c9466faec545093045476327d"},
+    {file = "multidict-6.0.4-cp37-cp37m-win32.whl", hash = "sha256:5a4dcf02b908c3b8b17a45fb0f15b695bf117a67b76b7ad18b73cf8e92608775"},
+    {file = "multidict-6.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:6ed5f161328b7df384d71b07317f4d8656434e34591f20552c7bcef27b0ab88e"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5fc1b16f586f049820c5c5b17bb4ee7583092fa0d1c4e28b5239181ff9532e0c"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1502e24330eb681bdaa3eb70d6358e818e8e8f908a22a1851dfd4e15bc2f8161"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b692f419760c0e65d060959df05f2a531945af31fda0c8a3b3195d4efd06de11"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45e1ecb0379bfaab5eef059f50115b54571acfbe422a14f668fc8c27ba410e7e"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ddd3915998d93fbcd2566ddf9cf62cdb35c9e093075f862935573d265cf8f65d"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:59d43b61c59d82f2effb39a93c48b845efe23a3852d201ed2d24ba830d0b4cf2"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc8e1d0c705233c5dd0c5e6460fbad7827d5d36f310a0fadfd45cc3029762258"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6aa0418fcc838522256761b3415822626f866758ee0bc6632c9486b179d0b52"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6748717bb10339c4760c1e63da040f5f29f5ed6e59d76daee30305894069a660"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:4d1a3d7ef5e96b1c9e92f973e43aa5e5b96c659c9bc3124acbbd81b0b9c8a951"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4372381634485bec7e46718edc71528024fcdc6f835baefe517b34a33c731d60"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:fc35cb4676846ef752816d5be2193a1e8367b4c1397b74a565a9d0389c433a1d"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:4b9d9e4e2b37daddb5c23ea33a3417901fa7c7b3dee2d855f63ee67a0b21e5b1"},
+    {file = "multidict-6.0.4-cp38-cp38-win32.whl", hash = "sha256:e41b7e2b59679edfa309e8db64fdf22399eec4b0b24694e1b2104fb789207779"},
+    {file = "multidict-6.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:d6c254ba6e45d8e72739281ebc46ea5eb5f101234f3ce171f0e9f5cc86991480"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16ab77bbeb596e14212e7bab8429f24c1579234a3a462105cda4a66904998664"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc779e9e6f7fda81b3f9aa58e3a6091d49ad528b11ed19f6621408806204ad35"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ceef517eca3e03c1cceb22030a3e39cb399ac86bff4e426d4fc6ae49052cc60"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:281af09f488903fde97923c7744bb001a9b23b039a909460d0f14edc7bf59706"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:52f2dffc8acaba9a2f27174c41c9e57f60b907bb9f096b36b1a1f3be71c6284d"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b41156839806aecb3641f3208c0dafd3ac7775b9c4c422d82ee2a45c34ba81ca"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5e3fc56f88cc98ef8139255cf8cd63eb2c586531e43310ff859d6bb3a6b51f1"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8316a77808c501004802f9beebde51c9f857054a0c871bd6da8280e718444449"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f70b98cd94886b49d91170ef23ec5c0e8ebb6f242d734ed7ed677b24d50c82cf"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bf6774e60d67a9efe02b3616fee22441d86fab4c6d335f9d2051d19d90a40063"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e69924bfcdda39b722ef4d9aa762b2dd38e4632b3641b1d9a57ca9cd18f2f83a"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:6b181d8c23da913d4ff585afd1155a0e1194c0b50c54fcfe286f70cdaf2b7176"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:52509b5be062d9eafc8170e53026fbc54cf3b32759a23d07fd935fb04fc22d95"},
+    {file = "multidict-6.0.4-cp39-cp39-win32.whl", hash = "sha256:27c523fbfbdfd19c6867af7346332b62b586eed663887392cff78d614f9ec313"},
+    {file = "multidict-6.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:33029f5734336aa0d4c0384525da0387ef89148dc7191aae00ca5fb23d7aafc2"},
+    {file = "multidict-6.0.4.tar.gz", hash = "sha256:3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49"},
 ]
 
 [[package]]
@@ -1190,69 +1285,120 @@ files = [
 [package.extras]
 dev = ["black", "mypy", "pytest"]
 
+[[package]]
+name = "orjson"
+version = "3.8.7"
+description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "orjson-3.8.7-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:f98c82850b7b4b7e27785ca43706fa86c893cdb88d54576bbb9b0d9c1070e421"},
+    {file = "orjson-3.8.7-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:1dee503c6c1a0659c5b46f5f39d9ca9d3657b11ca8bb4af8506086df416887d9"},
+    {file = "orjson-3.8.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc4fa83831f42ce5c938f8cefc2e175fa1df6f661fdeaba3badf26d2b8cfcf73"},
+    {file = "orjson-3.8.7-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9e432c6c9c8b97ad825276d5795286f7cc9689f377a97e3b7ecf14918413303f"},
+    {file = "orjson-3.8.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ee519964a5a0efb9633f38b1129fd242807c5c57162844efeeaab1c8de080051"},
+    {file = "orjson-3.8.7-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:109b539ce5bf60a121454d008fa67c3b67e5a3249e47d277012645922cf74bd0"},
+    {file = "orjson-3.8.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ad4d441fbde4133af6fee37f67dbf23181b9c537ecc317346ec8c3b4c8ec7705"},
+    {file = "orjson-3.8.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:89dc786419e1ce2588345f58dd6a434e6728bce66b94989644234bcdbe39b603"},
+    {file = "orjson-3.8.7-cp310-none-win_amd64.whl", hash = "sha256:697abde7350fb8076d44bcb6b4ab3ce415ae2b5a9bb91efc460e5ab0d96bb5d3"},
+    {file = "orjson-3.8.7-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:1c19f47b35b9966a3abadf341b18ee4a860431bf2b00fd8d58906d51cf78aa70"},
+    {file = "orjson-3.8.7-cp311-cp311-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:3ffaabb380cd0ee187b4fc362516df6bf739808130b1339445c7d8878fca36e7"},
+    {file = "orjson-3.8.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d88837002c5a8af970745b8e0ca1b0fdb06aafbe7f1279e110d338ea19f3d23"},
+    {file = "orjson-3.8.7-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff60187d1b7e0bfab376b6002b08c560b7de06c87cf3a8ac639ecf58f84c5f3b"},
+    {file = "orjson-3.8.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0110970aed35dec293f30ed1e09f8604afd5d15c5ef83de7f6c427619b3ba47b"},
+    {file = "orjson-3.8.7-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:51b275475d4e36118b65ad56f9764056a09d985c5d72e64579bf8816f1356a5e"},
+    {file = "orjson-3.8.7-cp311-none-win_amd64.whl", hash = "sha256:63144d27735f3b60f079f247ac9a289d80dfe49a7f03880dfa0c0ba64d6491d5"},
+    {file = "orjson-3.8.7-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:a16273d77db746bb1789a2bbfded81148a60743fd6f9d5185e02d92e3732fa18"},
+    {file = "orjson-3.8.7-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5bb32259ea22cc9dd47a6fdc4b8f9f1e2f798fcf56c7c1122a7df0f4c5d33bf3"},
+    {file = "orjson-3.8.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad02e9102d4ba67db30a136e631e32aeebd1dce26c9f5942a457b02df131c5d0"},
+    {file = "orjson-3.8.7-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dbcfcec2b7ac52deb7be3685b551addc28ee8fa454ef41f8b714df6ba0e32a27"},
+    {file = "orjson-3.8.7-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e1a0e5504a5fc86083cc210c6946e8d61e13fe9f1d7a7bf81b42f7050a49d4fb"},
+    {file = "orjson-3.8.7-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:7bd4fd37adb03b1f2a1012d43c9f95973a02164e131dfe3ff804d7e180af5653"},
+    {file = "orjson-3.8.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:188ed9f9a781333ad802af54c55d5a48991e292239aef41bd663b6e314377eb8"},
+    {file = "orjson-3.8.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:cc52f58c688cb10afd810280e450f56fbcb27f52c053463e625c8335c95db0dc"},
+    {file = "orjson-3.8.7-cp37-none-win_amd64.whl", hash = "sha256:403c8c84ac8a02c40613b0493b74d5256379e65196d39399edbf2ed3169cbeb5"},
+    {file = "orjson-3.8.7-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:7d6ac5f8a2a17095cd927c4d52abbb38af45918e0d3abd60fb50cfd49d71ae24"},
+    {file = "orjson-3.8.7-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:0295a7bfd713fa89231fd0822c995c31fc2343c59a1d13aa1b8b6651335654f5"},
+    {file = "orjson-3.8.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:feb32aaaa34cf2f891eb793ad320d4bb6731328496ae59b6c9eb1b620c42b529"},
+    {file = "orjson-3.8.7-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7a3ab1a473894e609b6f1d763838c6689ba2b97620c256a32c4d9f10595ac179"},
+    {file = "orjson-3.8.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e8c430d82b532c5ab95634e034bbf6ca7432ffe175a3e63eadd493e00b3a555"},
+    {file = "orjson-3.8.7-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:366cc75f7e09106f9dac95a675aef413367b284f25507d21e55bd7f45f445e80"},
+    {file = "orjson-3.8.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:84d154d07e8b17d97e990d5d710b719a031738eb1687d8a05b9089f0564ff3e0"},
+    {file = "orjson-3.8.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06180014afcfdc167ca984b312218aa62ce20093965c437c5f9166764cb65ef7"},
+    {file = "orjson-3.8.7-cp38-none-win_amd64.whl", hash = "sha256:41244431ba13f2e6ef22b52c5cf0202d17954489f4a3c0505bd28d0e805c3546"},
+    {file = "orjson-3.8.7-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b20f29fa8371b8023f1791df035a2c3ccbd98baa429ac3114fc104768f7db6f8"},
+    {file = "orjson-3.8.7-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:226bfc1da2f21ee74918cee2873ea9a0fec1a8830e533cb287d192d593e99d02"},
+    {file = "orjson-3.8.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e75c11023ac29e29fd3e75038d0e8dd93f9ea24d7b9a5e871967a8921a88df24"},
+    {file = "orjson-3.8.7-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:78604d3acfd7cd502f6381eea0c42281fe2b74755b334074ab3ebc0224100be1"},
+    {file = "orjson-3.8.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7129a6847f0494aa1427167486ef6aea2e835ba05f6c627df522692ee228f65"},
+    {file = "orjson-3.8.7-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1a1a8f4980059f48483782c608145b0f74538c266e01c183d9bcd9f8b71dbada"},
+    {file = "orjson-3.8.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d60304172a33705ce4bd25a6261ab84bed2dab0b3d3b79672ea16c7648af4832"},
+    {file = "orjson-3.8.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4f733062d84389c32c0492e5a4929056fac217034a94523debe0430bcc602cda"},
+    {file = "orjson-3.8.7-cp39-none-win_amd64.whl", hash = "sha256:010e2970ec9e826c332819e0da4b14b29b19641da0f1a6af4cec91629ef9b988"},
+    {file = "orjson-3.8.7.tar.gz", hash = "sha256:8460c8810652dba59c38c80d27c325b5092d189308d8d4f3e688dbd8d4f3b2dc"},
+]
+
 [[package]]
 name = "packaging"
-version = "21.3"
+version = "23.0"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
+    {file = "packaging-23.0-py3-none-any.whl", hash = "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2"},
+    {file = "packaging-23.0.tar.gz", hash = "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"},
 ]
 
-[package.dependencies]
-pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
-
 [[package]]
 name = "pep8-naming"
-version = "0.13.2"
+version = "0.13.3"
 description = "Check PEP-8 naming conventions, plugin for flake8"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pep8-naming-0.13.2.tar.gz", hash = "sha256:93eef62f525fd12a6f8c98f4dcc17fa70baae2f37fa1f73bec00e3e44392fa48"},
-    {file = "pep8_naming-0.13.2-py3-none-any.whl", hash = "sha256:59e29e55c478db69cffbe14ab24b5bd2cd615c0413edf790d47d3fb7ba9a4e23"},
+    {file = "pep8-naming-0.13.3.tar.gz", hash = "sha256:1705f046dfcd851378aac3be1cd1551c7c1e5ff363bacad707d43007877fa971"},
+    {file = "pep8_naming-0.13.3-py3-none-any.whl", hash = "sha256:1a86b8c71a03337c97181917e2b472f0f5e4ccb06844a0d6f0a33522549e7a80"},
 ]
 
 [package.dependencies]
-flake8 = ">=3.9.1"
+flake8 = ">=5.0.0"
 
 [[package]]
 name = "pip-licenses"
-version = "4.0.1"
+version = "4.1.0"
 description = "Dump the software license list of Python packages installed with pip."
 category = "dev"
 optional = false
 python-versions = "~=3.8"
 files = [
-    {file = "pip-licenses-4.0.1.tar.gz", hash = "sha256:05a180f5610b262e2d56eea99f04e380db7080e79655abf1c916125f39fe207d"},
-    {file = "pip_licenses-4.0.1-py3-none-any.whl", hash = "sha256:5896c18b7897e38fdd7be9a9ea0de02d6ff3264b7411967d6b679019ddc31878"},
+    {file = "pip-licenses-4.1.0.tar.gz", hash = "sha256:6905abcc8b3ca45548a7a33b24abbee0e7a6eb451463acc676eaa879f1130598"},
+    {file = "pip_licenses-4.1.0-py3-none-any.whl", hash = "sha256:0aef43fa605aaed17342f74c325b5b1a15be034c9b12bcc97ff290de1a8bc0af"},
 ]
 
 [package.dependencies]
 prettytable = ">=2.3.0"
 
 [package.extras]
-test = ["docutils", "pytest-cov", "pytest-pycodestyle", "pytest-runner"]
+test = ["docutils", "mypy", "pytest-cov", "pytest-pycodestyle", "pytest-runner"]
 
 [[package]]
 name = "platformdirs"
-version = "2.5.4"
+version = "3.1.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"},
-    {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"},
+    {file = "platformdirs-3.1.0-py3-none-any.whl", hash = "sha256:13b08a53ed71021350c9e300d4ea8668438fb0046ab3937ac9a29913a1a1350a"},
+    {file = "platformdirs-3.1.0.tar.gz", hash = "sha256:accc3665857288317f32c7bebb5a8e482ba717b474f3fc1d18ca7f9214be0cef"},
 ]
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
-test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -1272,14 +1418,14 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.20.0"
+version = "3.1.1"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+    {file = "pre_commit-3.1.1-py2.py3-none-any.whl", hash = "sha256:b80254e60668e1dd1f5c03a1c9e0413941d61f568a57d745add265945f65bfe8"},
+    {file = "pre_commit-3.1.1.tar.gz", hash = "sha256:d63e6537f9252d99f65755ae5b79c989b462d511ebbc481b561db6a297e1e865"},
 ]
 
 [package.dependencies]
@@ -1287,19 +1433,18 @@ cfgv = ">=2.0.0"
 identify = ">=1.0.0"
 nodeenv = ">=0.11.1"
 pyyaml = ">=5.1"
-toml = "*"
-virtualenv = ">=20.0.8"
+virtualenv = ">=20.10.0"
 
 [[package]]
 name = "prettytable"
-version = "3.5.0"
+version = "3.6.0"
 description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "prettytable-3.5.0-py3-none-any.whl", hash = "sha256:fe391c3b545800028edf5dbb6a5360893feb398367fcc1cf8d7a5b29ce5c59a1"},
-    {file = "prettytable-3.5.0.tar.gz", hash = "sha256:52f682ba4efe29dccb38ff0fe5bac8a23007d0780ff92a8b85af64bc4fc74d72"},
+    {file = "prettytable-3.6.0-py3-none-any.whl", hash = "sha256:3b767129491767a3a5108e6f305cbaa650f8020a7db5dfe994a2df7ef7bad0fe"},
+    {file = "prettytable-3.6.0.tar.gz", hash = "sha256:2e0026af955b4ea67b22122f310b90eae890738c08cb0458693a49b6221530ac"},
 ]
 
 [package.dependencies]
@@ -1337,61 +1482,64 @@ test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
 
 [[package]]
 name = "pycares"
-version = "4.2.2"
+version = "4.3.0"
 description = "Python interface for c-ares"
 category = "main"
 optional = false
 python-versions = "*"
 files = [
-    {file = "pycares-4.2.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5dc6418e87729105d93162155793002b3fa95490e2f2df33afec08b0b0d44989"},
-    {file = "pycares-4.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9481ee42df7e34c9ef7b2f045e534062b980b2c971677868df9f17730b147ceb"},
-    {file = "pycares-4.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05e029e594c27a0066cdb89dfc5bba28ba94e2b27b0ca7aceb94f9aea06812cd"},
-    {file = "pycares-4.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0eb203ceedcf7f9865ed3abb6128dfbb3498c5e76342e3c820c4274cc0c8e873"},
-    {file = "pycares-4.2.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4a01ba75e8a2947fc0b954850f8db9d52166634a206056febef2f833c8cfa1e"},
-    {file = "pycares-4.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:064543e222e3587a92bccae704fcc5f4ce1ba1ce66aac96483c9cf504d554a67"},
-    {file = "pycares-4.2.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a5a28f1d041aa2102bd2512e7361671e4ef46bc927e95b6932ed95cc45273480"},
-    {file = "pycares-4.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:650b16f025bd3dad6a331e63bb8c9d55994c1b5d0d289ebe03c0bc16edad114f"},
-    {file = "pycares-4.2.2-cp310-cp310-win32.whl", hash = "sha256:f8b76c13275b319b850e28bb9b3f5815de7521b1e0a581453d1acf10011bafef"},
-    {file = "pycares-4.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:bcfcafbb376376c9cca6d37a8497dfd6dbd82333bf37627067b34dcaf5039612"},
-    {file = "pycares-4.2.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ae5accd693c6910bbd1a99d1f4551a9e99decd65d792a80f10c27b8fcc32b497"},
-    {file = "pycares-4.2.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f1901b309cb5cf7ade5822d74b904f55c49369e4ff9328818e554d4c34b4714"},
-    {file = "pycares-4.2.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bc61edb98aff9cb4b2e07c25383100b81459a676ca0b0bd5fe77226eb1f850e"},
-    {file = "pycares-4.2.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:241155687db7b45cb4ef84a18755ebc78c3ad624fd2578b48ea52ac16a4c8d9f"},
-    {file = "pycares-4.2.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:27a21184ba35fff12eec36375d5b064516a0c3401dbf66a7eded7da34c5ca282"},
-    {file = "pycares-4.2.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:8a376e637ecd79db62761ca40cda080b9383a07d6dedbc799dd1a31e053862d9"},
-    {file = "pycares-4.2.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:6c411610be8de17cd5257845ebba5104b8e6356c62e66768728985a2ac0e9d1c"},
-    {file = "pycares-4.2.2-cp36-cp36m-win32.whl", hash = "sha256:6a5af6443a1cefb36ddca47af37e29cae94a734c6c7cea3eb94e5de5cc2a4f1a"},
-    {file = "pycares-4.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:a01ab41405dd4dd8449f9323b2dac25e1d856ef02d85c8aedea0130b65275b2a"},
-    {file = "pycares-4.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:9a2053b34163d13d6d135248c65e71cefce3f25b3611677a1428ec7a57bae856"},
-    {file = "pycares-4.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8064eaae5084e5155008b8f9d089055a432ff2115960273fc570f55dccedf666"},
-    {file = "pycares-4.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc045040c094068d5de28e61a6fd0babe8522e8f61829839b893f7aff928173b"},
-    {file = "pycares-4.2.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:135a356d52773f02d7babd2b38ad64493418363274972cc786fdce847875ca03"},
-    {file = "pycares-4.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:512fb2c04c28e0e5a7de0b61624ab9c15d2df52db113f63a0aba6c6f1174b92f"},
-    {file = "pycares-4.2.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0eb374525c6231920509612f197ca47bdaa6ec9a0728aa199ba536dc0c25bb55"},
-    {file = "pycares-4.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:47c6e18bbe6f2f4ce42fbdfa4ab2602268590f76110f06af60d02f964b72fada"},
-    {file = "pycares-4.2.2-cp37-cp37m-win32.whl", hash = "sha256:a2c7fb5d3cb633e3f23344194da9b5caa54eb40da34dbe4465f0ebcede2e1e1a"},
-    {file = "pycares-4.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:90f374fae2af5eb728841b4c2a0c8038a6889ba2a5a421e4c4e4e0f15bcc5912"},
-    {file = "pycares-4.2.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c0a7e0f9371c47cf028e2389f11385e906ba2797900419509adfa86587a2ac"},
-    {file = "pycares-4.2.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0fb3944af9492cfde6e1167780c9b8a701a56cf7d3fb29086cfb906b8261648f"},
-    {file = "pycares-4.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7466315e76ab0ca4dc1354f3d7cb53f6d99d365b3778d9849e52643270beb6f2"},
-    {file = "pycares-4.2.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46f58398bd9fa99cc2dd79f7fecddc85837ccb452d673168037ea603b15aa11b"},
-    {file = "pycares-4.2.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:47eae9809826cea5c0eb08eec9da584dd6330e51c075c2f6963ca2067555cd07"},
-    {file = "pycares-4.2.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6cbd4df536d2c32d2d74b854db25f1d15cc61cdd182b03206afbd7ccbe7b8f11"},
-    {file = "pycares-4.2.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3e4519bc51b744331c968eef0bd0071ca9c3e5863b8b8c1d99540ab8bfb04235"},
-    {file = "pycares-4.2.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5e2af8ca3bc49894a87d2b5629b993c22b0e602ecb7fd2fad660ebb9be584829"},
-    {file = "pycares-4.2.2-cp38-cp38-win32.whl", hash = "sha256:f6b5360e2278fae1e79479a4b56198fc7faf46ab350da18756c4de789835dbcd"},
-    {file = "pycares-4.2.2-cp38-cp38-win_amd64.whl", hash = "sha256:4304e5f0c10281abcee3c2547140a6b280c70866f2828956c9bcb2de6cffa211"},
-    {file = "pycares-4.2.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:9155e95cbe26b4b57ca691e9d8bfb5a002c7ce14ac02ddfcfe7849d4d349badb"},
-    {file = "pycares-4.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:612a20514685a3d999dd0a99eede9da851be11171d599b211fac287eee452ff1"},
-    {file = "pycares-4.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:075d4bdde10590a2d0456eab20028aab997207e45469d30dd01a4a65caa7f8da"},
-    {file = "pycares-4.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f6eebdf34477c9bfb00497f8e58a674fd22b348bd928d19d29c84e8923554e1"},
-    {file = "pycares-4.2.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:55d39f2c38d1285d1ae248b9d2d965b161dcf51a4b6eacf97ff056da6f09dd30"},
-    {file = "pycares-4.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:64261640fd52910e7960f30888abeca4e6a7a91371d351ccebc70ac1625ca74e"},
-    {file = "pycares-4.2.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:72184b1510866c9bc97a6daca7d8218a6954c4a78640197f0840e604ba1182f9"},
-    {file = "pycares-4.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:02fdf5ce48b21da6eafc5cb4508d344a0d48ac1a31e8df178f7c2fb548fcbc14"},
-    {file = "pycares-4.2.2-cp39-cp39-win32.whl", hash = "sha256:fe8e0f8ed7fd795868bfc2211e345963174a9f4d1e2125753e1715a60441c8a0"},
-    {file = "pycares-4.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:bb09c084de909206e6db1f014d4c6d662c7df04194df31f4831088d426afe8f1"},
-    {file = "pycares-4.2.2.tar.gz", hash = "sha256:e1f57a8004370080694bd6fb969a1ffc9171a59c6824d54f791c1b2e4d298385"},
+    {file = "pycares-4.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:19c9cdd3322d422931982939773e453e491dfc5c0b2e23d7266959315c7a0824"},
+    {file = "pycares-4.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9e56e9cdf46a092970dc4b75bbabddea9f480be5eeadc3fcae3eb5c6807c4136"},
+    {file = "pycares-4.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c75a6241c79b935048272cb77df498da64b8defc8c4b29fdf9870e43ba4cbb4"},
+    {file = "pycares-4.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24d8654fac3742791b8bef59d1fbb3e19ae6a5c48876a6d98659f7c66ee546c4"},
+    {file = "pycares-4.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ebf50b049a245880f1aa16a6f72c4408e0a65b49ea1d3bf13383a44a2cabd2bf"},
+    {file = "pycares-4.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:84daf560962763c0359fd79c750ef480f0fda40c08b57765088dbe362e8dc452"},
+    {file = "pycares-4.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:978d10da7ee74b9979c494afa8b646411119ad0186a29c7f13c72bb4295630c6"},
+    {file = "pycares-4.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c5b9d7fe52eb3d243f5ead58d5c0011884226d961df8360a34618c38c7515"},
+    {file = "pycares-4.3.0-cp310-cp310-win32.whl", hash = "sha256:da7c7089ae617317d2cbe38baefd3821387b3bfef7b3ee5b797b871cb1257974"},
+    {file = "pycares-4.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:7106dc683db30e1d851283b7b9df7a5ea4964d6bdd000d918d91d4b1f9bed329"},
+    {file = "pycares-4.3.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4e7a24ecef0b1933f2a3fdbf328d1b529a76cda113f8364fa0742e5b3bd76566"},
+    {file = "pycares-4.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e7abccc2aa4771c06994e4d9ed596453061e2b8846f887d9c98a64ccdaf4790a"},
+    {file = "pycares-4.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:531fed46c5ed798a914c3207be4ae7b297c4d09e4183d3cf8fd9ee59a55d5080"},
+    {file = "pycares-4.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c9335175af0c64a1e0ba67bdd349eb62d4eea0ad02c235ccdf0d535fd20f323"},
+    {file = "pycares-4.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5f0e95535027d2dcd51e780410632b0d3ed7e9e5ceb25dc0fe937f2c2960079"},
+    {file = "pycares-4.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3692179ce5fb96908ba342e1e5303608d0c976f0d5d4619fa9d3d6d9d5a9a1b4"},
+    {file = "pycares-4.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5c4cb6cc7fe8e0606d30b60367f59fe26d1472e88555d61e202db70dea5c8edb"},
+    {file = "pycares-4.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3215445396c74103e2054e6b349d9e85883ceda2006d0039fc2d58c9b11818a2"},
+    {file = "pycares-4.3.0-cp311-cp311-win32.whl", hash = "sha256:6a0c0c3a0adf490bba9dbb37dbd07ec81e4a6584f095036ac34f06a633710ffe"},
+    {file = "pycares-4.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:995cb37cc39bd40ca87bb16555a0f7724f3be30d9f9059a4caab2fde45b1b903"},
+    {file = "pycares-4.3.0-cp36-cp36m-win32.whl", hash = "sha256:4c9187be72449c975c11daa1d94d7ddcc494f8a4c37a6c18f977cd7024a531d9"},
+    {file = "pycares-4.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d7405ba10a2903a58b8b0faedcb54994c9ee002ad01963587fabf93e7e479783"},
+    {file = "pycares-4.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:40aaa12081495f879f11f4cfc95edfec1ea14711188563102f9e33fe98728fac"},
+    {file = "pycares-4.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4972cac24b66c5997f3a3e2cb608e408066d80103d443e36d626a88a287b9ae7"},
+    {file = "pycares-4.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35886dba7aa5b73affca8729aeb5a1f5e94d3d9a764adb1b7e75bafca44eeca5"},
+    {file = "pycares-4.3.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5cea6e1f3be016f155d60f27f16c1074d58b4d6e123228fdbc3326d076016af8"},
+    {file = "pycares-4.3.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3a9fd2665b053afb39226ac6f8137a60910ca7729358456df2fb94866f4297de"},
+    {file = "pycares-4.3.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e8e9195f869120e44e0aa0a6098bb5c19947f4753054365891f592e6f9eab3ef"},
+    {file = "pycares-4.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:674486ecf2afb25ee219171b07cdaba481a1aaa2dabb155779c7be9ded03eaa9"},
+    {file = "pycares-4.3.0-cp37-cp37m-win32.whl", hash = "sha256:1b6cd3161851499b6894d1e23bfd633e7b775472f5af35ae35409c4a47a2d45e"},
+    {file = "pycares-4.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:710120c97b9afdba443564350c3f5f72fd9aae74d95b73dc062ca8ac3d7f36d7"},
+    {file = "pycares-4.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9103649bd29d84bc6bcfaf09def9c0592bbc766018fad19d76d09989608b915d"},
+    {file = "pycares-4.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c072dbaf73cb5434279578dc35322867d8d5df053e14fdcdcc589994ba4804ae"},
+    {file = "pycares-4.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:008531733f9c7a976b59c7760a3672b191159fd69ae76c01ca051f20b5e44164"},
+    {file = "pycares-4.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2aae02d97d77dcff840ab55f86cb8b99bf644acbca17e1edb7048408b9782088"},
+    {file = "pycares-4.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:257953ae6d400a934fd9193aeb20990ac84a78648bdf5978e998bd007a4045cd"},
+    {file = "pycares-4.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c28d481efae26936ec08cb6beea305f4b145503b152cf2c4dc68cc4ad9644f0e"},
+    {file = "pycares-4.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:976249b39037dbfb709ccf7e1c40d2785905a0065536385d501b94570cfed96d"},
+    {file = "pycares-4.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:98568c30cfab6b327d94ae1acdf85bbba4cffd415980804985d34ca07e6f4791"},
+    {file = "pycares-4.3.0-cp38-cp38-win32.whl", hash = "sha256:a2f3c4f49f43162f7e684419d9834c2c8ec165e54cb8dc47aa9dc0c2132701c0"},
+    {file = "pycares-4.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:1730ef93e33e4682fbbf0e7fb19df2ed9822779d17de8ea6e20d5b0d71c1d2be"},
+    {file = "pycares-4.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5a26b3f1684557025da26ce65d076619890c82b95e38cc7284ce51c3539a1ce8"},
+    {file = "pycares-4.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:86112cce01655b9f63c5e53b74722084e88e784a7a8ad138d373440337c591c9"},
+    {file = "pycares-4.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c01465a191dc78e923884bb45cd63c7e012623e520cf7ed67e542413ee334804"},
+    {file = "pycares-4.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9fd5d6012f3ee8c8038cbfe16e988bbd17b2f21eea86650874bf63757ee6161"},
+    {file = "pycares-4.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa36b8ea91eae20b5c7205f3e6654423f066af24a1df02b274770a96cbcafaa7"},
+    {file = "pycares-4.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:61019151130557c1788cae52e4f2f388a7520c9d92574f3a0d61c974c6740db0"},
+    {file = "pycares-4.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:231962bb46274c52632469a1e686fab065dbd106dbef586de4f7fb101e297587"},
+    {file = "pycares-4.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6c979512fa51c7ccef5204fe10ed4e5c44c2bce5f335fe98a3e423f1672bd7d4"},
+    {file = "pycares-4.3.0-cp39-cp39-win32.whl", hash = "sha256:655cf0df862ce3847a60e1a106dafa2ba2c14e6636bac49e874347acdc7312dc"},
+    {file = "pycares-4.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:36f2251ad0f99a5ce13df45c94c3161d9734c9e9fa2b9b4cc163b853ca170dc5"},
+    {file = "pycares-4.3.0.tar.gz", hash = "sha256:c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45"},
 ]
 
 [package.dependencies]
@@ -1426,52 +1574,52 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "1.10.2"
+version = "1.10.5"
 description = "Data validation and settings management using python type hints"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pydantic-1.10.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bb6ad4489af1bac6955d38ebcb95079a836af31e4c4f74aba1ca05bb9f6027bd"},
-    {file = "pydantic-1.10.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a1f5a63a6dfe19d719b1b6e6106561869d2efaca6167f84f5ab9347887d78b98"},
-    {file = "pydantic-1.10.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:352aedb1d71b8b0736c6d56ad2bd34c6982720644b0624462059ab29bd6e5912"},
-    {file = "pydantic-1.10.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:19b3b9ccf97af2b7519c42032441a891a5e05c68368f40865a90eb88833c2559"},
-    {file = "pydantic-1.10.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e9069e1b01525a96e6ff49e25876d90d5a563bc31c658289a8772ae186552236"},
-    {file = "pydantic-1.10.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:355639d9afc76bcb9b0c3000ddcd08472ae75318a6eb67a15866b87e2efa168c"},
-    {file = "pydantic-1.10.2-cp310-cp310-win_amd64.whl", hash = "sha256:ae544c47bec47a86bc7d350f965d8b15540e27e5aa4f55170ac6a75e5f73b644"},
-    {file = "pydantic-1.10.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a4c805731c33a8db4b6ace45ce440c4ef5336e712508b4d9e1aafa617dc9907f"},
-    {file = "pydantic-1.10.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d49f3db871575e0426b12e2f32fdb25e579dea16486a26e5a0474af87cb1ab0a"},
-    {file = "pydantic-1.10.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37c90345ec7dd2f1bcef82ce49b6235b40f282b94d3eec47e801baf864d15525"},
-    {file = "pydantic-1.10.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b5ba54d026c2bd2cb769d3468885f23f43710f651688e91f5fb1edcf0ee9283"},
-    {file = "pydantic-1.10.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:05e00dbebbe810b33c7a7362f231893183bcc4251f3f2ff991c31d5c08240c42"},
-    {file = "pydantic-1.10.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:2d0567e60eb01bccda3a4df01df677adf6b437958d35c12a3ac3e0f078b0ee52"},
-    {file = "pydantic-1.10.2-cp311-cp311-win_amd64.whl", hash = "sha256:c6f981882aea41e021f72779ce2a4e87267458cc4d39ea990729e21ef18f0f8c"},
-    {file = "pydantic-1.10.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c4aac8e7103bf598373208f6299fa9a5cfd1fc571f2d40bf1dd1955a63d6eeb5"},
-    {file = "pydantic-1.10.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81a7b66c3f499108b448f3f004801fcd7d7165fb4200acb03f1c2402da73ce4c"},
-    {file = "pydantic-1.10.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bedf309630209e78582ffacda64a21f96f3ed2e51fbf3962d4d488e503420254"},
-    {file = "pydantic-1.10.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9300fcbebf85f6339a02c6994b2eb3ff1b9c8c14f502058b5bf349d42447dcf5"},
-    {file = "pydantic-1.10.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:216f3bcbf19c726b1cc22b099dd409aa371f55c08800bcea4c44c8f74b73478d"},
-    {file = "pydantic-1.10.2-cp37-cp37m-win_amd64.whl", hash = "sha256:dd3f9a40c16daf323cf913593083698caee97df2804aa36c4b3175d5ac1b92a2"},
-    {file = "pydantic-1.10.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b97890e56a694486f772d36efd2ba31612739bc6f3caeee50e9e7e3ebd2fdd13"},
-    {file = "pydantic-1.10.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:9cabf4a7f05a776e7793e72793cd92cc865ea0e83a819f9ae4ecccb1b8aa6116"},
-    {file = "pydantic-1.10.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06094d18dd5e6f2bbf93efa54991c3240964bb663b87729ac340eb5014310624"},
-    {file = "pydantic-1.10.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc78cc83110d2f275ec1970e7a831f4e371ee92405332ebfe9860a715f8336e1"},
-    {file = "pydantic-1.10.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ee433e274268a4b0c8fde7ad9d58ecba12b069a033ecc4645bb6303c062d2e9"},
-    {file = "pydantic-1.10.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7c2abc4393dea97a4ccbb4ec7d8658d4e22c4765b7b9b9445588f16c71ad9965"},
-    {file = "pydantic-1.10.2-cp38-cp38-win_amd64.whl", hash = "sha256:0b959f4d8211fc964772b595ebb25f7652da3f22322c007b6fed26846a40685e"},
-    {file = "pydantic-1.10.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c33602f93bfb67779f9c507e4d69451664524389546bacfe1bee13cae6dc7488"},
-    {file = "pydantic-1.10.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5760e164b807a48a8f25f8aa1a6d857e6ce62e7ec83ea5d5c5a802eac81bad41"},
-    {file = "pydantic-1.10.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6eb843dcc411b6a2237a694f5e1d649fc66c6064d02b204a7e9d194dff81eb4b"},
-    {file = "pydantic-1.10.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b8795290deaae348c4eba0cebb196e1c6b98bdbe7f50b2d0d9a4a99716342fe"},
-    {file = "pydantic-1.10.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e0bedafe4bc165ad0a56ac0bd7695df25c50f76961da29c050712596cf092d6d"},
-    {file = "pydantic-1.10.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2e05aed07fa02231dbf03d0adb1be1d79cabb09025dd45aa094aa8b4e7b9dcda"},
-    {file = "pydantic-1.10.2-cp39-cp39-win_amd64.whl", hash = "sha256:c1ba1afb396148bbc70e9eaa8c06c1716fdddabaf86e7027c5988bae2a829ab6"},
-    {file = "pydantic-1.10.2-py3-none-any.whl", hash = "sha256:1b6ee725bd6e83ec78b1aa32c5b1fa67a3a65badddde3976bca5fe4568f27709"},
-    {file = "pydantic-1.10.2.tar.gz", hash = "sha256:91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410"},
+    {file = "pydantic-1.10.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5920824fe1e21cbb3e38cf0f3dd24857c8959801d1031ce1fac1d50857a03bfb"},
+    {file = "pydantic-1.10.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3bb99cf9655b377db1a9e47fa4479e3330ea96f4123c6c8200e482704bf1eda2"},
+    {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2185a3b3d98ab4506a3f6707569802d2d92c3a7ba3a9a35683a7709ea6c2aaa2"},
+    {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f582cac9d11c227c652d3ce8ee223d94eb06f4228b52a8adaafa9fa62e73d5c9"},
+    {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c9e5b778b6842f135902e2d82624008c6a79710207e28e86966cd136c621bfee"},
+    {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:72ef3783be8cbdef6bca034606a5de3862be6b72415dc5cb1fb8ddbac110049a"},
+    {file = "pydantic-1.10.5-cp310-cp310-win_amd64.whl", hash = "sha256:45edea10b75d3da43cfda12f3792833a3fa70b6eee4db1ed6aed528cef17c74e"},
+    {file = "pydantic-1.10.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:63200cd8af1af2c07964546b7bc8f217e8bda9d0a2ef0ee0c797b36353914984"},
+    {file = "pydantic-1.10.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:305d0376c516b0dfa1dbefeae8c21042b57b496892d721905a6ec6b79494a66d"},
+    {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1fd326aff5d6c36f05735c7c9b3d5b0e933b4ca52ad0b6e4b38038d82703d35b"},
+    {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6bb0452d7b8516178c969d305d9630a3c9b8cf16fcf4713261c9ebd465af0d73"},
+    {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:9a9d9155e2a9f38b2eb9374c88f02fd4d6851ae17b65ee786a87d032f87008f8"},
+    {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f836444b4c5ece128b23ec36a446c9ab7f9b0f7981d0d27e13a7c366ee163f8a"},
+    {file = "pydantic-1.10.5-cp311-cp311-win_amd64.whl", hash = "sha256:8481dca324e1c7b715ce091a698b181054d22072e848b6fc7895cd86f79b4449"},
+    {file = "pydantic-1.10.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:87f831e81ea0589cd18257f84386bf30154c5f4bed373b7b75e5cb0b5d53ea87"},
+    {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ce1612e98c6326f10888df951a26ec1a577d8df49ddcaea87773bfbe23ba5cc"},
+    {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58e41dd1e977531ac6073b11baac8c013f3cd8706a01d3dc74e86955be8b2c0c"},
+    {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6a4b0aab29061262065bbdede617ef99cc5914d1bf0ddc8bcd8e3d7928d85bd6"},
+    {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:36e44a4de37b8aecffa81c081dbfe42c4d2bf9f6dff34d03dce157ec65eb0f15"},
+    {file = "pydantic-1.10.5-cp37-cp37m-win_amd64.whl", hash = "sha256:261f357f0aecda005934e413dfd7aa4077004a174dafe414a8325e6098a8e419"},
+    {file = "pydantic-1.10.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b429f7c457aebb7fbe7cd69c418d1cd7c6fdc4d3c8697f45af78b8d5a7955760"},
+    {file = "pydantic-1.10.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:663d2dd78596c5fa3eb996bc3f34b8c2a592648ad10008f98d1348be7ae212fb"},
+    {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51782fd81f09edcf265823c3bf43ff36d00db246eca39ee765ef58dc8421a642"},
+    {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c428c0f64a86661fb4873495c4fac430ec7a7cef2b8c1c28f3d1a7277f9ea5ab"},
+    {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:76c930ad0746c70f0368c4596020b736ab65b473c1f9b3872310a835d852eb19"},
+    {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3257bd714de9db2102b742570a56bf7978e90441193acac109b1f500290f5718"},
+    {file = "pydantic-1.10.5-cp38-cp38-win_amd64.whl", hash = "sha256:f5bee6c523d13944a1fdc6f0525bc86dbbd94372f17b83fa6331aabacc8fd08e"},
+    {file = "pydantic-1.10.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:532e97c35719f137ee5405bd3eeddc5c06eb91a032bc755a44e34a712420daf3"},
+    {file = "pydantic-1.10.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ca9075ab3de9e48b75fa8ccb897c34ccc1519177ad8841d99f7fd74cf43be5bf"},
+    {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd46a0e6296346c477e59a954da57beaf9c538da37b9df482e50f836e4a7d4bb"},
+    {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3353072625ea2a9a6c81ad01b91e5c07fa70deb06368c71307529abf70d23325"},
+    {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3f9d9b2be177c3cb6027cd67fbf323586417868c06c3c85d0d101703136e6b31"},
+    {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b473d00ccd5c2061fd896ac127b7755baad233f8d996ea288af14ae09f8e0d1e"},
+    {file = "pydantic-1.10.5-cp39-cp39-win_amd64.whl", hash = "sha256:5f3bc8f103b56a8c88021d481410874b1f13edf6e838da607dcb57ecff9b4594"},
+    {file = "pydantic-1.10.5-py3-none-any.whl", hash = "sha256:7c5b94d598c90f2f46b3a983ffb46ab806a67099d118ae0da7ef21a2a4033b28"},
+    {file = "pydantic-1.10.5.tar.gz", hash = "sha256:9e337ac83686645a46db0e825acceea8e02fca4062483f40e9ae178e8bd1103a"},
 ]
 
 [package.dependencies]
-typing-extensions = ">=4.1.0"
+typing-extensions = ">=4.2.0"
 
 [package.extras]
 dotenv = ["python-dotenv (>=0.10.4)"]
@@ -1500,21 +1648,21 @@ async-rediscache = ["async-rediscache[fakeredis] (==1.0.0rc2)"]
 
 [[package]]
 name = "pydocstyle"
-version = "6.1.1"
+version = "6.3.0"
 description = "Python docstring style checker"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "pydocstyle-6.1.1-py3-none-any.whl", hash = "sha256:6987826d6775056839940041beef5c08cc7e3d71d63149b48e36727f70144dc4"},
-    {file = "pydocstyle-6.1.1.tar.gz", hash = "sha256:1d41b7c459ba0ee6c345f2eb9ae827cab14a7533a88c5c6f7e94923f72df92dc"},
+    {file = "pydocstyle-6.3.0-py3-none-any.whl", hash = "sha256:118762d452a49d6b05e194ef344a55822987a462831ade91ec5c06fd2169d019"},
+    {file = "pydocstyle-6.3.0.tar.gz", hash = "sha256:7ce43f0c0ac87b07494eb9c0b462c0b73e6ff276807f204d6b53edc72b7e44e1"},
 ]
 
 [package.dependencies]
-snowballstemmer = "*"
+snowballstemmer = ">=2.2.0"
 
 [package.extras]
-toml = ["toml"]
+toml = ["tomli (>=1.2.3)"]
 
 [[package]]
 name = "pyflakes"
@@ -1528,21 +1676,6 @@ files = [
     {file = "pyflakes-3.0.1.tar.gz", hash = "sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd"},
 ]
 
-[[package]]
-name = "pyparsing"
-version = "3.0.9"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "dev"
-optional = false
-python-versions = ">=3.6.8"
-files = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
-]
-
-[package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
-
 [[package]]
 name = "pyreadline3"
 version = "3.4.1"
@@ -1557,14 +1690,14 @@ files = [
 
 [[package]]
 name = "pytest"
-version = "7.2.0"
+version = "7.2.2"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+    {file = "pytest-7.2.2-py3-none-any.whl", hash = "sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e"},
+    {file = "pytest-7.2.2.tar.gz", hash = "sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4"},
 ]
 
 [package.dependencies]
@@ -1600,29 +1733,30 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-subtests"
-version = "0.9.0"
+version = "0.10.0"
 description = "unittest subTest() support and subtests fixture"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-subtests-0.9.0.tar.gz", hash = "sha256:c0317cd5f6a5eb3e957e89dbe4fc3322a9afddba2db8414355ed2a2cb91a844e"},
-    {file = "pytest_subtests-0.9.0-py3-none-any.whl", hash = "sha256:f5f616b92c13405909d210569d6d3914db6fe156333ff5426534f97d5b447861"},
+    {file = "pytest-subtests-0.10.0.tar.gz", hash = "sha256:d9961a67c1791e8c1e32dce7a70ed1e54f3b1e641087f2094f2d37087ab7fb17"},
+    {file = "pytest_subtests-0.10.0-py3-none-any.whl", hash = "sha256:03a50a14f7981cd03090e8ca94205d783e290266d828728210c3d79f4d00c46f"},
 ]
 
 [package.dependencies]
+attrs = ">=19.2.0"
 pytest = ">=7.0"
 
 [[package]]
 name = "pytest-xdist"
-version = "3.0.2"
-description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+version = "3.2.0"
+description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
-    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
+    {file = "pytest-xdist-3.2.0.tar.gz", hash = "sha256:fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9"},
+    {file = "pytest_xdist-3.2.0-py3-none-any.whl", hash = "sha256:336098e3bbd8193276867cc87db8b22903c3927665dff9d1ac8684c02f597b68"},
 ]
 
 [package.dependencies]
@@ -1651,14 +1785,14 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.21.0"
+version = "1.0.0"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
+    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
 ]
 
 [package.extras]
@@ -1735,101 +1869,101 @@ files = [
 
 [[package]]
 name = "rapidfuzz"
-version = "2.13.2"
+version = "2.13.7"
 description = "rapid fuzzy string matching"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "rapidfuzz-2.13.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:91c049f7591d9e9f8bcc3c556c0c4b448223f564ad04511a8719d28f5d38daed"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:26e4b7f7941b92546a9b06ed75b40b5d7ceace8f3074d06cb3369349388d700d"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ba2a8fbd21079093118c40e8e80068750c1619a5988e54220ea0929de48e7d65"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de707808f1997574014d9ba87c2d9f8a619688d615520e3dce958bf4398514c7"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba3f47a5b82de7304ae08e2a111ccc90a6ea06ecc3f25d7870d08be0973c94cb"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a181b6ef9b480b56b29bdc58dc50c198e93d33398d2f8e57da05cbddb095bd9e"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1e569953a2abe945f116a6c22b71e8fc02d7c27068af2af40990115f25c93e4"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:026f6ecd8948e168a89fc015ef34b6bcb200f30ac33f1480554d722181b38bea"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:daf5e4f6b048c225a494c941a21463a0d397c39a080db8fece9b3136297ed240"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e39ae60598ed533f513db6d0370755685666024ab187a144fc688dd16cfa2d33"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e8d71f1611431c445ced872b303cd61f215551a11df0c7171e5993bed84867d5"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:f5d07dca69bf5a9f1e1cd5756ded6c197a27e8d8f2d8a3d99565add37a3bd1ec"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ac95981911559c842e1e4532e2f89ca255531db1d87257e5e69cd8c0c0d585fc"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-win32.whl", hash = "sha256:b4162b96d0908cb0ca218513eab559e9a77c8a1d9705c9133813634d9db27f4f"},
-    {file = "rapidfuzz-2.13.2-cp310-cp310-win_amd64.whl", hash = "sha256:84fd3cfc1cb872019e60a3844b1deedb176de0b9ded11bf30147137ac65185f5"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a599cc5cec196c0776faf65b74ac957354bd036f878905a16be9e20884870d02"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dbad2b7dad98b854a468d2c6a0b11464f68ce841428aded2f24f201a17a144eb"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ad78fb90540dc752b532345065146371acd3804a917c31fdd8a337951da9def2"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed0f99e0037b7f9f7117493e8723851c9eece4629906b2d5da21d3ef124149a2"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9abdffc590ef08d27dfd14d32e571f4a0f5f797f433f00c5faf4cf56ab62792a"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:352c920e166e838bc560014885ba979df656938fcc29a12c73ff06dc76b150d8"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c40acbadc965e72f1b44b3c665a59ec78a5e959757e52520bf73687c84ce6854"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a4053d5b62cedec83ff67d55e50da35f7736bed0a3b2af51fa6143f5fef3785"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0c324d82871fe50471f7ba38a21c3e68167e868f541f57ac0ef23c053bbef6e6"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cb4bd75518838b141dab8fe663de988c4d08502999068dc0b3949d43bd86ace6"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:4b785ffbc16795fca27c9e899993df7721d886249061689c48dbfe60fa7d02a1"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:1f363bf95d79dbafa8eac17697965e02e74da6f21b231b3fb808b2185bfed337"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f7cfc25d8143a7570f5e4c9da072a1e1c335d81a6926eb10c1fd3f637fa3c022"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-win32.whl", hash = "sha256:580f32cda7f911fef8266c7d811e580c18734cd12308d099b9975b914f33fcaf"},
-    {file = "rapidfuzz-2.13.2-cp311-cp311-win_amd64.whl", hash = "sha256:98be3e873c8f9d90a982891b2b061521ba4e5e49552ba2d3c1b0806dd5677f88"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:de8ec700127b645b0e2e28e694a2bba6dcb6a305ef080ad312f3086d47fb6973"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0ec73e6d3ad9442cfb5b94c137cf4241fff2860d81a9ee8be8c3d987bb400c0"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da5b7f35fc824cff36a2baa62486d5b427bf0fd7714c19704b5a7df82c2950b4"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0f186b3a32d78af7a805584a7e1c2fdf6f6fd62939936e4f3df869158c147a55"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:68f2e23eec59fc77bef164157889a2f7fb9800c47d615c58ee3809e2be3c8509"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4291a8c02d32aa6ebdffe63cf91abc2846383de95ae04a275f036c4e7a27f9ba"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a2eeee09ff716c8ff75942c1b93f0bca129590499f1127cbeb1b5cefbdc0c3d5"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2345656b30d7e18d18a4df5b765e4059111860a69bf3a36608a7d625e92567e6"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:1e1dd1a328464dd2ae70f0e31ec403593fbb1b254bab7ac9f0cd08ba71c797d0"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:54fe1835f96c1033cdb7e4677497e784704c81d028c962d2222239ded93d978b"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6b68b6a12411cfacca16ace22d42ae8e9946315d79f49c6c97089789c235e795"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-win32.whl", hash = "sha256:9a740ddd3f7725c80e500f16b1b02b83a58b47164c0f3ddd9379208629c8c4b5"},
-    {file = "rapidfuzz-2.13.2-cp37-cp37m-win_amd64.whl", hash = "sha256:378554acdcf8370cc5c777b1312921a2a670f68888e999ea1305599c55b67f5d"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:aa96955f2878116239db55506fe825f574651a8893d07a83de7b3c76a2f0386e"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b4df886481ca27a6d53d30a73625fb86dd308cf7d6d99d32e0dfbfcc8e8a75b9"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c66f3b8e93cdc3063ffd7224cad84951834d9434ffd27fa3fabad2e942ddab7"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8d6d5ab0f12f2d7ae6aad77af67ae6253b6c1d54c320484f1acd2fce38b39ac2"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8f0574d5d97722cfaf51b7dd667c8c836fa9fdf5a7d8158a787b98ee2788f6c5"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:83ff31d33c1391a0a6b23273b7f839dc8f7b5fb75ddca59ce4f334b83ca822bb"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:94d8c65f48665f82064bea8a48ff185409a309ba396f5aec3a846831cbe36e6d"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c065a83883af2a9a0303b6c06844a700af0db97ff6dc894324f656ad8efe405"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:773c60a5368a361253efea194552ff9ed6879756f6feb71b61b514723f8cb726"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:12ece1a4d024297afa4b76d2ce71c2c65fc7eaa487a9ae9f6e17c160253cfd23"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2b491f2fac36718247070c3343f53aadbbe8684f3e0cf3b6cce1bd099e1d05cb"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:31370273787dca851e2df6f32f1ec8c61f86e9bbeb1cc42787020b6dfff952fd"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:47b5b227dc0bd53530dda55f344e1b24087fa99bb1bd7fceb6f5a2b1e2831ad4"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-win32.whl", hash = "sha256:8f09a16ae84b1decb9df9a7e393ec84a0b2a11da6356c3eedcf86da8cabe3071"},
-    {file = "rapidfuzz-2.13.2-cp38-cp38-win_amd64.whl", hash = "sha256:e038e187270cbb987cf7c5d4b574fce7a32bc3d9593e9346d129874a7dc08dc3"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:aee5dce78e157e503269121ad6f886acab4b1ab3e3956bcdf0549d54596eab57"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:80073e897af0669f496d23899583b5c2f0decc2ec06aa7c36a3b8fb16eda5e0e"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ce40c2a68fe28e05a4f66229c11885ef928086fbcd2eff086decdacfe5254da9"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd268701bf930bbb2d12f6f7f75c681e16fee646ea1663d258e825bf919ca7a1"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f5d93e77881497f76e77056feea4c375732d27151151273d6e4cb8a1defbf17a"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b27c3e2b1789a635b9df1d74838ae032dc2dbc596ece5d89f9de2c37ba0a6dfe"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e49f412fe58c793af61b04fb5536534dfc95000b6c2bf0bfa42fcf7eb1453d42"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27bbdee91718019e251d315c6e9b03aa5b7663b90e4228ac1ddb0a567ff3634b"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b51d45cb9ed81669206e338413ba224c06a8900ab0cc9106f4750ac73dc687bb"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3479a2fd88504cc41eb707650e81fd7ce864f2418fee24f7224775b539536b39"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7adb4327453c1550f51d6ba13d718a84091f82230c1d0daca6db628e57d0fa5a"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:3a4e87aae287d757d9c5b045c819c985b02b38dea3f75630cc24d53826e640be"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:13e175b1643306558a3d7604789c4a8c217a64406fe82bf1a9e52efb5dea53ae"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-win32.whl", hash = "sha256:fb896fafa206db4d55f4412135c3ae28fbc56b8afc476970d0c5f29d2ce50948"},
-    {file = "rapidfuzz-2.13.2-cp39-cp39-win_amd64.whl", hash = "sha256:37a9a8f5737b8e429291148be67d2dd8ba779a69a87ad95d2785bb3d80fd1df7"},
-    {file = "rapidfuzz-2.13.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d6cb51a8459e7160366c6c7b31e8f9a671f7d617591c0ad305f2697707061da2"},
-    {file = "rapidfuzz-2.13.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:343fe1fcbbf55c994b22962bfb46f6b6903faeac5a2671b2f0fa5e3664de3e66"},
-    {file = "rapidfuzz-2.13.2-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8d9d081cd8e0110661c8a3e728d7b491a903bb54d34de40b17d19144563bd5f6"},
-    {file = "rapidfuzz-2.13.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f93a6740fef239a8aca6521cc1891d448664115b53528a3dd7f95c1781a5fa6"},
-    {file = "rapidfuzz-2.13.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:deaf26cc23cfbf90650993108de888533635b981a7157a0234b4753527ac6e5c"},
-    {file = "rapidfuzz-2.13.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b6a0617ba60f81a8df3b9ddca09f591a0a0c8269402169825fcd50daa03e5c25"},
-    {file = "rapidfuzz-2.13.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6bee1065d55edfeabdb98211bb673cb44a8b118cded42d743f7d59c07b05a80d"},
-    {file = "rapidfuzz-2.13.2-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4e5afd5477332ceeb960e2002d5bb0b04ad00b40037a0ab1de9916041badcf00"},
-    {file = "rapidfuzz-2.13.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eead76c172ba08d49ea621016cf84031fff1ee33d7db751d7003e491e55e66af"},
-    {file = "rapidfuzz-2.13.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:83b1e8aca6c3fad058d8a2b7653b7496df0c4aca903d589bb0e4184868290767"},
-    {file = "rapidfuzz-2.13.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:41610c3a9be4febcbcac2b69b2f45d0da33e39d1194e5ffa3dd3a104d5a67a70"},
-    {file = "rapidfuzz-2.13.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3aacc4eb58d6bccf6ec571619bee35861d4103961b9873d9b0829d347ca8a63e"},
-    {file = "rapidfuzz-2.13.2-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:791d90aa1c68b5485f6340a8dc485aba7e9bcb729572449174ded0692e7e7ad0"},
-    {file = "rapidfuzz-2.13.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d4f94b408c9f9218d61e8af55e43c8102f813eea2cf82de10906b032ddcb9aa"},
-    {file = "rapidfuzz-2.13.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:ac6a8a34f858f3862798383f51012788df6be823e2874fa426667a4da94ded7e"},
-    {file = "rapidfuzz-2.13.2.tar.gz", hash = "sha256:1c67007161655c59e13bba130a2db29d7c9e5c81bcecb8846a3dd7386065eb24"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:b75dd0928ce8e216f88660ab3d5c5ffe990f4dd682fd1709dba29d5dafdde6de"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:24d3fea10680d085fd0a4d76e581bfb2b1074e66e78fd5964d4559e1fcd2a2d4"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8109e0324d21993d5b2d111742bf5958f3516bf8c59f297c5d1cc25a2342eb66"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5f705652360d520c2de52bee11100c92f59b3e3daca308ebb150cbc58aecdad"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7496e8779905b02abc0ab4ba2a848e802ab99a6e20756ffc967a0de4900bd3da"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:24eb6b843492bdc63c79ee4b2f104059b7a2201fef17f25177f585d3be03405a"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:467c1505362823a5af12b10234cb1c4771ccf124c00e3fc9a43696512bd52293"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53dcae85956853b787c27c1cb06f18bb450e22cf57a4ad3444cf03b8ff31724a"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46b9b8aa09998bc48dd800854e8d9b74bc534d7922c1d6e1bbf783e7fa6ac29c"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:1fbad8fb28d98980f5bff33c7842efef0315d42f0cd59082108482a7e6b61410"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:43fb8cb030f888c3f076d40d428ed5eb4331f5dd6cf1796cfa39c67bf0f0fc1e"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:b6bad92de071cbffa2acd4239c1779f66851b60ffbbda0e4f4e8a2e9b17e7eef"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d00df2e4a81ffa56a6b1ec4d2bc29afdcb7f565e0b8cd3092fece2290c4c7a79"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-win32.whl", hash = "sha256:2c836f0f2d33d4614c3fbaf9a1eb5407c0fe23f8876f47fd15b90f78daa64c34"},
+    {file = "rapidfuzz-2.13.7-cp310-cp310-win_amd64.whl", hash = "sha256:c36fd260084bb636b9400bb92016c6bd81fd80e59ed47f2466f85eda1fc9f782"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b34e8c0e492949ecdd5da46a1cfc856a342e2f0389b379b1a45a3cdcd3176a6e"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:875d51b3497439a72e2d76183e1cb5468f3f979ab2ddfc1d1f7dde3b1ecfb42f"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ae33a72336059213996fe4baca4e0e4860913905c2efb7c991eab33b95a98a0a"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5585189b3d90d81ccd62d4f18530d5ac8972021f0aaaa1ffc6af387ff1dce75"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:42085d4b154a8232767de8296ac39c8af5bccee6b823b0507de35f51c9cbc2d7"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:585206112c294e335d84de5d5f179c0f932837752d7420e3de21db7fdc476278"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f891b98f8bc6c9d521785816085e9657212621e93f223917fb8e32f318b2957e"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08590905a95ccfa43f4df353dcc5d28c15d70664299c64abcad8721d89adce4f"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b5dd713a1734574c2850c566ac4286594bacbc2d60b9170b795bee4b68656625"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:988f8f6abfba7ee79449f8b50687c174733b079521c3cc121d65ad2d38831846"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b3210869161a864f3831635bb13d24f4708c0aa7208ef5baac1ac4d46e9b4208"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f6fe570e20e293eb50491ae14ddeef71a6a7e5f59d7e791393ffa99b13f1f8c2"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6120f2995f5154057454c5de99d86b4ef3b38397899b5da1265467e8980b2f60"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-win32.whl", hash = "sha256:b20141fa6cee041917801de0bab503447196d372d4c7ee9a03721b0a8edf5337"},
+    {file = "rapidfuzz-2.13.7-cp311-cp311-win_amd64.whl", hash = "sha256:ec55a81ac2b0f41b8d6fb29aad16e55417036c7563bad5568686931aa4ff08f7"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7d005e058d86f2a968a8d28ca6f2052fab1f124a39035aa0523261d6baf21e1f"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fe59a0c21a032024edb0c8e43f5dee5623fef0b65a1e3c1281836d9ce199af3b"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfc04f7647c29fb48da7a04082c34cdb16f878d3c6d098d62d5715c0ad3000c"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:68a89bb06d5a331511961f4d3fa7606f8e21237467ba9997cae6f67a1c2c2b9e"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:effe182767d102cb65dfbbf74192237dbd22d4191928d59415aa7d7c861d8c88"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25b4cedf2aa19fb7212894ce5f5219010cce611b60350e9a0a4d492122e7b351"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3a9bd02e1679c0fd2ecf69b72d0652dbe2a9844eaf04a36ddf4adfbd70010e95"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5e2b3d020219baa75f82a4e24b7c8adcb598c62f0e54e763c39361a9e5bad510"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:cf62dacb3f9234f3fddd74e178e6d25c68f2067fde765f1d95f87b1381248f58"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:fa263135b892686e11d5b84f6a1892523123a00b7e5882eff4fbdabb38667347"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:fa4c598ed77f74ec973247ca776341200b0f93ec3883e34c222907ce72cb92a4"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-win32.whl", hash = "sha256:c2523f8180ebd9796c18d809e9a19075a1060b1a170fde3799e83db940c1b6d5"},
+    {file = "rapidfuzz-2.13.7-cp37-cp37m-win_amd64.whl", hash = "sha256:5ada0a14c67452358c1ee52ad14b80517a87b944897aaec3e875279371a9cb96"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ca8a23097c1f50e0fdb4de9e427537ca122a18df2eead06ed39c3a0bef6d9d3a"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9be02162af0376d64b840f2fc8ee3366794fc149f1e06d095a6a1d42447d97c5"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af4f7c3c904ca709493eb66ca9080b44190c38e9ecb3b48b96d38825d5672559"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f50d1227e6e2a0e3ae1fb1c9a2e1c59577d3051af72c7cab2bcc430cb5e18da"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c71d9d512b76f05fa00282227c2ae884abb60e09f08b5ca3132b7e7431ac7f0d"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b52ac2626945cd21a2487aeefed794c14ee31514c8ae69b7599170418211e6f6"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca00fafd2756bc9649bf80f1cf72c647dce38635f0695d7ce804bc0f759aa756"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d248a109699ce9992304e79c1f8735c82cc4c1386cd8e27027329c0549f248a2"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c88adbcb933f6b8612f6c593384bf824e562bb35fc8a0f55fac690ab5b3486e5"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c8601a66fbfc0052bb7860d2eacd303fcde3c14e87fdde409eceff516d659e77"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:27be9c63215d302ede7d654142a2e21f0d34ea6acba512a4ae4cfd52bbaa5b59"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3dcffe1f3cbda0dc32133a2ae2255526561ca594f15f9644384549037b355245"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8450d15f7765482e86ef9be2ad1a05683cd826f59ad236ef7b9fb606464a56aa"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-win32.whl", hash = "sha256:460853983ab88f873173e27cc601c5276d469388e6ad6e08c4fd57b2a86f1064"},
+    {file = "rapidfuzz-2.13.7-cp38-cp38-win_amd64.whl", hash = "sha256:424f82c35dbe4f83bdc3b490d7d696a1dc6423b3d911460f5493b7ffae999fd2"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c3fbe449d869ea4d0909fc9d862007fb39a584fb0b73349a6aab336f0d90eaed"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:16080c05a63d6042643ae9b6cfec1aefd3e61cef53d0abe0df3069b9d4b72077"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dbcf5371ea704759fcce772c66a07647751d1f5dbdec7818331c9b31ae996c77"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114810491efb25464016fd554fdf1e20d390309cecef62587494fc474d4b926f"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:99a84ab9ac9a823e7e93b4414f86344052a5f3e23b23aa365cda01393ad895bd"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81642a24798851b118f82884205fc1bd9ff70b655c04018c467824b6ecc1fabc"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3741cb0bf9794783028e8b0cf23dab917fa5e37a6093b94c4c2f805f8e36b9f"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:759a3361711586a29bc753d3d1bdb862983bd9b9f37fbd7f6216c24f7c972554"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:1333fb3d603d6b1040e365dca4892ba72c7e896df77a54eae27dc07db90906e3"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:916bc2e6cf492c77ad6deb7bcd088f0ce9c607aaeabc543edeb703e1fbc43e31"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:23524635840500ce6f4d25005c9529a97621689c85d2f727c52eed1782839a6a"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:ebe303cd9839af69dd1f7942acaa80b1ba90bacef2e7ded9347fbed4f1654672"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fe56659ccadbee97908132135de4b875543353351e0c92e736b7c57aee298b5a"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-win32.whl", hash = "sha256:3f11a7eff7bc6301cd6a5d43f309e22a815af07e1f08eeb2182892fca04c86cb"},
+    {file = "rapidfuzz-2.13.7-cp39-cp39-win_amd64.whl", hash = "sha256:e8914dad106dacb0775718e54bf15e528055c4e92fb2677842996f2d52da5069"},
+    {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:7f7930adf84301797c3f09c94b9c5a9ed90a9e8b8ed19b41d2384937e0f9f5bd"},
+    {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c31022d9970177f6affc6d5dd757ed22e44a10890212032fabab903fdee3bfe7"},
+    {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f42b82f268689f429def9ecfb86fa65ceea0eaf3fed408b570fe113311bf5ce7"},
+    {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b477b43ced896301665183a5e0faec0f5aea2373005648da8bdcb3c4b73f280"},
+    {file = "rapidfuzz-2.13.7-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:d63def9bbc6b35aef4d76dc740301a4185867e8870cbb8719ec9de672212fca8"},
+    {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:c66546e30addb04a16cd864f10f5821272a1bfe6462ee5605613b4f1cb6f7b48"},
+    {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f799d1d6c33d81e983d3682571cc7d993ae7ff772c19b3aabb767039c33f6d1e"},
+    {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d82f20c0060ffdaadaf642b88ab0aa52365b56dffae812e188e5bdb998043588"},
+    {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:042644133244bfa7b20de635d500eb9f46af7097f3d90b1724f94866f17cb55e"},
+    {file = "rapidfuzz-2.13.7-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:75c45dcd595f8178412367e302fd022860ea025dc4a78b197b35428081ed33d5"},
+    {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3d8b081988d0a49c486e4e845a547565fee7c6e7ad8be57ff29c3d7c14c6894c"},
+    {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:16ffad751f43ab61001187b3fb4a9447ec2d1aedeff7c5bac86d3b95f9980cc3"},
+    {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:020858dd89b60ce38811cd6e37875c4c3c8d7fcd8bc20a0ad2ed1f464b34dc4e"},
+    {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cda1e2f66bb4ba7261a0f4c2d052d5d909798fca557cbff68f8a79a87d66a18f"},
+    {file = "rapidfuzz-2.13.7-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:b6389c50d8d214c9cd11a77f6d501529cb23279a9c9cafe519a3a4b503b5f72a"},
+    {file = "rapidfuzz-2.13.7.tar.gz", hash = "sha256:8d3e252d4127c79b4d7c2ae47271636cbaca905c8bb46d80c7930ab906cf4b5c"},
 ]
 
 [package.extras]
@@ -1837,14 +1971,14 @@ full = ["numpy"]
 
 [[package]]
 name = "redis"
-version = "4.4.2"
+version = "4.5.1"
 description = "Python client for Redis database and key-value store"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "redis-4.4.2-py3-none-any.whl", hash = "sha256:e6206448e2f8a432871d07d432c13ed6c2abcf6b74edb436c99752b1371be387"},
-    {file = "redis-4.4.2.tar.gz", hash = "sha256:a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7"},
+    {file = "redis-4.5.1-py3-none-any.whl", hash = "sha256:5deb072d26e67d2be1712603bfb7947ec3431fb0eec9c578994052e33035af6d"},
+    {file = "redis-4.5.1.tar.gz", hash = "sha256:1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864"},
 ]
 
 [package.dependencies]
@@ -1954,19 +2088,19 @@ files = [
 
 [[package]]
 name = "requests"
-version = "2.28.1"
+version = "2.28.2"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
 python-versions = ">=3.7, <4"
 files = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+    {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},
+    {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},
 ]
 
 [package.dependencies]
 certifi = ">=2017.4.17"
-charset-normalizer = ">=2,<3"
+charset-normalizer = ">=2,<4"
 idna = ">=2.5,<4"
 urllib3 = ">=1.21.1,<1.27"
 
@@ -2033,18 +2167,18 @@ tornado = ["tornado (>=5)"]
 
 [[package]]
 name = "setuptools"
-version = "65.6.3"
+version = "67.5.1"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+    {file = "setuptools-67.5.1-py3-none-any.whl", hash = "sha256:1c39d42bda4cb89f7fdcad52b6762e3c309ec8f8715b27c684176b7d71283242"},
+    {file = "setuptools-67.5.1.tar.gz", hash = "sha256:15136a251127da2d2e77ac7a1bc231eb504654f7e3346d93613a13f2e2787535"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -2097,14 +2231,14 @@ files = [
 
 [[package]]
 name = "soupsieve"
-version = "2.3.2.post1"
+version = "2.4"
 description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+    {file = "soupsieve-2.4-py3-none-any.whl", hash = "sha256:49e5368c2cda80ee7e84da9dbe3e110b70a4575f196efb74e51b94549d921955"},
+    {file = "soupsieve-2.4.tar.gz", hash = "sha256:e28dba9ca6c7c00173e34e4ba57448f0688bb681b7c5e8bf4971daafc093d69a"},
 ]
 
 [[package]]
@@ -2155,18 +2289,6 @@ idna = "*"
 requests = ">=2.1.0"
 requests-file = ">=1.4"
 
-[[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
-category = "dev"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-files = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
-
 [[package]]
 name = "tomli"
 version = "2.0.1"
@@ -2181,26 +2303,26 @@ files = [
 
 [[package]]
 name = "typing-extensions"
-version = "4.4.0"
+version = "4.5.0"
 description = "Backported and Experimental Type Hints for Python 3.7+"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"},
-    {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"},
+    {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"},
+    {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"},
 ]
 
 [[package]]
 name = "urllib3"
-version = "1.26.13"
+version = "1.26.14"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 files = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+    {file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"},
+    {file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"},
 ]
 
 [package.extras]
@@ -2210,104 +2332,119 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.16.7"
+version = "20.20.0"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.16.7-py3-none-any.whl", hash = "sha256:efd66b00386fdb7dbe4822d172303f40cd05e50e01740b19ea42425cbe653e29"},
-    {file = "virtualenv-20.16.7.tar.gz", hash = "sha256:8691e3ff9387f743e00f6bb20f70121f5e4f596cae754531f2b3b3a1b1ac696e"},
+    {file = "virtualenv-20.20.0-py3-none-any.whl", hash = "sha256:3c22fa5a7c7aa106ced59934d2c20a2ecb7f49b4130b8bf444178a16b880fa45"},
+    {file = "virtualenv-20.20.0.tar.gz", hash = "sha256:a8a4b8ca1e28f864b7514a253f98c1d62b64e31e77325ba279248c65fb4fcef4"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
 filelock = ">=3.4.1,<4"
-platformdirs = ">=2.4,<3"
+platformdirs = ">=2.4,<4"
 
 [package.extras]
-docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sphinx-rtd-theme (>=1)", "towncrier (>=22.8)"]
-testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23)", "pytest (>=7.2.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "wcwidth"
-version = "0.2.5"
+version = "0.2.6"
 description = "Measures the displayed width of unicode strings in a terminal"
 category = "dev"
 optional = false
 python-versions = "*"
 files = [
-    {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
-    {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
+    {file = "wcwidth-0.2.6-py2.py3-none-any.whl", hash = "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e"},
+    {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"},
 ]
 
 [[package]]
 name = "yarl"
-version = "1.8.1"
+version = "1.8.2"
 description = "Yet another URL library"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "yarl-1.8.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:abc06b97407868ef38f3d172762f4069323de52f2b70d133d096a48d72215d28"},
-    {file = "yarl-1.8.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:07b21e274de4c637f3e3b7104694e53260b5fc10d51fb3ec5fed1da8e0f754e3"},
-    {file = "yarl-1.8.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9de955d98e02fab288c7718662afb33aab64212ecb368c5dc866d9a57bf48880"},
-    {file = "yarl-1.8.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ec362167e2c9fd178f82f252b6d97669d7245695dc057ee182118042026da40"},
-    {file = "yarl-1.8.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:20df6ff4089bc86e4a66e3b1380460f864df3dd9dccaf88d6b3385d24405893b"},
-    {file = "yarl-1.8.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5999c4662631cb798496535afbd837a102859568adc67d75d2045e31ec3ac497"},
-    {file = "yarl-1.8.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed19b74e81b10b592084a5ad1e70f845f0aacb57577018d31de064e71ffa267a"},
-    {file = "yarl-1.8.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e4808f996ca39a6463f45182e2af2fae55e2560be586d447ce8016f389f626f"},
-    {file = "yarl-1.8.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2d800b9c2eaf0684c08be5f50e52bfa2aa920e7163c2ea43f4f431e829b4f0fd"},
-    {file = "yarl-1.8.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6628d750041550c5d9da50bb40b5cf28a2e63b9388bac10fedd4f19236ef4957"},
-    {file = "yarl-1.8.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:f5af52738e225fcc526ae64071b7e5342abe03f42e0e8918227b38c9aa711e28"},
-    {file = "yarl-1.8.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:76577f13333b4fe345c3704811ac7509b31499132ff0181f25ee26619de2c843"},
-    {file = "yarl-1.8.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0c03f456522d1ec815893d85fccb5def01ffaa74c1b16ff30f8aaa03eb21e453"},
-    {file = "yarl-1.8.1-cp310-cp310-win32.whl", hash = "sha256:ea30a42dc94d42f2ba4d0f7c0ffb4f4f9baa1b23045910c0c32df9c9902cb272"},
-    {file = "yarl-1.8.1-cp310-cp310-win_amd64.whl", hash = "sha256:9130ddf1ae9978abe63808b6b60a897e41fccb834408cde79522feb37fb72fb0"},
-    {file = "yarl-1.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0ab5a138211c1c366404d912824bdcf5545ccba5b3ff52c42c4af4cbdc2c5035"},
-    {file = "yarl-1.8.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0fb2cb4204ddb456a8e32381f9a90000429489a25f64e817e6ff94879d432fc"},
-    {file = "yarl-1.8.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:85cba594433915d5c9a0d14b24cfba0339f57a2fff203a5d4fd070e593307d0b"},
-    {file = "yarl-1.8.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1ca7e596c55bd675432b11320b4eacc62310c2145d6801a1f8e9ad160685a231"},
-    {file = "yarl-1.8.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0f77539733e0ec2475ddcd4e26777d08996f8cd55d2aef82ec4d3896687abda"},
-    {file = "yarl-1.8.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:29e256649f42771829974e742061c3501cc50cf16e63f91ed8d1bf98242e5507"},
-    {file = "yarl-1.8.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7fce6cbc6c170ede0221cc8c91b285f7f3c8b9fe28283b51885ff621bbe0f8ee"},
-    {file = "yarl-1.8.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:59ddd85a1214862ce7c7c66457f05543b6a275b70a65de366030d56159a979f0"},
-    {file = "yarl-1.8.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:12768232751689c1a89b0376a96a32bc7633c08da45ad985d0c49ede691f5c0d"},
-    {file = "yarl-1.8.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:b19255dde4b4f4c32e012038f2c169bb72e7f081552bea4641cab4d88bc409dd"},
-    {file = "yarl-1.8.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6c8148e0b52bf9535c40c48faebb00cb294ee577ca069d21bd5c48d302a83780"},
-    {file = "yarl-1.8.1-cp37-cp37m-win32.whl", hash = "sha256:de839c3a1826a909fdbfe05f6fe2167c4ab033f1133757b5936efe2f84904c07"},
-    {file = "yarl-1.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:dd032e8422a52e5a4860e062eb84ac94ea08861d334a4bcaf142a63ce8ad4802"},
-    {file = "yarl-1.8.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:19cd801d6f983918a3f3a39f3a45b553c015c5aac92ccd1fac619bd74beece4a"},
-    {file = "yarl-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6347f1a58e658b97b0a0d1ff7658a03cb79bdbda0331603bed24dd7054a6dea1"},
-    {file = "yarl-1.8.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7c0da7e44d0c9108d8b98469338705e07f4bb7dab96dbd8fa4e91b337db42548"},
-    {file = "yarl-1.8.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5587bba41399854703212b87071c6d8638fa6e61656385875f8c6dff92b2e461"},
-    {file = "yarl-1.8.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:31a9a04ecccd6b03e2b0e12e82131f1488dea5555a13a4d32f064e22a6003cfe"},
-    {file = "yarl-1.8.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:205904cffd69ae972a1707a1bd3ea7cded594b1d773a0ce66714edf17833cdae"},
-    {file = "yarl-1.8.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea513a25976d21733bff523e0ca836ef1679630ef4ad22d46987d04b372d57fc"},
-    {file = "yarl-1.8.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d0b51530877d3ad7a8d47b2fff0c8df3b8f3b8deddf057379ba50b13df2a5eae"},
-    {file = "yarl-1.8.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d2b8f245dad9e331540c350285910b20dd913dc86d4ee410c11d48523c4fd546"},
-    {file = "yarl-1.8.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ab2a60d57ca88e1d4ca34a10e9fb4ab2ac5ad315543351de3a612bbb0560bead"},
-    {file = "yarl-1.8.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:449c957ffc6bc2309e1fbe67ab7d2c1efca89d3f4912baeb8ead207bb3cc1cd4"},
-    {file = "yarl-1.8.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a165442348c211b5dea67c0206fc61366212d7082ba8118c8c5c1c853ea4d82e"},
-    {file = "yarl-1.8.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b3ded839a5c5608eec8b6f9ae9a62cb22cd037ea97c627f38ae0841a48f09eae"},
-    {file = "yarl-1.8.1-cp38-cp38-win32.whl", hash = "sha256:c1445a0c562ed561d06d8cbc5c8916c6008a31c60bc3655cdd2de1d3bf5174a0"},
-    {file = "yarl-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:56c11efb0a89700987d05597b08a1efcd78d74c52febe530126785e1b1a285f4"},
-    {file = "yarl-1.8.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e80ed5a9939ceb6fda42811542f31c8602be336b1fb977bccb012e83da7e4936"},
-    {file = "yarl-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6afb336e23a793cd3b6476c30f030a0d4c7539cd81649683b5e0c1b0ab0bf350"},
-    {file = "yarl-1.8.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4c322cbaa4ed78a8aac89b2174a6df398faf50e5fc12c4c191c40c59d5e28357"},
-    {file = "yarl-1.8.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fae37373155f5ef9b403ab48af5136ae9851151f7aacd9926251ab26b953118b"},
-    {file = "yarl-1.8.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5395da939ffa959974577eff2cbfc24b004a2fb6c346918f39966a5786874e54"},
-    {file = "yarl-1.8.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:076eede537ab978b605f41db79a56cad2e7efeea2aa6e0fa8f05a26c24a034fb"},
-    {file = "yarl-1.8.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d1a50e461615747dd93c099f297c1994d472b0f4d2db8a64e55b1edf704ec1c"},
-    {file = "yarl-1.8.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7de89c8456525650ffa2bb56a3eee6af891e98f498babd43ae307bd42dca98f6"},
-    {file = "yarl-1.8.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4a88510731cd8d4befaba5fbd734a7dd914de5ab8132a5b3dde0bbd6c9476c64"},
-    {file = "yarl-1.8.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2d93a049d29df172f48bcb09acf9226318e712ce67374f893b460b42cc1380ae"},
-    {file = "yarl-1.8.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:21ac44b763e0eec15746a3d440f5e09ad2ecc8b5f6dcd3ea8cb4773d6d4703e3"},
-    {file = "yarl-1.8.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:d0272228fabe78ce00a3365ffffd6f643f57a91043e119c289aaba202f4095b0"},
-    {file = "yarl-1.8.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:99449cd5366fe4608e7226c6cae80873296dfa0cde45d9b498fefa1de315a09e"},
-    {file = "yarl-1.8.1-cp39-cp39-win32.whl", hash = "sha256:8b0af1cf36b93cee99a31a545fe91d08223e64390c5ecc5e94c39511832a4bb6"},
-    {file = "yarl-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:de49d77e968de6626ba7ef4472323f9d2e5a56c1d85b7c0e2a190b2173d3b9be"},
-    {file = "yarl-1.8.1.tar.gz", hash = "sha256:af887845b8c2e060eb5605ff72b6f2dd2aab7a761379373fd89d314f4752abbf"},
+    {file = "yarl-1.8.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:bb81f753c815f6b8e2ddd2eef3c855cf7da193b82396ac013c661aaa6cc6b0a5"},
+    {file = "yarl-1.8.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:47d49ac96156f0928f002e2424299b2c91d9db73e08c4cd6742923a086f1c863"},
+    {file = "yarl-1.8.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3fc056e35fa6fba63248d93ff6e672c096f95f7836938241ebc8260e062832fe"},
+    {file = "yarl-1.8.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:58a3c13d1c3005dbbac5c9f0d3210b60220a65a999b1833aa46bd6677c69b08e"},
+    {file = "yarl-1.8.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10b08293cda921157f1e7c2790999d903b3fd28cd5c208cf8826b3b508026996"},
+    {file = "yarl-1.8.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de986979bbd87272fe557e0a8fcb66fd40ae2ddfe28a8b1ce4eae22681728fef"},
+    {file = "yarl-1.8.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c4fcfa71e2c6a3cb568cf81aadc12768b9995323186a10827beccf5fa23d4f8"},
+    {file = "yarl-1.8.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae4d7ff1049f36accde9e1ef7301912a751e5bae0a9d142459646114c70ecba6"},
+    {file = "yarl-1.8.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:bf071f797aec5b96abfc735ab97da9fd8f8768b43ce2abd85356a3127909d146"},
+    {file = "yarl-1.8.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:74dece2bfc60f0f70907c34b857ee98f2c6dd0f75185db133770cd67300d505f"},
+    {file = "yarl-1.8.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:df60a94d332158b444301c7f569659c926168e4d4aad2cfbf4bce0e8fb8be826"},
+    {file = "yarl-1.8.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:63243b21c6e28ec2375f932a10ce7eda65139b5b854c0f6b82ed945ba526bff3"},
+    {file = "yarl-1.8.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cfa2bbca929aa742b5084fd4663dd4b87c191c844326fcb21c3afd2d11497f80"},
+    {file = "yarl-1.8.2-cp310-cp310-win32.whl", hash = "sha256:b05df9ea7496df11b710081bd90ecc3a3db6adb4fee36f6a411e7bc91a18aa42"},
+    {file = "yarl-1.8.2-cp310-cp310-win_amd64.whl", hash = "sha256:24ad1d10c9db1953291f56b5fe76203977f1ed05f82d09ec97acb623a7976574"},
+    {file = "yarl-1.8.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2a1fca9588f360036242f379bfea2b8b44cae2721859b1c56d033adfd5893634"},
+    {file = "yarl-1.8.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f37db05c6051eff17bc832914fe46869f8849de5b92dc4a3466cd63095d23dfd"},
+    {file = "yarl-1.8.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:77e913b846a6b9c5f767b14dc1e759e5aff05502fe73079f6f4176359d832581"},
+    {file = "yarl-1.8.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0978f29222e649c351b173da2b9b4665ad1feb8d1daa9d971eb90df08702668a"},
+    {file = "yarl-1.8.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:388a45dc77198b2460eac0aca1efd6a7c09e976ee768b0d5109173e521a19daf"},
+    {file = "yarl-1.8.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2305517e332a862ef75be8fad3606ea10108662bc6fe08509d5ca99503ac2aee"},
+    {file = "yarl-1.8.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42430ff511571940d51e75cf42f1e4dbdded477e71c1b7a17f4da76c1da8ea76"},
+    {file = "yarl-1.8.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3150078118f62371375e1e69b13b48288e44f6691c1069340081c3fd12c94d5b"},
+    {file = "yarl-1.8.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c15163b6125db87c8f53c98baa5e785782078fbd2dbeaa04c6141935eb6dab7a"},
+    {file = "yarl-1.8.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4d04acba75c72e6eb90745447d69f84e6c9056390f7a9724605ca9c56b4afcc6"},
+    {file = "yarl-1.8.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e7fd20d6576c10306dea2d6a5765f46f0ac5d6f53436217913e952d19237efc4"},
+    {file = "yarl-1.8.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:75c16b2a900b3536dfc7014905a128a2bea8fb01f9ee26d2d7d8db0a08e7cb2c"},
+    {file = "yarl-1.8.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6d88056a04860a98341a0cf53e950e3ac9f4e51d1b6f61a53b0609df342cc8b2"},
+    {file = "yarl-1.8.2-cp311-cp311-win32.whl", hash = "sha256:fb742dcdd5eec9f26b61224c23baea46c9055cf16f62475e11b9b15dfd5c117b"},
+    {file = "yarl-1.8.2-cp311-cp311-win_amd64.whl", hash = "sha256:8c46d3d89902c393a1d1e243ac847e0442d0196bbd81aecc94fcebbc2fd5857c"},
+    {file = "yarl-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ceff9722e0df2e0a9e8a79c610842004fa54e5b309fe6d218e47cd52f791d7ef"},
+    {file = "yarl-1.8.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f6b4aca43b602ba0f1459de647af954769919c4714706be36af670a5f44c9c1"},
+    {file = "yarl-1.8.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1684a9bd9077e922300ecd48003ddae7a7474e0412bea38d4631443a91d61077"},
+    {file = "yarl-1.8.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ebb78745273e51b9832ef90c0898501006670d6e059f2cdb0e999494eb1450c2"},
+    {file = "yarl-1.8.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adeef150d528ded2a8e734ebf9ae2e658f4c49bf413f5f157a470e17a4a2e89"},
+    {file = "yarl-1.8.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57a7c87927a468e5a1dc60c17caf9597161d66457a34273ab1760219953f7f4c"},
+    {file = "yarl-1.8.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:efff27bd8cbe1f9bd127e7894942ccc20c857aa8b5a0327874f30201e5ce83d0"},
+    {file = "yarl-1.8.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a783cd344113cb88c5ff7ca32f1f16532a6f2142185147822187913eb989f739"},
+    {file = "yarl-1.8.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:705227dccbe96ab02c7cb2c43e1228e2826e7ead880bb19ec94ef279e9555b5b"},
+    {file = "yarl-1.8.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:34c09b43bd538bf6c4b891ecce94b6fa4f1f10663a8d4ca589a079a5018f6ed7"},
+    {file = "yarl-1.8.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a48f4f7fea9a51098b02209d90297ac324241bf37ff6be6d2b0149ab2bd51b37"},
+    {file = "yarl-1.8.2-cp37-cp37m-win32.whl", hash = "sha256:0414fd91ce0b763d4eadb4456795b307a71524dbacd015c657bb2a39db2eab89"},
+    {file = "yarl-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:d881d152ae0007809c2c02e22aa534e702f12071e6b285e90945aa3c376463c5"},
+    {file = "yarl-1.8.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5df5e3d04101c1e5c3b1d69710b0574171cc02fddc4b23d1b2813e75f35a30b1"},
+    {file = "yarl-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7a66c506ec67eb3159eea5096acd05f5e788ceec7b96087d30c7d2865a243918"},
+    {file = "yarl-1.8.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2b4fa2606adf392051d990c3b3877d768771adc3faf2e117b9de7eb977741229"},
+    {file = "yarl-1.8.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e21fb44e1eff06dd6ef971d4bdc611807d6bd3691223d9c01a18cec3677939e"},
+    {file = "yarl-1.8.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:93202666046d9edadfe9f2e7bf5e0782ea0d497b6d63da322e541665d65a044e"},
+    {file = "yarl-1.8.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fc77086ce244453e074e445104f0ecb27530d6fd3a46698e33f6c38951d5a0f1"},
+    {file = "yarl-1.8.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64dd68a92cab699a233641f5929a40f02a4ede8c009068ca8aa1fe87b8c20ae3"},
+    {file = "yarl-1.8.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1b372aad2b5f81db66ee7ec085cbad72c4da660d994e8e590c997e9b01e44901"},
+    {file = "yarl-1.8.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e6f3515aafe0209dd17fb9bdd3b4e892963370b3de781f53e1746a521fb39fc0"},
+    {file = "yarl-1.8.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:dfef7350ee369197106805e193d420b75467b6cceac646ea5ed3049fcc950a05"},
+    {file = "yarl-1.8.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:728be34f70a190566d20aa13dc1f01dc44b6aa74580e10a3fb159691bc76909d"},
+    {file = "yarl-1.8.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:ff205b58dc2929191f68162633d5e10e8044398d7a45265f90a0f1d51f85f72c"},
+    {file = "yarl-1.8.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:baf211dcad448a87a0d9047dc8282d7de59473ade7d7fdf22150b1d23859f946"},
+    {file = "yarl-1.8.2-cp38-cp38-win32.whl", hash = "sha256:272b4f1599f1b621bf2aabe4e5b54f39a933971f4e7c9aa311d6d7dc06965165"},
+    {file = "yarl-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:326dd1d3caf910cd26a26ccbfb84c03b608ba32499b5d6eeb09252c920bcbe4f"},
+    {file = "yarl-1.8.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f8ca8ad414c85bbc50f49c0a106f951613dfa5f948ab69c10ce9b128d368baf8"},
+    {file = "yarl-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:418857f837347e8aaef682679f41e36c24250097f9e2f315d39bae3a99a34cbf"},
+    {file = "yarl-1.8.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ae0eec05ab49e91a78700761777f284c2df119376e391db42c38ab46fd662b77"},
+    {file = "yarl-1.8.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:009a028127e0a1755c38b03244c0bea9d5565630db9c4cf9572496e947137a87"},
+    {file = "yarl-1.8.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3edac5d74bb3209c418805bda77f973117836e1de7c000e9755e572c1f7850d0"},
+    {file = "yarl-1.8.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da65c3f263729e47351261351b8679c6429151ef9649bba08ef2528ff2c423b2"},
+    {file = "yarl-1.8.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ef8fb25e52663a1c85d608f6dd72e19bd390e2ecaf29c17fb08f730226e3a08"},
+    {file = "yarl-1.8.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bcd7bb1e5c45274af9a1dd7494d3c52b2be5e6bd8d7e49c612705fd45420b12d"},
+    {file = "yarl-1.8.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:44ceac0450e648de86da8e42674f9b7077d763ea80c8ceb9d1c3e41f0f0a9951"},
+    {file = "yarl-1.8.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:97209cc91189b48e7cfe777237c04af8e7cc51eb369004e061809bcdf4e55220"},
+    {file = "yarl-1.8.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:48dd18adcf98ea9cd721a25313aef49d70d413a999d7d89df44f469edfb38a06"},
+    {file = "yarl-1.8.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e59399dda559688461762800d7fb34d9e8a6a7444fd76ec33220a926c8be1516"},
+    {file = "yarl-1.8.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d617c241c8c3ad5c4e78a08429fa49e4b04bedfc507b34b4d8dceb83b4af3588"},
+    {file = "yarl-1.8.2-cp39-cp39-win32.whl", hash = "sha256:cb6d48d80a41f68de41212f3dfd1a9d9898d7841c8f7ce6696cf2fd9cb57ef83"},
+    {file = "yarl-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:6604711362f2dbf7160df21c416f81fac0de6dbcf0b5445a2ef25478ecc4c778"},
+    {file = "yarl-1.8.2.tar.gz", hash = "sha256:49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562"},
 ]
 
 [package.dependencies]
@@ -2317,4 +2454,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "4b3549e9e47535d1fea6015a0f7ebf056a42e4d27e766583ccd8b59ebe8297d6"
+content-hash = "55864b0999f050d425372702a3ee959010419e76f8269b5d2cfa239b84bf8c53"
diff --git a/pyproject.toml b/pyproject.toml
index 11e99ecbe..67f72e776 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,47 +10,44 @@ python = "3.10.*"
 
 # See https://bot-core.pythondiscord.com/ for docs.
 pydis_core = { version = "9.5.1", extras = ["async-rediscache"] }
-redis = "4.4.2"
-fakeredis = { version = "2.0.0", extras = ["lua"] }
 
-aiohttp = "3.8.3"
 arrow = "1.2.3"
-beautifulsoup4 = "4.11.1"
+beautifulsoup4 = "4.11.2"
 colorama = { version = "0.4.6", markers = "sys_platform == 'win32'" }
 coloredlogs = "15.0.1"
-deepdiff = "6.2.1"
+deepdiff = "6.2.3"
 emoji = "2.2.0"
 feedparser = "6.0.10"
-lxml = "4.9.1"
+lxml = "4.9.2"
 markdownify = "0.11.6"
-more-itertools = "9.0.0"
+more-itertools = "9.1.0"
 python-dateutil = "2.8.2"
 python-frontmatter = "1.0.0"
 pyyaml = "6.0"
-rapidfuzz = "2.13.2"
+rapidfuzz = "2.13.7"
 regex = "2022.10.31"
 sentry-sdk = "1.16.0"
 tldextract = "3.4.0"
-pydantic = "1.10.2"
+pydantic = "1.10.5"
 
 [tool.poetry.dev-dependencies]
-coverage = "6.5.0"
+coverage = "7.2.1"
 flake8 = "6.0.0"
-flake8-annotations = "2.9.1"
-flake8-bugbear = "22.10.27"
-flake8-docstrings = "1.6.0"
+flake8-annotations = "3.0.0"
+flake8-bugbear = "23.2.13"
+flake8-docstrings = "1.7.0"
 flake8-string-format = "0.3.0"
 flake8-tidy-imports = "4.8.0"
 flake8-todo = "0.7"
-flake8-isort = "5.0.3"
-pep8-naming = "0.13.2"
-pre-commit = "2.20.0"
-pip-licenses = "4.0.1"
-pytest = "7.2.0"
+flake8-isort = "6.0.0"
+pep8-naming = "0.13.3"
+pre-commit = "3.1.1"
+pip-licenses = "4.1.0"
+pytest = "7.2.2"
 pytest-cov = "4.0.0"
-python-dotenv = "0.21.0"
-pytest-xdist = "3.0.2"
-pytest-subtests = "0.9.0"
+python-dotenv = "1.0.0"
+pytest-subtests = "0.10.0"
+pytest-xdist = "3.2.0"
 taskipy = "1.10.3"
 
 
-- 
cgit v1.2.3


From 5120a07792fc49fce316afcc9ec6911d24f2a13d Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Tue, 7 Mar 2023 21:06:20 +0000
Subject: Allow The Unlicense (Unlicense) in pip-licenses

---
 .github/workflows/lint-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index b3e58316a..af1d703c0 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -16,7 +16,8 @@ jobs:
         MIT License;
         Mozilla Public License 2.0 (MPL 2.0);
         Public Domain;
-        Python Software Foundation License
+        Python Software Foundation License;
+        The Unlicense (Unlicense)
 
       # Dummy values for required bot environment variables
       BOT_API_KEY: foo
-- 
cgit v1.2.3


From 12fe15baa5f3ea5d35d43d27ff671dca5fe58334 Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 07:34:54 +0100
Subject: Merge #2408: Scaffold server config via a bootstrapping script

Refactor configuration into a pydantic-based python constants file,
and add a utility to auto-populate guild data.

Squashed commits:
* use basic config for demo purposes

* fix guiding comments

* update var names for proper context reflection

* fix wront iteration var

* add all roles, & channels

* load categories

* separate sections in env file

* ignore .env.server

* rename change_log to changelog

This also adds a default env file to look for

* remove instantiation of webhooks

* add most of the default configs

These will mostly be fetched from the .env.default file, which won't be bootstrapped

* warn when categories/roles/channels are not found

* add env file to keep server defaults

* fix malformatted value in the .env.default

* add default server env variables

* update the sections formatting in default env file

* fallback to server env when loading constants

* add guild basic defaults

* update change_log channel name to changelog

* add the Guid settings prefix

* make _Guild inherit from EnvConfig

* add webhook defaults

* add python_news defaults to the server env

* ad missing webhooks prefix

* update bootstrapper logger name

* update priority of the env loaded files

According to Pydantic's docs: "Later files in the list/tuple will take priority over earlier files."

* warn user that default value from PyDis' config will be used

* add colours default config

* add antispam config

* update antispam references

* add redis default cfg

* add Stats, Cooldowns and CleanMessages consts

This also includes their default values

* add Metabase to constants

This also includes its default values

* add URLS to constants

This also includes its default values

* use the Field class to provide defaults

This avoids overriding & changing the `fields` of the `Config` class "dynamically"

* add keys constant class

* add Guild conf

* replace dash with underscore in script

* appease linter

* transform attributes of AntiSpam to dict when needed

This ensures that the application stays backwards compatible

* add root_validator for the colours class

This enables the conversion from hex to int easily since it's not a supported type by pydantic

* reinstate the role & channels combinations

* rename URLS to URLs

* add emojis & icons constants

* add filter constants & their default values

* remove all useless spaces

* instantiate the keys class

* add bot prefix to default env file

* fetch Bot constants from env vars instead of the prefix ones

* add Miscellaneous config

* instantiate poor forgotten Miscellaneous config

* add final touches to the constants module

This includes removing dups, adding missing channels & fixing type casts

* move all default values to constants.py

This is done by using the `Field` class.

It allows us to
1. Set defaults, in case the variables are not configured
2. Load them from a env variable under a specific name (for backwards comp)
3. load it from any env variable file that contains the right prefix

* ignore all .env files

* load BOT_TOKEN & GUILD_ID from .env

* allow _GUILD to read its id from the `GUILD_ID` env var

* base Webhooks settings off of a Webhook model

* create necessary webhooks if non existent

* appease flake8 docstrings error

* make the script idempotent

* update type hints

* uppercase all consts

* make webhook channel optional

* add httpx to its own dependency group

This group will be optional & only related to the bootstrapper

* replace requests with httpx

* pass client as param

* include raise_for_status as a response hook

* rename get_webhook to webhook_exists

* update docstring of the constants module

* use "." as a separator

* update script to account for already created webhooks

* make ANTI_SPAM_RULES a module level constant

This ensures that flake8 doesn't complain about making a function call in the function's signature

* remove the manual resolving of .env paths

* update usages of AntiSpam constants

* remove forgotten assignment of rule_config

* remove useless assignments of env file names

* delete default config-default.yml

* update docstrings of CodeBlockCog to reference constants.py

* add a poetry task that runs the bootstrapping script

* add python-dotenv to the config-bootstrap group

* update hook name to _raise_for_status

* construct site_api in _URLs

* remove __name__ == '__main__'guard

* Revert "construct site_api in _URLs"

This reverts commit 1c555c4280c6a0bdd452319cbd3ffcd0370f5d48.

* remove usage of the Field class

* update env var keys that the bootstrapping script needs

* use API_KEYS.SITE_API as env var in docker compose instead of BOT_API_KEY

* use basic config for demo purposes

* fix guiding comments

* update var names for proper context reflection

* fix wront iteration var

* add all roles, & channels

* load categories

* separate sections in env file

* ignore .env.server

* rename change_log to changelog

This also adds a default env file to look for

* remove instantiation of webhooks

* add most of the default configs

These will mostly be fetched from the .env.default file, which won't be bootstrapped

* warn when categories/roles/channels are not found

* add env file to keep server defaults

* fix malformatted value in the .env.default

* add default server env variables

* update the sections formatting in default env file

* fallback to server env when loading constants

* add guild basic defaults

* update change_log channel name to changelog

* add the Guid settings prefix

* make _Guild inherit from EnvConfig

* add webhook defaults

* add python_news defaults to the server env

* ad missing webhooks prefix

* update bootstrapper logger name

* update priority of the env loaded files

According to Pydantic's docs: "Later files in the list/tuple will take priority over earlier files."

* warn user that default value from PyDis' config will be used

* add colours default config

* add antispam config

* update antispam references

* add redis default cfg

* add Stats, Cooldowns and CleanMessages consts

This also includes their default values

* add Metabase to constants

This also includes its default values

* add URLS to constants

This also includes its default values

* use the Field class to provide defaults

This avoids overriding & changing the `fields` of the `Config` class "dynamically"

* add keys constant class

* add Guild conf

* replace dash with underscore in script

* appease linter

* transform attributes of AntiSpam to dict when needed

This ensures that the application stays backwards compatible

* add root_validator for the colours class

This enables the conversion from hex to int easily since it's not a supported type by pydantic

* reinstate the role & channels combinations

* rename URLS to URLs

* add emojis & icons constants

* add filter constants & their default values

* remove all useless spaces

* instantiate the keys class

* add bot prefix to default env file

* fetch Bot constants from env vars instead of the prefix ones

* add Miscellaneous config

* instantiate poor forgotten Miscellaneous config

* add final touches to the constants module

This includes removing dups, adding missing channels & fixing type casts

* move all default values to constants.py

This is done by using the `Field` class.

It allows us to
1. Set defaults, in case the variables are not configured
2. Load them from a env variable under a specific name (for backwards comp)
3. load it from any env variable file that contains the right prefix

* ignore all .env files

* load BOT_TOKEN & GUILD_ID from .env

* allow _GUILD to read its id from the `GUILD_ID` env var

* base Webhooks settings off of a Webhook model

* create necessary webhooks if non existent

* appease flake8 docstrings error

* make the script idempotent

* update type hints

* uppercase all consts

* make webhook channel optional

* add httpx to its own dependency group

This group will be optional & only related to the bootstrapper

* replace requests with httpx

* pass client as param

* include raise_for_status as a response hook

* rename get_webhook to webhook_exists

* update docstring of the constants module

* use "." as a separator

* update script to account for already created webhooks

* make ANTI_SPAM_RULES a module level constant

This ensures that flake8 doesn't complain about making a function call in the function's signature

* remove the manual resolving of .env paths

* update usages of AntiSpam constants

* remove forgotten assignment of rule_config

* remove useless assignments of env file names

* delete default config-default.yml

* update docstrings of CodeBlockCog to reference constants.py

* add a poetry task that runs the bootstrapping script

* add python-dotenv to the config-bootstrap group

* update hook name to _raise_for_status

* construct site_api in _URLs

* remove __name__ == '__main__'guard

* Revert "construct site_api in _URLs"

This reverts commit 1c555c4280c6a0bdd452319cbd3ffcd0370f5d48.

* remove usage of the Field class

* update env var keys that the bootstrapping script needs

* use API_KEYS.SITE_API as env var in docker compose instead of BOT_API_KEY

* relock dependencies

* update snekbox's defaults

* add support for ot channels

* rename help_system_forum to python_help

* rename nomination_archive to nomination_voting_archive

* rename appeals2 to appeals_2

* yeet sprinters role out

* rename all big_brother_logs instances to big_brother

The purpose is to adhere to what we have in prod

* rename bootstrap_config.py to botstrap.py

* update module name of the configure poetry task

* update error messages to reflect the new keys needed for env variables

* install dotenv as an extra with pydantic

* update all prefixes to "_" (underscore)

* log tuple of (channel_name, channel_id) in the config verifier

* update needed default values for docker compose env var

* relock dependencies

* update forgotten delimiters & env prefixes
---
 .gitignore                                         |    1 +
 bot/constants.py                                   | 1106 ++++++++++----------
 bot/exts/backend/branding/_cog.py                  |    2 +-
 bot/exts/backend/config_verifier.py                |    4 +-
 bot/exts/filters/antispam.py                       |   14 +-
 bot/exts/fun/duck_pond.py                          |    2 +-
 bot/exts/help_channels/_channel.py                 |    4 +-
 bot/exts/help_channels/_cog.py                     |    4 +-
 bot/exts/help_channels/_stats.py                   |    2 +-
 bot/exts/info/codeblock/_cog.py                    |    2 +-
 bot/exts/moderation/incidents.py                   |    6 +-
 bot/exts/moderation/watchchannels/_watchchannel.py |    2 +-
 bot/exts/moderation/watchchannels/bigbrother.py    |    4 +-
 bot/exts/recruitment/talentpool/_review.py         |    2 +-
 botstrap.py                                        |  164 +++
 config-default.yml                                 |  560 ----------
 docker-compose.yml                                 |    7 +-
 poetry.lock                                        |  269 ++---
 pyproject.toml                                     |    4 +-
 19 files changed, 863 insertions(+), 1296 deletions(-)
 create mode 100644 botstrap.py
 delete mode 100644 config-default.yml

diff --git a/.gitignore b/.gitignore
index 6691dbea1..65a9af431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@ TEST-**.xml
 
 # Mac OS .DS_Store, which is a file that stores custom attributes of its containing folder
 .DS_Store
+*.env*
diff --git a/bot/constants.py b/bot/constants.py
index f1fb5471f..5e5173a63 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -1,703 +1,726 @@
 """
-Loads bot configuration from YAML files.
-By default, this simply loads the default
-configuration located at `config-default.yml`.
-If a file called `config.yml` is found in the
-project directory, the default configuration
-is recursively updated with any settings from
-the custom configuration. Any settings left
-out in the custom user configuration will stay
-their default values from `config-default.yml`.
+Loads bot configuration from environment variables
+and `.env` files. By default, this simply loads the
+default configuration defined thanks to the `default`
+keyword argument in each instance of the `Field` class
+If two files called `.env` and `.env.server` are found
+in the project directory, the values will be loaded
+from both of them, thus overlooking the predefined defaults.
+Any settings left out in the custom user configuration
+will default to the values passed to the `default` kwarg.
 """
 import os
-from collections.abc import Mapping
 from enum import Enum
-from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Optional
 
-import yaml
+from pydantic import BaseModel, BaseSettings, root_validator
 
-try:
-    import dotenv
-    dotenv.load_dotenv()
-except ModuleNotFoundError:
-    pass
 
+class EnvConfig(BaseSettings):
+    class Config:
+        env_file = ".env", ".env.server",
+        env_file_encoding = 'utf-8'
 
-def _env_var_constructor(loader, node):
-    """
-    Implements a custom YAML tag for loading optional environment
-    variables. If the environment variable is set, returns the
-    value of it. Otherwise, returns `None`.
 
-    Example usage in the YAML configuration:
+class _Miscellaneous(EnvConfig):
+    debug = True
+    file_logs = False
 
-        # Optional app configuration. Set `MY_APP_KEY` in the environment to use it.
-        application:
-            key: !ENV 'MY_APP_KEY'
-    """
 
-    default = None
+Miscellaneous = _Miscellaneous()
 
-    # Check if the node is a plain string value
-    if node.id == 'scalar':
-        value = loader.construct_scalar(node)
-        key = str(value)
-    else:
-        # The node value is a list
-        value = loader.construct_sequence(node)
 
-        if len(value) >= 2:
-            # If we have at least two values, then we have both a key and a default value
-            default = value[1]
-            key = value[0]
-        else:
-            # Otherwise, we just have a key
-            key = value[0]
+FILE_LOGS = Miscellaneous.file_logs
+DEBUG_MODE = Miscellaneous.debug
 
-    return os.getenv(key, default)
 
+class _Bot(EnvConfig):
+    EnvConfig.Config.env_prefix = "bot_"
 
-def _join_var_constructor(loader, node):
-    """
-    Implements a custom YAML tag for concatenating other tags in
-    the document to strings. This allows for a much more DRY configuration
-    file.
-    """
+    prefix = "!"
+    sentry_dsn = ""
+    token = ""
+    trace_loggers = "*"
 
-    fields = loader.construct_sequence(node)
-    return "".join(str(x) for x in fields)
 
+Bot = _Bot()
 
-yaml.SafeLoader.add_constructor("!ENV", _env_var_constructor)
-yaml.SafeLoader.add_constructor("!JOIN", _join_var_constructor)
 
-# Pointing old tag to !ENV constructor to avoid breaking existing configs
-yaml.SafeLoader.add_constructor("!REQUIRED_ENV", _env_var_constructor)
+class _Channels(EnvConfig):
+    EnvConfig.Config.env_prefix = "channels_"
 
+    announcements = 354619224620138496
+    changelog = 748238795236704388
+    mailing_lists = 704372456592506880
+    python_events = 729674110270963822
+    python_news = 704372456592506880
+    reddit = 458224812528238616
 
-with open("config-default.yml", encoding="UTF-8") as f:
-    _CONFIG_YAML = yaml.safe_load(f)
+    dev_contrib = 635950537262759947
+    dev_core = 411200599653351425
+    dev_log = 622895325144940554
 
+    meta = 429409067623251969
+    python_general = 267624335836053506
 
-def _recursive_update(original, new):
-    """
-    Helper method which implements a recursive `dict.update`
-    method, used for updating the original configuration with
-    configuration specified by the user.
-    """
+    python_help = 1035199133436354600
 
-    for key, value in original.items():
-        if key not in new:
-            continue
+    attachment_log = 649243850006855680
+    filter_log = 1014943924185473094
+    message_log = 467752170159079424
+    mod_log = 282638479504965634
+    nomination_voting_archive = 833371042046148738
+    user_log = 528976905546760203
+    voice_log = 640292421988646961
 
-        if isinstance(value, Mapping):
-            if not any(isinstance(subvalue, Mapping) for subvalue in value.values()):
-                original[key].update(new[key])
-            _recursive_update(original[key], new[key])
-        else:
-            original[key] = new[key]
+    off_topic_0 = 291284109232308226
+    off_topic_1 = 463035241142026251
+    off_topic_2 = 463035268514185226
 
+    bot_commands = 267659945086812160
+    discord_bots = 343944376055103488
+    esoteric = 470884583684964352
+    voice_gate = 764802555427029012
+    code_jam_planning = 490217981872177157
 
-if Path("config.yml").exists():
-    print("Found `config.yml` file, loading constants from it.")
-    with open("config.yml", encoding="UTF-8") as f:
-        user_config = yaml.safe_load(f)
-    _recursive_update(_CONFIG_YAML, user_config)
+    # Staff
+    admins = 365960823622991872
+    admin_spam = 563594791770914816
+    defcon = 464469101889454091
+    helpers = 385474242440986624
+    incidents = 714214212200562749
+    incidents_archive = 720668923636351037
+    mod_alerts = 473092532147060736
+    mod_meta = 775412552795947058
+    mods = 305126844661760000
+    nominations = 822920136150745168
+    nomination_voting = 822853512709931008
+    organisation = 551789653284356126
 
+    # Staff announcement channels
+    admin_announcements = 749736155569848370
+    mod_announcements = 372115205867700225
+    staff_announcements = 464033278631084042
+    staff_info = 396684402404622347
+    staff_lounge = 464905259261755392
 
-def check_required_keys(keys):
-    """
-    Verifies that keys that are set to be required are present in the
-    loaded configuration.
-    """
-    for key_path in keys:
-        lookup = _CONFIG_YAML
-        try:
-            for key in key_path.split('.'):
-                lookup = lookup[key]
-                if lookup is None:
-                    raise KeyError(key)
-        except KeyError:
-            raise KeyError(
-                f"A configuration for `{key_path}` is required, but was not found. "
-                "Please set it in `config.yml` or setup an environment variable and try again."
-            )
-
-
-try:
-    required_keys = _CONFIG_YAML['config']['required_keys']
-except KeyError:
-    pass
-else:
-    check_required_keys(required_keys)
-
-
-class YAMLGetter(type):
+    # Voice Channels
+    admins_voice = 500734494840717332
+    code_help_voice_0 = 751592231726481530
+    code_help_voice_1 = 764232549840846858
+    general_voice_0 = 751591688538947646
+    general_voice_1 = 799641437645701151
+    staff_voice = 412375055910043655
+
+    black_formatter = 846434317021741086
+
+    # Voice Chat
+    code_help_chat_0 = 755154969761677312
+    code_help_chat_1 = 766330079135268884
+    staff_voice_chat = 541638762007101470
+    voice_chat_0 = 412357430186344448
+    voice_chat_1 = 799647045886541885
+
+    big_brother = 468507907357409333
+    duck_pond = 637820308341915648
+    roles = 851270062434156586
+
+
+Channels = _Channels()
+
+
+class _Roles(EnvConfig):
+
+    EnvConfig.Config.env_prefix = "roles_"
+
+    # Self-assignable roles, see the Subscribe cog
+    advent_of_code = 518565788744024082
+    announcements = 463658397560995840
+    lovefest = 542431903886606399
+    pyweek_announcements = 897568414044938310
+    revival_of_code = 988801794668908655
+    legacy_help_channels_access = 1074780483776417964
+
+    contributors = 295488872404484098
+    help_cooldown = 699189276025421825
+    muted = 277914926603829249
+    partners = 323426753857191936
+    python_community = 458226413825294336
+    voice_verified = 764802720779337729
+
+    # Streaming
+    video = 764245844798079016
+
+    # Staff
+    admins = 267628507062992896
+    core_developers = 587606783669829632
+    code_jam_event_team = 787816728474288181
+    devops = 409416496733880320
+    domain_leads = 807415650778742785
+    events_lead = 778361735739998228
+    helpers = 267630620367257601
+    moderators = 831776746206265384
+    mod_team = 267629731250176001
+    owners = 267627879762755584
+    project_leads = 815701647526330398
+
+    # Code Jam
+    jammers = 737249140966162473
+
+    # Patreon
+    patreon_tier_1 = 505040943800516611
+    patreon_tier_2 = 743399725914390631
+    patreon_tier_3 = 743400204367036520
+
+
+Roles = _Roles()
+
+
+class _Categories(EnvConfig):
+    EnvConfig.Config.env_prefix = "categories_"
+
+    logs = 468520609152892958
+    moderators = 749736277464842262
+    modmail = 714494672835444826
+    appeals = 890331800025563216
+    appeals_2 = 895417395261341766
+    voice = 356013253765234688
+
+    # 2021 Summer Code Jam
+    summer_code_jam = 861692638540857384
+
+
+Categories = _Categories()
+
+
+class _Guild(EnvConfig):
+    EnvConfig.Config.env_prefix = "guild_"
+
+    id = 267624335836053506
+    invite = "https://discord.gg/python"
+
+    moderation_categories = [
+        Categories.moderators,
+        Categories.modmail,
+        Categories.logs,
+        Categories.appeals,
+        Categories.appeals_2
+    ]
+    moderation_channels = [Channels.admins, Channels.admin_spam, Channels.mods]
+    modlog_blacklist = [
+        Channels.attachment_log,
+        Channels.message_log,
+        Channels.mod_log,
+        Channels.staff_voice,
+        Channels.filter_log
+    ]
+    reminder_whitelist = [Channels.bot_commands, Channels.dev_contrib, Channels.black_formatter]
+    moderation_roles = [Roles.admins, Roles.mod_team, Roles.moderators, Roles.owners]
+    staff_roles = [Roles.admins, Roles.helpers, Roles.mod_team, Roles.owners]
+
+
+Guild = _Guild()
+
+
+class Event(Enum):
     """
-    Implements a custom metaclass used for accessing
-    configuration data by simply accessing class attributes.
-    Supports getting configuration from up to two levels
-    of nested configuration through `section` and `subsection`.
-
-    `section` specifies the YAML configuration section (or "key")
-    in which the configuration lives, and must be set.
-
-    `subsection` is an optional attribute specifying the section
-    within the section from which configuration should be loaded.
-
-    Example Usage:
-
-        # config.yml
-        bot:
-            prefixes:
-                direct_message: ''
-                guild: '!'
-
-        # config.py
-        class Prefixes(metaclass=YAMLGetter):
-            section = "bot"
-            subsection = "prefixes"
-
-        # Usage in Python code
-        from config import Prefixes
-        def get_prefix(bot, message):
-            if isinstance(message.channel, PrivateChannel):
-                return Prefixes.direct_message
-            return Prefixes.guild
+    Event names. This does not include every event (for example, raw
+    events aren't here), but only events used in ModLog for now.
     """
 
-    subsection = None
+    guild_channel_create = "guild_channel_create"
+    guild_channel_delete = "guild_channel_delete"
+    guild_channel_update = "guild_channel_update"
+    guild_role_create = "guild_role_create"
+    guild_role_delete = "guild_role_delete"
+    guild_role_update = "guild_role_update"
+    guild_update = "guild_update"
+
+    member_join = "member_join"
+    member_remove = "member_remove"
+    member_ban = "member_ban"
+    member_unban = "member_unban"
+    member_update = "member_update"
 
-    def __getattr__(cls, name):
-        name = name.lower()
+    message_delete = "message_delete"
+    message_edit = "message_edit"
 
-        try:
-            if cls.subsection is not None:
-                return _CONFIG_YAML[cls.section][cls.subsection][name]
-            return _CONFIG_YAML[cls.section][name]
-        except KeyError as e:
-            dotted_path = '.'.join(
-                (cls.section, cls.subsection, name)
-                if cls.subsection is not None else (cls.section, name)
-            )
-            print(f"Tried accessing configuration variable at `{dotted_path}`, but it could not be found.")
-            raise AttributeError(repr(name)) from e
+    voice_state_update = "voice_state_update"
 
-    def __getitem__(cls, name):
-        return cls.__getattr__(name)
 
-    def __iter__(cls):
-        """Return generator of key: value pairs of current constants class' config values."""
-        for name in cls.__annotations__:
-            yield name, getattr(cls, name)
+class ThreadArchiveTimes(Enum):
+    HOUR = 60
+    DAY = 1440
+    THREE_DAY = 4320
+    WEEK = 10080
 
 
-# Dataclasses
-class Bot(metaclass=YAMLGetter):
-    section = "bot"
+class Webhook(BaseModel):
+    id: int
+    channel: Optional[int]
 
-    prefix: str
-    sentry_dsn: Optional[str]
-    token: str
-    trace_loggers: Optional[str]
 
+class _Webhooks(EnvConfig):
+    EnvConfig.Config.env_prefix = "webhooks_"
+    EnvConfig.Config.env_nested_delimiter = '_'
 
-class Redis(metaclass=YAMLGetter):
-    section = "bot"
-    subsection = "redis"
+    big_brother: Webhook = Webhook(id=569133704568373283, channel=Channels.big_brother)
+    dev_log: Webhook = Webhook(id=680501655111729222, channel=Channels.dev_log)
+    duck_pond: Webhook = Webhook(id=637821475327311927, channel=Channels.duck_pond)
+    incidents: Webhook = Webhook(id=816650601844572212, channel=Channels.incidents)
+    incidents_archive: Webhook = Webhook(id=720671599790915702, channel=Channels.incidents_archive)
+    python_news: Webhook = Webhook(id=704381182279942324, channel=Channels.python_news)
 
-    host: str
-    password: Optional[str]
-    port: int
-    use_fakeredis: bool  # If this is True, Bot will use fakeredis.aioredis
 
+Webhooks = _Webhooks()
 
-class Filter(metaclass=YAMLGetter):
-    section = "filter"
 
-    filter_domains: bool
-    filter_everyone_ping: bool
-    filter_invites: bool
-    filter_zalgo: bool
-    watch_regex: bool
-    watch_rich_embeds: bool
+class _BigBrother(EnvConfig):
+    EnvConfig.Config.env_prefix = "big_brother_"
 
-    # Notifications are not expected for "watchlist" type filters
+    header_message_limit = 15
+    log_delay = 15
 
-    notify_user_domains: bool
-    notify_user_everyone_ping: bool
-    notify_user_invites: bool
-    notify_user_zalgo: bool
 
-    offensive_msg_delete_days: int
-    ping_everyone: bool
+BigBrother = _BigBrother()
 
-    channel_whitelist: List[int]
-    role_whitelist: List[int]
 
+class _CodeBlock(EnvConfig):
+    EnvConfig.Config.env_prefix = "code_block_"
 
-class Cooldowns(metaclass=YAMLGetter):
-    section = "bot"
-    subsection = "cooldowns"
+    # The channels in which code blocks will be detected. They are not subject to a cooldown.
+    channel_whitelist: list[int] = [Channels.bot_commands]
+    # The channels which will be affected by a cooldown. These channels are also whitelisted.
+    cooldown_channels: list[int] = [Channels.python_general]
 
-    tags: int
+    cooldown_seconds = 300
+    minimum_lines = 4
 
 
-class Colours(metaclass=YAMLGetter):
-    section = "style"
-    subsection = "colours"
+CodeBlock = _CodeBlock()
 
-    blue: int
-    bright_green: int
-    orange: int
-    pink: int
-    purple: int
-    soft_green: int
-    soft_orange: int
-    soft_red: int
-    white: int
-    yellow: int
 
+class _Colours(EnvConfig):
+    EnvConfig.Config.env_prefix = "colours_"
 
-class DuckPond(metaclass=YAMLGetter):
-    section = "duck_pond"
+    blue = 0x3775a8
+    bright_green = 0x01d277
+    orange = 0xe67e22
+    pink = 0xcf84e0
+    purple = 0xb734eb
+    soft_green = 0x68c290
+    soft_orange = 0xf9cb54
+    soft_red = 0xcd6d6d
+    white = 0xfffffe
+    yellow = 0xffd241
 
-    threshold: int
-    channel_blacklist: List[int]
+    @root_validator(pre=True)
+    def parse_hex_values(cls, values):
+        for key, value in values.items():
+            values[key] = int(value, 16)
+        return values
 
 
-class Emojis(metaclass=YAMLGetter):
-    section = "style"
-    subsection = "emojis"
+Colours = _Colours()
 
-    badge_bug_hunter: str
-    badge_bug_hunter_level_2: str
-    badge_early_supporter: str
-    badge_hypesquad: str
-    badge_hypesquad_balance: str
-    badge_hypesquad_bravery: str
-    badge_hypesquad_brilliance: str
-    badge_partner: str
-    badge_staff: str
-    badge_verified_bot_developer: str
-    verified_bot: str
-    bot: str
 
-    defcon_shutdown: str  # noqa: E704
-    defcon_unshutdown: str  # noqa: E704
-    defcon_update: str  # noqa: E704
+class _Free(EnvConfig):
+    EnvConfig.Config.env_prefix = "free_"
 
-    failmail: str
+    activity_timeout = 600
+    cooldown_per = 60.0
+    cooldown_rate = 1
 
-    incident_actioned: str
-    incident_investigating: str
-    incident_unactioned: str
 
-    status_dnd: str
-    status_idle: str
-    status_offline: str
-    status_online: str
+Free = _Free()
 
-    ducky_dave: str
 
-    trashcan: str
+class Punishment(BaseModel):
+    remove_after = 600
+    role_id: int = Roles.muted
 
-    bullet: str
-    check_mark: str
-    cross_mark: str
-    new: str
-    pencil: str
 
-    ok_hand: str
+class Rule(BaseModel):
+    interval: int
+    max: int
 
 
-class Icons(metaclass=YAMLGetter):
-    section = "style"
-    subsection = "icons"
+# Some help in choosing an appropriate name for this is appreciated
+class ExtendedRule(Rule):
+    max_consecutive: int
 
-    crown_blurple: str
-    crown_green: str
-    crown_red: str
 
-    defcon_denied: str    # noqa: E704
-    defcon_shutdown: str  # noqa: E704
-    defcon_unshutdown: str   # noqa: E704
-    defcon_update: str   # noqa: E704
+class Rules(BaseModel):
+    attachments: Rule = Rule(interval=10, max=10)
+    burst: Rule = Rule(interval=10, max=7)
+    chars: Rule = Rule(interval=5, max=200)
+    discord_emojis: Rule = Rule(interval=10, max=20)
+    duplicates: Rule = Rule(interval=10, max=3)
+    links: Rule = Rule(interval=10, max=10)
+    mentions: Rule = Rule(interval=10, max=5)
+    newlines: ExtendedRule = ExtendedRule(interval=10, max=100, max_consecutive=10)
+    role_mentions: Rule = Rule(interval=10, max=3)
 
-    filtering: str
 
-    green_checkmark: str
-    green_questionmark: str
-    guild_update: str
+class _AntiSpam(EnvConfig):
+    EnvConfig.Config.env_prefix = 'anti_spam_'
+    EnvConfig.Config.env_nested_delimiter = '_'
 
-    hash_blurple: str
-    hash_green: str
-    hash_red: str
+    cache_size = 100
 
-    message_bulk_delete: str
-    message_delete: str
-    message_edit: str
+    clean_offending = True
+    ping_everyone = True
 
-    pencil: str
+    punishment = Punishment()
+    rules = Rules()
 
-    questionmark: str
 
-    remind_blurple: str
-    remind_green: str
-    remind_red: str
+AntiSpam = _AntiSpam()
 
-    sign_in: str
-    sign_out: str
 
-    superstarify: str
-    unsuperstarify: str
+class _HelpChannels(EnvConfig):
+    EnvConfig.Config.env_prefix = "help_channels_"
 
-    token_removed: str
+    enable = True
+    idle_minutes = 30
+    deleted_idle_minutes = 5
+    # Roles which are allowed to use the command which makes channels dormant
+    cmd_whitelist: list[int] = [Roles.helpers]
 
-    user_ban: str
-    user_mute: str
-    user_unban: str
-    user_unmute: str
-    user_update: str
-    user_verified: str
-    user_warn: str
 
-    voice_state_blue: str
-    voice_state_green: str
-    voice_state_red: str
+HelpChannels = _HelpChannels()
 
 
-class CleanMessages(metaclass=YAMLGetter):
-    section = "bot"
-    subsection = "clean"
+class _RedirectOutput(EnvConfig):
+    EnvConfig.Config.env_prefix = "redirect_output_"
 
-    message_limit: int
+    delete_delay = 15
+    delete_invocation = True
 
 
-class Stats(metaclass=YAMLGetter):
-    section = "bot"
-    subsection = "stats"
+RedirectOutput = _RedirectOutput()
 
-    presence_update_timeout: int
-    statsd_host: str
 
+class _DuckPond(EnvConfig):
+    EnvConfig.Config.env_prefix = "duck_pond_"
 
-class Categories(metaclass=YAMLGetter):
-    section = "guild"
-    subsection = "categories"
+    threshold = 7
 
-    moderators: int
-    modmail: int
-    voice: int
+    channel_blacklist: list[str] = [
+        Channels.announcements,
+        Channels.python_news,
+        Channels.python_events,
+        Channels.mailing_lists,
+        Channels.reddit,
+        Channels.duck_pond,
+        Channels.changelog,
+        Channels.staff_announcements,
+        Channels.mod_announcements,
+        Channels.admin_announcements,
+        Channels.staff_info
+    ]
 
-    # 2021 Summer Code Jam
-    summer_code_jam: int
-
-
-class Channels(metaclass=YAMLGetter):
-    section = "guild"
-    subsection = "channels"
-
-    announcements: int
-    change_log: int
-    mailing_lists: int
-    python_events: int
-    python_news: int
-    reddit: int
-
-    dev_contrib: int
-    dev_core: int
-    dev_log: int
-
-    meta: int
-    python_general: int
-
-    help_system_forum: int
-
-    attachment_log: int
-    filter_log: int
-    message_log: int
-    mod_log: int
-    nomination_archive: int
-    user_log: int
-    voice_log: int
-
-    off_topic_0: int
-    off_topic_1: int
-    off_topic_2: int
-
-    bot_commands: int
-    discord_bots: int
-    esoteric: int
-    voice_gate: int
-    code_jam_planning: int
-
-    admins: int
-    admin_spam: int
-    defcon: int
-    helpers: int
-    incidents: int
-    incidents_archive: int
-    mod_alerts: int
-    mod_meta: int
-    mods: int
-    nominations: int
-    nomination_voting: int
-    organisation: int
-
-    admin_announcements: int
-    mod_announcements: int
-    staff_announcements: int
-
-    admins_voice: int
-    code_help_voice_0: int
-    code_help_voice_1: int
-    general_voice_0: int
-    general_voice_1: int
-    staff_voice: int
-
-    code_help_chat_0: int
-    code_help_chat_1: int
-    staff_voice_chat: int
-    voice_chat_0: int
-    voice_chat_1: int
-
-    big_brother_logs: int
-
-    roles: int
-
-
-class Webhooks(metaclass=YAMLGetter):
-    section = "guild"
-    subsection = "webhooks"
-
-    big_brother: int
-    dev_log: int
-    duck_pond: int
-    incidents: int
-    incidents_archive: int
-
-
-class Roles(metaclass=YAMLGetter):
-    section = "guild"
-    subsection = "roles"
 
-    # Self-assignable roles, see the Subscribe cog
-    advent_of_code: int
-    announcements: int
-    lovefest: int
-    pyweek_announcements: int
-    revival_of_code: int
-    legacy_help_channels_access: int
-
-    contributors: int
-    help_cooldown: int
-    muted: int
-    partners: int
-    python_community: int
-    sprinters: int
-    voice_verified: int
-    video: int
-
-    admins: int
-    core_developers: int
-    code_jam_event_team: int
-    devops: int
-    domain_leads: int
-    events_lead: int
-    helpers: int
-    moderators: int
-    mod_team: int
-    owners: int
-    project_leads: int
-
-    jammers: int
-
-    patreon_tier_1: int
-    patreon_tier_2: int
-    patreon_tier_3: int
-
-
-class Guild(metaclass=YAMLGetter):
-    section = "guild"
+DuckPond = _DuckPond()
 
-    id: int
-    invite: str  # Discord invite, gets embedded in chat
 
-    moderation_categories: List[int]
-    moderation_channels: List[int]
-    modlog_blacklist: List[int]
-    reminder_whitelist: List[int]
-    moderation_roles: List[int]
-    staff_roles: List[int]
+class _PythonNews(EnvConfig):
+    EnvConfig.Config.env_prefix = "python_news_"
+
+    channel: int = Webhooks.python_news.channel
+    webhook: int = Webhooks.python_news.id
+    mail_lists = ['python-ideas', 'python-announce-list', 'pypi-announce', 'python-dev']
+
+
+PythonNews = _PythonNews()
+
+
+class _VoiceGate(EnvConfig):
+    EnvConfig.Config.env_prefix = "voice_gate_"
+
+    bot_message_delete_delay = 10
+    minimum_activity_blocks = 3
+    minimum_days_member = 3
+    minimum_messages = 50
+    voice_ping_delete_delay = 60
+
+
+VoiceGate = _VoiceGate()
+
+
+class _Branding(EnvConfig):
+    EnvConfig.Config.env_prefix = "branding_"
+
+    cycle_frequency = 3
 
 
-class Keys(metaclass=YAMLGetter):
-    section = "keys"
+Branding = _Branding()
 
-    github: Optional[str]
-    site_api: Optional[str]
 
+class _VideoPermission(EnvConfig):
+    EnvConfig.Config.env_prefix = "video_permission_"
 
-class URLs(metaclass=YAMLGetter):
-    section = "urls"
+    default_permission_duration = 5
+
+
+VideoPermission = _VideoPermission()
+
+
+class _Redis(EnvConfig):
+    EnvConfig.Config.env_prefix = "redis_"
+
+    host = "redis.default.svc.cluster.local"
+    password = ""
+    port = 6379
+    use_fakeredis = False  # If this is True, Bot will use fakeredis.aioredis
+
+
+Redis = _Redis()
+
+
+class _CleanMessages(EnvConfig):
+    EnvConfig.Config.env_prefix = "clean_"
+
+    message_limit = 10_000
+
+
+CleanMessages = _CleanMessages()
+
+
+class _Stats(EnvConfig):
+    EnvConfig.Config.env_prefix = "stats_"
+
+    presence_update_timeout = 30
+    statsd_host = "graphite.default.svc.cluster.local"
+
+
+Stats = _Stats()
+
+
+class _Cooldowns(EnvConfig):
+    EnvConfig.Config.env_prefix = "cooldowns_"
+
+    tags = 60
+
+
+Cooldowns = _Cooldowns()
+
+
+class _Metabase(EnvConfig):
+    EnvConfig.Config.env_prefix = "metabase_"
+
+    username = ""
+    password = ""
+    base_url = "http://metabase.default.svc.cluster.local"
+    public_url = "https://metabase.pythondiscord.com"
+    max_session_age = 20_160
+
+
+Metabase = _Metabase()
+
+
+class _BaseURLs(EnvConfig):
+    EnvConfig.Config.env_prefix = "urls_"
 
     # Snekbox endpoints
-    snekbox_eval_api: str
-    snekbox_311_eval_api: str
+    snekbox_eval_api = "http://snekbox-310.default.svc.cluster.local/eval"
+    snekbox_311_eval_api = "http://snekbox.default.svc.cluster.local/eval"
 
-    # Discord API endpoints
-    discord_api: str
-    discord_invite_api: str
+    # Discord API
+    discord_api = "https://discordapp.com/api/v7/"
 
     # Misc endpoints
-    bot_avatar: str
-    github_bot_repo: str
+    bot_avatar = "https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_circle/logo_circle.png"
+
+    github_bot_repo = "https://github.com/python-discord/bot"
+
+    # Site
+    site = "pythondiscord.com"
+    site_schema = "https://"
+    site_api = "site.default.svc.cluster.local/api"
+    site_api_schema = "http://"
+
+
+BaseURLs = _BaseURLs()
+
+
+class _URLs(_BaseURLs):
+
+    # Discord API endpoints
+    discord_invite_api: str = "".join([BaseURLs.discord_api, "invites"])
 
     # Base site vars
-    connect_max_retries: int
-    connect_cooldown: int
-    site: str
-    site_api: str
-    site_schema: str
-    site_api_schema: str
+    connect_max_retries = 3
+    connect_cooldown = 5
+
+    site_staff: str = "".join([BaseURLs.site_schema, BaseURLs.site, "/staff"])
+    site_paste = "".join(["paste.", BaseURLs.site])
 
     # Site endpoints
-    site_logs_view: str
-    paste_service: str
+    site_logs_view: str = "".join([BaseURLs.site_schema, BaseURLs.site, "/staff/bot/logs"])
+    paste_service: str = "".join([BaseURLs.site_schema, "paste.", BaseURLs.site, "/{key}"])
 
 
-class Metabase(metaclass=YAMLGetter):
-    section = "metabase"
+URLs = _URLs()
 
-    username: Optional[str]
-    password: Optional[str]
-    base_url: str
-    public_url: str
-    max_session_age: int
 
+class _Emojis(EnvConfig):
+    EnvConfig.Config.env_prefix = "emojis_"
 
-class AntiSpam(metaclass=YAMLGetter):
-    section = 'anti_spam'
+    badge_bug_hunter = "<:bug_hunter_lvl1:743882896372269137>"
+    badge_bug_hunter_level_2 = "<:bug_hunter_lvl2:743882896611344505>"
+    badge_early_supporter = "<:early_supporter:743882896909140058>"
+    badge_hypesquad = "<:hypesquad_events:743882896892362873>"
+    badge_hypesquad_balance = "<:hypesquad_balance:743882896460480625>"
+    badge_hypesquad_bravery = "<:hypesquad_bravery:743882896745693335>"
+    badge_hypesquad_brilliance = "<:hypesquad_brilliance:743882896938631248>"
+    badge_partner = "<:partner:748666453242413136>"
+    badge_staff = "<:discord_staff:743882896498098226>"
+    badge_verified_bot_developer = "<:verified_bot_dev:743882897299210310>"
+    verified_bot = "<:verified_bot:811645219220750347>"
+    bot = "<:bot:812712599464443914>"
 
-    cache_size: int
+    defcon_shutdown = "<:defcondisabled:470326273952972810>"  # noqa: E704
+    defcon_unshutdown = "<:defconenabled:470326274213150730>"  # noqa: E704
+    defcon_update = "<:defconsettingsupdated:470326274082996224>"  # noqa: E704
 
-    clean_offending: bool
-    ping_everyone: bool
+    failmail = "<:failmail:633660039931887616>"
 
-    punishment: Dict[str, Dict[str, int]]
-    rules: Dict[str, Dict[str, int]]
+    incident_actioned = "<:incident_actioned:714221559279255583>"
+    incident_investigating = "<:incident_investigating:714224190928191551>"
+    incident_unactioned = "<:incident_unactioned:714223099645526026>"
 
+    status_dnd = "<:status_dnd:470326272082313216>"
+    status_idle = "<:status_idle:470326266625785866>"
+    status_offline = "<:status_offline:470326266537705472>"
+    status_online = "<:status_online:470326272351010816>"
 
-class BigBrother(metaclass=YAMLGetter):
-    section = 'big_brother'
+    ducky_dave = "<:ducky_dave:742058418692423772>"
 
-    header_message_limit: int
-    log_delay: int
+    trashcan = "<:trashcan:637136429717389331>"
 
+    bullet = "\u2022"
+    check_mark = "\u2705"
+    cross_mark = "\u274C"
+    new = "\U0001F195"
+    pencil = "\u270F"
 
-class CodeBlock(metaclass=YAMLGetter):
-    section = 'code_block'
+    ok_hand = ":ok_hand:"
 
-    channel_whitelist: List[int]
-    cooldown_channels: List[int]
-    cooldown_seconds: int
-    minimum_lines: int
 
+Emojis = _Emojis()
 
-class Free(metaclass=YAMLGetter):
-    section = 'free'
 
-    activity_timeout: int
-    cooldown_per: float
-    cooldown_rate: int
+class _Icons(EnvConfig):
+    EnvConfig.Config.env_prefix = "icons_"
 
+    crown_blurple = "https://cdn.discordapp.com/emojis/469964153289965568.png"
+    crown_green = "https://cdn.discordapp.com/emojis/469964154719961088.png"
+    crown_red = "https://cdn.discordapp.com/emojis/469964154879344640.png"
 
-class HelpChannels(metaclass=YAMLGetter):
-    section = 'help_channels'
+    defcon_denied = "https://cdn.discordapp.com/emojis/472475292078964738.png"    # noqa: E704
+    defcon_shutdown = "https://cdn.discordapp.com/emojis/470326273952972810.png"  # noqa: E704
+    defcon_unshutdown = "https://cdn.discordapp.com/emojis/470326274213150730.png"   # noqa: E704
+    defcon_update = "https://cdn.discordapp.com/emojis/472472638342561793.png"   # noqa: E704
 
-    enable: bool
-    idle_minutes: int
-    deleted_idle_minutes: int
-    cmd_whitelist: List[int]
+    filtering = "https://cdn.discordapp.com/emojis/472472638594482195.png"
 
+    green_checkmark = "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-checkmark-dist.png"
+    green_questionmark = "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-question-mark-dist.png"
+    guild_update = "https://cdn.discordapp.com/emojis/469954765141442561.png"
 
-class RedirectOutput(metaclass=YAMLGetter):
-    section = 'redirect_output'
+    hash_blurple = "https://cdn.discordapp.com/emojis/469950142942806017.png"
+    hash_green = "https://cdn.discordapp.com/emojis/469950144918585344.png"
+    hash_red = "https://cdn.discordapp.com/emojis/469950145413251072.png"
 
-    delete_delay: int
-    delete_invocation: bool
+    message_bulk_delete = "https://cdn.discordapp.com/emojis/469952898994929668.png"
+    message_delete = "https://cdn.discordapp.com/emojis/472472641320648704.png"
+    message_edit = "https://cdn.discordapp.com/emojis/472472638976163870.png"
 
+    pencil = "https://cdn.discordapp.com/emojis/470326272401211415.png"
 
-class PythonNews(metaclass=YAMLGetter):
-    section = 'python_news'
+    questionmark = "https://cdn.discordapp.com/emojis/512367613339369475.png"
 
-    channel: int
-    webhook: int
-    mail_lists: List[str]
+    remind_blurple = "https://cdn.discordapp.com/emojis/477907609215827968.png"
+    remind_green = "https://cdn.discordapp.com/emojis/477907607785570310.png"
+    remind_red = "https://cdn.discordapp.com/emojis/477907608057937930.png"
 
+    sign_in = "https://cdn.discordapp.com/emojis/469952898181234698.png"
+    sign_out = "https://cdn.discordapp.com/emojis/469952898089091082.png"
 
-class VoiceGate(metaclass=YAMLGetter):
-    section = "voice_gate"
+    superstarify = "https://cdn.discordapp.com/emojis/636288153044516874.png"
+    unsuperstarify = "https://cdn.discordapp.com/emojis/636288201258172446.png"
 
-    bot_message_delete_delay: int
-    minimum_activity_blocks: int
-    minimum_days_member: int
-    minimum_messages: int
-    voice_ping_delete_delay: int
+    token_removed = "https://cdn.discordapp.com/emojis/470326273298792469.png"
 
+    user_ban = "https://cdn.discordapp.com/emojis/469952898026045441.png"
+    user_mute = "https://cdn.discordapp.com/emojis/472472640100106250.png"
+    user_unban = "https://cdn.discordapp.com/emojis/469952898692808704.png"
+    user_unmute = "https://cdn.discordapp.com/emojis/472472639206719508.png"
+    user_update = "https://cdn.discordapp.com/emojis/469952898684551168.png"
+    user_verified = "https://cdn.discordapp.com/emojis/470326274519334936.png"
+    user_warn = "https://cdn.discordapp.com/emojis/470326274238447633.png"
 
-class Branding(metaclass=YAMLGetter):
-    section = "branding"
+    voice_state_blue = "https://cdn.discordapp.com/emojis/656899769662439456.png"
+    voice_state_green = "https://cdn.discordapp.com/emojis/656899770094452754.png"
+    voice_state_red = "https://cdn.discordapp.com/emojis/656899769905709076.png"
 
-    cycle_frequency: int
 
+Icons = _Icons()
 
-class Event(Enum):
-    """
-    Event names. This does not include every event (for example, raw
-    events aren't here), but only events used in ModLog for now.
-    """
 
-    guild_channel_create = "guild_channel_create"
-    guild_channel_delete = "guild_channel_delete"
-    guild_channel_update = "guild_channel_update"
-    guild_role_create = "guild_role_create"
-    guild_role_delete = "guild_role_delete"
-    guild_role_update = "guild_role_update"
-    guild_update = "guild_update"
+class _Filter(EnvConfig):
+    EnvConfig.Config.env_prefix = "filters_"
 
-    member_join = "member_join"
-    member_remove = "member_remove"
-    member_ban = "member_ban"
-    member_unban = "member_unban"
-    member_update = "member_update"
+    filter_domains = True
+    filter_everyone_ping = True
+    filter_invites = True
+    filter_zalgo = False
+    watch_regex = True
+    watch_rich_embeds = True
 
-    message_delete = "message_delete"
-    message_edit = "message_edit"
+    # Notifications are not expected for "watchlist" type filters
 
-    voice_state_update = "voice_state_update"
+    notify_user_domains = False
+    notify_user_everyone_ping = True
+    notify_user_invites = True
+    notify_user_zalgo = False
 
+    offensive_msg_delete_days = 7
+    ping_everyone = True
 
-class VideoPermission(metaclass=YAMLGetter):
-    section = "video_permission"
+    channel_whitelist = [
+        Channels.admins,
+        Channels.big_brother,
+        Channels.dev_log,
+        Channels.message_log,
+        Channels.mod_log,
+        Channels.staff_lounge
+    ]
+    role_whitelist = [
+        Roles.admins,
+        Roles.helpers,
+        Roles.moderators,
+        Roles.owners,
+        Roles.python_community,
+        Roles.partners
+    ]
 
-    default_permission_duration: int
 
+Filter = _Filter()
 
-class ThreadArchiveTimes(Enum):
-    HOUR = 60
-    DAY = 1440
-    THREE_DAY = 4320
-    WEEK = 10080
 
+class _Keys(EnvConfig):
+
+    EnvConfig.Config.env_prefix = "api_keys_"
+
+    github = ""
+    site_api = ""
+
+
+Keys = _Keys()
 
-# Debug mode
-DEBUG_MODE: bool = _CONFIG_YAML["debug"] == "true"
-FILE_LOGS: bool = _CONFIG_YAML["file_logs"].lower() == "true"
 
-# Paths
 BOT_DIR = os.path.dirname(__file__)
 PROJECT_ROOT = os.path.abspath(os.path.join(BOT_DIR, os.pardir))
 
@@ -715,6 +738,7 @@ MODERATION_CATEGORIES = Guild.moderation_categories
 # Git SHA for Sentry
 GIT_SHA = os.environ.get("GIT_SHA", "development")
 
+
 # Bot replies
 NEGATIVE_REPLIES = [
     "Noooooo!!",
diff --git a/bot/exts/backend/branding/_cog.py b/bot/exts/backend/branding/_cog.py
index ff2704835..94429c172 100644
--- a/bot/exts/backend/branding/_cog.py
+++ b/bot/exts/backend/branding/_cog.py
@@ -325,7 +325,7 @@ class Branding(commands.Cog):
 
         # Notify guild of new event ~ this reads the information that we cached above.
         if event_changed and not event.meta.is_fallback:
-            await self.send_info_embed(Channels.change_log, is_notification=True)
+            await self.send_info_embed(Channels.changelog, is_notification=True)
         else:
             log.trace("Omitting #changelog notification. Event has not changed, or new event is fallback.")
 
diff --git a/bot/exts/backend/config_verifier.py b/bot/exts/backend/config_verifier.py
index 97c8869a1..84ae5ca92 100644
--- a/bot/exts/backend/config_verifier.py
+++ b/bot/exts/backend/config_verifier.py
@@ -24,12 +24,12 @@ class ConfigVerifier(Cog):
 
         server_channel_ids = {channel.id for channel in server.channels}
         invalid_channels = [
-            channel_name for channel_name, channel_id in constants.Channels
+            (channel_name, channel_id) for channel_name, channel_id in constants.Channels
             if channel_id not in server_channel_ids
         ]
 
         if invalid_channels:
-            log.warning(f"Configured channels do not exist in server: {', '.join(invalid_channels)}.")
+            log.warning(f"Configured channels do not exist in server: {invalid_channels}.")
 
 
 async def setup(bot: Bot) -> None:
diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py
index d7783292d..4d2e67a31 100644
--- a/bot/exts/filters/antispam.py
+++ b/bot/exts/filters/antispam.py
@@ -41,6 +41,8 @@ RULE_FUNCTION_MAPPING = {
     'role_mentions': rules.apply_role_mentions,
 }
 
+ANTI_SPAM_RULES = AntiSpamConfig.rules.dict()
+
 
 @dataclass
 class DeletionContext:
@@ -121,7 +123,7 @@ class AntiSpam(Cog):
     def __init__(self, bot: Bot, validation_errors: Dict[str, str]) -> None:
         self.bot = bot
         self.validation_errors = validation_errors
-        role_id = AntiSpamConfig.punishment['role_id']
+        role_id = AntiSpamConfig.punishment.role_id
         self.muted_role = Object(role_id)
         self.expiration_date_converter = Duration()
 
@@ -129,7 +131,7 @@ class AntiSpam(Cog):
 
         # Fetch the rule configuration with the highest rule interval.
         max_interval_config = max(
-            AntiSpamConfig.rules.values(),
+            ANTI_SPAM_RULES.values(),
             key=itemgetter('interval')
         )
         self.max_interval = max_interval_config['interval']
@@ -178,8 +180,7 @@ class AntiSpam(Cog):
         earliest_relevant_at = arrow.utcnow() - timedelta(seconds=self.max_interval)
         relevant_messages = list(takewhile(lambda msg: msg.created_at > earliest_relevant_at, self.cache))
 
-        for rule_name in AntiSpamConfig.rules:
-            rule_config = AntiSpamConfig.rules[rule_name]
+        for rule_name, rule_config in ANTI_SPAM_RULES.items():
             rule_function = RULE_FUNCTION_MAPPING[rule_name]
 
             # Create a list of messages that were sent in the interval that the rule cares about.
@@ -229,7 +230,7 @@ class AntiSpam(Cog):
     async def punish(self, msg: Message, member: Member, reason: str) -> None:
         """Punishes the given member for triggering an antispam rule."""
         if not any(role.id == self.muted_role.id for role in member.roles):
-            remove_role_after = AntiSpamConfig.punishment['remove_after']
+            remove_role_after = AntiSpamConfig.punishment.remove_after
 
             # Get context and make sure the bot becomes the actor of infraction by patching the `author` attributes
             context = await self.bot.get_context(msg)
@@ -297,10 +298,11 @@ class AntiSpam(Cog):
         self.cache.update(after)
 
 
-def validate_config(rules_: Mapping = AntiSpamConfig.rules) -> Dict[str, str]:
+def validate_config(rules_: Mapping = ANTI_SPAM_RULES) -> Dict[str, str]:
     """Validates the antispam configs."""
     validation_errors = {}
     for name, config in rules_.items():
+        config = config
         if name not in RULE_FUNCTION_MAPPING:
             log.error(
                 f"Unrecognized antispam rule `{name}`. "
diff --git a/bot/exts/fun/duck_pond.py b/bot/exts/fun/duck_pond.py
index 1815e54f2..fee933b47 100644
--- a/bot/exts/fun/duck_pond.py
+++ b/bot/exts/fun/duck_pond.py
@@ -21,7 +21,7 @@ class DuckPond(Cog):
 
     def __init__(self, bot: Bot):
         self.bot = bot
-        self.webhook_id = constants.Webhooks.duck_pond
+        self.webhook_id = constants.Webhooks.duck_pond.id
         self.webhook = None
         self.ducked_messages = []
         self.relay_lock = None
diff --git a/bot/exts/help_channels/_channel.py b/bot/exts/help_channels/_channel.py
index f64162006..670a10446 100644
--- a/bot/exts/help_channels/_channel.py
+++ b/bot/exts/help_channels/_channel.py
@@ -30,7 +30,7 @@ NEW_POST_ICON_URL = f"{BRANDING_REPO_RAW_URL}/main/icons/checkmark/green-checkma
 
 CLOSED_POST_MSG = f"""
 This help channel has been closed and it's no longer possible to send messages here. \
-If your question wasn't answered, feel free to create a new post in <#{constants.Channels.help_system_forum}>. \
+If your question wasn't answered, feel free to create a new post in <#{constants.Channels.python_help}>. \
 To maximize your chances of getting a response, check out this guide on [asking good questions]({ASKING_GUIDE_URL}).
 """
 CLOSED_POST_ICON_URL = f"{BRANDING_REPO_RAW_URL}/main/icons/zzz/zzz-dist.png"
@@ -39,7 +39,7 @@ CLOSED_POST_ICON_URL = f"{BRANDING_REPO_RAW_URL}/main/icons/zzz/zzz-dist.png"
 def is_help_forum_post(channel: discord.abc.GuildChannel) -> bool:
     """Return True if `channel` is a post in the help forum."""
     log.trace(f"Checking if #{channel} is a help channel.")
-    return getattr(channel, "parent_id", None) == constants.Channels.help_system_forum
+    return getattr(channel, "parent_id", None) == constants.Channels.python_help
 
 
 async def _close_help_post(closed_post: discord.Thread, closing_reason: _stats.ClosingReason) -> None:
diff --git a/bot/exts/help_channels/_cog.py b/bot/exts/help_channels/_cog.py
index bc6bd0303..29d238a5c 100644
--- a/bot/exts/help_channels/_cog.py
+++ b/bot/exts/help_channels/_cog.py
@@ -39,9 +39,9 @@ class HelpForum(commands.Cog):
     async def cog_load(self) -> None:
         """Archive all idle open posts, schedule check for later for active open posts."""
         log.trace("Initialising help forum cog.")
-        self.help_forum_channel = self.bot.get_channel(constants.Channels.help_system_forum)
+        self.help_forum_channel = self.bot.get_channel(constants.Channels.python_help)
         if not isinstance(self.help_forum_channel, discord.ForumChannel):
-            raise TypeError("Channels.help_system_forum is not a forum channel!")
+            raise TypeError("Channels.python_help is not a forum channel!")
 
         for post in self.help_forum_channel.threads:
             await _channel.maybe_archive_idle_post(post, self.scheduler, has_task=False)
diff --git a/bot/exts/help_channels/_stats.py b/bot/exts/help_channels/_stats.py
index 1075b439e..6ca40139b 100644
--- a/bot/exts/help_channels/_stats.py
+++ b/bot/exts/help_channels/_stats.py
@@ -22,7 +22,7 @@ class ClosingReason(Enum):
 
 def report_post_count() -> None:
     """Report post count stats of the help forum."""
-    help_forum = bot.instance.get_channel(constants.Channels.help_system_forum)
+    help_forum = bot.instance.get_channel(constants.Channels.python_help)
     bot.instance.stats.gauge("help.total.in_use", len(help_forum.threads))
 
 
diff --git a/bot/exts/info/codeblock/_cog.py b/bot/exts/info/codeblock/_cog.py
index a431175fd..073a91a53 100644
--- a/bot/exts/info/codeblock/_cog.py
+++ b/bot/exts/info/codeblock/_cog.py
@@ -50,7 +50,7 @@ class CodeBlockCog(Cog, name="Code Block"):
     The cog only detects messages in whitelisted channels. Channels may also have a cooldown on the
     instructions being sent. Note all help channels are also whitelisted with cooldowns enabled.
 
-    For configurable parameters, see the `code_block` section in config-default.py.
+    For configurable parameters, see the `_CodeBlock` class in constants.py.
     """
 
     def __init__(self, bot: Bot):
diff --git a/bot/exts/moderation/incidents.py b/bot/exts/moderation/incidents.py
index ce83ca3fe..3e06cc215 100644
--- a/bot/exts/moderation/incidents.py
+++ b/bot/exts/moderation/incidents.py
@@ -329,9 +329,9 @@ class Incidents(Cog):
         await self.bot.wait_until_guild_available()
 
         try:
-            self.incidents_webhook = await self.bot.fetch_webhook(Webhooks.incidents)
+            self.incidents_webhook = await self.bot.fetch_webhook(Webhooks.incidents.id)
         except discord.HTTPException:
-            log.error(f"Failed to fetch incidents webhook with id `{Webhooks.incidents}`.")
+            log.error(f"Failed to fetch incidents webhook with id `{Webhooks.incidents.id}`.")
 
     async def crawl_incidents(self) -> None:
         """
@@ -389,7 +389,7 @@ class Incidents(Cog):
         embed, attachment_file = await make_embed(incident, outcome, actioned_by)
 
         try:
-            webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive)
+            webhook = await self.bot.fetch_webhook(Webhooks.incidents_archive.id)
             await webhook.send(
                 embed=embed,
                 username=sub_clyde(incident.author.display_name),
diff --git a/bot/exts/moderation/watchchannels/_watchchannel.py b/bot/exts/moderation/watchchannels/_watchchannel.py
index 2871eb5de..bc70a8c1d 100644
--- a/bot/exts/moderation/watchchannels/_watchchannel.py
+++ b/bot/exts/moderation/watchchannels/_watchchannel.py
@@ -53,7 +53,7 @@ class WatchChannel(metaclass=CogABCMeta):
     ) -> None:
         self.bot = bot
 
-        self.destination = destination  # E.g., Channels.big_brother_logs
+        self.destination = destination  # E.g., Channels.big_brother
         self.webhook_id = webhook_id  # E.g.,  Webhooks.big_brother
         self.api_endpoint = api_endpoint  # E.g., 'bot/infractions'
         self.api_default_params = api_default_params  # E.g., {'active': 'true', 'type': 'watch'}
diff --git a/bot/exts/moderation/watchchannels/bigbrother.py b/bot/exts/moderation/watchchannels/bigbrother.py
index 4a746edff..fe652cc5b 100644
--- a/bot/exts/moderation/watchchannels/bigbrother.py
+++ b/bot/exts/moderation/watchchannels/bigbrother.py
@@ -19,8 +19,8 @@ class BigBrother(WatchChannel, Cog, name="Big Brother"):
     def __init__(self, bot: Bot) -> None:
         super().__init__(
             bot,
-            destination=Channels.big_brother_logs,
-            webhook_id=Webhooks.big_brother,
+            destination=Channels.big_brother,
+            webhook_id=Webhooks.big_brother.id,
             api_endpoint='bot/infractions',
             api_default_params={'active': 'true', 'type': 'watch', 'ordering': '-inserted_at', 'limit': 10_000},
             logger=log
diff --git a/bot/exts/recruitment/talentpool/_review.py b/bot/exts/recruitment/talentpool/_review.py
index b9e76b60f..efc9c7a4d 100644
--- a/bot/exts/recruitment/talentpool/_review.py
+++ b/bot/exts/recruitment/talentpool/_review.py
@@ -292,7 +292,7 @@ class Reviewer:
         else:
             embed_title = f"Vote for `{user_id}`"
 
-        channel = self.bot.get_channel(Channels.nomination_archive)
+        channel = self.bot.get_channel(Channels.nomination_voting_archive)
         for number, part in enumerate(
                 textwrap.wrap(embed_content, width=MAX_EMBED_SIZE, replace_whitespace=False, placeholder="")
         ):
diff --git a/botstrap.py b/botstrap.py
new file mode 100644
index 000000000..4b00be9aa
--- /dev/null
+++ b/botstrap.py
@@ -0,0 +1,164 @@
+import os
+import re
+from pathlib import Path
+
+from dotenv import load_dotenv
+from httpx import Client, HTTPStatusError, Response
+
+from bot.constants import Webhooks, _Categories, _Channels, _Roles
+from bot.log import get_logger
+
+load_dotenv()
+log = get_logger("Config Bootstrapper")
+
+env_file_path = Path(".env.server")
+BOT_TOKEN = os.getenv("BOT_TOKEN", None)
+GUILD_ID = os.getenv("GUILD_ID", None)
+
+
+if not BOT_TOKEN:
+    message = (
+        "Couldn't find BOT_TOKEN in the environment variables."
+        "Make sure to add it to the `.env` file likewise: `BOT_TOKEN=value_of_your_bot_token`"
+    )
+    log.warning(message)
+    raise ValueError(message)
+
+if not GUILD_ID:
+    message = (
+        "Couldn't find GUILD_ID in the environment variables."
+        "Make sure to add it to the `.env` file likewise: `GUILD_ID=value_of_your_discord_server_id`"
+    )
+    log.warning(message)
+    raise ValueError(message)
+
+
+class DiscordClient(Client):
+    """An HTTP client to communicate with Discord's APIs."""
+
+    def __init__(self):
+        super().__init__(
+            base_url="https://discord.com/api/v10",
+            headers={"Authorization": f"Bot {BOT_TOKEN}"},
+            event_hooks={"response": [self._raise_for_status]}
+        )
+
+    @staticmethod
+    def _raise_for_status(response: Response) -> None:
+        response.raise_for_status()
+
+
+def get_all_roles(guild_id: int | str, client: DiscordClient) -> dict:
+    """Fetches all the roles in a guild."""
+    result = {}
+
+    response = client.get(f"guilds/{guild_id}/roles")
+    roles = response.json()
+
+    for role in roles:
+        name = "_".join(part.lower() for part in role["name"].split(" ")).replace("-", "_")
+        result[name] = role["id"]
+
+    return result
+
+
+def get_all_channels_and_categories(
+        guild_id: int | str,
+        client: DiscordClient
+) -> tuple[dict[str, str], dict[str, str]]:
+    """Fetches all the text channels & categories in a guild."""
+    off_topic_channel_name_regex = r"ot\d{1}(_.*)+"
+    off_topic_count = 0
+    channels = {}  # could be text channels only as well
+    categories = {}
+
+    response = client.get(f"guilds/{guild_id}/channels")
+    server_channels = response.json()
+
+    for channel in server_channels:
+        channel_type = channel["type"]
+        name = "_".join(part.lower() for part in channel["name"].split(" ")).replace("-", "_")
+        if re.match(off_topic_channel_name_regex, name):
+            name = f"off_topic_{off_topic_count}"
+            off_topic_count += 1
+
+        if channel_type == 4:
+            categories[name] = channel["id"]
+        else:
+            channels[name] = channel["id"]
+
+    return channels, categories
+
+
+def webhook_exists(webhook_id_: int, client: DiscordClient) -> bool:
+    """A predicate that indicates whether a webhook exists already or not."""
+    try:
+        client.get(f"webhooks/{webhook_id_}")
+        return True
+    except HTTPStatusError:
+        return False
+
+
+def create_webhook(name: str, channel_id_: int, client: DiscordClient) -> str:
+    """Creates a new webhook for a particular channel."""
+    payload = {"name": name}
+
+    response = client.post(f"channels/{channel_id_}/webhooks", json=payload)
+    new_webhook = response.json()
+    return new_webhook["id"]
+
+
+with DiscordClient() as discord_client:
+    config_str = "#Roles\n"
+
+    all_roles = get_all_roles(guild_id=GUILD_ID, client=discord_client)
+
+    for role_name in _Roles.__fields__:
+
+        role_id = all_roles.get(role_name, None)
+        if not role_id:
+            log.warning(f"Couldn't find the role {role_name} in the guild, PyDis' default values will be used.")
+            continue
+
+        config_str += f"roles_{role_name}={role_id}\n"
+
+    all_channels, all_categories = get_all_channels_and_categories(guild_id=GUILD_ID, client=discord_client)
+
+    config_str += "\n#Channels\n"
+
+    for channel_name in _Channels.__fields__:
+        channel_id = all_channels.get(channel_name, None)
+        if not channel_id:
+            log.warning(
+                f"Couldn't find the channel {channel_name} in the guild, PyDis' default values will be used."
+            )
+            continue
+
+        config_str += f"channels_{channel_name}={channel_id}\n"
+
+    config_str += "\n#Categories\n"
+
+    for category_name in _Categories.__fields__:
+        category_id = all_categories.get(category_name, None)
+        if not category_id:
+            log.warning(
+                f"Couldn't find the category {category_name} in the guild, PyDis' default values will be used."
+            )
+            continue
+
+        config_str += f"categories_{category_name}={category_id}\n"
+
+    env_file_path.write_text(config_str)
+
+    config_str += "\n#Webhooks\n"
+
+    for webhook_name, webhook_model in Webhooks:
+        webhook = webhook_exists(webhook_model.id, client=discord_client)
+        if not webhook:
+            webhook_channel_id = int(all_channels[webhook_name])
+            webhook_id = create_webhook(webhook_name, webhook_channel_id, client=discord_client)
+        else:
+            webhook_id = webhook_model.id
+        config_str += f"webhooks_{webhook_name}.id={webhook_id}\n"
+
+    env_file_path.write_text(config_str)
diff --git a/config-default.yml b/config-default.yml
deleted file mode 100644
index de0f7e4e8..000000000
--- a/config-default.yml
+++ /dev/null
@@ -1,560 +0,0 @@
-debug:     !ENV ["BOT_DEBUG", "true"]
-file_logs: !ENV ["FILE_LOGS", "false"]
-
-
-bot:
-    prefix:         "!"
-    sentry_dsn:     !ENV "BOT_SENTRY_DSN"
-    token:          !ENV "BOT_TOKEN"
-    trace_loggers:  !ENV "BOT_TRACE_LOGGERS"
-
-    clean:
-        # Maximum number of messages to traverse for clean commands
-        message_limit: 10000
-
-    cooldowns:
-        # Per channel, per tag.
-        tags: 60
-
-    redis:
-        host:  "redis.default.svc.cluster.local"
-        password: !ENV "REDIS_PASSWORD"
-        port:  6379
-        use_fakeredis: false
-
-    stats:
-        presence_update_timeout: 300
-        statsd_host: "graphite.default.svc.cluster.local"
-
-
-style:
-    colours:
-        blue: 0x3775a8
-        bright_green: 0x01d277
-        orange: 0xe67e22
-        pink: 0xcf84e0
-        purple: 0xb734eb
-        soft_green: 0x68c290
-        soft_orange: 0xf9cb54
-        soft_red: 0xcd6d6d
-        white: 0xfffffe
-        yellow: 0xffd241
-
-    emojis:
-        badge_bug_hunter: "<:bug_hunter_lvl1:743882896372269137>"
-        badge_bug_hunter_level_2: "<:bug_hunter_lvl2:743882896611344505>"
-        badge_early_supporter: "<:early_supporter:743882896909140058>"
-        badge_hypesquad: "<:hypesquad_events:743882896892362873>"
-        badge_hypesquad_balance: "<:hypesquad_balance:743882896460480625>"
-        badge_hypesquad_bravery: "<:hypesquad_bravery:743882896745693335>"
-        badge_hypesquad_brilliance: "<:hypesquad_brilliance:743882896938631248>"
-        badge_partner: "<:partner:748666453242413136>"
-        badge_staff: "<:discord_staff:743882896498098226>"
-        badge_verified_bot_developer: "<:verified_bot_dev:743882897299210310>"
-        bot: "<:bot:812712599464443914>"
-        verified_bot: "<:verified_bot:811645219220750347>"
-
-        defcon_shutdown:    "<:defcondisabled:470326273952972810>"
-        defcon_unshutdown:  "<:defconenabled:470326274213150730>"
-        defcon_update:      "<:defconsettingsupdated:470326274082996224>"
-
-        failmail: "<:failmail:633660039931887616>"
-
-        incident_actioned: "<:incident_actioned:714221559279255583>"
-        incident_investigating: "<:incident_investigating:714224190928191551>"
-        incident_unactioned: "<:incident_unactioned:714223099645526026>"
-
-        status_dnd:     "<:status_dnd:470326272082313216>"
-        status_idle:    "<:status_idle:470326266625785866>"
-        status_offline: "<:status_offline:470326266537705472>"
-        status_online:  "<:status_online:470326272351010816>"
-
-        ducky_dave: "<:ducky_dave:742058418692423772>"
-
-        trashcan: "<:trashcan:637136429717389331>"
-
-        bullet:     "\u2022"
-        check_mark: "\u2705"
-        cross_mark: "\u274C"
-        new:        "\U0001F195"
-        pencil:     "\u270F"
-
-        ok_hand: ":ok_hand:"
-
-    icons:
-        crown_blurple: "https://cdn.discordapp.com/emojis/469964153289965568.png"
-        crown_green:   "https://cdn.discordapp.com/emojis/469964154719961088.png"
-        crown_red:     "https://cdn.discordapp.com/emojis/469964154879344640.png"
-
-        defcon_denied:   "https://cdn.discordapp.com/emojis/472475292078964738.png"
-        defcon_shutdown: "https://cdn.discordapp.com/emojis/470326273952972810.png"
-        defcon_unshutdown:  "https://cdn.discordapp.com/emojis/470326274213150730.png"
-        defcon_update:  "https://cdn.discordapp.com/emojis/472472638342561793.png"
-
-        filtering: "https://cdn.discordapp.com/emojis/472472638594482195.png"
-
-        green_checkmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-checkmark-dist.png"
-        green_questionmark: "https://raw.githubusercontent.com/python-discord/branding/main/icons/checkmark/green-question-mark-dist.png"
-        guild_update: "https://cdn.discordapp.com/emojis/469954765141442561.png"
-
-        hash_blurple: "https://cdn.discordapp.com/emojis/469950142942806017.png"
-        hash_green:   "https://cdn.discordapp.com/emojis/469950144918585344.png"
-        hash_red:     "https://cdn.discordapp.com/emojis/469950145413251072.png"
-
-        message_bulk_delete: "https://cdn.discordapp.com/emojis/469952898994929668.png"
-        message_delete:      "https://cdn.discordapp.com/emojis/472472641320648704.png"
-        message_edit:        "https://cdn.discordapp.com/emojis/472472638976163870.png"
-
-        pencil: "https://cdn.discordapp.com/emojis/470326272401211415.png"
-
-        questionmark: "https://cdn.discordapp.com/emojis/512367613339369475.png"
-
-        remind_blurple: "https://cdn.discordapp.com/emojis/477907609215827968.png"
-        remind_green: "https://cdn.discordapp.com/emojis/477907607785570310.png"
-        remind_red: "https://cdn.discordapp.com/emojis/477907608057937930.png"
-
-        sign_in:  "https://cdn.discordapp.com/emojis/469952898181234698.png"
-        sign_out: "https://cdn.discordapp.com/emojis/469952898089091082.png"
-
-        superstarify: "https://cdn.discordapp.com/emojis/636288153044516874.png"
-        unsuperstarify: "https://cdn.discordapp.com/emojis/636288201258172446.png"
-
-        token_removed: "https://cdn.discordapp.com/emojis/470326273298792469.png"
-
-        user_ban:    "https://cdn.discordapp.com/emojis/469952898026045441.png"
-        user_mute:     "https://cdn.discordapp.com/emojis/472472640100106250.png"
-        user_unban:  "https://cdn.discordapp.com/emojis/469952898692808704.png"
-        user_unmute:   "https://cdn.discordapp.com/emojis/472472639206719508.png"
-        user_update: "https://cdn.discordapp.com/emojis/469952898684551168.png"
-        user_verified: "https://cdn.discordapp.com/emojis/470326274519334936.png"
-        user_warn: "https://cdn.discordapp.com/emojis/470326274238447633.png"
-
-        voice_state_blue: "https://cdn.discordapp.com/emojis/656899769662439456.png"
-        voice_state_green: "https://cdn.discordapp.com/emojis/656899770094452754.png"
-        voice_state_red: "https://cdn.discordapp.com/emojis/656899769905709076.png"
-
-
-guild:
-    id: 267624335836053506
-    invite: "https://discord.gg/python"
-
-    categories:
-        logs:               &LOGS           468520609152892958
-        moderators:         &MODS_CATEGORY  749736277464842262
-        modmail:            &MODMAIL        714494672835444826
-        appeals:            &APPEALS        890331800025563216
-        appeals2:           &APPEALS2       895417395261341766
-        voice:                              356013253765234688
-        summer_code_jam:                    861692638540857384
-
-    channels:
-        # Public announcement and news channels
-        announcements:              &ANNOUNCEMENTS      354619224620138496
-        change_log:                 &CHANGE_LOG         748238795236704388
-        mailing_lists:              &MAILING_LISTS      704372456592506880
-        python_events:              &PYEVENTS_CHANNEL   729674110270963822
-        python_news:                &PYNEWS_CHANNEL     704372456592506880
-        reddit:                     &REDDIT_CHANNEL     458224812528238616
-
-        # Development
-        dev_contrib:        &DEV_CONTRIB     635950537262759947
-        dev_core:           &DEV_CORE        411200599653351425
-        dev_voting:         &DEV_CORE_VOTING 839162966519447552
-        dev_log:            &DEV_LOG         622895325144940554
-
-        # Discussion
-        meta:                               429409067623251969
-        python_general:     &PY_GENERAL     267624335836053506
-
-        # Python Help
-        help_system_forum:  1035199133436354600
-
-        # Topical
-        discord_bots:         343944376055103488
-
-        # Logs
-        attachment_log:     &ATTACH_LOG     649243850006855680
-        filter_log:         &FILTER_LOG     1014943924185473094
-        message_log:        &MESSAGE_LOG    467752170159079424
-        mod_log:            &MOD_LOG        282638479504965634
-        nomination_archive:                 833371042046148738
-        user_log:                           528976905546760203
-        voice_log:                          640292421988646961
-
-        # Open Source Projects
-        black_formatter:    &BLACK_FORMATTER 846434317021741086
-
-        # Off-topic
-        off_topic_0:    291284109232308226
-        off_topic_1:    463035241142026251
-        off_topic_2:    463035268514185226
-
-        # Special
-        bot_commands:       &BOT_CMD        267659945086812160
-        esoteric:                           470884583684964352
-        voice_gate:                         764802555427029012
-        code_jam_planning:                  490217981872177157
-
-        # Staff
-        admins:             &ADMINS         365960823622991872
-        admin_spam:         &ADMIN_SPAM     563594791770914816
-        defcon:             &DEFCON         464469101889454091
-        duck_pond:          &DUCK_POND      637820308341915648
-        helpers:            &HELPERS        385474242440986624
-        incidents:                          714214212200562749
-        incidents_archive:                  720668923636351037
-        mod_alerts:                         473092532147060736
-        mods:               &MODS           305126844661760000
-        mod_meta:                           775412552795947058
-        nominations:                        822920136150745168
-        nomination_voting:                  822853512709931008
-        organisation:       &ORGANISATION   551789653284356126
-        staff_lounge:       &STAFF_LOUNGE   464905259261755392
-        staff_info:         &STAFF_INFO     396684402404622347
-
-        # Staff announcement channels
-        admin_announcements:    &ADMIN_ANNOUNCEMENTS    749736155569848370
-        mod_announcements:      &MOD_ANNOUNCEMENTS      372115205867700225
-        staff_announcements:    &STAFF_ANNOUNCEMENTS    464033278631084042
-
-        # Voice Channels
-        admins_voice:       &ADMINS_VOICE   500734494840717332
-        code_help_voice_0:                  751592231726481530
-        code_help_voice_1:                  764232549840846858
-        general_voice_0:                    751591688538947646
-        general_voice_1:                    799641437645701151
-        staff_voice:        &STAFF_VOICE    412375055910043655
-
-        # Voice Chat
-        code_help_chat_0:                   755154969761677312
-        code_help_chat_1:                   766330079135268884
-        staff_voice_chat:                   541638762007101470
-        voice_chat_0:                       412357430186344448
-        voice_chat_1:                       799647045886541885
-
-        # Watch
-        big_brother_logs:   &BB_LOGS        468507907357409333
-
-        # Information
-        roles:                              851270062434156586
-
-    moderation_categories:
-        - *MODS_CATEGORY
-        - *MODMAIL
-        - *LOGS
-        - *APPEALS
-        - *APPEALS2
-
-    moderation_channels:
-        - *ADMINS
-        - *ADMIN_SPAM
-        - *MODS
-
-    # Modlog cog explicitly ignores events which occur in these channels.
-    # This is on top of implicitly ignoring events in channels that the mod team cannot view.
-    modlog_blacklist:
-        - *ATTACH_LOG
-        - *MESSAGE_LOG
-        - *MOD_LOG
-        - *STAFF_VOICE
-        - *FILTER_LOG
-
-    reminder_whitelist:
-        - *BOT_CMD
-        - *DEV_CONTRIB
-        - *BLACK_FORMATTER
-
-    roles:
-        # Self-assignable roles, see the Subscribe cog
-        advent_of_code:                         518565788744024082
-        announcements:                          463658397560995840
-        lovefest:                               542431903886606399
-        pyweek_announcements:                   897568414044938310
-        revival_of_code:                        988801794668908655
-        legacy_help_channels_access:            1074780483776417964
-
-        contributors:                           295488872404484098
-        help_cooldown:                          699189276025421825
-        muted:              &MUTED_ROLE         277914926603829249
-        partners:           &PY_PARTNER_ROLE    323426753857191936
-        python_community:   &PY_COMMUNITY_ROLE  458226413825294336
-        sprinters:          &SPRINTERS          758422482289426471
-        voice_verified:                         764802720779337729
-
-        # Staff
-        admins:             &ADMINS_ROLE    267628507062992896
-        core_developers:                    587606783669829632
-        code_jam_event_team:                787816728474288181
-        devops:                             409416496733880320
-        domain_leads:                       807415650778742785
-        events_lead:                        778361735739998228
-        helpers:            &HELPERS_ROLE   267630620367257601
-        moderators:         &MODS_ROLE      831776746206265384
-        mod_team:           &MOD_TEAM_ROLE  267629731250176001
-        owners:             &OWNERS_ROLE    267627879762755584
-        project_leads:                      815701647526330398
-
-        # Code Jam
-        jammers:        737249140966162473
-
-        # Streaming
-        video:          764245844798079016
-
-        # Patreon
-        patreon_tier_1: 505040943800516611
-        patreon_tier_2: 743399725914390631
-        patreon_tier_3: 743400204367036520
-
-    moderation_roles:
-        - *ADMINS_ROLE
-        - *MOD_TEAM_ROLE
-        - *MODS_ROLE
-        - *OWNERS_ROLE
-
-    staff_roles:
-        - *ADMINS_ROLE
-        - *HELPERS_ROLE
-        - *MOD_TEAM_ROLE
-        - *OWNERS_ROLE
-
-    webhooks:
-        big_brother:                        569133704568373283
-        dev_log:                            680501655111729222
-        duck_pond:                          637821475327311927
-        incidents:                          816650601844572212
-        incidents_archive:                  720671599790915702
-        python_news:        &PYNEWS_WEBHOOK 704381182279942324
-
-
-filter:
-    # What do we filter?
-    filter_domains:        true
-    filter_everyone_ping:  true
-    filter_invites:        true
-    filter_zalgo:          false
-    watch_regex:           true
-    watch_rich_embeds:     true
-
-    # Notify user on filter?
-    # Notifications are not expected for "watchlist" type filters
-    notify_user_domains:        false
-    notify_user_everyone_ping:  true
-    notify_user_invites:        true
-    notify_user_zalgo:          false
-
-    # Filter configuration
-    offensive_msg_delete_days: 7     # How many days before deleting an offensive message?
-    ping_everyone:             true
-
-    # Censor doesn't apply to these
-    channel_whitelist:
-        - *ADMINS
-        - *BB_LOGS
-        - *DEV_LOG
-        - *MESSAGE_LOG
-        - *MOD_LOG
-        - *STAFF_LOUNGE
-
-    role_whitelist:
-        - *ADMINS_ROLE
-        - *HELPERS_ROLE
-        - *MODS_ROLE
-        - *OWNERS_ROLE
-        - *PY_COMMUNITY_ROLE
-        - *SPRINTERS
-        - *PY_PARTNER_ROLE
-
-
-keys:
-    github:      !ENV "GITHUB_API_KEY"
-    site_api:    !ENV "BOT_API_KEY"
-
-
-urls:
-    # PyDis site vars
-    connect_max_retries:       3
-    connect_cooldown:          5
-    site:        &DOMAIN       "pythondiscord.com"
-    site_api:    &API          "site.default.svc.cluster.local/api"
-    site_api_schema:           "http://"
-    site_paste:  &PASTE  !JOIN ["paste.", *DOMAIN]
-    site_schema: &SCHEMA       "https://"
-    site_staff:  &STAFF  !JOIN [*SCHEMA, *DOMAIN, "/staff"]
-
-    paste_service:                      !JOIN [*SCHEMA, *PASTE, "/{key}"]
-    site_logs_view:                     !JOIN [*STAFF, "/bot/logs"]
-
-    # Snekbox
-    snekbox_eval_api: !ENV ["SNEKBOX_EVAL_API", "http://snekbox.default.svc.cluster.local/eval"]
-    snekbox_311_eval_api: !ENV ["SNEKBOX_311_EVAL_API", "http://snekbox-311.default.svc.cluster.local/eval"]
-
-    # Discord API URLs
-    discord_api:        &DISCORD_API "https://discordapp.com/api/v7/"
-    discord_invite_api: !JOIN [*DISCORD_API, "invites"]
-
-    # Misc URLsw
-    bot_avatar:      "https://raw.githubusercontent.com/python-discord/branding/main/logos/logo_circle/logo_circle.png"
-    github_bot_repo: "https://github.com/python-discord/bot"
-
-
-anti_spam:
-    cache_size: 100
-
-    # Clean messages that violate a rule.
-    clean_offending: true
-    ping_everyone: true
-
-    punishment:
-        remove_after: 600
-        role_id: *MUTED_ROLE
-
-    rules:
-        attachments:
-            interval: 10
-            max: 6
-
-        burst:
-            interval: 10
-            max: 7
-
-        # Burst shared it (temporarily) disabled to prevent
-        # the bug that triggers multiple infractions/DMs per
-        # user. It also tends to catch a lot of innocent users
-        # now that we're so big.
-        # burst_shared:
-        #    interval: 10
-        #    max: 20
-
-        chars:
-            interval: 5
-            max: 4_200
-
-        discord_emojis:
-            interval: 10
-            max: 20
-
-        duplicates:
-            interval: 10
-            max: 3
-
-        links:
-            interval: 10
-            max: 10
-
-        mentions:
-            interval: 10
-            max: 5
-
-        newlines:
-            interval: 10
-            max: 100
-            max_consecutive: 10
-
-        role_mentions:
-            interval: 10
-            max: 3
-
-
-metabase:
-    username: !ENV      "METABASE_USERNAME"
-    password: !ENV      "METABASE_PASSWORD"
-    base_url:           "http://metabase.default.svc.cluster.local"
-    public_url:         "https://metabase.pythondiscord.com"
-    # 14 days, see https://www.metabase.com/docs/latest/operations-guide/environment-variables.html#max_session_age
-    max_session_age:    20160
-
-
-big_brother:
-    header_message_limit: 15
-    log_delay: 15
-
-
-code_block:
-    # The channels in which code blocks will be detected. They are not subject to a cooldown.
-    channel_whitelist:
-        - *BOT_CMD
-
-    # The channels which will be affected by a cooldown. These channels are also whitelisted.
-    cooldown_channels:
-        - *PY_GENERAL
-
-    # Sending instructions triggers a cooldown on a per-channel basis.
-    # More instruction messages will not be sent in the same channel until the cooldown has elapsed.
-    cooldown_seconds: 300
-
-    # The minimum amount of lines a message or code block must have for instructions to be sent.
-    minimum_lines: 4
-
-
-free:
-    # Seconds to elapse for a channel
-    # to be considered inactive.
-    activity_timeout: 600
-    cooldown_per: 60.0
-    cooldown_rate: 1
-
-
-help_channels:
-    enable: true
-
-    # Allowed duration of inactivity before archiving a help post
-    idle_minutes: 30
-
-    # Allowed duration of inactivity when post is empty (due to deleted messages)
-    # before archiving a help post
-    deleted_idle_minutes: 5
-
-    # Roles which are allowed to use the command which makes channels dormant
-    cmd_whitelist:
-        - *HELPERS_ROLE
-
-redirect_output:
-    delete_delay: 15
-    delete_invocation: true
-
-
-duck_pond:
-    threshold: 7
-    channel_blacklist:
-        - *ANNOUNCEMENTS
-        - *PYNEWS_CHANNEL
-        - *PYEVENTS_CHANNEL
-        - *MAILING_LISTS
-        - *REDDIT_CHANNEL
-        - *DUCK_POND
-        - *CHANGE_LOG
-        - *STAFF_ANNOUNCEMENTS
-        - *MOD_ANNOUNCEMENTS
-        - *ADMIN_ANNOUNCEMENTS
-        - *STAFF_INFO
-
-
-python_news:
-    channel: *PYNEWS_CHANNEL
-    webhook: *PYNEWS_WEBHOOK
-
-    mail_lists:
-        - 'python-ideas'
-        - 'python-announce-list'
-        - 'pypi-announce'
-        - 'python-dev'
-
-
-voice_gate:
-    bot_message_delete_delay: 10  # Seconds before deleting bot's response in Voice Gate
-    minimum_activity_blocks: 3  # Number of 10 minute blocks during which a user must have been active
-    minimum_days_member: 3  # How many days the user must have been a member for
-    minimum_messages: 50  # How many messages a user must have to be eligible for voice
-    voice_ping_delete_delay: 60  # Seconds before deleting the bot's ping to user in Voice Gate
-
-
-branding:
-    cycle_frequency: 3  # How many days bot wait before refreshing server icon
-
-
-config:
-    required_keys: ['bot.token']
-
-
-video_permission:
-    default_permission_duration: 5  # Default duration for stream command in minutes
diff --git a/docker-compose.yml b/docker-compose.yml
index bc53c482b..694f44507 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -112,4 +112,9 @@ services:
     env_file:
       - .env
     environment:
-      BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531
+      API_KEYS_SITE_API: "badbot13m0n8f570f942013fc818f234916ca531"
+      URLS_SITE_API: "web:8000/api"
+      URLS_SNEKBOX_EVAL_API: "http://snekbox/eval"
+      URLS_SNEKBOX_311_EVAL_API: "http://snekbox-311/eval"
+      REDIS_HOST: "redis"
+      STATS_STATSD_HOST: "http://localhost"
diff --git a/poetry.lock b/poetry.lock
index 3bc0ea024..3ed2ade4b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -17,106 +17,106 @@ pycares = ">=4.0.0"
 
 [[package]]
 name = "aiohttp"
-version = "3.8.4"
+version = "3.8.3"
 description = "Async http client/server framework (asyncio)"
 category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5ce45967538fb747370308d3145aa68a074bdecb4f3a300869590f725ced69c1"},
-    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b744c33b6f14ca26b7544e8d8aadff6b765a80ad6164fb1a430bbadd593dfb1a"},
-    {file = "aiohttp-3.8.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a45865451439eb320784918617ba54b7a377e3501fb70402ab84d38c2cd891b"},
-    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a86d42d7cba1cec432d47ab13b6637bee393a10f664c425ea7b305d1301ca1a3"},
-    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee3c36df21b5714d49fc4580247947aa64bcbe2939d1b77b4c8dcb8f6c9faecc"},
-    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:176a64b24c0935869d5bbc4c96e82f89f643bcdf08ec947701b9dbb3c956b7dd"},
-    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c844fd628851c0bc309f3c801b3a3d58ce430b2ce5b359cd918a5a76d0b20cb5"},
-    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5393fb786a9e23e4799fec788e7e735de18052f83682ce2dfcabaf1c00c2c08e"},
-    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e4b09863aae0dc965c3ef36500d891a3ff495a2ea9ae9171e4519963c12ceefd"},
-    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:adfbc22e87365a6e564c804c58fc44ff7727deea782d175c33602737b7feadb6"},
-    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:147ae376f14b55f4f3c2b118b95be50a369b89b38a971e80a17c3fd623f280c9"},
-    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:eafb3e874816ebe2a92f5e155f17260034c8c341dad1df25672fb710627c6949"},
-    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c6cc15d58053c76eacac5fa9152d7d84b8d67b3fde92709195cb984cfb3475ea"},
-    {file = "aiohttp-3.8.4-cp310-cp310-win32.whl", hash = "sha256:59f029a5f6e2d679296db7bee982bb3d20c088e52a2977e3175faf31d6fb75d1"},
-    {file = "aiohttp-3.8.4-cp310-cp310-win_amd64.whl", hash = "sha256:fe7ba4a51f33ab275515f66b0a236bcde4fb5561498fe8f898d4e549b2e4509f"},
-    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3d8ef1a630519a26d6760bc695842579cb09e373c5f227a21b67dc3eb16cfea4"},
-    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5b3f2e06a512e94722886c0827bee9807c86a9f698fac6b3aee841fab49bbfb4"},
-    {file = "aiohttp-3.8.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3a80464982d41b1fbfe3154e440ba4904b71c1a53e9cd584098cd41efdb188ef"},
-    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b631e26df63e52f7cce0cce6507b7a7f1bc9b0c501fcde69742130b32e8782f"},
-    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f43255086fe25e36fd5ed8f2ee47477408a73ef00e804cb2b5cba4bf2ac7f5e"},
-    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4d347a172f866cd1d93126d9b239fcbe682acb39b48ee0873c73c933dd23bd0f"},
-    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3fec6a4cb5551721cdd70473eb009d90935b4063acc5f40905d40ecfea23e05"},
-    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80a37fe8f7c1e6ce8f2d9c411676e4bc633a8462844e38f46156d07a7d401654"},
-    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d1e6a862b76f34395a985b3cd39a0d949ca80a70b6ebdea37d3ab39ceea6698a"},
-    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cd468460eefef601ece4428d3cf4562459157c0f6523db89365202c31b6daebb"},
-    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:618c901dd3aad4ace71dfa0f5e82e88b46ef57e3239fc7027773cb6d4ed53531"},
-    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:652b1bff4f15f6287550b4670546a2947f2a4575b6c6dff7760eafb22eacbf0b"},
-    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80575ba9377c5171407a06d0196b2310b679dc752d02a1fcaa2bc20b235dbf24"},
-    {file = "aiohttp-3.8.4-cp311-cp311-win32.whl", hash = "sha256:bbcf1a76cf6f6dacf2c7f4d2ebd411438c275faa1dc0c68e46eb84eebd05dd7d"},
-    {file = "aiohttp-3.8.4-cp311-cp311-win_amd64.whl", hash = "sha256:6e74dd54f7239fcffe07913ff8b964e28b712f09846e20de78676ce2a3dc0bfc"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:880e15bb6dad90549b43f796b391cfffd7af373f4646784795e20d92606b7a51"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb96fa6b56bb536c42d6a4a87dfca570ff8e52de2d63cabebfd6fb67049c34b6"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a6cadebe132e90cefa77e45f2d2f1a4b2ce5c6b1bfc1656c1ddafcfe4ba8131"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f352b62b45dff37b55ddd7b9c0c8672c4dd2eb9c0f9c11d395075a84e2c40f75"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ab43061a0c81198d88f39aaf90dae9a7744620978f7ef3e3708339b8ed2ef01"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9cb1565a7ad52e096a6988e2ee0397f72fe056dadf75d17fa6b5aebaea05622"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:1b3ea7edd2d24538959c1c1abf97c744d879d4e541d38305f9bd7d9b10c9ec41"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:7c7837fe8037e96b6dd5cfcf47263c1620a9d332a87ec06a6ca4564e56bd0f36"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:3b90467ebc3d9fa5b0f9b6489dfb2c304a1db7b9946fa92aa76a831b9d587e99"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:cab9401de3ea52b4b4c6971db5fb5c999bd4260898af972bf23de1c6b5dd9d71"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d1f9282c5f2b5e241034a009779e7b2a1aa045f667ff521e7948ea9b56e0c5ff"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-win32.whl", hash = "sha256:5e14f25765a578a0a634d5f0cd1e2c3f53964553a00347998dfdf96b8137f777"},
-    {file = "aiohttp-3.8.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4c745b109057e7e5f1848c689ee4fb3a016c8d4d92da52b312f8a509f83aa05e"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:aede4df4eeb926c8fa70de46c340a1bc2c6079e1c40ccf7b0eae1313ffd33519"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ddaae3f3d32fc2cb4c53fab020b69a05c8ab1f02e0e59665c6f7a0d3a5be54f"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4eb3b82ca349cf6fadcdc7abcc8b3a50ab74a62e9113ab7a8ebc268aad35bb9"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9bcb89336efa095ea21b30f9e686763f2be4478f1b0a616969551982c4ee4c3b"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c08e8ed6fa3d477e501ec9db169bfac8140e830aa372d77e4a43084d8dd91ab"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c6cd05ea06daca6ad6a4ca3ba7fe7dc5b5de063ff4daec6170ec0f9979f6c332"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7a00a9ed8d6e725b55ef98b1b35c88013245f35f68b1b12c5cd4100dddac333"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:de04b491d0e5007ee1b63a309956eaed959a49f5bb4e84b26c8f5d49de140fa9"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:40653609b3bf50611356e6b6554e3a331f6879fa7116f3959b20e3528783e699"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dbf3a08a06b3f433013c143ebd72c15cac33d2914b8ea4bea7ac2c23578815d6"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:854f422ac44af92bfe172d8e73229c270dc09b96535e8a548f99c84f82dde241"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-win32.whl", hash = "sha256:aeb29c84bb53a84b1a81c6c09d24cf33bb8432cc5c39979021cc0f98c1292a1a"},
-    {file = "aiohttp-3.8.4-cp37-cp37m-win_amd64.whl", hash = "sha256:db3fc6120bce9f446d13b1b834ea5b15341ca9ff3f335e4a951a6ead31105480"},
-    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fabb87dd8850ef0f7fe2b366d44b77d7e6fa2ea87861ab3844da99291e81e60f"},
-    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91f6d540163f90bbaef9387e65f18f73ffd7c79f5225ac3d3f61df7b0d01ad15"},
-    {file = "aiohttp-3.8.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d265f09a75a79a788237d7f9054f929ced2e69eb0bb79de3798c468d8a90f945"},
-    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d89efa095ca7d442a6d0cbc755f9e08190ba40069b235c9886a8763b03785da"},
-    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4dac314662f4e2aa5009977b652d9b8db7121b46c38f2073bfeed9f4049732cd"},
-    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe11310ae1e4cd560035598c3f29d86cef39a83d244c7466f95c27ae04850f10"},
-    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ddb2a2026c3f6a68c3998a6c47ab6795e4127315d2e35a09997da21865757f8"},
-    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e75b89ac3bd27d2d043b234aa7b734c38ba1b0e43f07787130a0ecac1e12228a"},
-    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6e601588f2b502c93c30cd5a45bfc665faaf37bbe835b7cfd461753068232074"},
-    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a5d794d1ae64e7753e405ba58e08fcfa73e3fad93ef9b7e31112ef3c9a0efb52"},
-    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:a1f4689c9a1462f3df0a1f7e797791cd6b124ddbee2b570d34e7f38ade0e2c71"},
-    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3032dcb1c35bc330134a5b8a5d4f68c1a87252dfc6e1262c65a7e30e62298275"},
-    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8189c56eb0ddbb95bfadb8f60ea1b22fcfa659396ea36f6adcc521213cd7b44d"},
-    {file = "aiohttp-3.8.4-cp38-cp38-win32.whl", hash = "sha256:33587f26dcee66efb2fff3c177547bd0449ab7edf1b73a7f5dea1e38609a0c54"},
-    {file = "aiohttp-3.8.4-cp38-cp38-win_amd64.whl", hash = "sha256:e595432ac259af2d4630008bf638873d69346372d38255774c0e286951e8b79f"},
-    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5a7bdf9e57126dc345b683c3632e8ba317c31d2a41acd5800c10640387d193ed"},
-    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:22f6eab15b6db242499a16de87939a342f5a950ad0abaf1532038e2ce7d31567"},
-    {file = "aiohttp-3.8.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7235604476a76ef249bd64cb8274ed24ccf6995c4a8b51a237005ee7a57e8643"},
-    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea9eb976ffdd79d0e893869cfe179a8f60f152d42cb64622fca418cd9b18dc2a"},
-    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92c0cea74a2a81c4c76b62ea1cac163ecb20fb3ba3a75c909b9fa71b4ad493cf"},
-    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:493f5bc2f8307286b7799c6d899d388bbaa7dfa6c4caf4f97ef7521b9cb13719"},
-    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a63f03189a6fa7c900226e3ef5ba4d3bd047e18f445e69adbd65af433add5a2"},
-    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10c8cefcff98fd9168cdd86c4da8b84baaa90bf2da2269c6161984e6737bf23e"},
-    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bca5f24726e2919de94f047739d0a4fc01372801a3672708260546aa2601bf57"},
-    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:03baa76b730e4e15a45f81dfe29a8d910314143414e528737f8589ec60cf7391"},
-    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:8c29c77cc57e40f84acef9bfb904373a4e89a4e8b74e71aa8075c021ec9078c2"},
-    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:03543dcf98a6619254b409be2d22b51f21ec66272be4ebda7b04e6412e4b2e14"},
-    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:17b79c2963db82086229012cff93ea55196ed31f6493bb1ccd2c62f1724324e4"},
-    {file = "aiohttp-3.8.4-cp39-cp39-win32.whl", hash = "sha256:34ce9f93a4a68d1272d26030655dd1b58ff727b3ed2a33d80ec433561b03d67a"},
-    {file = "aiohttp-3.8.4-cp39-cp39-win_amd64.whl", hash = "sha256:41a86a69bb63bb2fc3dc9ad5ea9f10f1c9c8e282b471931be0268ddd09430b04"},
-    {file = "aiohttp-3.8.4.tar.gz", hash = "sha256:bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c"},
+    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ba71c9b4dcbb16212f334126cc3d8beb6af377f6703d9dc2d9fb3874fd667ee9"},
+    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d24b8bb40d5c61ef2d9b6a8f4528c2f17f1c5d2d31fed62ec860f6006142e83e"},
+    {file = "aiohttp-3.8.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f88df3a83cf9df566f171adba39d5bd52814ac0b94778d2448652fc77f9eb491"},
+    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b97decbb3372d4b69e4d4c8117f44632551c692bb1361b356a02b97b69e18a62"},
+    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:309aa21c1d54b8ef0723181d430347d7452daaff93e8e2363db8e75c72c2fb2d"},
+    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ad5383a67514e8e76906a06741febd9126fc7c7ff0f599d6fcce3e82b80d026f"},
+    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20acae4f268317bb975671e375493dbdbc67cddb5f6c71eebdb85b34444ac46b"},
+    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:05a3c31c6d7cd08c149e50dc7aa2568317f5844acd745621983380597f027a18"},
+    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d6f76310355e9fae637c3162936e9504b4767d5c52ca268331e2756e54fd4ca5"},
+    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:256deb4b29fe5e47893fa32e1de2d73c3afe7407738bd3c63829874661d4822d"},
+    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:5c59fcd80b9049b49acd29bd3598cada4afc8d8d69bd4160cd613246912535d7"},
+    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:059a91e88f2c00fe40aed9031b3606c3f311414f86a90d696dd982e7aec48142"},
+    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2feebbb6074cdbd1ac276dbd737b40e890a1361b3cc30b74ac2f5e24aab41f7b"},
+    {file = "aiohttp-3.8.3-cp310-cp310-win32.whl", hash = "sha256:5bf651afd22d5f0c4be16cf39d0482ea494f5c88f03e75e5fef3a85177fecdeb"},
+    {file = "aiohttp-3.8.3-cp310-cp310-win_amd64.whl", hash = "sha256:653acc3880459f82a65e27bd6526e47ddf19e643457d36a2250b85b41a564715"},
+    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:86fc24e58ecb32aee09f864cb11bb91bc4c1086615001647dbfc4dc8c32f4008"},
+    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75e14eac916f024305db517e00a9252714fce0abcb10ad327fb6dcdc0d060f1d"},
+    {file = "aiohttp-3.8.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d1fde0f44029e02d02d3993ad55ce93ead9bb9b15c6b7ccd580f90bd7e3de476"},
+    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ab94426ddb1ecc6a0b601d832d5d9d421820989b8caa929114811369673235c"},
+    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89d2e02167fa95172c017732ed7725bc8523c598757f08d13c5acca308e1a061"},
+    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:02f9a2c72fc95d59b881cf38a4b2be9381b9527f9d328771e90f72ac76f31ad8"},
+    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c7149272fb5834fc186328e2c1fa01dda3e1fa940ce18fded6d412e8f2cf76d"},
+    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:512bd5ab136b8dc0ffe3fdf2dfb0c4b4f49c8577f6cae55dca862cd37a4564e2"},
+    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7018ecc5fe97027214556afbc7c502fbd718d0740e87eb1217b17efd05b3d276"},
+    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:88c70ed9da9963d5496d38320160e8eb7e5f1886f9290475a881db12f351ab5d"},
+    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:da22885266bbfb3f78218dc40205fed2671909fbd0720aedba39b4515c038091"},
+    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:e65bc19919c910127c06759a63747ebe14f386cda573d95bcc62b427ca1afc73"},
+    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:08c78317e950e0762c2983f4dd58dc5e6c9ff75c8a0efeae299d363d439c8e34"},
+    {file = "aiohttp-3.8.3-cp311-cp311-win32.whl", hash = "sha256:45d88b016c849d74ebc6f2b6e8bc17cabf26e7e40c0661ddd8fae4c00f015697"},
+    {file = "aiohttp-3.8.3-cp311-cp311-win_amd64.whl", hash = "sha256:96372fc29471646b9b106ee918c8eeb4cca423fcbf9a34daa1b93767a88a2290"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c971bf3786b5fad82ce5ad570dc6ee420f5b12527157929e830f51c55dc8af77"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff25f48fc8e623d95eca0670b8cc1469a83783c924a602e0fbd47363bb54aaca"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e381581b37db1db7597b62a2e6b8b57c3deec95d93b6d6407c5b61ddc98aca6d"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db19d60d846283ee275d0416e2a23493f4e6b6028825b51290ac05afc87a6f97"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25892c92bee6d9449ffac82c2fe257f3a6f297792cdb18ad784737d61e7a9a85"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:398701865e7a9565d49189f6c90868efaca21be65c725fc87fc305906be915da"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4a4fbc769ea9b6bd97f4ad0b430a6807f92f0e5eb020f1e42ece59f3ecfc4585"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:b29bfd650ed8e148f9c515474a6ef0ba1090b7a8faeee26b74a8ff3b33617502"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:1e56b9cafcd6531bab5d9b2e890bb4937f4165109fe98e2b98ef0dcfcb06ee9d"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ec40170327d4a404b0d91855d41bfe1fe4b699222b2b93e3d833a27330a87a6d"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2df5f139233060578d8c2c975128fb231a89ca0a462b35d4b5fcf7c501ebdbe1"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-win32.whl", hash = "sha256:f973157ffeab5459eefe7b97a804987876dd0a55570b8fa56b4e1954bf11329b"},
+    {file = "aiohttp-3.8.3-cp36-cp36m-win_amd64.whl", hash = "sha256:437399385f2abcd634865705bdc180c8314124b98299d54fe1d4c8990f2f9494"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:09e28f572b21642128ef31f4e8372adb6888846f32fecb288c8b0457597ba61a"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f3553510abdbec67c043ca85727396ceed1272eef029b050677046d3387be8d"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e168a7560b7c61342ae0412997b069753f27ac4862ec7867eff74f0fe4ea2ad9"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db4c979b0b3e0fa7e9e69ecd11b2b3174c6963cebadeecfb7ad24532ffcdd11a"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e164e0a98e92d06da343d17d4e9c4da4654f4a4588a20d6c73548a29f176abe2"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8a78079d9a39ca9ca99a8b0ac2fdc0c4d25fc80c8a8a82e5c8211509c523363"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:21b30885a63c3f4ff5b77a5d6caf008b037cb521a5f33eab445dc566f6d092cc"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4b0f30372cef3fdc262f33d06e7b411cd59058ce9174ef159ad938c4a34a89da"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:8135fa153a20d82ffb64f70a1b5c2738684afa197839b34cc3e3c72fa88d302c"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ad61a9639792fd790523ba072c0555cd6be5a0baf03a49a5dd8cfcf20d56df48"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:978b046ca728073070e9abc074b6299ebf3501e8dee5e26efacb13cec2b2dea0"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-win32.whl", hash = "sha256:0d2c6d8c6872df4a6ec37d2ede71eff62395b9e337b4e18efd2177de883a5033"},
+    {file = "aiohttp-3.8.3-cp37-cp37m-win_amd64.whl", hash = "sha256:21d69797eb951f155026651f7e9362877334508d39c2fc37bd04ff55b2007091"},
+    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ca9af5f8f5812d475c5259393f52d712f6d5f0d7fdad9acdb1107dd9e3cb7eb"},
+    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d90043c1882067f1bd26196d5d2db9aa6d268def3293ed5fb317e13c9413ea4"},
+    {file = "aiohttp-3.8.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d737fc67b9a970f3234754974531dc9afeea11c70791dcb7db53b0cf81b79784"},
+    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebf909ea0a3fc9596e40d55d8000702a85e27fd578ff41a5500f68f20fd32e6c"},
+    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5835f258ca9f7c455493a57ee707b76d2d9634d84d5d7f62e77be984ea80b849"},
+    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da37dcfbf4b7f45d80ee386a5f81122501ec75672f475da34784196690762f4b"},
+    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87f44875f2804bc0511a69ce44a9595d5944837a62caecc8490bbdb0e18b1342"},
+    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:527b3b87b24844ea7865284aabfab08eb0faf599b385b03c2aa91fc6edd6e4b6"},
+    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d5ba88df9aa5e2f806650fcbeedbe4f6e8736e92fc0e73b0400538fd25a4dd96"},
+    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e7b8813be97cab8cb52b1375f41f8e6804f6507fe4660152e8ca5c48f0436017"},
+    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2dea10edfa1a54098703cb7acaa665c07b4e7568472a47f4e64e6319d3821ccf"},
+    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:713d22cd9643ba9025d33c4af43943c7a1eb8547729228de18d3e02e278472b6"},
+    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d252771fc85e0cf8da0b823157962d70639e63cb9b578b1dec9868dd1f4f937"},
+    {file = "aiohttp-3.8.3-cp38-cp38-win32.whl", hash = "sha256:66bd5f950344fb2b3dbdd421aaa4e84f4411a1a13fca3aeb2bcbe667f80c9f76"},
+    {file = "aiohttp-3.8.3-cp38-cp38-win_amd64.whl", hash = "sha256:84b14f36e85295fe69c6b9789b51a0903b774046d5f7df538176516c3e422446"},
+    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16c121ba0b1ec2b44b73e3a8a171c4f999b33929cd2397124a8c7fcfc8cd9e06"},
+    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8d6aaa4e7155afaf994d7924eb290abbe81a6905b303d8cb61310a2aba1c68ba"},
+    {file = "aiohttp-3.8.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43046a319664a04b146f81b40e1545d4c8ac7b7dd04c47e40bf09f65f2437346"},
+    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:599418aaaf88a6d02a8c515e656f6faf3d10618d3dd95866eb4436520096c84b"},
+    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92a2964319d359f494f16011e23434f6f8ef0434acd3cf154a6b7bec511e2fb7"},
+    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:73a4131962e6d91109bca6536416aa067cf6c4efb871975df734f8d2fd821b37"},
+    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:598adde339d2cf7d67beaccda3f2ce7c57b3b412702f29c946708f69cf8222aa"},
+    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75880ed07be39beff1881d81e4a907cafb802f306efd6d2d15f2b3c69935f6fb"},
+    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0239da9fbafd9ff82fd67c16704a7d1bccf0d107a300e790587ad05547681c8"},
+    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4e3a23ec214e95c9fe85a58470b660efe6534b83e6cbe38b3ed52b053d7cb6ad"},
+    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:47841407cc89a4b80b0c52276f3cc8138bbbfba4b179ee3acbd7d77ae33f7ac4"},
+    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:54d107c89a3ebcd13228278d68f1436d3f33f2dd2af5415e3feaeb1156e1a62c"},
+    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c37c5cce780349d4d51739ae682dec63573847a2a8dcb44381b174c3d9c8d403"},
+    {file = "aiohttp-3.8.3-cp39-cp39-win32.whl", hash = "sha256:f178d2aadf0166be4df834c4953da2d7eef24719e8aec9a65289483eeea9d618"},
+    {file = "aiohttp-3.8.3-cp39-cp39-win_amd64.whl", hash = "sha256:88e5be56c231981428f4f506c68b6a46fa25c4123a2e86d156c58a8369d31ab7"},
+    {file = "aiohttp-3.8.3.tar.gz", hash = "sha256:3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269"},
 ]
 
 [package.dependencies]
 aiosignal = ">=1.1.2"
 async-timeout = ">=4.0.0a3,<5.0"
 attrs = ">=17.3.0"
-charset-normalizer = ">=2.0,<4.0"
+charset-normalizer = ">=2.0,<3.0"
 frozenlist = ">=1.1.1"
 multidict = ">=4.5,<7.0"
 yarl = ">=1.0,<2.0"
@@ -326,89 +326,19 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "3.1.0"
+version = "2.1.1"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.7.0"
-files = [
-    {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"},
-    {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"},
-    {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"},
-    {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"},
-    {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"},
-    {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"},
-    {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"},
+python-versions = ">=3.6.0"
+files = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
 ]
 
+[package.extras]
+unicode-backport = ["unicodedata2"]
+
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -1619,6 +1549,7 @@ files = [
 ]
 
 [package.dependencies]
+python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""}
 typing-extensions = ">=4.2.0"
 
 [package.extras]
@@ -1787,7 +1718,7 @@ six = ">=1.5"
 name = "python-dotenv"
 version = "1.0.0"
 description = "Read key-value pairs from a .env file and set them as environment variables"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.8"
 files = [
@@ -2454,4 +2385,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "55864b0999f050d425372702a3ee959010419e76f8269b5d2cfa239b84bf8c53"
+content-hash = "a6f4f1d677e9273746ab05c3bfe87ef0f7969fe42983d3f5cb7ab4ef10324d78"
diff --git a/pyproject.toml b/pyproject.toml
index 67f72e776..227ea4303 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,6 +11,7 @@ python = "3.10.*"
 # See https://bot-core.pythondiscord.com/ for docs.
 pydis_core = { version = "9.5.1", extras = ["async-rediscache"] }
 
+aiohttp = "3.8.3"
 arrow = "1.2.3"
 beautifulsoup4 = "4.11.2"
 colorama = { version = "0.4.6", markers = "sys_platform == 'win32'" }
@@ -28,7 +29,7 @@ rapidfuzz = "2.13.7"
 regex = "2022.10.31"
 sentry-sdk = "1.16.0"
 tldextract = "3.4.0"
-pydantic = "1.10.5"
+pydantic = { version = "1.10.5", extras = ["dotenv"]}
 
 [tool.poetry.dev-dependencies]
 coverage = "7.2.1"
@@ -45,7 +46,6 @@ pre-commit = "3.1.1"
 pip-licenses = "4.1.0"
 pytest = "7.2.2"
 pytest-cov = "4.0.0"
-python-dotenv = "1.0.0"
 pytest-subtests = "0.10.0"
 pytest-xdist = "3.2.0"
 taskipy = "1.10.3"
-- 
cgit v1.2.3


From 19a2e315af0504db378de537d07fb76527f81d20 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 08:14:37 +0100
Subject: update threshold values for rules

---
 bot/constants.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index 5e5173a63..6a08e02ff 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -351,9 +351,9 @@ class ExtendedRule(Rule):
 
 
 class Rules(BaseModel):
-    attachments: Rule = Rule(interval=10, max=10)
+    attachments: Rule = Rule(interval=10, max=6)
     burst: Rule = Rule(interval=10, max=7)
-    chars: Rule = Rule(interval=5, max=200)
+    chars: Rule = Rule(interval=5, max=4_200)
     discord_emojis: Rule = Rule(interval=10, max=20)
     duplicates: Rule = Rule(interval=10, max=3)
     links: Rule = Rule(interval=10, max=10)
-- 
cgit v1.2.3


From c66edf9efe1127fd31944dba475a0d6df8a3e2da Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 10:13:44 +0100
Subject: Make tag slash command guild only (#2452)

Co-authored-by: ChrisJL <ChrisLovering@users.noreply.github.com>
---
 bot/exts/info/tags.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bot/exts/info/tags.py b/bot/exts/info/tags.py
index 309f22cad..27dfa1913 100644
--- a/bot/exts/info/tags.py
+++ b/bot/exts/info/tags.py
@@ -317,6 +317,7 @@ class Tags(Cog):
         return True
 
     @app_commands.command(name="tag")
+    @app_commands.guild_only()
     async def get_command(self, interaction: Interaction, *, name: Optional[str]) -> bool:
         """
         If a single argument matching a group name is given, list all accessible tags from that group
-- 
cgit v1.2.3


From 2913c51518809e7e120a133f2aabe9668007f954 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 15:51:44 +0100
Subject: replace . with _ when mapping webhook ids

---
 botstrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/botstrap.py b/botstrap.py
index 4b00be9aa..2b34dad81 100644
--- a/botstrap.py
+++ b/botstrap.py
@@ -159,6 +159,6 @@ with DiscordClient() as discord_client:
             webhook_id = create_webhook(webhook_name, webhook_channel_id, client=discord_client)
         else:
             webhook_id = webhook_model.id
-        config_str += f"webhooks_{webhook_name}.id={webhook_id}\n"
+        config_str += f"webhooks_{webhook_name}_id={webhook_id}\n"
 
     env_file_path.write_text(config_str)
-- 
cgit v1.2.3


From cc6b90cccb4637a1b8fcb05f058811caaadfd28e Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 16:08:14 +0100
Subject: add the botstrap dependency group

---
 pyproject.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 227ea4303..6729adfe3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,6 +50,11 @@ pytest-subtests = "0.10.0"
 pytest-xdist = "3.2.0"
 taskipy = "1.10.3"
 
+[tool.poetry.group.config-bootstrap]
+optional = true
+
+[tool.poetry.group.config-bootstrap.dependencies]
+httpx = "0.23.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-- 
cgit v1.2.3


From d9e14caad13ab3879b1b88a588d8c16057de2a8f Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 16:08:28 +0100
Subject: add a poetry task to configure bot

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index 6729adfe3..05f4af68b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,6 +62,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.taskipy.tasks]
 start = "python -m bot"
+configure = "python -m botstrap"
 lint = "pre-commit run --all-files"
 precommit = "pre-commit install"
 build = "docker build -t ghcr.io/python-discord/bot:latest -f Dockerfile ."
-- 
cgit v1.2.3


From da6ac51b9652ef4a2579392807763ec435715c94 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 16:11:01 +0100
Subject: relock dependencies

---
 poetry.lock | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 3ed2ade4b..95a0dd48a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -139,6 +139,27 @@ files = [
 [package.dependencies]
 frozenlist = ">=1.1.0"
 
+[[package]]
+name = "anyio"
+version = "3.6.2"
+description = "High level compatibility layer for multiple asynchronous event loop implementations"
+category = "dev"
+optional = false
+python-versions = ">=3.6.2"
+files = [
+    {file = "anyio-3.6.2-py3-none-any.whl", hash = "sha256:fbbe32bd270d2a2ef3ed1c5d45041250284e31fc0a4df4a5a6071842051a51e3"},
+    {file = "anyio-3.6.2.tar.gz", hash = "sha256:25ea0d673ae30af41a0c442f81cf3b38c7e79fdc7b60335a4c14e05eb0947421"},
+]
+
+[package.dependencies]
+idna = ">=2.8"
+sniffio = ">=1.1"
+
+[package.extras]
+doc = ["packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
+test = ["contextlib2", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "uvloop (>=0.15)"]
+trio = ["trio (>=0.16,<0.22)"]
+
 [[package]]
 name = "arrow"
 version = "1.2.3"
@@ -799,6 +820,64 @@ files = [
     {file = "frozenlist-1.3.3.tar.gz", hash = "sha256:58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a"},
 ]
 
+[[package]]
+name = "h11"
+version = "0.14.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"},
+    {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"},
+]
+
+[[package]]
+name = "httpcore"
+version = "0.16.3"
+description = "A minimal low-level HTTP client."
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "httpcore-0.16.3-py3-none-any.whl", hash = "sha256:da1fb708784a938aa084bde4feb8317056c55037247c787bd7e19eb2c2949dc0"},
+    {file = "httpcore-0.16.3.tar.gz", hash = "sha256:c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb"},
+]
+
+[package.dependencies]
+anyio = ">=3.0,<5.0"
+certifi = "*"
+h11 = ">=0.13,<0.15"
+sniffio = ">=1.0.0,<2.0.0"
+
+[package.extras]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (>=1.0.0,<2.0.0)"]
+
+[[package]]
+name = "httpx"
+version = "0.23.3"
+description = "The next generation HTTP client."
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "httpx-0.23.3-py3-none-any.whl", hash = "sha256:a211fcce9b1254ea24f0cd6af9869b3d29aba40154e947d2a07bb499b3e310d6"},
+    {file = "httpx-0.23.3.tar.gz", hash = "sha256:9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9"},
+]
+
+[package.dependencies]
+certifi = "*"
+httpcore = ">=0.15.0,<0.17.0"
+rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
+sniffio = "*"
+
+[package.extras]
+brotli = ["brotli", "brotlicffi"]
+cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<13)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (>=1.0.0,<2.0.0)"]
+
 [[package]]
 name = "humanfriendly"
 version = "10.0"
@@ -2055,6 +2134,24 @@ files = [
 requests = ">=1.0.0"
 six = "*"
 
+[[package]]
+name = "rfc3986"
+version = "1.5.0"
+description = "Validating URI References per RFC 3986"
+category = "dev"
+optional = false
+python-versions = "*"
+files = [
+    {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
+    {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"},
+]
+
+[package.dependencies]
+idna = {version = "*", optional = true, markers = "extra == \"idna2008\""}
+
+[package.extras]
+idna2008 = ["idna"]
+
 [[package]]
 name = "sentry-sdk"
 version = "1.16.0"
@@ -2136,6 +2233,18 @@ files = [
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
 
+[[package]]
+name = "sniffio"
+version = "1.3.0"
+description = "Sniff out which async library your code is running under"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "sniffio-1.3.0-py3-none-any.whl", hash = "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"},
+    {file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"},
+]
+
 [[package]]
 name = "snowballstemmer"
 version = "2.2.0"
@@ -2385,4 +2494,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "a6f4f1d677e9273746ab05c3bfe87ef0f7969fe42983d3f5cb7ab4ef10324d78"
+content-hash = "f1d23712464bcae5882bb3b044116f75b4e400fcac03fc9c7bc990dedfcb14b1"
-- 
cgit v1.2.3


From bca2c120e699df9ba33c2164c8c6aa02471f43f0 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 16:29:22 +0100
Subject: move httpx to the dev dependency group

---
 poetry.lock    | 2 +-
 pyproject.toml | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 95a0dd48a..5f90384ab 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2494,4 +2494,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "f1d23712464bcae5882bb3b044116f75b4e400fcac03fc9c7bc990dedfcb14b1"
+content-hash = "e8487c5583b62d24dd7dda6b45b5bd8d6405d2e5ba55fef3c23a08ac965f2ab6"
diff --git a/pyproject.toml b/pyproject.toml
index 05f4af68b..6c8344fc9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,13 +49,9 @@ pytest-cov = "4.0.0"
 pytest-subtests = "0.10.0"
 pytest-xdist = "3.2.0"
 taskipy = "1.10.3"
-
-[tool.poetry.group.config-bootstrap]
-optional = true
-
-[tool.poetry.group.config-bootstrap.dependencies]
 httpx = "0.23.3"
 
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
-- 
cgit v1.2.3


From c6f9eb9480c3dc8a74aac4ab83af0bdd1a50facc Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Thu, 9 Mar 2023 19:00:51 +0100
Subject: Merge #2459: Update nested delimiter to double underscore

* change nested delimiter to double underscore

* write channel_id along with the webhook_id

* make channel mandatory for webhook
---
 bot/constants.py | 5 ++---
 botstrap.py      | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index 6a08e02ff..a4d5761be 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -20,6 +20,7 @@ class EnvConfig(BaseSettings):
     class Config:
         env_file = ".env", ".env.server",
         env_file_encoding = 'utf-8'
+        env_nested_delimiter = '__'
 
 
 class _Miscellaneous(EnvConfig):
@@ -257,12 +258,11 @@ class ThreadArchiveTimes(Enum):
 
 class Webhook(BaseModel):
     id: int
-    channel: Optional[int]
+    channel: int
 
 
 class _Webhooks(EnvConfig):
     EnvConfig.Config.env_prefix = "webhooks_"
-    EnvConfig.Config.env_nested_delimiter = '_'
 
     big_brother: Webhook = Webhook(id=569133704568373283, channel=Channels.big_brother)
     dev_log: Webhook = Webhook(id=680501655111729222, channel=Channels.dev_log)
@@ -364,7 +364,6 @@ class Rules(BaseModel):
 
 class _AntiSpam(EnvConfig):
     EnvConfig.Config.env_prefix = 'anti_spam_'
-    EnvConfig.Config.env_nested_delimiter = '_'
 
     cache_size = 100
 
diff --git a/botstrap.py b/botstrap.py
index 2b34dad81..28486bd36 100644
--- a/botstrap.py
+++ b/botstrap.py
@@ -159,6 +159,7 @@ with DiscordClient() as discord_client:
             webhook_id = create_webhook(webhook_name, webhook_channel_id, client=discord_client)
         else:
             webhook_id = webhook_model.id
-        config_str += f"webhooks_{webhook_name}_id={webhook_id}\n"
+        config_str += f"webhooks_{webhook_name}__id={webhook_id}\n"
+        config_str += f"webhooks_{webhook_name}__channel={all_channels[webhook_name]}\n"
 
     env_file_path.write_text(config_str)
-- 
cgit v1.2.3


From 8b8647c5a4c8c8304ccb0bedfb1042cd5cfc0387 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Thu, 9 Mar 2023 18:28:26 -0500
Subject: Merge branch 'main' into snekbox-files

---
 docker-compose.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bc53c482b..694f44507 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -112,4 +112,9 @@ services:
     env_file:
       - .env
     environment:
-      BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531
+      API_KEYS_SITE_API: "badbot13m0n8f570f942013fc818f234916ca531"
+      URLS_SITE_API: "web:8000/api"
+      URLS_SNEKBOX_EVAL_API: "http://snekbox/eval"
+      URLS_SNEKBOX_311_EVAL_API: "http://snekbox-311/eval"
+      REDIS_HOST: "redis"
+      STATS_STATSD_HOST: "http://localhost"
-- 
cgit v1.2.3


From 0cc7fa30ca30c756c64c05d081ddb927dcbe19c2 Mon Sep 17 00:00:00 2001
From: vivekashok1221 <vivekashok1221@gmail.com>
Date: Fri, 10 Mar 2023 23:28:13 +0530
Subject: Display "N/A" for infractions in ModMail

Previously displayed "Infraction issued in modmail" for infractions in ModMail.
---
 bot/exts/moderation/infraction/_scheduler.py | 6 ++++--
 bot/exts/moderation/infraction/_utils.py     | 2 +-
 bot/exts/moderation/infraction/management.py | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py
index de1ec398e..63aac6340 100644
--- a/bot/exts/moderation/infraction/_scheduler.py
+++ b/bot/exts/moderation/infraction/_scheduler.py
@@ -262,9 +262,11 @@ class InfractionScheduler:
         mentions = discord.AllowedMentions(users=[user], roles=False)
         await ctx.send(f"{dm_result}{confirm_msg}{infr_message}.", allowed_mentions=mentions)
 
-        if "discord.com" in jump_url:
+        if jump_url is None:
+            # Infraction issued in ModMail category.
+            jump_url = "N/A"
+        else:
             jump_url = f"[Click here.]({jump_url})"
-            # Else, infraction was issued in ModMail category.
 
         # Send a log message to the mod log.
         # Don't use ctx.message.author for the actor; antispam only patches ctx.author.
diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index 12c8f0614..edd875921 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -99,7 +99,7 @@ async def post_infraction(
         is_in_category(ctx.channel, category)
         for category in (Categories.modmail, Categories.appeals, Categories.appeals2)
     ):
-        jump_url = "Infraction issued in a ModMail channel."
+        jump_url = None
     else:
         jump_url = ctx.message.jump_url
 
diff --git a/bot/exts/moderation/infraction/management.py b/bot/exts/moderation/infraction/management.py
index 78778048e..aafa6d9b0 100644
--- a/bot/exts/moderation/infraction/management.py
+++ b/bot/exts/moderation/infraction/management.py
@@ -421,12 +421,12 @@ class ModManagement(commands.Cog):
         else:
             dm_sent_text = "Yes" if dm_sent else "No"
 
-        if jump_url == "":
-            # Infraction was issued prior to jump urls being stored in the database.
+        if jump_url is None:
+            # Infraction was issued prior to jump urls being stored in the database
+            # or infraction was issued in ModMail category.
             jump_url = "N/A"
-        elif "discord.com" in jump_url:
+        else:
             jump_url = f"[Click here.]({jump_url})"
-            # Else, infraction was issued in ModMail category.
 
         lines = textwrap.dedent(f"""
             {"**===============**" if active else "==============="}
-- 
cgit v1.2.3


From 0e116430be8ef2e0bda2ad195250a88b792bd7b8 Mon Sep 17 00:00:00 2001
From: vivekashok1221 <vivekashok1221@gmail.com>
Date: Sat, 11 Mar 2023 23:52:31 +0530
Subject: Update appeals2 to appeals_2 to reflect config change

---
 bot/exts/moderation/infraction/_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py
index f86c78707..5e9fa75cc 100644
--- a/bot/exts/moderation/infraction/_utils.py
+++ b/bot/exts/moderation/infraction/_utils.py
@@ -98,7 +98,7 @@ async def post_infraction(
 
     if any(
         is_in_category(ctx.channel, category)
-        for category in (Categories.modmail, Categories.appeals, Categories.appeals2)
+        for category in (Categories.modmail, Categories.appeals, Categories.appeals_2)
     ):
         jump_url = None
     else:
-- 
cgit v1.2.3


From e084a7ec9418e61d7e15f97675625a46c694746f Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sat, 11 Mar 2023 21:27:49 +0100
Subject: switch order of env files to be parsed

The priority of the value to be picked is always the last file in the `env_file` tuple

We want server values to always be picked up from .env.server, and if someone wants to override them for testing, they'll go into .env

But the `env.server` shouldn't be manually tampered with
---
 bot/constants.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index 3aacd0a16..006d0e4ce 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -11,14 +11,13 @@ will default to the values passed to the `default` kwarg.
 """
 import os
 from enum import Enum
-from typing import Optional
 
 from pydantic import BaseModel, BaseSettings, root_validator
 
 
 class EnvConfig(BaseSettings):
     class Config:
-        env_file = ".env", ".env.server",
+        env_file = ".env.server", ".env",
         env_file_encoding = 'utf-8'
         env_nested_delimiter = '__'
 
-- 
cgit v1.2.3


From 1a7a8a271e37ecd628768412181c8d01133d8582 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sat, 11 Mar 2023 22:15:19 +0100
Subject: write emoji_trashcan to .env.server upon botstrap

---
 botstrap.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/botstrap.py b/botstrap.py
index 28486bd36..55e1bb6c7 100644
--- a/botstrap.py
+++ b/botstrap.py
@@ -162,4 +162,8 @@ with DiscordClient() as discord_client:
         config_str += f"webhooks_{webhook_name}__id={webhook_id}\n"
         config_str += f"webhooks_{webhook_name}__channel={all_channels[webhook_name]}\n"
 
-    env_file_path.write_text(config_str)
+    config_str += "\n#Emojis\n"
+    config_str += "emojis_trashcan=🗑️"
+
+    with env_file_path.open("ab") as file:
+        file.write(config_str.encode("utf-8"))
-- 
cgit v1.2.3


From fd7bc9cedebb253fdd936726092e99f65c4d88e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Mar 2023 10:26:59 +0000
Subject: Bump pydantic from 1.10.5 to 1.10.6

Bumps [pydantic](https://github.com/pydantic/pydantic) from 1.10.5 to 1.10.6.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/v1.10.6/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v1.10.5...v1.10.6)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 76 +++++++++++++++++++++++++++++-----------------------------
 pyproject.toml |  2 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5f90384ab..8575434ce 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1583,48 +1583,48 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "1.10.5"
+version = "1.10.6"
 description = "Data validation and settings management using python type hints"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pydantic-1.10.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5920824fe1e21cbb3e38cf0f3dd24857c8959801d1031ce1fac1d50857a03bfb"},
-    {file = "pydantic-1.10.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3bb99cf9655b377db1a9e47fa4479e3330ea96f4123c6c8200e482704bf1eda2"},
-    {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2185a3b3d98ab4506a3f6707569802d2d92c3a7ba3a9a35683a7709ea6c2aaa2"},
-    {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f582cac9d11c227c652d3ce8ee223d94eb06f4228b52a8adaafa9fa62e73d5c9"},
-    {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c9e5b778b6842f135902e2d82624008c6a79710207e28e86966cd136c621bfee"},
-    {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:72ef3783be8cbdef6bca034606a5de3862be6b72415dc5cb1fb8ddbac110049a"},
-    {file = "pydantic-1.10.5-cp310-cp310-win_amd64.whl", hash = "sha256:45edea10b75d3da43cfda12f3792833a3fa70b6eee4db1ed6aed528cef17c74e"},
-    {file = "pydantic-1.10.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:63200cd8af1af2c07964546b7bc8f217e8bda9d0a2ef0ee0c797b36353914984"},
-    {file = "pydantic-1.10.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:305d0376c516b0dfa1dbefeae8c21042b57b496892d721905a6ec6b79494a66d"},
-    {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1fd326aff5d6c36f05735c7c9b3d5b0e933b4ca52ad0b6e4b38038d82703d35b"},
-    {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6bb0452d7b8516178c969d305d9630a3c9b8cf16fcf4713261c9ebd465af0d73"},
-    {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:9a9d9155e2a9f38b2eb9374c88f02fd4d6851ae17b65ee786a87d032f87008f8"},
-    {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f836444b4c5ece128b23ec36a446c9ab7f9b0f7981d0d27e13a7c366ee163f8a"},
-    {file = "pydantic-1.10.5-cp311-cp311-win_amd64.whl", hash = "sha256:8481dca324e1c7b715ce091a698b181054d22072e848b6fc7895cd86f79b4449"},
-    {file = "pydantic-1.10.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:87f831e81ea0589cd18257f84386bf30154c5f4bed373b7b75e5cb0b5d53ea87"},
-    {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ce1612e98c6326f10888df951a26ec1a577d8df49ddcaea87773bfbe23ba5cc"},
-    {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58e41dd1e977531ac6073b11baac8c013f3cd8706a01d3dc74e86955be8b2c0c"},
-    {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6a4b0aab29061262065bbdede617ef99cc5914d1bf0ddc8bcd8e3d7928d85bd6"},
-    {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:36e44a4de37b8aecffa81c081dbfe42c4d2bf9f6dff34d03dce157ec65eb0f15"},
-    {file = "pydantic-1.10.5-cp37-cp37m-win_amd64.whl", hash = "sha256:261f357f0aecda005934e413dfd7aa4077004a174dafe414a8325e6098a8e419"},
-    {file = "pydantic-1.10.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b429f7c457aebb7fbe7cd69c418d1cd7c6fdc4d3c8697f45af78b8d5a7955760"},
-    {file = "pydantic-1.10.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:663d2dd78596c5fa3eb996bc3f34b8c2a592648ad10008f98d1348be7ae212fb"},
-    {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51782fd81f09edcf265823c3bf43ff36d00db246eca39ee765ef58dc8421a642"},
-    {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c428c0f64a86661fb4873495c4fac430ec7a7cef2b8c1c28f3d1a7277f9ea5ab"},
-    {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:76c930ad0746c70f0368c4596020b736ab65b473c1f9b3872310a835d852eb19"},
-    {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3257bd714de9db2102b742570a56bf7978e90441193acac109b1f500290f5718"},
-    {file = "pydantic-1.10.5-cp38-cp38-win_amd64.whl", hash = "sha256:f5bee6c523d13944a1fdc6f0525bc86dbbd94372f17b83fa6331aabacc8fd08e"},
-    {file = "pydantic-1.10.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:532e97c35719f137ee5405bd3eeddc5c06eb91a032bc755a44e34a712420daf3"},
-    {file = "pydantic-1.10.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ca9075ab3de9e48b75fa8ccb897c34ccc1519177ad8841d99f7fd74cf43be5bf"},
-    {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd46a0e6296346c477e59a954da57beaf9c538da37b9df482e50f836e4a7d4bb"},
-    {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3353072625ea2a9a6c81ad01b91e5c07fa70deb06368c71307529abf70d23325"},
-    {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3f9d9b2be177c3cb6027cd67fbf323586417868c06c3c85d0d101703136e6b31"},
-    {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b473d00ccd5c2061fd896ac127b7755baad233f8d996ea288af14ae09f8e0d1e"},
-    {file = "pydantic-1.10.5-cp39-cp39-win_amd64.whl", hash = "sha256:5f3bc8f103b56a8c88021d481410874b1f13edf6e838da607dcb57ecff9b4594"},
-    {file = "pydantic-1.10.5-py3-none-any.whl", hash = "sha256:7c5b94d598c90f2f46b3a983ffb46ab806a67099d118ae0da7ef21a2a4033b28"},
-    {file = "pydantic-1.10.5.tar.gz", hash = "sha256:9e337ac83686645a46db0e825acceea8e02fca4062483f40e9ae178e8bd1103a"},
+    {file = "pydantic-1.10.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f9289065611c48147c1dd1fd344e9d57ab45f1d99b0fb26c51f1cf72cd9bcd31"},
+    {file = "pydantic-1.10.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8c32b6bba301490d9bb2bf5f631907803135e8085b6aa3e5fe5a770d46dd0160"},
+    {file = "pydantic-1.10.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd9b9e98068fa1068edfc9eabde70a7132017bdd4f362f8b4fd0abed79c33083"},
+    {file = "pydantic-1.10.6-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c84583b9df62522829cbc46e2b22e0ec11445625b5acd70c5681ce09c9b11c4"},
+    {file = "pydantic-1.10.6-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b41822064585fea56d0116aa431fbd5137ce69dfe837b599e310034171996084"},
+    {file = "pydantic-1.10.6-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:61f1f08adfaa9cc02e0cbc94f478140385cbd52d5b3c5a657c2fceb15de8d1fb"},
+    {file = "pydantic-1.10.6-cp310-cp310-win_amd64.whl", hash = "sha256:32937835e525d92c98a1512218db4eed9ddc8f4ee2a78382d77f54341972c0e7"},
+    {file = "pydantic-1.10.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bbd5c531b22928e63d0cb1868dee76123456e1de2f1cb45879e9e7a3f3f1779b"},
+    {file = "pydantic-1.10.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e277bd18339177daa62a294256869bbe84df1fb592be2716ec62627bb8d7c81d"},
+    {file = "pydantic-1.10.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f15277d720aa57e173954d237628a8d304896364b9de745dcb722f584812c7"},
+    {file = "pydantic-1.10.6-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b243b564cea2576725e77aeeda54e3e0229a168bc587d536cd69941e6797543d"},
+    {file = "pydantic-1.10.6-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3ce13a558b484c9ae48a6a7c184b1ba0e5588c5525482681db418268e5f86186"},
+    {file = "pydantic-1.10.6-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3ac1cd4deed871dfe0c5f63721e29debf03e2deefa41b3ed5eb5f5df287c7b70"},
+    {file = "pydantic-1.10.6-cp311-cp311-win_amd64.whl", hash = "sha256:b1eb6610330a1dfba9ce142ada792f26bbef1255b75f538196a39e9e90388bf4"},
+    {file = "pydantic-1.10.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4ca83739c1263a044ec8b79df4eefc34bbac87191f0a513d00dd47d46e307a65"},
+    {file = "pydantic-1.10.6-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea4e2a7cb409951988e79a469f609bba998a576e6d7b9791ae5d1e0619e1c0f2"},
+    {file = "pydantic-1.10.6-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53de12b4608290992a943801d7756f18a37b7aee284b9ffa794ee8ea8153f8e2"},
+    {file = "pydantic-1.10.6-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:60184e80aac3b56933c71c48d6181e630b0fbc61ae455a63322a66a23c14731a"},
+    {file = "pydantic-1.10.6-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:415a3f719ce518e95a92effc7ee30118a25c3d032455d13e121e3840985f2efd"},
+    {file = "pydantic-1.10.6-cp37-cp37m-win_amd64.whl", hash = "sha256:72cb30894a34d3a7ab6d959b45a70abac8a2a93b6480fc5a7bfbd9c935bdc4fb"},
+    {file = "pydantic-1.10.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3091d2eaeda25391405e36c2fc2ed102b48bac4b384d42b2267310abae350ca6"},
+    {file = "pydantic-1.10.6-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:751f008cd2afe812a781fd6aa2fb66c620ca2e1a13b6a2152b1ad51553cb4b77"},
+    {file = "pydantic-1.10.6-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:12e837fd320dd30bd625be1b101e3b62edc096a49835392dcf418f1a5ac2b832"},
+    {file = "pydantic-1.10.6-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:587d92831d0115874d766b1f5fddcdde0c5b6c60f8c6111a394078ec227fca6d"},
+    {file = "pydantic-1.10.6-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:476f6674303ae7965730a382a8e8d7fae18b8004b7b69a56c3d8fa93968aa21c"},
+    {file = "pydantic-1.10.6-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3a2be0a0f32c83265fd71a45027201e1278beaa82ea88ea5b345eea6afa9ac7f"},
+    {file = "pydantic-1.10.6-cp38-cp38-win_amd64.whl", hash = "sha256:0abd9c60eee6201b853b6c4be104edfba4f8f6c5f3623f8e1dba90634d63eb35"},
+    {file = "pydantic-1.10.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6195ca908045054dd2d57eb9c39a5fe86409968b8040de8c2240186da0769da7"},
+    {file = "pydantic-1.10.6-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43cdeca8d30de9a897440e3fb8866f827c4c31f6c73838e3a01a14b03b067b1d"},
+    {file = "pydantic-1.10.6-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c19eb5163167489cb1e0161ae9220dadd4fc609a42649e7e84a8fa8fff7a80f"},
+    {file = "pydantic-1.10.6-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:012c99a9c0d18cfde7469aa1ebff922e24b0c706d03ead96940f5465f2c9cf62"},
+    {file = "pydantic-1.10.6-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:528dcf7ec49fb5a84bf6fe346c1cc3c55b0e7603c2123881996ca3ad79db5bfc"},
+    {file = "pydantic-1.10.6-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:163e79386c3547c49366e959d01e37fc30252285a70619ffc1b10ede4758250a"},
+    {file = "pydantic-1.10.6-cp39-cp39-win_amd64.whl", hash = "sha256:189318051c3d57821f7233ecc94708767dd67687a614a4e8f92b4a020d4ffd06"},
+    {file = "pydantic-1.10.6-py3-none-any.whl", hash = "sha256:acc6783751ac9c9bc4680379edd6d286468a1dc8d7d9906cd6f1186ed682b2b0"},
+    {file = "pydantic-1.10.6.tar.gz", hash = "sha256:cf95adb0d1671fc38d8c43dd921ad5814a735e7d9b4d9e437c088002863854fd"},
 ]
 
 [package.dependencies]
@@ -2494,4 +2494,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "e8487c5583b62d24dd7dda6b45b5bd8d6405d2e5ba55fef3c23a08ac965f2ab6"
+content-hash = "358b0ed5825600514b9a48056f8dbf95f1fb245cc483bb08e2546746c55d7cea"
diff --git a/pyproject.toml b/pyproject.toml
index 6c8344fc9..33edf66a8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,7 +29,7 @@ rapidfuzz = "2.13.7"
 regex = "2022.10.31"
 sentry-sdk = "1.16.0"
 tldextract = "3.4.0"
-pydantic = { version = "1.10.5", extras = ["dotenv"]}
+pydantic = { version = "1.10.6", extras = ["dotenv"]}
 
 [tool.poetry.dev-dependencies]
 coverage = "7.2.1"
-- 
cgit v1.2.3


From e39a093c1856ff6fcf0bd0566cb4a8fe59fb9e14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Mar 2023 10:31:20 +0000
Subject: Bump aiohttp from 3.8.3 to 3.8.4

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.3 to 3.8.4.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.8.3...v3.8.4)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 180 ++++++++++++++++++++++++++++-----------------------------
 pyproject.toml |   2 +-
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 8575434ce..22a4c0730 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -17,106 +17,106 @@ pycares = ">=4.0.0"
 
 [[package]]
 name = "aiohttp"
-version = "3.8.3"
+version = "3.8.4"
 description = "Async http client/server framework (asyncio)"
 category = "main"
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ba71c9b4dcbb16212f334126cc3d8beb6af377f6703d9dc2d9fb3874fd667ee9"},
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d24b8bb40d5c61ef2d9b6a8f4528c2f17f1c5d2d31fed62ec860f6006142e83e"},
-    {file = "aiohttp-3.8.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f88df3a83cf9df566f171adba39d5bd52814ac0b94778d2448652fc77f9eb491"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b97decbb3372d4b69e4d4c8117f44632551c692bb1361b356a02b97b69e18a62"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:309aa21c1d54b8ef0723181d430347d7452daaff93e8e2363db8e75c72c2fb2d"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ad5383a67514e8e76906a06741febd9126fc7c7ff0f599d6fcce3e82b80d026f"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20acae4f268317bb975671e375493dbdbc67cddb5f6c71eebdb85b34444ac46b"},
-    {file = "aiohttp-3.8.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:05a3c31c6d7cd08c149e50dc7aa2568317f5844acd745621983380597f027a18"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d6f76310355e9fae637c3162936e9504b4767d5c52ca268331e2756e54fd4ca5"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:256deb4b29fe5e47893fa32e1de2d73c3afe7407738bd3c63829874661d4822d"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:5c59fcd80b9049b49acd29bd3598cada4afc8d8d69bd4160cd613246912535d7"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:059a91e88f2c00fe40aed9031b3606c3f311414f86a90d696dd982e7aec48142"},
-    {file = "aiohttp-3.8.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2feebbb6074cdbd1ac276dbd737b40e890a1361b3cc30b74ac2f5e24aab41f7b"},
-    {file = "aiohttp-3.8.3-cp310-cp310-win32.whl", hash = "sha256:5bf651afd22d5f0c4be16cf39d0482ea494f5c88f03e75e5fef3a85177fecdeb"},
-    {file = "aiohttp-3.8.3-cp310-cp310-win_amd64.whl", hash = "sha256:653acc3880459f82a65e27bd6526e47ddf19e643457d36a2250b85b41a564715"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:86fc24e58ecb32aee09f864cb11bb91bc4c1086615001647dbfc4dc8c32f4008"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75e14eac916f024305db517e00a9252714fce0abcb10ad327fb6dcdc0d060f1d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d1fde0f44029e02d02d3993ad55ce93ead9bb9b15c6b7ccd580f90bd7e3de476"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ab94426ddb1ecc6a0b601d832d5d9d421820989b8caa929114811369673235c"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:89d2e02167fa95172c017732ed7725bc8523c598757f08d13c5acca308e1a061"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:02f9a2c72fc95d59b881cf38a4b2be9381b9527f9d328771e90f72ac76f31ad8"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c7149272fb5834fc186328e2c1fa01dda3e1fa940ce18fded6d412e8f2cf76d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:512bd5ab136b8dc0ffe3fdf2dfb0c4b4f49c8577f6cae55dca862cd37a4564e2"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7018ecc5fe97027214556afbc7c502fbd718d0740e87eb1217b17efd05b3d276"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:88c70ed9da9963d5496d38320160e8eb7e5f1886f9290475a881db12f351ab5d"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:da22885266bbfb3f78218dc40205fed2671909fbd0720aedba39b4515c038091"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:e65bc19919c910127c06759a63747ebe14f386cda573d95bcc62b427ca1afc73"},
-    {file = "aiohttp-3.8.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:08c78317e950e0762c2983f4dd58dc5e6c9ff75c8a0efeae299d363d439c8e34"},
-    {file = "aiohttp-3.8.3-cp311-cp311-win32.whl", hash = "sha256:45d88b016c849d74ebc6f2b6e8bc17cabf26e7e40c0661ddd8fae4c00f015697"},
-    {file = "aiohttp-3.8.3-cp311-cp311-win_amd64.whl", hash = "sha256:96372fc29471646b9b106ee918c8eeb4cca423fcbf9a34daa1b93767a88a2290"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c971bf3786b5fad82ce5ad570dc6ee420f5b12527157929e830f51c55dc8af77"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff25f48fc8e623d95eca0670b8cc1469a83783c924a602e0fbd47363bb54aaca"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e381581b37db1db7597b62a2e6b8b57c3deec95d93b6d6407c5b61ddc98aca6d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db19d60d846283ee275d0416e2a23493f4e6b6028825b51290ac05afc87a6f97"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25892c92bee6d9449ffac82c2fe257f3a6f297792cdb18ad784737d61e7a9a85"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:398701865e7a9565d49189f6c90868efaca21be65c725fc87fc305906be915da"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4a4fbc769ea9b6bd97f4ad0b430a6807f92f0e5eb020f1e42ece59f3ecfc4585"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:b29bfd650ed8e148f9c515474a6ef0ba1090b7a8faeee26b74a8ff3b33617502"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:1e56b9cafcd6531bab5d9b2e890bb4937f4165109fe98e2b98ef0dcfcb06ee9d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ec40170327d4a404b0d91855d41bfe1fe4b699222b2b93e3d833a27330a87a6d"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2df5f139233060578d8c2c975128fb231a89ca0a462b35d4b5fcf7c501ebdbe1"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-win32.whl", hash = "sha256:f973157ffeab5459eefe7b97a804987876dd0a55570b8fa56b4e1954bf11329b"},
-    {file = "aiohttp-3.8.3-cp36-cp36m-win_amd64.whl", hash = "sha256:437399385f2abcd634865705bdc180c8314124b98299d54fe1d4c8990f2f9494"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:09e28f572b21642128ef31f4e8372adb6888846f32fecb288c8b0457597ba61a"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f3553510abdbec67c043ca85727396ceed1272eef029b050677046d3387be8d"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e168a7560b7c61342ae0412997b069753f27ac4862ec7867eff74f0fe4ea2ad9"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db4c979b0b3e0fa7e9e69ecd11b2b3174c6963cebadeecfb7ad24532ffcdd11a"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e164e0a98e92d06da343d17d4e9c4da4654f4a4588a20d6c73548a29f176abe2"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8a78079d9a39ca9ca99a8b0ac2fdc0c4d25fc80c8a8a82e5c8211509c523363"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:21b30885a63c3f4ff5b77a5d6caf008b037cb521a5f33eab445dc566f6d092cc"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:4b0f30372cef3fdc262f33d06e7b411cd59058ce9174ef159ad938c4a34a89da"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:8135fa153a20d82ffb64f70a1b5c2738684afa197839b34cc3e3c72fa88d302c"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ad61a9639792fd790523ba072c0555cd6be5a0baf03a49a5dd8cfcf20d56df48"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:978b046ca728073070e9abc074b6299ebf3501e8dee5e26efacb13cec2b2dea0"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-win32.whl", hash = "sha256:0d2c6d8c6872df4a6ec37d2ede71eff62395b9e337b4e18efd2177de883a5033"},
-    {file = "aiohttp-3.8.3-cp37-cp37m-win_amd64.whl", hash = "sha256:21d69797eb951f155026651f7e9362877334508d39c2fc37bd04ff55b2007091"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ca9af5f8f5812d475c5259393f52d712f6d5f0d7fdad9acdb1107dd9e3cb7eb"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d90043c1882067f1bd26196d5d2db9aa6d268def3293ed5fb317e13c9413ea4"},
-    {file = "aiohttp-3.8.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d737fc67b9a970f3234754974531dc9afeea11c70791dcb7db53b0cf81b79784"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebf909ea0a3fc9596e40d55d8000702a85e27fd578ff41a5500f68f20fd32e6c"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5835f258ca9f7c455493a57ee707b76d2d9634d84d5d7f62e77be984ea80b849"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da37dcfbf4b7f45d80ee386a5f81122501ec75672f475da34784196690762f4b"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87f44875f2804bc0511a69ce44a9595d5944837a62caecc8490bbdb0e18b1342"},
-    {file = "aiohttp-3.8.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:527b3b87b24844ea7865284aabfab08eb0faf599b385b03c2aa91fc6edd6e4b6"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d5ba88df9aa5e2f806650fcbeedbe4f6e8736e92fc0e73b0400538fd25a4dd96"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e7b8813be97cab8cb52b1375f41f8e6804f6507fe4660152e8ca5c48f0436017"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2dea10edfa1a54098703cb7acaa665c07b4e7568472a47f4e64e6319d3821ccf"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:713d22cd9643ba9025d33c4af43943c7a1eb8547729228de18d3e02e278472b6"},
-    {file = "aiohttp-3.8.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d252771fc85e0cf8da0b823157962d70639e63cb9b578b1dec9868dd1f4f937"},
-    {file = "aiohttp-3.8.3-cp38-cp38-win32.whl", hash = "sha256:66bd5f950344fb2b3dbdd421aaa4e84f4411a1a13fca3aeb2bcbe667f80c9f76"},
-    {file = "aiohttp-3.8.3-cp38-cp38-win_amd64.whl", hash = "sha256:84b14f36e85295fe69c6b9789b51a0903b774046d5f7df538176516c3e422446"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16c121ba0b1ec2b44b73e3a8a171c4f999b33929cd2397124a8c7fcfc8cd9e06"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8d6aaa4e7155afaf994d7924eb290abbe81a6905b303d8cb61310a2aba1c68ba"},
-    {file = "aiohttp-3.8.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43046a319664a04b146f81b40e1545d4c8ac7b7dd04c47e40bf09f65f2437346"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:599418aaaf88a6d02a8c515e656f6faf3d10618d3dd95866eb4436520096c84b"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92a2964319d359f494f16011e23434f6f8ef0434acd3cf154a6b7bec511e2fb7"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:73a4131962e6d91109bca6536416aa067cf6c4efb871975df734f8d2fd821b37"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:598adde339d2cf7d67beaccda3f2ce7c57b3b412702f29c946708f69cf8222aa"},
-    {file = "aiohttp-3.8.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75880ed07be39beff1881d81e4a907cafb802f306efd6d2d15f2b3c69935f6fb"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0239da9fbafd9ff82fd67c16704a7d1bccf0d107a300e790587ad05547681c8"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4e3a23ec214e95c9fe85a58470b660efe6534b83e6cbe38b3ed52b053d7cb6ad"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:47841407cc89a4b80b0c52276f3cc8138bbbfba4b179ee3acbd7d77ae33f7ac4"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:54d107c89a3ebcd13228278d68f1436d3f33f2dd2af5415e3feaeb1156e1a62c"},
-    {file = "aiohttp-3.8.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c37c5cce780349d4d51739ae682dec63573847a2a8dcb44381b174c3d9c8d403"},
-    {file = "aiohttp-3.8.3-cp39-cp39-win32.whl", hash = "sha256:f178d2aadf0166be4df834c4953da2d7eef24719e8aec9a65289483eeea9d618"},
-    {file = "aiohttp-3.8.3-cp39-cp39-win_amd64.whl", hash = "sha256:88e5be56c231981428f4f506c68b6a46fa25c4123a2e86d156c58a8369d31ab7"},
-    {file = "aiohttp-3.8.3.tar.gz", hash = "sha256:3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5ce45967538fb747370308d3145aa68a074bdecb4f3a300869590f725ced69c1"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b744c33b6f14ca26b7544e8d8aadff6b765a80ad6164fb1a430bbadd593dfb1a"},
+    {file = "aiohttp-3.8.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a45865451439eb320784918617ba54b7a377e3501fb70402ab84d38c2cd891b"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a86d42d7cba1cec432d47ab13b6637bee393a10f664c425ea7b305d1301ca1a3"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ee3c36df21b5714d49fc4580247947aa64bcbe2939d1b77b4c8dcb8f6c9faecc"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:176a64b24c0935869d5bbc4c96e82f89f643bcdf08ec947701b9dbb3c956b7dd"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c844fd628851c0bc309f3c801b3a3d58ce430b2ce5b359cd918a5a76d0b20cb5"},
+    {file = "aiohttp-3.8.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5393fb786a9e23e4799fec788e7e735de18052f83682ce2dfcabaf1c00c2c08e"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e4b09863aae0dc965c3ef36500d891a3ff495a2ea9ae9171e4519963c12ceefd"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:adfbc22e87365a6e564c804c58fc44ff7727deea782d175c33602737b7feadb6"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:147ae376f14b55f4f3c2b118b95be50a369b89b38a971e80a17c3fd623f280c9"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:eafb3e874816ebe2a92f5e155f17260034c8c341dad1df25672fb710627c6949"},
+    {file = "aiohttp-3.8.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c6cc15d58053c76eacac5fa9152d7d84b8d67b3fde92709195cb984cfb3475ea"},
+    {file = "aiohttp-3.8.4-cp310-cp310-win32.whl", hash = "sha256:59f029a5f6e2d679296db7bee982bb3d20c088e52a2977e3175faf31d6fb75d1"},
+    {file = "aiohttp-3.8.4-cp310-cp310-win_amd64.whl", hash = "sha256:fe7ba4a51f33ab275515f66b0a236bcde4fb5561498fe8f898d4e549b2e4509f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3d8ef1a630519a26d6760bc695842579cb09e373c5f227a21b67dc3eb16cfea4"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5b3f2e06a512e94722886c0827bee9807c86a9f698fac6b3aee841fab49bbfb4"},
+    {file = "aiohttp-3.8.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3a80464982d41b1fbfe3154e440ba4904b71c1a53e9cd584098cd41efdb188ef"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b631e26df63e52f7cce0cce6507b7a7f1bc9b0c501fcde69742130b32e8782f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f43255086fe25e36fd5ed8f2ee47477408a73ef00e804cb2b5cba4bf2ac7f5e"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4d347a172f866cd1d93126d9b239fcbe682acb39b48ee0873c73c933dd23bd0f"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3fec6a4cb5551721cdd70473eb009d90935b4063acc5f40905d40ecfea23e05"},
+    {file = "aiohttp-3.8.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:80a37fe8f7c1e6ce8f2d9c411676e4bc633a8462844e38f46156d07a7d401654"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d1e6a862b76f34395a985b3cd39a0d949ca80a70b6ebdea37d3ab39ceea6698a"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cd468460eefef601ece4428d3cf4562459157c0f6523db89365202c31b6daebb"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:618c901dd3aad4ace71dfa0f5e82e88b46ef57e3239fc7027773cb6d4ed53531"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:652b1bff4f15f6287550b4670546a2947f2a4575b6c6dff7760eafb22eacbf0b"},
+    {file = "aiohttp-3.8.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80575ba9377c5171407a06d0196b2310b679dc752d02a1fcaa2bc20b235dbf24"},
+    {file = "aiohttp-3.8.4-cp311-cp311-win32.whl", hash = "sha256:bbcf1a76cf6f6dacf2c7f4d2ebd411438c275faa1dc0c68e46eb84eebd05dd7d"},
+    {file = "aiohttp-3.8.4-cp311-cp311-win_amd64.whl", hash = "sha256:6e74dd54f7239fcffe07913ff8b964e28b712f09846e20de78676ce2a3dc0bfc"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:880e15bb6dad90549b43f796b391cfffd7af373f4646784795e20d92606b7a51"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb96fa6b56bb536c42d6a4a87dfca570ff8e52de2d63cabebfd6fb67049c34b6"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a6cadebe132e90cefa77e45f2d2f1a4b2ce5c6b1bfc1656c1ddafcfe4ba8131"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f352b62b45dff37b55ddd7b9c0c8672c4dd2eb9c0f9c11d395075a84e2c40f75"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ab43061a0c81198d88f39aaf90dae9a7744620978f7ef3e3708339b8ed2ef01"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9cb1565a7ad52e096a6988e2ee0397f72fe056dadf75d17fa6b5aebaea05622"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:1b3ea7edd2d24538959c1c1abf97c744d879d4e541d38305f9bd7d9b10c9ec41"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:7c7837fe8037e96b6dd5cfcf47263c1620a9d332a87ec06a6ca4564e56bd0f36"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:3b90467ebc3d9fa5b0f9b6489dfb2c304a1db7b9946fa92aa76a831b9d587e99"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:cab9401de3ea52b4b4c6971db5fb5c999bd4260898af972bf23de1c6b5dd9d71"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d1f9282c5f2b5e241034a009779e7b2a1aa045f667ff521e7948ea9b56e0c5ff"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-win32.whl", hash = "sha256:5e14f25765a578a0a634d5f0cd1e2c3f53964553a00347998dfdf96b8137f777"},
+    {file = "aiohttp-3.8.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4c745b109057e7e5f1848c689ee4fb3a016c8d4d92da52b312f8a509f83aa05e"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:aede4df4eeb926c8fa70de46c340a1bc2c6079e1c40ccf7b0eae1313ffd33519"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ddaae3f3d32fc2cb4c53fab020b69a05c8ab1f02e0e59665c6f7a0d3a5be54f"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4eb3b82ca349cf6fadcdc7abcc8b3a50ab74a62e9113ab7a8ebc268aad35bb9"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9bcb89336efa095ea21b30f9e686763f2be4478f1b0a616969551982c4ee4c3b"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c08e8ed6fa3d477e501ec9db169bfac8140e830aa372d77e4a43084d8dd91ab"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c6cd05ea06daca6ad6a4ca3ba7fe7dc5b5de063ff4daec6170ec0f9979f6c332"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7a00a9ed8d6e725b55ef98b1b35c88013245f35f68b1b12c5cd4100dddac333"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:de04b491d0e5007ee1b63a309956eaed959a49f5bb4e84b26c8f5d49de140fa9"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:40653609b3bf50611356e6b6554e3a331f6879fa7116f3959b20e3528783e699"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dbf3a08a06b3f433013c143ebd72c15cac33d2914b8ea4bea7ac2c23578815d6"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:854f422ac44af92bfe172d8e73229c270dc09b96535e8a548f99c84f82dde241"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-win32.whl", hash = "sha256:aeb29c84bb53a84b1a81c6c09d24cf33bb8432cc5c39979021cc0f98c1292a1a"},
+    {file = "aiohttp-3.8.4-cp37-cp37m-win_amd64.whl", hash = "sha256:db3fc6120bce9f446d13b1b834ea5b15341ca9ff3f335e4a951a6ead31105480"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fabb87dd8850ef0f7fe2b366d44b77d7e6fa2ea87861ab3844da99291e81e60f"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91f6d540163f90bbaef9387e65f18f73ffd7c79f5225ac3d3f61df7b0d01ad15"},
+    {file = "aiohttp-3.8.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d265f09a75a79a788237d7f9054f929ced2e69eb0bb79de3798c468d8a90f945"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d89efa095ca7d442a6d0cbc755f9e08190ba40069b235c9886a8763b03785da"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4dac314662f4e2aa5009977b652d9b8db7121b46c38f2073bfeed9f4049732cd"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe11310ae1e4cd560035598c3f29d86cef39a83d244c7466f95c27ae04850f10"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ddb2a2026c3f6a68c3998a6c47ab6795e4127315d2e35a09997da21865757f8"},
+    {file = "aiohttp-3.8.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e75b89ac3bd27d2d043b234aa7b734c38ba1b0e43f07787130a0ecac1e12228a"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6e601588f2b502c93c30cd5a45bfc665faaf37bbe835b7cfd461753068232074"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a5d794d1ae64e7753e405ba58e08fcfa73e3fad93ef9b7e31112ef3c9a0efb52"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:a1f4689c9a1462f3df0a1f7e797791cd6b124ddbee2b570d34e7f38ade0e2c71"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:3032dcb1c35bc330134a5b8a5d4f68c1a87252dfc6e1262c65a7e30e62298275"},
+    {file = "aiohttp-3.8.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8189c56eb0ddbb95bfadb8f60ea1b22fcfa659396ea36f6adcc521213cd7b44d"},
+    {file = "aiohttp-3.8.4-cp38-cp38-win32.whl", hash = "sha256:33587f26dcee66efb2fff3c177547bd0449ab7edf1b73a7f5dea1e38609a0c54"},
+    {file = "aiohttp-3.8.4-cp38-cp38-win_amd64.whl", hash = "sha256:e595432ac259af2d4630008bf638873d69346372d38255774c0e286951e8b79f"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5a7bdf9e57126dc345b683c3632e8ba317c31d2a41acd5800c10640387d193ed"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:22f6eab15b6db242499a16de87939a342f5a950ad0abaf1532038e2ce7d31567"},
+    {file = "aiohttp-3.8.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7235604476a76ef249bd64cb8274ed24ccf6995c4a8b51a237005ee7a57e8643"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea9eb976ffdd79d0e893869cfe179a8f60f152d42cb64622fca418cd9b18dc2a"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92c0cea74a2a81c4c76b62ea1cac163ecb20fb3ba3a75c909b9fa71b4ad493cf"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:493f5bc2f8307286b7799c6d899d388bbaa7dfa6c4caf4f97ef7521b9cb13719"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a63f03189a6fa7c900226e3ef5ba4d3bd047e18f445e69adbd65af433add5a2"},
+    {file = "aiohttp-3.8.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10c8cefcff98fd9168cdd86c4da8b84baaa90bf2da2269c6161984e6737bf23e"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bca5f24726e2919de94f047739d0a4fc01372801a3672708260546aa2601bf57"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:03baa76b730e4e15a45f81dfe29a8d910314143414e528737f8589ec60cf7391"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:8c29c77cc57e40f84acef9bfb904373a4e89a4e8b74e71aa8075c021ec9078c2"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:03543dcf98a6619254b409be2d22b51f21ec66272be4ebda7b04e6412e4b2e14"},
+    {file = "aiohttp-3.8.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:17b79c2963db82086229012cff93ea55196ed31f6493bb1ccd2c62f1724324e4"},
+    {file = "aiohttp-3.8.4-cp39-cp39-win32.whl", hash = "sha256:34ce9f93a4a68d1272d26030655dd1b58ff727b3ed2a33d80ec433561b03d67a"},
+    {file = "aiohttp-3.8.4-cp39-cp39-win_amd64.whl", hash = "sha256:41a86a69bb63bb2fc3dc9ad5ea9f10f1c9c8e282b471931be0268ddd09430b04"},
+    {file = "aiohttp-3.8.4.tar.gz", hash = "sha256:bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c"},
 ]
 
 [package.dependencies]
 aiosignal = ">=1.1.2"
 async-timeout = ">=4.0.0a3,<5.0"
 attrs = ">=17.3.0"
-charset-normalizer = ">=2.0,<3.0"
+charset-normalizer = ">=2.0,<4.0"
 frozenlist = ">=1.1.1"
 multidict = ">=4.5,<7.0"
 yarl = ">=1.0,<2.0"
@@ -2494,4 +2494,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "358b0ed5825600514b9a48056f8dbf95f1fb245cc483bb08e2546746c55d7cea"
+content-hash = "9063356c1260ec285981fe813dcbcf4ea0959c83623e6dc10bf645ad4db57096"
diff --git a/pyproject.toml b/pyproject.toml
index 33edf66a8..6eceb9a1b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ python = "3.10.*"
 # See https://bot-core.pythondiscord.com/ for docs.
 pydis_core = { version = "9.5.1", extras = ["async-rediscache"] }
 
-aiohttp = "3.8.3"
+aiohttp = "3.8.4"
 arrow = "1.2.3"
 beautifulsoup4 = "4.11.2"
 colorama = { version = "0.4.6", markers = "sys_platform == 'win32'" }
-- 
cgit v1.2.3


From 39d70b258b257483cc735c4cec74e6f53a83b6e0 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sun, 12 Mar 2023 14:46:21 +0100
Subject: remove custom ids that handle routing to the view

---
 bot/exts/info/subscribe.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/bot/exts/info/subscribe.py b/bot/exts/info/subscribe.py
index 7f4b4f95a..db66069b6 100644
--- a/bot/exts/info/subscribe.py
+++ b/bot/exts/info/subscribe.py
@@ -82,16 +82,6 @@ class RoleButtonView(discord.ui.View):
             row = index // ITEMS_PER_ROW
             self.add_item(SingleRoleButton(role, role.role_id in author_roles, row))
 
-    async def interaction_check(self, interaction: Interaction) -> bool:
-        """Ensure that the user clicking the button is the member who invoked the command."""
-        if interaction.user != self.interaction_owner:
-            await interaction.response.send_message(
-                ":x: This is not your command to react to!",
-                ephemeral=True
-            )
-            return False
-        return True
-
 
 class SingleRoleButton(discord.ui.Button):
     """A button that adds or removes a role from the member depending on its current state."""
@@ -113,7 +103,6 @@ class SingleRoleButton(discord.ui.Button):
         super().__init__(
             style=style,
             label=label,
-            custom_id=self.CUSTOM_ID_FORMAT.format(role_id=role.role_id),
             row=row,
         )
         self.role = role
-- 
cgit v1.2.3


From f535a5ace04d7bc0610dc0ffd8c07eb943aaad1c Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sun, 12 Mar 2023 15:09:55 +0100
Subject: bring back the interaction_check

This one is still needed for the `!subscribe` text command to work properly
---
 bot/exts/info/subscribe.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bot/exts/info/subscribe.py b/bot/exts/info/subscribe.py
index db66069b6..3cde07aee 100644
--- a/bot/exts/info/subscribe.py
+++ b/bot/exts/info/subscribe.py
@@ -82,6 +82,16 @@ class RoleButtonView(discord.ui.View):
             row = index // ITEMS_PER_ROW
             self.add_item(SingleRoleButton(role, role.role_id in author_roles, row))
 
+    async def interaction_check(self, interaction: Interaction) -> bool:
+        """Ensure that the user clicking the button is the member who invoked the command."""
+        if interaction.user != self.interaction_owner:
+            await interaction.response.send_message(
+                ":x: This is not your command to react to!",
+                ephemeral=True
+            )
+            return False
+        return True
+
 
 class SingleRoleButton(discord.ui.Button):
     """A button that adds or removes a role from the member depending on its current state."""
-- 
cgit v1.2.3


From ca335ef87e32548b51eed4798aac96c8700a11e9 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sun, 12 Mar 2023 17:43:41 +0100
Subject: remove CUSTOM_ID_FORMAT

---
 bot/exts/info/subscribe.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bot/exts/info/subscribe.py b/bot/exts/info/subscribe.py
index 3cde07aee..aff1302bb 100644
--- a/bot/exts/info/subscribe.py
+++ b/bot/exts/info/subscribe.py
@@ -100,7 +100,6 @@ class SingleRoleButton(discord.ui.Button):
     REMOVE_STYLE = discord.ButtonStyle.red
     UNAVAILABLE_STYLE = discord.ButtonStyle.secondary
     LABEL_FORMAT = "{action} role {role_name}"
-    CUSTOM_ID_FORMAT = "subscribe-{role_id}"
 
     def __init__(self, role: AssignableRole, assigned: bool, row: int):
         if role.is_currently_available():
-- 
cgit v1.2.3


From b4bb64fcfde32cf95708f66beb137f32e2abf5d7 Mon Sep 17 00:00:00 2001
From: shtlrs <amrbellalouna@gmail.com>
Date: Sun, 12 Mar 2023 18:13:10 +0100
Subject: change mode to "wb"

---
 botstrap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/botstrap.py b/botstrap.py
index 55e1bb6c7..90a954d9b 100644
--- a/botstrap.py
+++ b/botstrap.py
@@ -165,5 +165,5 @@ with DiscordClient() as discord_client:
     config_str += "\n#Emojis\n"
     config_str += "emojis_trashcan=🗑️"
 
-    with env_file_path.open("ab") as file:
+    with env_file_path.open("wb") as file:
         file.write(config_str.encode("utf-8"))
-- 
cgit v1.2.3


From 2188de11519081743d43a6d47d6947d355648a91 Mon Sep 17 00:00:00 2001
From: TizzySaurus <tizzysaurus@gmail.com>
Date: Tue, 14 Mar 2023 16:16:32 +0000
Subject: Fix pydantic model that prevented channel blacklist from working

---
 bot/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/constants.py b/bot/constants.py
index 006d0e4ce..31a8b4d31 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -404,7 +404,7 @@ class _DuckPond(EnvConfig):
 
     threshold = 7
 
-    channel_blacklist: list[str] = [
+    channel_blacklist: list[int] = [
         Channels.announcements,
         Channels.python_news,
         Channels.python_events,
-- 
cgit v1.2.3


From 46e9a1b4574a8840d9db5110cf586db340974c74 Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Sun, 19 Mar 2023 15:24:04 +0200
Subject: Mention target user in cap message

---
 bot/exts/moderation/infraction/infractions.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 1eb67bee4..7400c82f5 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -32,7 +32,7 @@ if t.TYPE_CHECKING:
 
 MAXIMUM_TIMEOUT_DAYS = timedelta(days=28)
 TIMEOUT_CAP_MESSAGE = (
-    f"Timeouts can't be longer than {MAXIMUM_TIMEOUT_DAYS.days} days."
+    f"The timeout for {{0}} can't be longer than {MAXIMUM_TIMEOUT_DAYS.days} days."
     " I'll pretend that's what you meant."
 )
 
@@ -242,11 +242,12 @@ class Infractions(InfractionScheduler, commands.Cog):
             if isinstance(duration, relativedelta):
                 duration += now
             if duration > now + MAXIMUM_TIMEOUT_DAYS:
+                cap_message_for_user = TIMEOUT_CAP_MESSAGE.format(user.mention)
                 if is_mod_channel(ctx.channel):
-                    await ctx.reply(f":warning: {TIMEOUT_CAP_MESSAGE}")
+                    await ctx.reply(f":warning: {cap_message_for_user}")
                 else:
                     await self.bot.get_channel(Channels.mods).send(
-                        f":warning: {ctx.author.mention} {TIMEOUT_CAP_MESSAGE}"
+                        f":warning: {ctx.author.mention} {cap_message_for_user}"
                     )
                 duration = now + MAXIMUM_TIMEOUT_DAYS - timedelta(minutes=1)  # Duration cap is exclusive.
             elif duration > now + MAXIMUM_TIMEOUT_DAYS - timedelta(minutes=1):
-- 
cgit v1.2.3


From ea0afec3e936be53fd6f2382de4133445ecb1fa2 Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Sun, 19 Mar 2023 15:32:23 +0200
Subject: Add role hierarchy guards for timeouts

Timeouts have similar role hierarchy restrictions to bans.
---
 bot/exts/moderation/infraction/infractions.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 7400c82f5..d8c997755 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -408,8 +408,13 @@ class Infractions(InfractionScheduler, commands.Cog):
     # endregion
     # region: Base apply functions
 
+    @respect_role_hierarchy(member_arg=2)
     async def apply_timeout(self, ctx: Context, user: Member, reason: t.Optional[str], **kwargs) -> None:
         """Apply a timeout infraction with kwargs passed to `post_infraction`."""
+        if isinstance(user, Member) and user.top_role >= ctx.me.top_role:
+            await ctx.send(":x: I can't timeout users above or equal to me in the role hierarchy.")
+            return None
+
         if active := await _utils.get_active_infraction(ctx, user, "timeout", send_msg=False):
             if active["actor"] != self.bot.user.id:
                 await _utils.send_active_infraction_message(ctx, active)
-- 
cgit v1.2.3


From 8e63fd916fbdb4cf5c7c8e5d305d4beac07f3086 Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Mon, 20 Mar 2023 14:04:51 +0200
Subject: Don't manually move timed out users

The timeout already natively handles blocking voice channels and removing the user from them.
---
 bot/exts/moderation/infraction/infractions.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index d8c997755..4ec9e41c7 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -445,9 +445,6 @@ class Infractions(InfractionScheduler, commands.Cog):
 
             await user.edit(timed_out_until=duration_or_expiry, reason=reason)
 
-            log.trace(f"Attempting to kick {user} from voice because they've been timed out.")
-            await user.move_to(None, reason=reason)
-
         await self.apply_infraction(ctx, infraction, user, action)
 
     @respect_role_hierarchy(member_arg=2)
-- 
cgit v1.2.3


From 9435ce3a79880c45f91a79839a02b410ab82b308 Mon Sep 17 00:00:00 2001
From: mbaruh <mbaruh@hotmail.com>
Date: Mon, 20 Mar 2023 15:03:22 +0200
Subject: Remove usage of the muted role

---
 bot/constants.py                              |  1 -
 bot/exts/moderation/infraction/infractions.py | 28 ---------------------------
 2 files changed, 29 deletions(-)

diff --git a/bot/constants.py b/bot/constants.py
index 4553095f3..4186472b1 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -143,7 +143,6 @@ class _Roles(EnvConfig):
 
     contributors = 295488872404484098
     help_cooldown = 699189276025421825
-    muted = 277914926603829249  # TODO remove when no longer relevant.
     partners = 323426753857191936
     python_community = 458226413825294336
     voice_verified = 764802720779337729
diff --git a/bot/exts/moderation/infraction/infractions.py b/bot/exts/moderation/infraction/infractions.py
index 4ec9e41c7..d61a3fa5c 100644
--- a/bot/exts/moderation/infraction/infractions.py
+++ b/bot/exts/moderation/infraction/infractions.py
@@ -47,33 +47,8 @@ class Infractions(InfractionScheduler, commands.Cog):
         super().__init__(bot, supported_infractions={"ban", "kick", "timeout", "note", "warning", "voice_mute"})
 
         self.category = "Moderation"
-        self._muted_role = discord.Object(constants.Roles.muted)  # TODO remove when no longer relevant.
         self._voice_verified_role = discord.Object(constants.Roles.voice_verified)
 
-    @commands.Cog.listener()
-    async def on_member_join(self, member: Member) -> None:
-        """
-        Apply active timeout infractions for returning members.
-
-        This is only needed for users who received the old role-mute, and are returning before it's ended.
-        TODO remove when no longer relevant.
-        """
-        active_timeouts = await self.bot.api_client.get(
-            "bot/infractions",
-            params={
-                "active": "true",
-                "type": "timeout",
-                "user__id": member.id
-            }
-        )
-
-        if active_timeouts and not member.is_timed_out():
-            reason = f"Applying active timeout for returning member: {active_timeouts[0]['id']}"
-
-            async def action() -> None:
-                await member.edit(timed_out_until=arrow.get(active_timeouts[0]["expires_at"]).datetime, reason=reason)
-            await self.reapply_infraction(active_timeouts[0], action)
-
     # region: Permanent infractions
 
     @command()
@@ -574,9 +549,6 @@ class Infractions(InfractionScheduler, commands.Cog):
         if user:
             # Remove the timeout.
             self.mod_log.ignore(Event.member_update, user.id)
-            if user.get_role(self._muted_role.id):
-                # Compatibility with existing role mutes. TODO remove when no longer relevant.
-                await user.remove_roles(self._muted_role, reason=reason)
             if user.is_timed_out():  # Handle pardons via the command and any other obscure weirdness.
                 log.trace(f"Manually pardoning timeout for user {user.id}")
                 await user.edit(timed_out_until=None, reason=reason)
-- 
cgit v1.2.3


From a7002536d3635dd9c5b47a54f48bf3e452a35c19 Mon Sep 17 00:00:00 2001
From: Amrou Bellalouna <amrbellalouna@gmail.com>
Date: Mon, 20 Mar 2023 17:53:44 +0100
Subject: Override context command explicitly in antispam filter(#2477)

---
 bot/exts/filters/antispam.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py
index 70a9c00b8..0d02edabf 100644
--- a/bot/exts/filters/antispam.py
+++ b/bot/exts/filters/antispam.py
@@ -232,12 +232,14 @@ class AntiSpam(Cog):
 
             # Get context and make sure the bot becomes the actor of infraction by patching the `author` attributes
             context = await self.bot.get_context(msg)
-            context.author = self.bot.user
+            command = self.bot.get_command("timeout")
+            context.author = context.guild.get_member(self.bot.user.id)
+            context.command = command
 
             # Since we're going to invoke the timeout command directly, we need to manually call the converter.
             dt_remove_role_after = await self.expiration_date_converter.convert(context, f"{remove_timeout_after}S")
             await context.invoke(
-                self.bot.get_command('timeout'),
+                command,
                 member,
                 dt_remove_role_after,
                 reason=reason
-- 
cgit v1.2.3