Merge branch 'Kav-K:main' into main

.gitignore

@@ -0,0 +1,9 @@
+#cache folders
+__pycache__
+/cogs/__pycache__
+/models/__pycache__
+#user files
+.env
+bot.pid
+usage.txt
+/dalleimages

Dockerfile

@@ -11,10 +11,12 @@ RUN pip install --target="/install" --upgrade pip setuptools wheel
 COPY requirements.txt /install
 RUN pip install --target="/install" -r requirements.txt
 COPY README.md /src
-COPY cogs /src
-COPY models /src
+COPY cogs /src/cogs
+COPY models /src/models
 COPY gpt3discord.py /src
 COPY pyproject.toml /src
+# For debugging + seeing that the modiles file layouts look correct ...
+RUN find /src
 RUN pip install --target="/install" /src
 
 # Copy minimal to main image (to keep as small as possible)
@@ -22,4 +24,4 @@ FROM python:${PY_VERSION}-slim
 ARG PY_VERSION
 COPY --from=builder /install /usr/local/lib/python${PY_VERSION}/site-packages
 COPY gpt3discord.py /bin/gpt3discord
-CMD ["python3", "/bin/gpt3discord"]
+CMD ["python3", "/bin/gpt3discord"]

README.md

@@ -61,6 +61,10 @@ Both the OpenAI API key and the Discord bot token needed to be loaded into a .en
 
 You also need to add a DEBUG_GUILD id and a DEBUG_CHANNEL id, the debug guild id is a server id, and the debug channel id is a text-channel id in Discord. Your final .env file should look like the following:
 
