osef

kayo/__init__.py

@@ -9,9 +9,10 @@
 import dotenv
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
+from peewee import *
 
 dotenv.load_dotenv()
-LOGLEVEL = os.environ.get('LOGLEVEL').upper()
+LOGLEVEL = os.environ.get('LOGLEVEL', 'info').upper()
 
 
 class BotContext:
@@ -27,23 +28,17 @@ def __init__(self):
         handler = logging.StreamHandler(sys.stdout)
         handler.setFormatter(logging.Formatter('%(asctime)s:%(levelname)s:%(message)s'))
         self.logger.addHandler(handler)
-
-        if LOGLEVEL == "DEBUG":
-            logging.getLogger("sqlalchemy.engine").setLevel(level=LOGLEVEL)
-
         self.http_client = aiohttp.ClientSession()
 
         if os.getenv("DEPLOYED") == "production":
-            self.engine = (create_engine("sqlite:///db/kayo.db"))
+            self.db = SqliteDatabase("sqlite:///db/kayo.db")
         else:
-            self.engine = (create_engine("sqlite:///:memory:", echo=True))
+            self.db = SqliteDatabase("sqlite:///:memory:")
 
-        Session = sessionmaker(bind=self.engine)
-        global session
-        self.session = Session()
+        global db
 
         # Initializing core objects
-        if os.environ.get('DEPLOYED').upper() == "PRODUCTION":
+        if os.environ.get('DEPLOYED', 'DEBUG').upper() == "PRODUCTION":
             self.bot = discord.Bot()
         else:
             self.bot = discord.Bot(debug_guilds=[int(os.environ.get('DEBUG_GUILD'))])

kayo/match.py

@@ -3,23 +3,14 @@
 from datetime import datetime
 from datetime import timedelta
 from typing import Optional
-
-from sqlalchemy import DateTime
-from sqlalchemy import ForeignKey
-from sqlalchemy import select
-from sqlalchemy import String
-from sqlalchemy.dialects.sqlite import insert
-from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import Mapped
-from sqlalchemy.orm import mapped_column
-from sqlalchemy.orm import relationship
+from peewee import *
 
 from kayo import instance
 from kayo.league import League
 from kayo.model import Base
 
 
-class Match(Base):
+class Match(Model):
     """Represents a Match between two teams.
 
     Args:

main.py

@@ -280,7 +280,7 @@ async def updateDatabase():
     fetch_leagues()
     await fetch_events_and_teams()
 
-if os.environ.get('DEPLOYED').upper() != "PRODUCTION":
+if os.environ.get('DEPLOYED', 'DEBUG').upper() != "PRODUCTION":
     @instance.bot.slash_command(name="debug_alert", description="DO NOT USE ON YOUR SERVER !")
     @commands.has_permissions(manage_roles=True, ban_members=True)
     async def debug_alerts(ctx):