Merge branch 'prometheus' into 'dev'

Prometheus

See merge request stark-industries/jarvis/jarvis-bot!66

jarvis/__init__.py

@@ -45,7 +45,7 @@ async def run() -> None:
     )
 
     if jconfig.log_level == "DEBUG":
-        jurigged.watch()
+        jurigged.watch(pattern="jarvis/*.py")
     if jconfig.rook_token:
         rook.start(token=jconfig.rook_token, labels={"env": "dev"})
     logger.info("Starting JARVIS")
@@ -58,6 +58,8 @@ async def run() -> None:
     for extension in get_extensions(cogs_path):
         jarvis.load_extension(extension)
         logger.debug("Loaded %s", extension)
+    logger.debug("Loading nafftrack")
+    jarvis.load_extension("nafftrack.extension")
 
     jarvis.max_messages = jconfig.max_messages
     logger.debug("Running JARVIS")

jarvis/client.py

@@ -4,6 +4,7 @@ import logging
 import re
 import traceback
 from datetime import datetime, timedelta, timezone
+from typing import TYPE_CHECKING
 
 from aiohttp import ClientSession
 from jarvis_core.db import q
@@ -19,7 +20,7 @@ from jarvis_core.db.models import (
 )
 from jarvis_core.filters import invites, url
 from jarvis_core.util.ansi import RESET, Fore, Format, fmt
-from naff import Client, listen
+from naff import listen
 from naff.api.events.discord import (
     MemberAdd,
     MemberRemove,
@@ -39,12 +40,17 @@ from naff.models.discord.user import Member
 from naff.models.naff.context import Context, InteractionContext, PrefixedContext
 from naff.models.naff.tasks.task import Task
 from naff.models.naff.tasks.triggers import IntervalTrigger
+from nafftrack.client import StatsClient
 from pastypy import AsyncPaste as Paste
 
 from jarvis import const
+from jarvis.tracking import jarvis_info, malicious_tracker, warnings_tracker
 from jarvis.utils import build_embed
 from jarvis.utils.embeds import warning_embed
 
+if TYPE_CHECKING:
+    from aioredis import Redis
+
 DEFAULT_GUILD = 862402786116763668
 DEFAULT_ERROR_CHANNEL = 943395824560394250
 DEFAULT_SITE = "https://paste.zevs.me"
@@ -68,9 +74,8 @@ VAL_FMT = fmt(Fore.WHITE)
 CMD_FMT = fmt(Fore.GREEN, Format.BOLD)
 
 
-class Jarvis(Client):
+class Jarvis(StatsClient):
-    def __init__(self, *args, **kwargs):  # noqa: ANN002 ANN003
+    def __init__(self, redis: "Redis", *args, **kwargs):  # noqa: ANN002 ANN003
-        redis = kwargs.pop("redis")
         super().__init__(*args, **kwargs)
         self.redis = redis
         self.logger = logging.getLogger(__name__)
@@ -120,6 +125,11 @@ class Jarvis(Client):
             self.phishing_domains = await response.json()
             self.logger.info(f"Protected from {len(self.phishing_domains)} phishing domains")
 
+    @listen()
+    async def on_startup(self) -> None:
+        """NAFF on_startup override. Prometheus info generated here."""
+        jarvis_info.info({"version": const.__version__})
+
     @listen()
     async def on_ready(self) -> None:
         """NAFF on_ready override."""
@@ -485,6 +495,10 @@ class Jarvis(Client):
                     reason="Sent an invite link",
                     user=message.author.id,
                 ).commit()
+                tracker = warnings_tracker.labels(
+                    guild_id=message.guild.id, guild_name=message.guild.name
+                )
+                tracker.inc()
                 embed = warning_embed(message.author, "Sent an invite link")
                 await message.channel.send(embeds=embed)
 
@@ -517,6 +531,10 @@ class Jarvis(Client):
                 reason="Mass Mention",
                 user=message.author.id,
             ).commit()
+            tracker = warnings_tracker.labels(
+                guild_id=message.guild.id, guild_name=message.guild.name
+            )
+            tracker.inc()
             embed = warning_embed(message.author, "Mass Mention")
             await message.channel.send(embeds=embed)
 
@@ -578,6 +596,10 @@ class Jarvis(Client):
                 reason="Pinged a blocked role/user with a blocked role",
                 user=message.author.id,
             ).commit()
+            tracker = warnings_tracker.labels(
+                guild_id=message.guild.id, guild_name=message.guild.name
+            )
+            tracker.inc()
             embed = warning_embed(message.author, "Pinged a blocked role/user with a blocked role")
             await message.channel.send(embeds=embed)
 
@@ -598,9 +620,20 @@ class Jarvis(Client):
                     reason="Phishing URL",
                     user=message.author.id,
                 ).commit()
