AI core migrated to async api

Author: Ambratolm

.vscode/settings.json

@@ -1,14 +1,15 @@
 {
   "jupyter.notebookFileRoot": "${workspaceFolder}",
   "files.exclude": {
-    "**/*cache*": true,
-    ".vscode": true,
-    ".venv": true,
+    ".github": true,
+    ".gitignore": true,
     ".mongodb": true,
     ".python-version": true,
-    "uv.lock": true,
-    ".gitignore": true,
+    ".venv": true,
+    ".vscode": true,
+    "**/*cache*": true,
     "LICENSE": true,
-    "README.*": true
+    "README.*": true,
+    "uv.lock": true
   }
 }

api/routers/default_router.py

@@ -1,11 +1,6 @@
-from typing import cast
+from fastapi import APIRouter
 
-from discord import Guild
-from fastapi import APIRouter, HTTPException
-
-from bot.cogs.board_cog import BoardCog
 from bot.main import ActBot
-from db.actor import Actor
 
 
 # ----------------------------------------------------------------------------------------------------

api/routers/guild_router.py

@@ -1,11 +1,7 @@
-from typing import cast
-
 from discord import Guild
 from fastapi import APIRouter, HTTPException
 
-from bot.cogs.board_cog import BoardCog
 from bot.main import ActBot
-from db.actor import Actor
 
 
 # ----------------------------------------------------------------------------------------------------

api/routers/member_router.py

@@ -16,7 +16,7 @@ class MemberRouter(APIRouter):
     def __init__(self, bot: ActBot, *args, **kwargs):
         super().__init__(prefix="/members", tags=["Members"], *args, **kwargs)
 
-        def member_dict(member: Member, actor: Actor):
+        def member_dict(actor: Actor, member: Member):
             return {
                 **actor.model_dump(),
                 "id": member.id,
@@ -36,34 +36,12 @@ async def get_members(guild_id: int, limit: int = 10, top: bool = True):
             try:
                 for guild in bot.guilds:
                     if guild.id == guild_id:
-                        db = bot.get_db(guild)
-                        actors = (
-                            db.find(
-                                Actor,
-                                Actor.is_member == True,
-                                sort=(
-                                    query.desc(Actor.rank),
-                                    query.desc(Actor.level),
-                                    query.desc(Actor.xp),
-                                    query.desc(Actor.gold),
-                                ),
-                                limit=limit,
+                        return [
+                            member_dict(actor, member)
+                            for actor, member in await bot.get_actors_members(
+                                guild, limit, top
                             )
-                            if top
-                            else db.find(Actor, limit=limit)
-                        )
-                        members = []
-                        for actor in actors:
-                            member = None
-                            try:
-                                member = guild.get_member(
-                                    actor.id
-                                ) or await guild.fetch_member(actor.id)
-                            except:
-                                pass
-                            if member:
-                                members.append(member_dict(member, actor))
-                        return members
+                        ]
                     raise HTTPException(
                         status_code=404,
                         detail=f"No guild with id '{guild_id}' found among the guilds the discord bot is member of.",

bot/cogs/ai_cog.py bot/cogs/chat_cogs/ai_cog.pybot/cogs/ai_cog.py renamed to bot/cogs/chat_cogs/ai_cog.py

@@ -108,7 +108,7 @@ async def incite(
                     history=self.load_guild_history(interaction.guild),
                 )
                 await interaction.channel.send(
-                    self.ai.prompt(text=text_prompt)
+                    await self.ai.prompt(text=text_prompt)
                     or f"👋 {member.mention if member else "👋"}"
                 )
             except Exception as e:
@@ -192,7 +192,7 @@ async def respond():
                         ),
                     )
                     await message.reply(
-                        self.ai.prompt(text_prompt, file_prompt)
+                        await self.ai.prompt(text_prompt, file_prompt)
                         or f"👋 {member.mention if member else "What? 😕"}"
                     )
                 except APIError as e:
@@ -313,7 +313,7 @@ async def perform_initiative(self, guild: Guild):
                 ),
             )
             await message.reply(
-                self.ai.prompt(text_prompt, file_prompt)
+                await self.ai.prompt(text_prompt, file_prompt)
                 or f"👋 {member.mention if member else "What? 😕"}"
             )
 

bot/cogs/ai_cog.toml bot/cogs/chat_cogs/ai_cog.tomlbot/cogs/ai_cog.toml renamed to bot/cogs/chat_cogs/ai_cog.toml

@@ -81,7 +81,7 @@ async def on_message(self, message: Message):
 
         # Notice
         embed = EmbedX.error(
-            icon="🚨",
+            emoji="🚨",
             title="Penalty",
             description=f"{member.mention} has been penalized for repeated use of offensive language.",
         )

bot/cogs/filter_cog.py bot/cogs/chat_cogs/filter_cog.pybot/cogs/filter_cog.py renamed to bot/cogs/chat_cogs/filter_cog.py

@@ -36,7 +36,7 @@ async def attack(self, interaction: Interaction, member: Member):
             content=f"{member.mention} 😱",
             embed=add_preview_notice(
                 EmbedX.info(
-                    icon=":crossed_swords:",
+                    emoji=":crossed_swords:",
                     title="Combat",
                     description=f"{interaction.user.mention} attacked {member.mention}.",
                 )

bot/cogs/combat_cog.py bot/cogs/game_cogs/combat_cog.pybot/cogs/combat_cog.py renamed to bot/cogs/game_cogs/combat_cog.py

@@ -9,9 +9,9 @@
 
 
 # ----------------------------------------------------------------------------------------------------
-# * Gift Cog
+# * Exchange Cog
 # ----------------------------------------------------------------------------------------------------
-class GiftCog(Cog, description="Allows players to gift eachother."):
+class ExchangeCog(Cog, description="Allows players to exchange gold and goods."):
     def __init__(self, bot: ActBot):
         self.bot = bot
 
@@ -79,7 +79,7 @@ async def donate(self, interaction: Interaction, member: Member, gold: int):
 
         # Create the response embed
         embed = EmbedX.success(
-            icon="💛",
+            emoji="💛",
             title="Gold Donation",
             description=(
                 f"{recipient_member.mention} has received **💰 {gold} Gold** from {donor_member.mention}."

bot/cogs/gift_cog.py bot/cogs/game_cogs/exchange_cog.pybot/cogs/gift_cog.py renamed to bot/cogs/game_cogs/exchange_cog.py

@@ -76,7 +76,7 @@ async def on_message(self, message: Message):
             gold_reward = randint(1, 500) * actor.level
             actor.gold += gold_reward
             embed = EmbedX.success(
-                icon="🏅",
+                emoji="🏅",
                 title="Level Up",
                 description=f"{member.mention} has reached a new level and has been rewarded.",
             )
@@ -95,7 +95,7 @@ async def on_message(self, message: Message):
             gold_reward = randint(1, 1000) * actor.level
             actor.gold += gold_reward
             embed = EmbedX.success(
-                icon="🏆",
+                emoji="🏆",
                 title="Rank Up",
                 description=f"{member.mention} has reached a new rank and has been rewarded.",
             )