diff --git a/agon/utilities/config.py b/agon/config.py similarity index 100% rename from agon/utilities/config.py rename to agon/config.py diff --git a/agon/utilities/logger.py b/agon/logger.py similarity index 100% rename from agon/utilities/logger.py rename to agon/logger.py diff --git a/agon/utilities/__init__.py b/agon/utilities/__init__.py deleted file mode 100644 index 3d3885f..0000000 --- a/agon/utilities/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Package of utility functions and environment configuration variables.""" diff --git a/agon/utilities/utils.py b/agon/utils.py similarity index 99% rename from agon/utilities/utils.py rename to agon/utils.py index 72dc99f..bb4a74c 100644 --- a/agon/utilities/utils.py +++ b/agon/utils.py @@ -4,13 +4,13 @@ import time import nextcord import pandas as pd -from database.db import engine -from database.models import Category, CategoryGroup, Guild, Score from sqlalchemy import distinct, select from sqlalchemy.orm import Session, aliased from sqlmodel import col -from agon.app import agon_logger +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Guild, Score +from agon.logger import agon_logger MAX_LINE_LENGTH = 142