From a6ded5ab814bb4480c9cc452173e31d6518411f7 Mon Sep 17 00:00:00 2001 From: Kaveen Kumarasinghe Date: Mon, 9 Jan 2023 18:01:15 -0500 Subject: [PATCH] fix opener file loading --- cogs/gpt_3_commands_and_converser.py | 5 +++-- models/autocomplete_model.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cogs/gpt_3_commands_and_converser.py b/cogs/gpt_3_commands_and_converser.py index 2fa666b..f16dc87 100644 --- a/cogs/gpt_3_commands_and_converser.py +++ b/cogs/gpt_3_commands_and_converser.py @@ -1134,7 +1134,7 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"): ): # only load in files if it's included in the command, if not pass on as normal if opener_file.endswith(".txt"): # Load the file and read it into opener - opener_file = f"openers{separator}{opener_file}" + opener_file = EnvService.find_shared_file(f"openers{separator}{opener_file}") opener_file = await self.load_file(opener_file, ctx) if ( not opener @@ -1202,7 +1202,8 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"): thread_message, ) self.awaiting_responses.remove(user_id_normalized) - self.awaiting_thread_responses.remove(thread.id) + if thread.id in self.awaiting_thread_responses: + self.awaiting_thread_responses.remove(thread.id) self.conversation_thread_owners[user_id_normalized] = thread.id diff --git a/models/autocomplete_model.py b/models/autocomplete_model.py index 7977fee..3fa9b6e 100644 --- a/models/autocomplete_model.py +++ b/models/autocomplete_model.py @@ -5,6 +5,7 @@ import re import discord from models.usage_service_model import UsageService from models.openai_model import Model +from models.env_service_model import EnvService usage_service = UsageService(Path(os.environ.get("DATA_DIR", os.getcwd()))) model = Model(usage_service) @@ -51,7 +52,7 @@ class File_autocompleter: try: return [ file - for file in os.listdir("openers") + for file in os.listdir(EnvService.find_shared_file("openers")) if file.startswith(ctx.value.lower()) ][ :25