From c7271ab5256048a8190d6dde92e997099187b882 Mon Sep 17 00:00:00 2001 From: github-actions <${GITHUB_ACTOR}@users.noreply.github.com> Date: Fri, 3 Feb 2023 05:17:30 +0000 Subject: [PATCH] Format Python code with psf/black push --- cogs/commands.py | 16 +++++++++------- cogs/text_service_cog.py | 4 +++- gpt3discord.py | 1 - models/autocomplete_model.py | 7 ++----- models/openai_model.py | 3 ++- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cogs/commands.py b/cogs/commands.py index 2e43229..ebc7dc1 100644 --- a/cogs/commands.py +++ b/cogs/commands.py @@ -302,9 +302,7 @@ class Commands(discord.Cog, name="Commands"): name="prompt", description="The prompt to send to GPT3", required=True ) @discord.option( - name="private", - description="Will only be visible to you", - required=False + name="private", description="Will only be visible to you", required=False ) @discord.option( name="temperature", @@ -346,7 +344,13 @@ class Commands(discord.Cog, name="Commands"): presence_penalty: float, ): await self.converser_cog.ask_command( - ctx, prompt, private, temperature, top_p, frequency_penalty, presence_penalty + ctx, + prompt, + private, + temperature, + top_p, + frequency_penalty, + presence_penalty, ) @add_to_group("gpt") @@ -367,9 +371,7 @@ class Commands(discord.Cog, name="Commands"): default="", ) @discord.option( - name="private", - description="Will only be visible to you", - required=False + name="private", description="Will only be visible to you", required=False ) @discord.option( name="temperature", diff --git a/cogs/text_service_cog.py b/cogs/text_service_cog.py index 8f01b84..b842b22 100644 --- a/cogs/text_service_cog.py +++ b/cogs/text_service_cog.py @@ -870,7 +870,9 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"): ) self.conversation_threads[thread.id] = Thread(thread.id) - self.conversation_threads[thread.id].model = self.model.model if not model else model + self.conversation_threads[thread.id].model = ( + self.model.model if not model else model + ) # Set the overrides for the conversation self.conversation_threads[thread.id].set_overrides( diff --git a/gpt3discord.py b/gpt3discord.py index 3ccd616..9db8afb 100644 --- a/gpt3discord.py +++ b/gpt3discord.py @@ -33,7 +33,6 @@ from models.openai_model import Model __version__ = "9.1" - PID_FILE = Path("bot.pid") PROCESS = None diff --git a/models/autocomplete_model.py b/models/autocomplete_model.py index c89acfd..017e8c0 100644 --- a/models/autocomplete_model.py +++ b/models/autocomplete_model.py @@ -91,12 +91,9 @@ class Settings_autocompleter: ): """Gets all models""" return [ - value - for value in Models.TEXT_MODELS - if value.startswith(ctx.value.lower()) + value for value in Models.TEXT_MODELS if value.startswith(ctx.value.lower()) ] - - + async def get_value_moderations( ctx: discord.AutocompleteContext, ): # Behaves a bit weird if you go back and edit the parameter without typing in a new command diff --git a/models/openai_model.py b/models/openai_model.py index ff65a5c..6f6f3c9 100644 --- a/models/openai_model.py +++ b/models/openai_model.py @@ -581,6 +581,7 @@ class Model: f"Backing off {details['wait']:0.1f} seconds after {details['tries']} tries calling function {details['target']} | " f"{details['exception'].status}: {details['exception'].message}" ) + def backoff_handler_request(details): print( f"Backing off {details['wait']:0.1f} seconds after {details['tries']} tries calling function {details['target']} | " @@ -795,7 +796,7 @@ class Model: "stop": "" if stop is None else stop, "temperature": self.temp if temp_override is None else temp_override, "top_p": self.top_p if top_p_override is None else top_p_override, - "max_tokens": self.max_tokens - tokens + "max_tokens": self.max_tokens - tokens if max_tokens_override is None else max_tokens_override, "presence_penalty": self.presence_penalty