+You also need to add the allowed guilds that the bot can operate on, this is the `ALLOWED_GUILDS` field, to get a guild ID, right click a server and click "Copy ID".
+
+You also need to add the roles that can use the bot, this is the `ALLOWED_ROLES` field, enter role names here, separated by commas. Currently, there is no way to give everybody access to the bot, and you have to use roles, but it will be done soon.
+
 ```
 OPENAI_TOKEN="<openai_api_token>"
 DISCORD_TOKEN="<discord_bot_token>"

cogs/draw_image_generation.py

@@ -12,6 +12,7 @@ from discord.ext import commands
 # We don't use the converser cog here because we want to be able to redo for the last images and text prompts at the same time
 from models.env_service_model import EnvService
 from models.user_model import RedoUser
+from models.check_model import Check
 
 redo_users = {}
 users_to_interactions = {}
@@ -131,7 +132,10 @@ class DrawDallEService(commands.Cog, name="DrawDallEService"):
                 )
 
     @discord.slash_command(
-        name="draw", description="Draw an image from a prompt", guild_ids=ALLOWED_GUILDS
+        name="draw",
+        description="Draw an image from a prompt",
+        guild_ids=ALLOWED_GUILDS,
+        checks=[Check.check_valid_roles()],
     )
     @discord.option(name="prompt", description="The prompt to draw from", required=True)
     async def draw(self, ctx: discord.ApplicationContext, prompt: str):
@@ -142,10 +146,6 @@ class DrawDallEService(commands.Cog, name="DrawDallEService"):
         if user == self.bot.user:
             return
 
-        # Only allow the bot to be used by people who have the role "Admin" or "GPT"
-        if not await self.converser_cog.check_valid_roles(ctx.user, ctx):
-            return
-
         try:
             asyncio.ensure_future(self.encapsulated_send(user.id, prompt, ctx))
 
@@ -183,14 +183,12 @@ class DrawDallEService(commands.Cog, name="DrawDallEService"):
         name="clear-local",
         description="Clear the local dalleimages folder on system.",
         guild_ids=ALLOWED_GUILDS,
+        checks=[Check.check_valid_roles()],
     )
     @discord.guild_only()
     async def clear_local(self, ctx):
         await ctx.defer()
 
-        if not await self.converser_cog.check_valid_roles(ctx.user, ctx):
-            return
-
         # Delete all the local images in the images folder.
         image_path = self.model.IMAGE_SAVE_PATH
         for dirpath, dirnames, filenames in os.walk(image_path):

cogs/gpt_3_commands_and_converser.py

@@ -11,6 +11,7 @@ from models.deletion_service_model import Deletion
 from models.env_service_model import EnvService
 from models.message_model import Message
 from models.user_model import User, RedoUser
+from models.check_model import Check
 from collections import defaultdict
 
 
@@ -37,7 +38,6 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
         self._last_member_ = None
         self.conversating_users = {}
         self.DAVINCI_ROLES = ["admin", "Admin", "GPT", "gpt"]
-        self.ALLOWED_ROLES = EnvService.get_allowed_roles()
         self.END_PROMPTS = [
             "end",
             "end conversation",
@@ -83,12 +83,6 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
         self.message_queue = message_queue
         self.conversation_threads = {}
 
-    async def check_valid_roles(self, user, ctx):
-        if not any(role.name in self.ALLOWED_ROLES for role in user.roles):
-            await ctx.respond("You don't have permission to use this.")
-            return False
-        return True
-
     @commands.Cog.listener()
     async def on_member_remove(self, member):
         pass
@@ -101,7 +95,9 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
         print(f"The debug channel was acquired")
 
     @discord.slash_command(
-        name="set-usage", description="Set the current OpenAI usage (in dollars)"
+        name="set-usage",
+        description="Set the current OpenAI usage (in dollars)",
+        checks=[Check.check_valid_roles()],
     )
     @discord.option(
         name="usage_amount",
@@ -111,9 +107,6 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
     async def set_usage(self, ctx, usage_amount: float):
         await ctx.defer()
 
-        if not await self.check_valid_roles(ctx.user, ctx):
-            return
-
         # Attempt to convert the input usage value into a float
         try:
             usage = float(usage_amount)
@@ -126,12 +119,10 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
     @discord.slash_command(
         name="delete-conversation-threads",
         description="Delete all conversation threads across the bot servers.",
+        checks=[Check.check_valid_roles()],
     )
     async def delete_all_conversation_threads(self, ctx):
         await ctx.defer()
-        # If the user has ADMIN_ROLES
-        if not await self.check_valid_roles(ctx.user, ctx):
-            return
 
         for guild in self.bot.guilds:
             for thread in guild.threads:
@@ -499,8 +490,11 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
             )
 
     # ctx can be of type AppContext(interaction) or Message
-    async def encapsulated_send(self, user_id, prompt, ctx, response_message=None):
-        new_prompt = prompt + "\nGPTie: "
+    async def encapsulated_send(
+        self, user_id, prompt, ctx, response_message=None, from_g_command=False
+    ):
+        new_prompt = prompt + "\nGPTie: " if not from_g_command else prompt
+
         from_context = isinstance(ctx, discord.ApplicationContext)
 
         # Replace 'Human:' with the user's name
@@ -516,6 +510,7 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
             if (
                 user_id in self.conversating_users
                 and tokens > self.model.summarize_threshold
+                and not from_g_command
             ):
 
                 # We don't need to worry about the differences between interactions and messages in this block,
@@ -559,6 +554,11 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
             response_text = response_text.replace("GPTie: ", "")
             response_text = response_text.replace("<|endofstatement|>", "")
 
+            if from_g_command:
+                # Append the prompt to the beginning of the response, in italics, then a new line
+                response_text = response_text.strip()
+                response_text = f"***{prompt}***\n\n{response_text}"
+
             # If GPT3 tries to ping somebody, don't let it happen
             if re.search(r"<@!?\d+>|<@&\d+>|<#\d+>", str(response_text)):
                 message = "I'm sorry, I can't mention users, roles, or channels."
@@ -567,7 +567,7 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
                 )
 
             # If the user is conversing, add the GPT response to their conversation history.
-            if user_id in self.conversating_users:
+            if user_id in self.conversating_users and not from_g_command:
                 self.conversating_users[user_id].history.append(
                     "\nGPTie: " + str(response_text) + "<|endofstatement|>\n"
                 )
@@ -632,7 +632,10 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
             return
 
     @discord.slash_command(
-        name="g", description="Ask GPT3 something!", guild_ids=ALLOWED_GUILDS
+        name="g",
+        description="Ask GPT3 something!",
+        guild_ids=ALLOWED_GUILDS,
+        checks=[Check.check_valid_roles()],
     )
     @discord.option(
         name="prompt", description="The prompt to send to GPT3", required=True
@@ -644,33 +647,22 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
         user = ctx.user
         prompt = prompt.strip()
 
-        if not await self.check_valid_roles(user, ctx):
-            return
-
         # CONVERSE Checks here TODO
         # Send the request to the model
         # If conversing, the prompt to send is the history, otherwise, it's just the prompt
 
-        await self.encapsulated_send(
-            user.id,
-            prompt
-            if user.id not in self.conversating_users
-            else "".join(self.conversating_users[user.id].history),
-            ctx,
-        )
+        await self.encapsulated_send(user.id, prompt, ctx, from_g_command=True)
 
     @discord.slash_command(
         name="chat-gpt",
         description="Have a conversation with GPT3",
         guild_ids=ALLOWED_GUILDS,
+        checks=[Check.check_valid_roles()],
     )
     @discord.guild_only()
     async def chat_gpt(self, ctx: discord.ApplicationContext):
         await ctx.defer()
 
-        if not await self.check_valid_roles(ctx.user, ctx):
-            return
-
         user = ctx.user
 
         if user.id in self.conversating_users:
@@ -736,7 +728,27 @@ class GPT3ComCon(commands.Cog, name="GPT3ComCon"):
         guild_ids=ALLOWED_GUILDS,
     )
     @discord.option(
-        name="parameter", description="The setting to change", required=False
+        name="parameter",
+        description="The setting to change",
+        required=False,
+        choices=[
+            "mode",
+            "temp",
+            "top_p",
+            "max_tokens",
+            "presence_penalty",
+            "frequency_penalty",
+            "best_of",
+            "prompt_min_length",
+            "max_conversation_length",
+            "model",
+            "low_usage_mode",
+            "image_size",
+            "num_images",
+            "summarize_conversations",
+            "summarize_threshold",
+            "IMAGE_SAVE_PATH",
+        ],
     )
     @discord.option(
         name="value", description="The value to set the setting to", required=False

cogs/image_prompt_optimizer.py

@@ -6,6 +6,7 @@ from discord.ext import commands
 
 from models.env_service_model import EnvService
 from models.user_model import RedoUser
+from models.check_model import Check
 
 ALLOWED_GUILDS = EnvService.get_allowed_guilds()
 
@@ -50,6 +51,7 @@ class ImgPromptOptimizer(commands.Cog, name="ImgPromptOptimizer"):
         name="imgoptimize",
         description="Optimize a text prompt for DALL-E/MJ/SD image generation.",
         guild_ids=ALLOWED_GUILDS,
+        checks=[Check.check_valid_roles()],
     )
     @discord.option(
         name="prompt", description="The text prompt to optimize.", required=True
@@ -58,9 +60,6 @@ class ImgPromptOptimizer(commands.Cog, name="ImgPromptOptimizer"):
     async def imgoptimize(self, ctx: discord.ApplicationContext, prompt: str):
         await ctx.defer()
 
-        if not await self.converser_cog.check_valid_roles(ctx.user, ctx):
-            return
-
         user = ctx.user
 
         final_prompt = self.OPTIMIZER_PRETEXT

gpt3discord.py

@@ -15,7 +15,7 @@ from models.message_model import Message
 from models.openai_model import Model
 from models.usage_service_model import UsageService
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 load_dotenv()
 import os
 
@@ -31,7 +31,10 @@ asyncio.ensure_future(Deletion.process_deletion_queue(deletion_queue, 1, 1))
 """
 Settings for the bot
 """
-bot = commands.Bot(intents=discord.Intents.all(), command_prefix="!")
+activity = discord.Activity(
+    type=discord.ActivityType.watching, name="for /help /g, and more!"
+)
+bot = commands.Bot(intents=discord.Intents.all(), command_prefix="!", activity=activity)
 usage_service = UsageService(Path(os.environ.get("DATA_DIR", os.getcwd())))
 model = Model(usage_service)
 
@@ -46,6 +49,16 @@ async def on_ready():  # I can make self optional by
     print("We have logged in as {0.user}".format(bot))
 
 
+@bot.event
+async def on_application_command_error(
+    ctx: discord.ApplicationContext, error: discord.DiscordException
+):
+    if isinstance(error, discord.CheckFailure):
+        pass
+    else:
+        raise error
+
+
 async def main():
     data_path = Path(os.environ.get("DATA_DIR", os.getcwd()))
     debug_guild = int(os.getenv("DEBUG_GUILD"))

models/check_model.py

@@ -0,0 +1,22 @@
+import discord
+from models.env_service_model import EnvService
+from typing import Callable
+
+
+ALLOWED_ROLES = EnvService.get_allowed_roles()
+
+
+class Check:
+    def check_valid_roles() -> Callable:
+        async def inner(ctx: discord.ApplicationContext):
+            if not any(role.name in ALLOWED_ROLES for role in ctx.user.roles):
+                await ctx.defer(ephemeral=True)
+                await ctx.respond(
+                    "You don't have permission to use this.",
+                    ephemeral=True,
+                    delete_after=10,
+                )
+                return False
+            return True
+
+        return inner