+                tracker = warnings_tracker.labels(
+                    guild_id=message.guild.id, guild_name=message.guild.name
+                )
+                tracker.inc()
                 embed = warning_embed(message.author, "Phishing URL")
                 await message.channel.send(embeds=embed)
+                try:
                     await message.delete()
+                except Exception:
+                    self.logger.warn("Failed to delete malicious message")
+                tracker = malicious_tracker.labels(
+                    guild_id=message.guild.id, guild_name=message.guild.name
+                )
+                tracker.inc()
                 return True
         return False
 
@@ -629,10 +662,21 @@ class Jarvis(Client):
                         reason="Unsafe URL",
                         user=message.author.id,
                     ).commit()
+                    tracker = warnings_tracker.labels(
+                        guild_id=message.guild.id, guild_name=message.guild.name
+                    )
+                    tracker.inc()
                     reasons = ", ".join(item["not_safe_reasons"])
                     embed = warning_embed(message.author, reasons)
                     await message.channel.send(embeds=embed)
+                    try:
                         await message.delete()
+                    except Exception:
+                        self.logger.warn("Failed to delete malicious message")
+                    tracker = malicious_tracker.labels(
+                        guild_id=message.guild.id, guild_name=message.guild.name
+                    )
+                    tracker.inc()
                     return True
         return False
 

jarvis/config.py

@@ -1,8 +1,8 @@
 """Load the config for JARVIS"""
