Feature/limit submodule

cogs/badges.py

@@ -3,7 +3,7 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 
 class BadgeModal(discord.ui.Modal, title="Your Badges"):
@@ -17,7 +17,7 @@ async def on_timeout(self, interaction):
 
 class BadgeContents:
     def __init__(self, name) -> None:
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
         apprentinceDesc = f"""Welcome *{name}*!!
 
 

cogs/discordDataScraper.py

@@ -9,7 +9,7 @@
 from discord.channel import TextChannel
 from discord.ext import commands, tasks
 
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 with open("config.json") as config_file:
     config_data = json.load(config_file)
@@ -24,7 +24,7 @@
 class DiscordDataScaper(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
 
     @commands.Cog.listener()
     async def on_message(self, message):

cogs/listeners/member_events_cog.py

@@ -1,13 +1,14 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import PostgresClient
+# from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 
 class MemberEventsListener(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
         super().__init__()
 
     @commands.Cog.listener("on_member_join")

cogs/listeners/message_events_cog.py

@@ -2,10 +2,11 @@
 from discord.ext import commands
 
 from config.server import ServerConfig
-from helpers.supabaseClient import PostgresClient
+# from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 serverConfig = ServerConfig()
-postgresClient = PostgresClient()
+postgresClient = DiscordBotQueries()
 
 
 async def grantVerifiedRole(member: discord.Member):

cogs/listeners/role_events_cog.py

@@ -1,13 +1,14 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import PostgresClient
+# from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 
 class RoleEventsListener(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
         super().__init__()
 
     @commands.Cog.listener()

cogs/serverManagement.py

@@ -3,15 +3,15 @@
 from discord.ext import commands, tasks
 
 from config.server import ServerConfig
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 serverConfig = ServerConfig()
 
 
 class ServerManagement(commands.Cog):
     def __init__(self, bot):
         self.bot: commands.Bot = bot
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
 
     def validUser(self, ctx):
         authorised_users = [

cogs/userInteractions.py

@@ -5,7 +5,7 @@
 from discord.ext import commands, tasks
 from dotenv import find_dotenv, load_dotenv
 
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 load_dotenv(find_dotenv())
 
@@ -16,7 +16,7 @@ class UserHandler(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
         self.update_contributors.start()
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
 
     @tasks.loop(minutes=60)
     async def update_contributors(self):

cogs/vcCog.py

@@ -6,7 +6,7 @@
 from discord.ext import commands
 
 from config.server import ServerConfig
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 """
 with io.BytesIO(image_bytes) as image_file:
@@ -21,7 +21,7 @@
 class CommunityVCView(ui.View):
     def __init__(self, *, timeout=None):
         super().__init__(timeout=timeout)
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
 
     def isCommunityContributor(self, roles: list[Role]):
         CommunityContributorRoleID = ServerConfig.Roles.CONTRIBUTOR_ROLE
@@ -215,7 +215,7 @@ async def serveCertificateLink(self, interaction: Interaction, button: ui.Button
 
 class VCProgramSelection(ui.View):
     def __init__(self, *, timeout=None):
-        self.postgres_client = PostgresClient()
+        self.postgres_client = DiscordBotQueries()
         super().__init__(timeout=timeout)
 
     async def resetSelectMenu(self, interaction):

helpers/supabaseClient.py

@@ -6,7 +6,8 @@
 from dotenv import load_dotenv            
 from sqlalchemy import create_engine,select,desc,update,delete
 from sqlalchemy.orm import sessionmaker
-from models import *
+# from models import *
+from shared_migrations.db.models import *
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
 

main.py

@@ -7,7 +7,7 @@
 from discord.ext import commands
 
 from cogs.vcCog import VCProgramSelection
-from helpers.supabaseClient import PostgresClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 from dotenv import load_dotenv, find_dotenv
 
 
@@ -70,7 +70,7 @@ async def on_submit(self, interaction: discord.Interaction):
         except Exception as e:
             print('exception e ', e)
         try:
-            response = await PostgresClient().updateContributor(user_data)
+            response = await DiscordBotQueries().updateContributor(user_data)
             print("DB updated for user:", user_data["discord_id"])
         except Exception as e:
             print("Failed to update credentials for user: "+e)
@@ -96,7 +96,7 @@ async def hasIntroduced():
                 while not authentication:
                     print("Not authenticated. Waiting")
                     await asyncio.sleep(15)
-                    authentication = await PostgresClient().read("contributors_registration", "discord_id", user.id)
+                    authentication = await DiscordBotQueries().read("contributors_registration", "discord_id", user.id)
                 print("User has authenticated")
                 return True
 

shared_migrations/.gitignore

@@ -0,0 +1 @@
+.env

shared_migrations/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "python.analysis.extraPaths": [
+        "./db"
+    ]
+}

shared_migrations/alembic.ini

@@ -0,0 +1,118 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# Use forward slashes (/) also on windows to provide an os agnostic path
+script_location = migrations
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to migrations/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+# version_path_separator = newline
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = %(DATABASE_URL)s
+
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = %(here)s/.venv/bin/ruff
+# ruff.options = --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S