diff --git a/agon/app.py b/agon/app.py index 7590ddf..81b6201 100644 --- a/agon/app.py +++ b/agon/app.py @@ -5,8 +5,9 @@ import sys import nextcord from nextcord.ext import commands -from utilities import config -from utilities.logger import agon_logger + +from . import config +from .logger import agon_logger def run() -> None: diff --git a/agon/cogs/commands/__init__.py b/agon/cogs/commands/__init__.py index 85407e7..1052ab1 100644 --- a/agon/cogs/commands/__init__.py +++ b/agon/cogs/commands/__init__.py @@ -2,15 +2,15 @@ from nextcord.ext import commands -from cogs.commands.create import CreateCog -from cogs.commands.delete import DeleteCog -from cogs.commands.get import GetCog -from cogs.commands.help import HelpCog -from cogs.commands.refresh import RefreshCog -from cogs.commands.set import SetCog -from cogs.commands.submission import SubmissionCog -from cogs.commands.update import UpdateCog -from cogs.commands.view import ViewCog +from agon.cogs.commands.create import CreateCog +from agon.cogs.commands.delete import DeleteCog +from agon.cogs.commands.get import GetCog +from agon.cogs.commands.help import HelpCog +from agon.cogs.commands.refresh import RefreshCog +from agon.cogs.commands.set import SetCog +from agon.cogs.commands.submission import SubmissionCog +from agon.cogs.commands.update import UpdateCog +from agon.cogs.commands.view import ViewCog # This function will be called when this extension is loaded. diff --git a/agon/cogs/commands/create.py b/agon/cogs/commands/create.py index 08703cc..7b9b0a1 100644 --- a/agon/cogs/commands/create.py +++ b/agon/cogs/commands/create.py @@ -6,9 +6,9 @@ from sqlalchemy import exc, select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Category, CategoryGroup -from utilities.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup +from agon.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message class CreateCog(commands.Cog, name="Create Cog"): diff --git a/agon/cogs/commands/delete.py b/agon/cogs/commands/delete.py index 98b67c0..8be1c56 100644 --- a/agon/cogs/commands/delete.py +++ b/agon/cogs/commands/delete.py @@ -6,9 +6,9 @@ from sqlalchemy import distinct, select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Category, CategoryGroup, Score -from utilities.utils import ( +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Score +from agon.utils import ( autofill_categories, autofill_groups, autofill_users_in_group_category, diff --git a/agon/cogs/commands/get.py b/agon/cogs/commands/get.py index e05e72f..d624db8 100644 --- a/agon/cogs/commands/get.py +++ b/agon/cogs/commands/get.py @@ -4,9 +4,9 @@ import nextcord from nextcord.ext import commands from sqlmodel import Session, col, select -from database.db import engine -from database.models import Category, CategoryGroup -from utilities.utils import autofill_categories, autofill_groups +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup +from agon.utils import autofill_categories, autofill_groups class GetCog(commands.Cog, name="Get command."): diff --git a/agon/cogs/commands/refresh.py b/agon/cogs/commands/refresh.py index 20e1064..55b0b57 100644 --- a/agon/cogs/commands/refresh.py +++ b/agon/cogs/commands/refresh.py @@ -6,9 +6,9 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import CategoryGroup -from utilities.utils import autofill_groups, send_highscore_message +from agon.database.db import engine +from agon.database.models import CategoryGroup +from agon.utils import autofill_groups, send_highscore_message class RefreshCog(commands.Cog, name="Refresh Cog"): diff --git a/agon/cogs/commands/set.py b/agon/cogs/commands/set.py index 780c147..dc015c0 100644 --- a/agon/cogs/commands/set.py +++ b/agon/cogs/commands/set.py @@ -6,10 +6,10 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Category, CategoryGroup, Guild -from utilities.logger import agon_logger -from utilities.utils import MAX_LINE_LENGTH, autofill_categories, autofill_groups, send_highscore_message +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Guild +from agon.logger import agon_logger +from agon.utils import MAX_LINE_LENGTH, autofill_categories, autofill_groups, send_highscore_message class SetCog(commands.Cog, name="Set command."): diff --git a/agon/cogs/commands/submission.py b/agon/cogs/commands/submission.py index cc7d2fc..368769d 100644 --- a/agon/cogs/commands/submission.py +++ b/agon/cogs/commands/submission.py @@ -3,16 +3,16 @@ import re import nextcord -from cogs.submission.verification_view import VerificationView -from database.db import engine -from database.models import Category, CategoryGroup, Guild, Submission from nextcord.ext import commands from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from utilities.utils import autofill_categories, autofill_groups, submit_score -from agon.app import agon_logger +from agon.cogs.submission.verification_view import VerificationView +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Guild, Submission +from agon.logger import agon_logger +from agon.utils import autofill_categories, autofill_groups, submit_score class SubmissionCog(commands.Cog): diff --git a/agon/cogs/commands/update.py b/agon/cogs/commands/update.py index fc6aadd..2ca1fb3 100644 --- a/agon/cogs/commands/update.py +++ b/agon/cogs/commands/update.py @@ -6,9 +6,9 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Guild -from utilities.utils import autofill_users_in_guild +from agon.database.db import engine +from agon.database.models import Guild +from agon.utils import autofill_users_in_guild from .views.update_username_verify import UpdateUsernameVerifyView diff --git a/agon/cogs/commands/view.py b/agon/cogs/commands/view.py index 88774dd..3a722ae 100644 --- a/agon/cogs/commands/view.py +++ b/agon/cogs/commands/view.py @@ -7,9 +7,9 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Category, CategoryGroup, Score -from utilities.utils import MAX_LINE_LENGTH, autofill_categories, autofill_groups, format_score_string +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Score +from agon.utils import MAX_LINE_LENGTH, autofill_categories, autofill_groups, format_score_string class ViewCog(commands.Cog, name="View Command"): diff --git a/agon/cogs/commands/views/delete_confirm.py b/agon/cogs/commands/views/delete_confirm.py index c2d95ea..0655b3e 100644 --- a/agon/cogs/commands/views/delete_confirm.py +++ b/agon/cogs/commands/views/delete_confirm.py @@ -4,9 +4,9 @@ import nextcord from sqlalchemy import delete, select from sqlalchemy.orm import Session -from database.db import engine -from database.models import Category, CategoryGroup -from utilities.utils import send_highscore_message +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup +from agon.utils import send_highscore_message class DeleteConfirmView(nextcord.ui.Modal): diff --git a/agon/cogs/commands/views/update_username_verify.py b/agon/cogs/commands/views/update_username_verify.py index 3d04ac2..d20ae26 100644 --- a/agon/cogs/commands/views/update_username_verify.py +++ b/agon/cogs/commands/views/update_username_verify.py @@ -5,9 +5,9 @@ from sqlalchemy import distinct, exc, select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Category, CategoryGroup, Score -from utilities.utils import send_highscore_message +from agon.database.db import engine +from agon.database.models import Category, CategoryGroup, Score +from agon.utils import send_highscore_message class UpdateUsernameVerifyView(nextcord.ui.View): diff --git a/agon/cogs/guild_listener/__init__.py b/agon/cogs/guild_listener/__init__.py index 2707f6b..90e9fb4 100644 --- a/agon/cogs/guild_listener/__init__.py +++ b/agon/cogs/guild_listener/__init__.py @@ -6,8 +6,8 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Guild +from agon.database.db import engine +from agon.database.models import Guild class GuildListener(commands.Cog, name="Guild Listener"): diff --git a/agon/cogs/loops/guild_data.py b/agon/cogs/loops/guild_data.py index 3ce385f..6b9cf0d 100644 --- a/agon/cogs/loops/guild_data.py +++ b/agon/cogs/loops/guild_data.py @@ -5,8 +5,8 @@ from sqlalchemy import select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Guild +from agon.database.db import engine +from agon.database.models import Guild class GuildData(commands.Cog, name="Guild Data"): diff --git a/agon/cogs/submission/verification_view.py b/agon/cogs/submission/verification_view.py index 6a71e93..bfba978 100644 --- a/agon/cogs/submission/verification_view.py +++ b/agon/cogs/submission/verification_view.py @@ -5,9 +5,9 @@ from sqlalchemy import delete, select from sqlalchemy.orm import Session from sqlmodel import col -from database.db import engine -from database.models import Submission -from utilities.utils import submit_score +from agon.database.db import engine +from agon.database.models import Submission +from agon.utils import submit_score class VerificationView(nextcord.ui.View): diff --git a/agon/database/db.py b/agon/database/db.py index 7a55afc..f13a96d 100644 --- a/agon/database/db.py +++ b/agon/database/db.py @@ -1,8 +1,9 @@ """Simple file to set up the sqlmodel connection to database.""" from sqlmodel import SQLModel, create_engine -from utilities import config -from utilities.logger import agon_logger + +from agon import config +from agon.logger import agon_logger from . import models # noqa: F401 - Need this import for creating the models.