fix: try to make railway happy again 12

JacobCoffee · Oct 10, 2024 · 7fa9f5d · 7fa9f5d
1 parent fc2c521
commit 7fa9f5d
Show file tree

Hide file tree

Showing 53 changed files with 91 additions and 89 deletions.
diff --git a/byte_bot/__init__.py b/byte_bot/__init__.py
@@ -5,8 +5,8 @@
 from rich import get_console
 from rich.traceback import install as rich_tracebacks
 
-from __metadata__ import __version__
-import app, byte, cli, server, utils
+from byte_bot.__metadata__ import __version__
+from byte_bot import app, byte, cli, server, utils
 
 __all__ = (
     "__version__",

diff --git a/byte_bot/app.py b/byte_bot/app.py
@@ -20,8 +20,8 @@ def create_app() -> Litestar:
     from litestar import Litestar
     from pydantic import SecretStr
 
-    from server import domain
-    from server.lib import (
+    from byte_bot.server import domain
+    from byte_bot.server.lib import (
         cors,
         db,
         exceptions,
@@ -31,7 +31,7 @@ def create_app() -> Litestar:
         static_files,
         template,
     )
-    from server.lib.dependencies import create_collection_dependencies
+    from byte_bot.server.lib.dependencies import create_collection_dependencies
 
     dependencies = create_collection_dependencies()
 

diff --git a/byte_bot/byte/__init__.py b/byte_bot/byte/__init__.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from byte import bot, lib
-from byte.lib.log import setup_logging
+from byte_bot.byte import bot, lib
+from byte_bot.byte.lib.log import setup_logging
 
 __all__ = ["bot", "lib"]
 

diff --git a/byte_bot/byte/bot.py b/byte_bot/byte/bot.py
@@ -11,8 +11,8 @@
 from discord.ext.commands import Bot, CommandError, Context, ExtensionAlreadyLoaded
 from dotenv import load_dotenv
 
-from byte.lib import settings
-from byte.lib.log import get_logger
+from byte_bot.byte.lib import settings
+from byte_bot.byte.lib.log import get_logger
 
 __all__ = [
     "Byte",

diff --git a/byte_bot/byte/lib/__init__.py b/byte_bot/byte/lib/__init__.py
@@ -1,6 +1,6 @@
 """Byte library module."""
 
-from byte.lib import common, log, settings, utils
+from byte_bot.byte.lib import common, log, settings, utils
 
 __all__ = [
     "settings",

diff --git a/byte_bot/byte/lib/common/__init__.py b/byte_bot/byte/lib/common/__init__.py
@@ -3,7 +3,7 @@
 .. todo:: temporary, these are not multi-guild friendly.
 """
 
-from byte.lib.common import assets, colors, guilds, links
+from byte_bot.byte.lib.common import assets, colors, guilds, links
 
 __all__ = (
     "assets",

diff --git a/byte_bot/byte/lib/log.py b/byte_bot/byte/lib/log.py
@@ -10,7 +10,7 @@
 from rich.logging import RichHandler  # noqa: F401
 from rich.traceback import install
 
-from byte.lib import settings
+from byte_bot.byte.lib import settings
 
 __all__ = [
     "setup_logging",

diff --git a/byte_bot/byte/lib/settings.py b/byte_bot/byte/lib/settings.py
@@ -12,7 +12,7 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
-from __metadata__ import __version__ as version
+from byte_bot.__metadata__ import __version__ as version
 
 __all__ = [
     "discord",
@@ -27,7 +27,7 @@
 
 DEFAULT_MODULE_NAME: str = "byte_bot"
 BASE_DIR: Final = module_to_os_path(DEFAULT_MODULE_NAME)
-PLUGINS_DIR: Final = module_to_os_path("byte.plugins")
+PLUGINS_DIR: Final = module_to_os_path("byte_bot.byte.plugins")
 
 
 class DiscordSettings(BaseSettings):

diff --git a/byte_bot/byte/lib/utils.py b/byte_bot/byte/lib/utils.py
@@ -15,8 +15,8 @@
 from discord.ext import commands
 from ruff.__main__ import find_ruff_bin  # type: ignore[import-untyped]
 
-from byte.lib import settings
-from byte.lib.common.links import pastebin
+from byte_bot.byte.lib import settings
+from byte_bot.byte.lib.common.links import pastebin
 
 if TYPE_CHECKING:
     from collections.abc import Iterable

diff --git a/byte_bot/byte/plugins/__init__.py b/byte_bot/byte/plugins/__init__.py
@@ -1,6 +1,6 @@
 """Pluggable modules for Byte."""
 
-from byte.plugins import admin, custom, events, forums, general, testing
+from byte_bot.byte.plugins import admin, custom, events, forums, general, testing
 
 __all__ = [
     "custom",

diff --git a/byte_bot/byte/plugins/admin.py b/byte_bot/byte/plugins/admin.py
@@ -8,7 +8,7 @@
 from discord.ext import commands
 from discord.ext.commands import Bot, Cog, Context, command, group, is_owner
 
-from byte.lib.utils import is_byte_dev
+from byte_bot.byte.lib.utils import is_byte_dev
 
 __all__ = ("AdminCommands", "setup")
 

diff --git a/byte_bot/byte/plugins/astral.py b/byte_bot/byte/plugins/astral.py
@@ -9,13 +9,13 @@
 from discord.app_commands import command as app_command
 from discord.ext.commands import Bot, Cog
 
-from byte.lib.common.assets import ruff_logo
-from byte.lib.common.colors import astral_purple, astral_yellow
-from byte.lib.utils import chunk_sequence, format_ruff_rule, query_all_ruff_rules
-from byte.views.astral import RuffView
+from byte_bot.byte.lib.common.assets import ruff_logo
+from byte_bot.byte.lib.common.colors import astral_purple, astral_yellow
+from byte_bot.byte.lib.utils import chunk_sequence, format_ruff_rule, query_all_ruff_rules
+from byte_bot.byte.views.astral import RuffView
 
 if TYPE_CHECKING:
-    from byte.lib.utils import RuffRule
+    from byte_bot.byte.lib.utils import RuffRule
 
 __all__ = ("Astral", "setup")
 

diff --git a/byte_bot/byte/plugins/custom/__init__.py b/byte_bot/byte/plugins/custom/__init__.py
@@ -1,6 +1,6 @@
 """Custom Pluggable modules for Byte."""
 
-from byte.plugins.custom import litestar
+from byte_bot.byte.plugins.custom import litestar
 
 __all__ = [
     "litestar",

diff --git a/byte_bot/byte/plugins/custom/litestar.py b/byte_bot/byte/plugins/custom/litestar.py
@@ -10,8 +10,8 @@
 from discord.utils import MISSING
 from httpx import codes
 
-from byte.lib.utils import is_byte_dev, mention_role, mention_user
-from server.domain.github.helpers import github_client
+from byte_bot.byte.lib.utils import is_byte_dev, mention_role, mention_user
+from byte_bot.server.domain.github.helpers import github_client
 
 __all__ = ("LitestarCommands", "setup")
 

diff --git a/byte_bot/byte/plugins/events.py b/byte_bot/byte/plugins/events.py
@@ -6,10 +6,10 @@
 from discord import Embed
 from discord.ext.commands import Bot, Cog
 
-from byte.lib.common.assets import litestar_logo_yellow
-from byte.lib.common.links import mcve
-from byte.lib.utils import linker
-from byte.views.forums import HelpThreadView
+from byte_bot.byte.lib.common.assets import litestar_logo_yellow
+from byte_bot.byte.lib.common.links import mcve
+from byte_bot.byte.lib.utils import linker
+from byte_bot.byte.views.forums import HelpThreadView
 
 __all__ = ("Events", "setup")
 

diff --git a/byte_bot/byte/plugins/forums.py b/byte_bot/byte/plugins/forums.py
@@ -5,9 +5,9 @@
 from discord.app_commands import command as app_command
 from discord.ext.commands import Bot, Cog, Context, command, hybrid_command
 
-from byte.lib.common.assets import litestar_logo_yellow
-from byte.lib.common.links import mcve
-from byte.lib.utils import linker
+from byte_bot.byte.lib.common.assets import litestar_logo_yellow
+from byte_bot.byte.lib.common.links import mcve
+from byte_bot.byte.lib.utils import linker
 
 __all__ = ("ForumCommands", "setup")
 

diff --git a/byte_bot/byte/plugins/general.py b/byte_bot/byte/plugins/general.py
@@ -6,9 +6,9 @@
 from discord.app_commands import command as app_command
 from discord.ext.commands import Bot, Cog
 
-from byte.lib.common.assets import litestar_logo_yellow
-from byte.lib.common.links import markdown_guide, pastebin
-from byte.lib.utils import linker
+from byte_bot.byte.lib.common.assets import litestar_logo_yellow
+from byte_bot.byte.lib.common.links import markdown_guide, pastebin
+from byte_bot.byte.lib.utils import linker
 
 __all__ = ("GeneralCommands", "setup")
 

diff --git a/byte_bot/byte/plugins/python.py b/byte_bot/byte/plugins/python.py
@@ -7,11 +7,11 @@
 from discord.app_commands import command as app_command
 from discord.ext.commands import Bot, Cog
 
-from byte.lib.common.assets import python_logo
-from byte.lib.common.colors import python_blue, python_yellow
-from byte.lib.utils import PEP, query_all_peps
-from byte.views.embed import ExtendedEmbed, Field
-from byte.views.python import PEPView
+from byte_bot.byte.lib.common.assets import python_logo
+from byte_bot.byte.lib.common.colors import python_blue, python_yellow
+from byte_bot.byte.lib.utils import PEP, query_all_peps
+from byte_bot.byte.views.embed import ExtendedEmbed, Field
+from byte_bot.byte.views.python import PEPView
 
 __all__ = ("Python", "setup")
 

diff --git a/byte_bot/byte/views/__init__.py b/byte_bot/byte/views/__init__.py
@@ -1,6 +1,6 @@
 """Views for the bot."""
 
-from byte.views import forums
+from byte_bot.byte.views import forums
 
 __all__ = [
     "forums",

diff --git a/byte_bot/byte/views/astral.py b/byte_bot/byte/views/astral.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from byte.lib.log import get_logger
-from byte.views.abstract_views import BaseEmbedView
+from byte_bot.byte.lib.log import get_logger
+from byte_bot.byte.views.abstract_views import BaseEmbedView
 
 __all__ = ("RuffView",)
 

diff --git a/byte_bot/byte/views/forums.py b/byte_bot/byte/views/forums.py
@@ -4,8 +4,8 @@
 from discord.ext.commands import Bot
 from discord.ui import Button, View, button
 
-from byte.lib.common.links import litestar_issues
-from byte.lib.log import get_logger
+from byte_bot.byte.lib.common.links import litestar_issues
+from byte_bot.byte.lib.log import get_logger
 
 __all__ = ("HelpThreadView",)
 

diff --git a/byte_bot/byte/views/python.py b/byte_bot/byte/views/python.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from byte.lib.log import get_logger
-from byte.views.abstract_views import BaseEmbedView
+from byte_bot.byte.lib.log import get_logger
+from byte_bot.byte.views.abstract_views import BaseEmbedView
 
 __all__ = ("PEPView",)
 

diff --git a/byte_bot/cli.py b/byte_bot/cli.py
@@ -10,7 +10,7 @@
 import click
 from rich import get_console
 
-from server.lib import log, settings
+from byte_bot.server.lib import log, settings
 
 __all__ = [
     "run_bot",

diff --git a/byte_bot/server/__init__.py b/byte_bot/server/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from server import domain, lib
+from byte_bot.server import domain, lib
 
 __all__ = (
     "domain",

diff --git a/byte_bot/server/domain/__init__.py b/byte_bot/server/domain/__init__.py
@@ -7,7 +7,7 @@
 from litestar.contrib.repository.filters import FilterTypes
 from advanced_alchemy.service import OffsetPagination
 
-from server.domain import db, guilds, system, urls, web
+from byte_bot.server.domain import db, guilds, system, urls, web
 
 if TYPE_CHECKING:
     from collections.abc import Mapping

diff --git a/byte_bot/server/domain/db/__init__.py b/byte_bot/server/domain/db/__init__.py
@@ -1,5 +1,5 @@
 """Domain for database models."""
 
-from server.domain.db import models
+from byte_bot.server.domain.db import models
 
 __all__ = ["models"]
diff --git a/byte_bot/server/domain/github/__init__.py b/byte_bot/server/domain/github/__init__.py
@@ -1,5 +1,5 @@
 """GitHub domain."""
 
-from server.domain.github import helpers
+from byte_bot.server.domain.github import helpers
 
 __all__ = ("helpers",)
diff --git a/byte_bot/server/domain/github/helpers.py b/byte_bot/server/domain/github/helpers.py
@@ -4,7 +4,7 @@
 
 from githubkit import AppInstallationAuthStrategy, GitHub  # type: ignore[reportMissingImports]
 
-from server.lib import settings
+from byte_bot.server.lib import settings
 
 __all__ = ("github_client",)
 

diff --git a/byte_bot/server/domain/guilds/__init__.py b/byte_bot/server/domain/guilds/__init__.py
@@ -1,5 +1,5 @@
 """Guilds domain."""
 
-from server.domain.guilds import controllers
+from byte_bot.server.domain.guilds import controllers
 
 __all__ = ("controllers",)
diff --git a/byte_bot/server/domain/guilds/controllers.py b/byte_bot/server/domain/guilds/controllers.py
@@ -13,10 +13,10 @@
 from litestar.handlers import BaseRouteHandler
 from litestar.exceptions import NotAuthorizedException
 
-from server.domain import urls
-from server.domain.guilds.dependencies import provides_guilds_service
-from server.domain.guilds.schemas import GuildSchema
-from server.domain.guilds.services import GuildsService  # noqa: TCH001
+from byte_bot.server.domain import urls
+from byte_bot.server.domain.guilds.dependencies import provides_guilds_service
+from byte_bot.server.domain.guilds.schemas import GuildSchema
+from byte_bot.server.domain.guilds.services import GuildsService  # noqa: TCH001
 
 if TYPE_CHECKING:
     from advanced_alchemy.filters import FilterTypes

diff --git a/byte_bot/server/domain/guilds/dependencies.py b/byte_bot/server/domain/guilds/dependencies.py
@@ -6,9 +6,9 @@
 
 from sqlalchemy import select
 
-from server.domain.db.models import Guild
-from server.domain.guilds.services import GuildsService
-from server.lib import log
+from byte_bot.server.domain.db.models import Guild
+from byte_bot.server.domain.guilds.services import GuildsService
+from byte_bot.server.lib import log
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator

diff --git a/byte_bot/server/domain/guilds/schemas.py b/byte_bot/server/domain/guilds/schemas.py
@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from server.lib.schema import CamelizedBaseModel
+from byte_bot.server.lib.schema import CamelizedBaseModel
 
 __all__ = ("GuildCreate", "GuildSchema", "GuildUpdate")
 

diff --git a/byte_bot/server/domain/guilds/services.py b/byte_bot/server/domain/guilds/services.py
@@ -7,8 +7,8 @@
 from advanced_alchemy.repository import SQLAlchemyAsyncSlugRepository
 from advanced_alchemy.service import SQLAlchemyAsyncRepositoryService
 
-from server.domain.db.models import Guild
-from server.lib import log
+from byte_bot.server.domain.db.models import Guild
+from byte_bot.server.lib import log
 
 
 __all__ = ("GuildsRepository", "GuildsService")

diff --git a/byte_bot/server/domain/system/__init__.py b/byte_bot/server/domain/system/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from server.domain.system import controllers
+from byte_bot.server.domain.system import controllers
 
 __all__ = [
     "controllers",

diff --git a/byte_bot/server/domain/system/controllers/__init__.py b/byte_bot/server/domain/system/controllers/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from server.domain.system.controllers import system
+from byte_bot.server.domain.system.controllers import system
 
 __all__ = [
     "system",

diff --git a/byte_bot/server/domain/web/__init__.py b/byte_bot/server/domain/web/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from server.domain.web import controllers
+from byte_bot.server.domain.web import controllers
 
 __all__ = [
     "controllers",