From deee0b328da4090958cd913da66e4bc41aba3c9f Mon Sep 17 00:00:00 2001
From: Rene Teigen <rene9917@gmail.com>
Date: Fri, 13 Jan 2023 12:45:10 +0000
Subject: [PATCH] Codex redo

---
 cogs/gpt_3_commands_and_converser.py | 11 +++++++++--
 models/openai_model.py               |  2 +-
 models/user_model.py                 |  3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cogs/gpt_3_commands_and_converser.py b/cogs/gpt_3_commands_and_converser.py
index 487279f..3666f1c 100644
--- a/cogs/gpt_3_commands_and_converser.py
+++ b/cogs/gpt_3_commands_and_converser.py
@@ -1177,7 +1177,7 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
                     )
 
                     self.redo_users[ctx.author.id] = RedoUser(
-                        prompt=new_prompt, instruction=instruction, ctx=ctx, message=ctx, response=actual_response_message
+                        prompt=new_prompt, instruction=instruction, ctx=ctx, message=ctx, response=actual_response_message, codex=codex
                     )
                     self.redo_users[ctx.author.id].add_interaction(
                         actual_response_message.id
@@ -1334,7 +1334,10 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
         max_value=1,
     )
     @discord.option(
-        name="codex", description="Enable codex version", required=False
+        name="codex", 
+        description="Enable codex version", 
+        required=False, 
+        default=False
     )
     @discord.guild_only()
     async def edit(
@@ -1410,11 +1413,13 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
         name="private",
         description="Converse in a private thread",
         required=False,
+        default=False,
     )
     @discord.option(
         name="minimal",
         description="Use minimal starter text, saves tokens and has a more open personality",
         required=False,
+        default=False,
     )
     @discord.guild_only()
     async def converse(
@@ -1856,6 +1861,7 @@ class RedoButton(discord.ui.Button["ConversationView"]):
             instruction = self.converser_cog.redo_users[user_id].instruction
             ctx = self.converser_cog.redo_users[user_id].ctx
             response_message = self.converser_cog.redo_users[user_id].response
+            codex = self.converser_cog.redo_users[user_id].codex
 
             msg = await interaction.response.send_message(
                 "Retrying your original request...", ephemeral=True, delete_after=15
@@ -1868,6 +1874,7 @@ class RedoButton(discord.ui.Button["ConversationView"]):
                 ctx=ctx,
                 model=self.model,
                 response_message=response_message,
+                codex=codex,
                 custom_api_key=self.custom_api_key,
                 redo_request=True,
                 from_edit_command=self.from_edit_command
diff --git a/models/openai_model.py b/models/openai_model.py
index 635487d..e850be0 100644
--- a/models/openai_model.py
+++ b/models/openai_model.py
@@ -409,7 +409,7 @@ class Model:
             )
         
 
-        print(f"The text about to be edited is [{input}] with instructions [{instruction}]")
+        print(f"The text about to be edited is [{input}] with instructions [{instruction}] codex [{codex}]")
         print(
             f"Overrides -> temp:{temp_override}, top_p:{top_p_override}"
         )
diff --git a/models/user_model.py b/models/user_model.py
index 5a58741..2b6d10b 100644
--- a/models/user_model.py
+++ b/models/user_model.py
@@ -5,12 +5,13 @@ history, message count, and the id of the user in order to track them.
 
 
 class RedoUser:
-    def __init__(self, prompt, instruction, message, ctx, response):
+    def __init__(self, prompt, instruction, message, ctx, response, codex):
         self.prompt = prompt
         self.instruction = instruction
         self.message = message
         self.ctx = ctx
         self.response = response
+        self.codex = codex
         self.interactions = []
 
     def add_interaction(self, interaction):