-from jarvis_core.config import Config as CConfig
+from jarvis_core.config import Config
 
 
-class JarvisConfig(CConfig):
+class JarvisConfig(Config):
     REQUIRED = ("token", "mongo", "urls", "redis")
     OPTIONAL = {
         "sync": False,

jarvis/tracking.py

@@ -0,0 +1,14 @@
+"""JARVIS Prometheus extra tracking."""
+from prometheus_client import Counter, Info
+
+malicious_tracker = Counter(
+    "jarvis_malicious_blocked",
+    "Amount of malicious messages blocked",
+    labelnames=["guild_id", "guild_name"],
+)
+
+warnings_tracker = Counter(
+    "jarvis_warnings", "Amount of warnings given out", labelnames=["guild_id", "guild_name"]
+)
+
+jarvis_info = Info("jarvis", "Jarvis version")

jarvis/utils/cogs.py

@@ -9,6 +9,7 @@ from naff.models.discord.components import ActionRow, Button, ButtonStyles
 from naff.models.discord.embed import EmbedField
 from naff.models.discord.user import Member
 
+from jarvis.tracking import warnings_tracker
 from jarvis.utils import build_embed
 
 MODLOG_LOOKUP = {"Ban": Ban, "Kick": Kick, "Mute": Mute, "Warning": Warning}
@@ -39,6 +40,9 @@ class ModcaseCog(Extension):
         name = self.__name__.replace("Cog", "")
 
         if name in MODLOG_LOOKUP and ctx.invoke_target not in IGNORE_COMMANDS[name]:
+            if name == "Warning":
+                tracker = warnings_tracker.labels(guild_id=ctx.guild.id, guild_name=ctx.guild.name)
+                tracker.inc()
             user = kwargs.pop("user", None)
             if not user and not ctx.target_id:
                 self.logger.warning("Admin action %s missing user, exiting", name)

poetry.lock

@@ -85,6 +85,17 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "asgiref"
+version = "3.5.2"
+description = "ASGI specs, helper code, and adapters"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"]
+
 [[package]]
 name = "async-generator"
 version = "1.10"
@@ -170,6 +181,27 @@ docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
 tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
 tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"]
 
+[[package]]
+name = "black"
+version = "22.3.0"
+description = "The uncompromising code formatter."
+category = "dev"
+optional = false
+python-versions = ">=3.6.2"
+
+[package.dependencies]
+click = ">=8.0.0"
+mypy-extensions = ">=0.4.3"
+pathspec = ">=0.9.0"
+platformdirs = ">=2"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
+
+[package.extras]
+colorama = ["colorama (>=0.4.3)"]
+d = ["aiohttp (>=3.7.4)"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
+uvloop = ["uvloop (>=0.15.2)"]
+
 [[package]]
 name = "blessed"
 version = "1.19.1"
@@ -213,6 +245,17 @@ python-versions = ">=3.5.0"
 [package.extras]
 unicode_backport = ["unicodedata2"]
 
+[[package]]
+name = "click"
+version = "8.1.3"
+description = "Composable command line interface toolkit"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
 [[package]]
 name = "codefind"
 version = "0.1.3"
@@ -221,6 +264,14 @@ category = "main"
 optional = false
 python-versions = ">=3.8,<4.0"
 
+[[package]]
+name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
 [[package]]
 name = "commonmark"
 version = "0.9.1"
@@ -308,6 +359,14 @@ python-versions = ">=3.7"
 [package.dependencies]
 gitdb = ">=4.0.1,<5"
 
+[[package]]
+name = "h11"
+version = "0.13.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "idna"
 version = "3.3"
@@ -419,6 +478,14 @@ category = "main"
 optional = false
 python-versions = ">=3.7"
 
+[[package]]
+name = "mypy-extensions"
+version = "0.4.3"
+description = "Experimental type system extensions for programs checked with the mypy typechecker."
+category = "dev"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "naff"
 version = "1.2.0"
@@ -438,6 +505,26 @@ all = ["PyNaCl (>=1.5.0,<1.6)", "cchardet", "aiodns", "orjson", "brotli"]
 speedup = ["cchardet", "aiodns", "orjson", "brotli"]
 voice = ["PyNaCl (>=1.5.0,<1.6)"]
 
+[[package]]
+name = "nafftrack"
+version = "0.1.0"
+description = "A stat tracker client for NAFF"
+category = "main"
+optional = false
+python-versions = "^3.10"
+develop = false
+
+[package.dependencies]
+naff = {version = "^1.2.0", extras = ["orjson"]}
+prometheus-client = "^0.14.1"
+uvicorn = "^0.17.6"
+
+[package.source]
+type = "git"
+url = "https://github.com/zevaryx/nafftrack.git"
+reference = "master"
+resolved_reference = "55ed394b24bd951a5b452e5d0eff801531eb151f"
+
 [[package]]
 name = "nanoid"
 version = "2.0.0"
@@ -533,6 +620,14 @@ requests = {version = "2.27.1", markers = "python_version >= \"2.7\" and python_
 urllib3 = {version = "1.26.8", markers = "python_version >= \"2.7\" and python_full_version < \"3.0.0\" or python_full_version >= \"3.6.0\" and python_version < \"4\""}
 yarl = {version = "1.7.2", markers = "python_version >= \"3.6\""}
 
+[[package]]
+name = "pathspec"
+version = "0.9.0"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
 [[package]]
 name = "pillow"
 version = "9.1.1"
@@ -545,6 +640,29 @@ python-versions = ">=3.7"
 docs = ["olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-issues (>=3.0.1)", "sphinx-removed-in", "sphinx-rtd-theme (>=1.0)", "sphinxext-opengraph"]
 tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
 
+[[package]]
+name = "platformdirs"
+version = "2.5.2"
+description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
+
+[[package]]
+name = "prometheus-client"
+version = "0.14.1"
+description = "Python client for the Prometheus monitoring system."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+twisted = ["twisted"]
+
 [[package]]
 name = "protobuf"
 version = "3.20.1"
@@ -879,6 +997,22 @@ brotli = ["brotlipy (>=0.6.0)"]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
+[[package]]
+name = "uvicorn"
+version = "0.17.6"
+description = "The lightning-fast ASGI server."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+asgiref = ">=3.4.0"
+click = ">=7.0"
+h11 = ">=0.8"
+
+[package.extras]
+standard = ["websockets (>=10.0)", "httptools (>=0.4.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"]
+
 [[package]]
 name = "watchdog"
 version = "2.1.8"
@@ -926,7 +1060,7 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "23a980a5fb3c6f41ab20c1055aa787ff69cd0e5c10c938dc48691bcb9a3a55aa"
+content-hash = "870969b60493050894d24e825f2c7bb7afd48f4f6c0ab28596ffcda0b68d7497"
 
 [metadata.files]
 aiofile = [
@@ -1027,6 +1161,10 @@ ansicon = [
     {file = "ansicon-1.89.0-py2.py3-none-any.whl", hash = "sha256:f1def52d17f65c2c9682cf8370c03f541f410c1752d6a14029f97318e4b9dfec"},
     {file = "ansicon-1.89.0.tar.gz", hash = "sha256:e4d039def5768a47e4afec8e89e83ec3ae5a26bf00ad851f914d1240b444d2b1"},
 ]
+asgiref = [
+    {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"},
+    {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"},
+]
 async-generator = [
     {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"},
     {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"},
@@ -1051,6 +1189,31 @@ attrs = [
     {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"},
     {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"},
 ]
+black = [
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"},
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"},
+    {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"},
+    {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"},
+    {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"},
+    {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"},
+    {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"},
+    {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"},
+    {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"},
+    {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"},
+    {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"},
+    {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"},
+    {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"},
+    {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"},
+    {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"},
+    {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"},
+    {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"},
+    {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"},
+    {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"},
+]
 blessed = [
     {file = "blessed-1.19.1-py2.py3-none-any.whl", hash = "sha256:63b8554ae2e0e7f43749b6715c734cc8f3883010a809bf16790102563e6cf25b"},
     {file = "blessed-1.19.1.tar.gz", hash = "sha256:9a0d099695bf621d4680dd6c73f6ad547f6a3442fbdbe80c4b1daa1edbc492fc"},
@@ -1080,10 +1243,18 @@ charset-normalizer = [
     {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"},
     {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"},
 ]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
 codefind = [
     {file = "codefind-0.1.3-py3-none-any.whl", hash = "sha256:3ffe85b74595b5c9f82391a11171ce7d68f1f555485720ab922f3b86f9bf30ec"},
     {file = "codefind-0.1.3.tar.gz", hash = "sha256:5667050361bf601a253031b2437d16b7d82cb0fa0e756d93e548c7b35ce6f910"},
 ]
+colorama = [
+    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+]
 commonmark = [
     {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"},
     {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"},
@@ -1173,6 +1344,10 @@ gitpython = [
     {file = "GitPython-3.1.27-py3-none-any.whl", hash = "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"},
     {file = "GitPython-3.1.27.tar.gz", hash = "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704"},
 ]
+h11 = [
+    {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"},
+    {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"},
+]
 idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
@@ -1259,10 +1434,15 @@ multidict = [
     {file = "multidict-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:4bae31803d708f6f15fd98be6a6ac0b6958fcf68fda3c77a048a4f9073704aae"},
     {file = "multidict-6.0.2.tar.gz", hash = "sha256:5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013"},
 ]
+mypy-extensions = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
 naff = [
     {file = "naff-1.2.0-py3-none-any.whl", hash = "sha256:c7d4beafcc26a10bf187b9481dcc771cb492444a22a76645f882b11ae7fba93e"},
     {file = "naff-1.2.0.tar.gz", hash = "sha256:8fc551871ecc2c3153d3c2994fa4e6902181ac8f636501a886e7886ba1c7a309"},
 ]
+nafftrack = []
 nanoid = [
     {file = "nanoid-2.0.0-py3-none-any.whl", hash = "sha256:90aefa650e328cffb0893bbd4c236cfd44c48bc1f2d0b525ecc53c3187b653bb"},
     {file = "nanoid-2.0.0.tar.gz", hash = "sha256:5a80cad5e9c6e9ae3a41fa2fb34ae189f7cb420b2a5d8f82bd9d23466e4efa68"},
@@ -1351,6 +1531,10 @@ pastypy = [
     {file = "pastypy-1.0.2-py3-none-any.whl", hash = "sha256:4476e47b5e52600a4d69c58cbbba2c5d42458f552ccfc2854d5fe97a119dcc20"},
     {file = "pastypy-1.0.2.tar.gz", hash = "sha256:81e0c4a65ec40c85d62685627b64d26397304ac91d68ddc80f833974504c13b8"},
 ]
+pathspec = [
+    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
+    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
+]
 pillow = [
     {file = "Pillow-9.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"},
     {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"},
@@ -1391,6 +1575,14 @@ pillow = [
     {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"},
     {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"},
 ]
+platformdirs = [
+    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
+    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
+]
+prometheus-client = [
+    {file = "prometheus_client-0.14.1-py3-none-any.whl", hash = "sha256:522fded625282822a89e2773452f42df14b5a8e84a86433e3f8a189c1d54dc01"},
+    {file = "prometheus_client-0.14.1.tar.gz", hash = "sha256:5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a"},
+]
 protobuf = [
     {file = "protobuf-3.20.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996"},
     {file = "protobuf-3.20.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3"},
@@ -1809,6 +2001,10 @@ urllib3 = [
     {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"},
     {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"},
 ]
+uvicorn = [
+    {file = "uvicorn-0.17.6-py3-none-any.whl", hash = "sha256:19e2a0e96c9ac5581c01eb1a79a7d2f72bb479691acd2b8921fce48ed5b961a6"},
+    {file = "uvicorn-0.17.6.tar.gz", hash = "sha256:5180f9d059611747d841a4a4c4ab675edf54c8489e97f96d0583ee90ac3bfc23"},
+]
 watchdog = [
     {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:676263bee67b165f16b05abc52acc7a94feac5b5ab2449b491f1a97638a79277"},
     {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:aa68d2d9a89d686fae99d28a6edf3b18595e78f5adf4f5c18fbfda549ac0f20c"},

pyproject.toml

@@ -26,6 +26,10 @@ rich = "^12.3.0"
 jurigged = "^0.5.0"
 aioredis = "^2.0.1"
 naff = { version = "^1.2.0", extras = ["orjson"] }
+nafftrack = {git = "https://github.com/zevaryx/nafftrack.git", rev = "master"}
+
+[tool.poetry.dev-dependencies]
+black = {version = "^22.3.0", allow-prereleases = true}
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]