Add jarvis.const to avoid potential future circular import

jarvis/__init__.py

@@ -1,19 +1,15 @@
 """Main JARVIS package."""
 import logging
-from importlib.metadata import version as _v
 
 from dis_snek import Intents
 from jarvis_core.db import connect
 from jarvis_core.log import get_logger
 
-from jarvis import utils
+from jarvis import const, utils
 from jarvis.client import Jarvis
 from jarvis.config import JarvisConfig
 
-try:
-    __version__ = _v("jarvis")
-except Exception:
-    __version__ = "0.0.0"
+__version__ = const.__version__
 
 jconfig = JarvisConfig.from_yaml()
 logger = get_logger("jarvis")

jarvis/client.py

@@ -29,6 +29,7 @@ from jarvis_core.util import build_embed
 from jarvis_core.util.ansi import RESET, Fore, Format, fmt
 from pastypy import AsyncPaste as Paste
 
+from jarvis import const
 from jarvis.utils.embeds import warning_embed
 
 DEFAULT_GUILD = 862402786116763668
@@ -101,6 +102,7 @@ class Jarvis(Snake):
         self._update_domains.start()
         self.logger.info("Logged in as {}".format(self.user))  # noqa: T001
         self.logger.info("Connected to {} guild(s)".format(len(self.guilds)))  # noqa: T001
+        self.logger.info("Current version: {}".format(const.__version__))
         self.logger.info(  # noqa: T001
             "https://discord.com/api/oauth2/authorize?client_id="
             "{}&permissions=8&scope=bot%20applications.commands".format(self.user.id)

jarvis/cogs/util.py

@@ -29,7 +29,7 @@ from dis_snek.models.snek.cooldowns import Buckets
 from PIL import Image
 from tzlocal import get_localzone
 
-import jarvis
+from jarvis import const as jconst
 from jarvis.data import pigpen
 from jarvis.data.robotcamo import emotes, hk, names
 from jarvis.utils import build_embed, get_repo_hash
@@ -57,7 +57,7 @@ class UtilCog(Scale):
         fields = []
 
         fields.append(EmbedField(name="dis-snek", value=const.__version__))
-        fields.append(EmbedField(name="Version", value=jarvis.__version__, inline=False))
+        fields.append(EmbedField(name="Version", value=jconst.__version__, inline=False))
         fields.append(EmbedField(name="Git Hash", value=get_repo_hash()[:7], inline=False))
         num_domains = len(self.bot.phishing_domains)
         fields.append(

jarvis/const.py

@@ -0,0 +1,7 @@
+"""JARVIS constants."""
+from importlib.metadata import version as _v
+
+try:
+    __version__ = _v("jarvis")
+except Exception:
+    __version__ = "0.0.0"