open-source-mirrors
/
GPT3Discord
mirror of https://github.com/Kav-K/GPT3Discord
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format Python code with psf/black push

Browse Source
github-actions 2 years ago
parent 57973cf606
commit 585638c457
4 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File

78
cogs/gpt_3_commands_and_converser.py
Unescape View File

@ -580,17 +580,27 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
summarized_text = response["choices"][0]["text"]
new_conversation_history = []
new_conversation_history.append(EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT,0))
new_conversation_history.append(
EmbeddedConversationItem("\nThis conversation has some context from earlier, which has been summarized as follows: ",0)
EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT, 0)
)
new_conversation_history.append(EmbeddedConversationItem(summarized_text,0))
new_conversation_history.append(
EmbeddedConversationItem("\nContinue the conversation, paying very close attention to things <username> told you, such as their name, and personal details.\n",0)
EmbeddedConversationItem(
"\nThis conversation has some context from earlier, which has been summarized as follows: ",
0,
)
)
new_conversation_history.append(EmbeddedConversationItem(summarized_text, 0))
new_conversation_history.append(
EmbeddedConversationItem(
"\nContinue the conversation, paying very close attention to things <username> told you, such as their name, and personal details.\n",
0,
)
)
# Get the last entry from the thread's conversation history
new_conversation_history.append(
EmbeddedConversationItem(self.conversation_threads[message.channel.id].history[-1] + "\n",0)
EmbeddedConversationItem(
self.conversation_threads[message.channel.id].history[-1] + "\n", 0
)
)
self.conversation_threads[message.channel.id].history = new_conversation_history
@ -632,7 +642,10 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
pinecone_dont_reinsert = None
if not self.pinecone_service:
self.conversation_threads[after.channel.id].history.append(
EmbeddedConversationItem(f"\n{after.author.display_name}: {after.content}<|endofstatement|>\n",0)
EmbeddedConversationItem(
f"\n{after.author.display_name}: {after.content}<|endofstatement|>\n",
0,
)
)
self.conversation_threads[after.channel.id].count += 1
@ -763,7 +776,10 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
if not self.pinecone_service:
self.conversation_threads[message.channel.id].history.append(
EmbeddedConversationItem(f"\n'{message.author.display_name}': {prompt} <|endofstatement|>\n",0)
EmbeddedConversationItem(
f"\n'{message.author.display_name}': {prompt} <|endofstatement|>\n",
0,
)
)
# increment the conversation counter for the user
@ -778,7 +794,12 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
primary_prompt = prompt
else:
primary_prompt = "".join(
[item.text for item in self.conversation_threads[message.channel.id].history]
[
item.text
for item in self.conversation_threads[
message.channel.id
].history
]
)
await self.encapsulated_send(
@ -871,7 +892,14 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
print(self.conversation_threads[ctx.channel.id].history)
print("---------------------------- END Conersation POINT 2")
if edited_request:
new_prompt = "".join([item.text for item in self.conversation_threads[ctx.channel.id].history])
new_prompt = "".join(
[
item.text
for item in self.conversation_threads[
ctx.channel.id
].history
]
)
self.redo_users[ctx.author.id].prompt = new_prompt
else:
# Create and upsert the embedding for the conversation id, prompt, timestamp
@ -924,7 +952,9 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
# remove duplicates from prompt_with_history and set the conversation history
prompt_with_history = list(dict.fromkeys(prompt_with_history))
self.conversation_threads[ctx.channel.id].history = prompt_with_history
self.conversation_threads[
ctx.channel.id
].history = prompt_with_history
# Sort the prompt_with_history by increasing timestamp if pinecone is enabled
if self.pinecone_service:
@ -944,7 +974,6 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
new_prompt = prompt_with_history + "\nGPTie: "
tokens = self.usage_service.count_tokens(new_prompt)
# No pinecone, we do conversation summarization for long term memory instead
@ -967,7 +996,13 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
# Check again if the prompt is about to go past the token limit
new_prompt = (
"".join([item.text for item in self.conversation_threads[id].history]) + "\nGPTie: "
"".join(
[
item.text
for item in self.conversation_threads[id].history
]
)
+ "\nGPTie: "
)
tokens = self.usage_service.count_tokens(new_prompt)
@ -1022,7 +1057,9 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
):
if not redo_request:
self.conversation_threads[id].history.append(
EmbeddedConversationItem("\nGPTie: " + str(response_text) + "<|endofstatement|>\n",0)
EmbeddedConversationItem(
"\nGPTie: " + str(response_text) + "<|endofstatement|>\n", 0
)
)
# Embeddings case!
@ -1112,8 +1149,6 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
if ctx.channel.id in self.awaiting_thread_responses:
self.awaiting_thread_responses.remove(ctx.channel.id)
# Error catching for OpenAI model value errors
except ValueError as e:
if from_context:
@ -1327,11 +1362,11 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
# Append the starter text for gpt3 to the user's history so it gets concatenated with the prompt later
if minimal or opener_file:
self.conversation_threads[thread.id].history.append(
EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT_MINIMAL,0)
EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT_MINIMAL, 0)
)
elif not minimal:
self.conversation_threads[thread.id].history.append(
EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT,0)
EmbeddedConversationItem(self.CONVERSATION_STARTER_TEXT, 0)
)
await thread.send(
@ -1349,7 +1384,10 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
if not self.pinecone_service:
self.conversation_threads[thread.id].history.append(
EmbeddedConversationItem(f"\n'{ctx.author.display_name}': {opener} <|endofstatement|>\n",0)
EmbeddedConversationItem(
f"\n'{ctx.author.display_name}': {opener} <|endofstatement|>\n",
0,
)
)
self.conversation_threads[thread.id].count += 1
@ -1358,7 +1396,9 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
thread.id,
opener
if thread.id not in self.conversation_threads or self.pinecone_service
else "".join([item.text for item in self.conversation_threads[thread.id].history]),
else "".join(
[item.text for item in self.conversation_threads[thread.id].history]
),
thread_message,
custom_api_key=user_api_key,
)

4
models/openai_model.py
Unescape View File

@ -425,7 +425,7 @@ class Model:
await self.valid_text_request(response)
#print(response["choices"][0]["text"])
# print(response["choices"][0]["text"])
return response
@ -559,7 +559,7 @@ class Model:
) as resp:
response = await resp.json()
#print(response)
# print(response)
image_urls = []
for result in response["data"]:

2
models/pinecone_service_model.py
Unescape View File

@ -59,7 +59,7 @@ class PineconeService:
include_metadata=True,
filter={"conversation_id": conversation_id},
)
#print(response)
# print(response)
relevant_phrases = [
(match["id"], match["metadata"]["timestamp"])
for match in response["matches"]

2
models/user_model.py
Unescape View File

@ -109,4 +109,4 @@ class EmbeddedConversationItem:
# Make it such that if there is an arry with these EmbeddedConversationItems, if we "".join the array, each item will
# return the .text attribute
def __format__(self, format_spec):
return self.text
return self.text

Write Preview
Loading…
Cancel
Save