Format Python code with psf/black push

github-actions 1 year ago
parent 9637ace4ec
commit 4aa20f832f

@ -805,7 +805,7 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
] ]
) )
#set conversation overrides # set conversation overrides
overrides = self.conversation_threads[message.channel.id].get_overrides() overrides = self.conversation_threads[message.channel.id].get_overrides()
await self.encapsulated_send( await self.encapsulated_send(
@ -1342,26 +1342,39 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
pass pass
else: else:
if not opener_file.endswith((".txt", ".json")): if not opener_file.endswith((".txt", ".json")):
opener_file = None # Just start a regular thread if the file fails to load opener_file = (
None # Just start a regular thread if the file fails to load
)
else: else:
# Load the file and read it into opener # Load the file and read it into opener
try: try:
opener_file = re.sub(".+(?=[\\//])", "", opener_file) # remove paths from the opener file opener_file = re.sub(
".+(?=[\\//])", "", opener_file
) # remove paths from the opener file
opener_file = EnvService.find_shared_file( opener_file = EnvService.find_shared_file(
f"openers{separator}{opener_file}" f"openers{separator}{opener_file}"
) )
opener_file = await self.load_file(opener_file, ctx) opener_file = await self.load_file(opener_file, ctx)
try: # Try opening as json, if it fails it'll just pass the whole txt or json to the opener try: # Try opening as json, if it fails it'll just pass the whole txt or json to the opener
opener_file = json.loads(opener_file) opener_file = json.loads(opener_file)
temperature=opener_file.get("temperature", None) temperature = opener_file.get("temperature", None)
top_p=opener_file.get("top_p", None) top_p = opener_file.get("top_p", None)
frequency_penalty=opener_file.get("frequency_penalty", None) frequency_penalty = opener_file.get(
presence_penalty=opener_file.get("presence_penalty", None) "frequency_penalty", None
self.conversation_threads[thread.id].set_overrides(temperature, top_p, frequency_penalty, presence_penalty) )
if not opener: # if we only use opener_file then only pass on opener_file for the opening prompt presence_penalty = opener_file.get("presence_penalty", None)
opener = opener_file.get('text', "error getting text") self.conversation_threads[thread.id].set_overrides(
temperature, top_p, frequency_penalty, presence_penalty
)
if (
not opener
): # if we only use opener_file then only pass on opener_file for the opening prompt
opener = opener_file.get("text", "error getting text")
else: else:
opener = opener_file.get('text', "error getting text") + opener opener = (
opener_file.get("text", "error getting text")
+ opener
)
except: # Parse as just regular text except: # Parse as just regular text
if not opener: if not opener:
opener = opener_file opener = opener_file
@ -1370,7 +1383,6 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
except: except:
opener_file = None # Just start a regular thread if the file fails to load opener_file = None # Just start a regular thread if the file fails to load
# Append the starter text for gpt3 to the user's history so it gets concatenated with the prompt later # Append the starter text for gpt3 to the user's history so it gets concatenated with the prompt later
if minimal or opener_file: if minimal or opener_file:
self.conversation_threads[thread.id].history.append( self.conversation_threads[thread.id].history.append(

@ -62,7 +62,13 @@ class Thread:
self.frequency_penalty = None self.frequency_penalty = None
self.presence_penalty = None self.presence_penalty = None
def set_overrides(self, temperature=None,top_p=None,frequency_penalty=None,presence_penalty=None): def set_overrides(
self,
temperature=None,
top_p=None,
frequency_penalty=None,
presence_penalty=None,
):
self.temperature = temperature self.temperature = temperature
self.top_p = top_p self.top_p = top_p
self.frequency_penalty = frequency_penalty self.frequency_penalty = frequency_penalty

Loading…
Cancel
Save